enable fonts to be loaded when windows has been installed other than default location

Animal.cpp

@@ -22,6 +22,7 @@ Animal::Animal(string skin) {
     cur = 0;
     viime_event = 0;
     state_changed = false;
+    animation_i = 0;
 
     // set rand seed
     SDL_srand(0);
@@ -31,6 +32,11 @@ Animal::Animal(string skin) {
 }
 
 Animal::~Animal() {
+    for (unsigned i = 0; i < states.size(); i++) {
+        if (states[i]) {
+            delete states[i];
+        }
+    }
 }
 
 SDL_Surface *Animal::readImg(string skin, string state_name, int num) {
@@ -79,6 +85,12 @@ void Animal::readSkin(string skin) {
     State feat;
     char prev_chr;
 
+    for (unsigned i = 0; i < states.size(); i++) {
+        if (states[i]) {
+            delete states[i];
+        }
+    }
+
     states.clear();
     special_states.clear();
     random_states.clear();
@@ -150,11 +162,11 @@ void Animal::readSkinStep(string skin, char chr, string &buf, string &key, State
     prev_chr = chr;
 }
 
-void Animal::readSkinFill(string skin, State feat) {
+void Animal::readSkinFill(string skin, State &feat) {
-    states.push_back(feat);
+    cur_state = new State(feat);
+    states.push_back(cur_state);
 
     // Load images to memory
-    cur_state = &states.back();
     for (int x = 0; x < cur_state->count; x++) {
         cur_state->imgs.push_back(NULL);
         cur_state->imgs[x] = readImg(skin, cur_state->img_name, x);

Animal.h

@@ -30,6 +30,13 @@ class State {
 
     vector<SDL_Surface *> imgs;
     SoundData sound_data;
+    ~State() {
+        for (unsigned i = 0; i < imgs.size(); i++) {
+            if (imgs[i]) {
+                SDL_DestroySurface(imgs[i]);
+            }
+        }
+    }
 };
 
 class Animal {
@@ -40,7 +47,7 @@ class Animal {
     SDL_Surface *readImg(string skin, string state_name, int num);
     void readSkin(string file);
     void readSkinStep(string skin, char chr, string &buf, string &key, State &state, char &prev_chr);
-    void readSkinFill(string skin, State state);
+    void readSkinFill(string skin, State &state);
     void createShape(int num, int w, int h);
     void move();
     void animate(bool reset);
@@ -57,7 +64,7 @@ class Animal {
 
     SDL_Rect disp_pos; // has display width and height and window posiion on it
 
-    vector<State> states;
+    vector<State *> states;
     vector<State *> special_states;
     State *cur_state;
     vector<State *> random_states;

NewDialogs/Button.cpp

@@ -1,3 +1,5 @@
+#include "../SDLHelpers.h"
+
 #include <string>
 #include <iostream>
 
@@ -5,8 +7,6 @@ using namespace std;
 
 #include <SDL3_ttf/SDL_ttf.h>
 
-#include "../SDLHelpers.h"
-
 #include "Button.h"
 
 Button::Button(string text, SDL_Color color, SDL_Rect pos) : Item(pos) {

NewDialogs/Checkbox.cpp

@@ -1,3 +1,5 @@
+#include "../SDLHelpers.h"
+
 #include <string>
 
 using namespace std;
@@ -5,8 +7,6 @@ using namespace std;
 #include <SDL3/SDL.h>
 #include <SDL3_ttf/SDL_ttf.h>
 
-#include "../SDLHelpers.h"
-
 #include "Checkbox.h"
 
 bool isBetween(float a, float b, float c) {

NewDialogs/DlgDropDownList.cpp

@@ -1,3 +1,5 @@
+#include "../SDLHelpers.h"
+
 #include <vector>
 
 using namespace std;
@@ -6,8 +8,6 @@ using namespace std;
 #include <SDL3_image/SDL_image.h>
 #include <SDL3_ttf/SDL_ttf.h>
 
-#include "../SDLHelpers.h"
-
 #include "Item.h"
 #include "Scrollbar.h"
 #include "Listbox.h"

NewDialogs/DlgMainMenu.cpp

@@ -1,3 +1,5 @@
+#include "../SDLHelpers.h"
+
 #include <string>
 #include <vector>
 #include <iostream>
@@ -12,12 +14,9 @@ using namespace std;
 #include <SDL3_ttf/SDL_ttf.h>
 #include <SDL3/SDL_storage.h>
 
-#include "../SDLHelpers.h"
-
 #include "Item.h"
 #include "Button.h"
 #include "Dialog.h"
-#include "Frame.h"
 
 #include "DlgMainMenu.h"
 

NewDialogs/DropDownList.cpp

@@ -1,3 +1,5 @@
+#include "../SDLHelpers.h"
+
 #include <string>
 #include <iostream>
 
@@ -6,8 +8,6 @@ using namespace std;
 #include <SDL3/SDL.h>
 #include <SDL3_ttf/SDL_ttf.h>
 
-#include "../SDLHelpers.h"
-
 #include "DropDownList.h"
 #include "DlgDropDownList.h"
 

NewDialogs/Listbox.cpp

@@ -1,3 +1,5 @@
+#include "../SDLHelpers.h"
+
 #include <string>
 
 using namespace std;
@@ -5,8 +7,6 @@ using namespace std;
 #include <SDL3/SDL.h>
 #include <SDL3_ttf/SDL_ttf.h>
 
-#include "../SDLHelpers.h"
-
 #include "Listbox.h"
 
 Listbox::Listbox(vector<string> list, int item_size, SDL_Rect pos) : Item(pos) {

SDLHelpers.h

@@ -8,6 +8,10 @@
 #include <iostream>
 #include <cmath>
 
+#ifdef SDL_PLATFORM_WINDOWS
+#include <windows.h>
+#endif
+
 static const char *font_paths[] = {"C:/windows/fonts/", "/usr/share/fonts/TTF/", "./"};
 static const short font_path_count = 3;
 
@@ -31,12 +35,24 @@ static SDL_Color getColor(Uint8 r, Uint8 g, Uint8 b) {
 static TTF_Font *openFont(std::vector<std::string> fonts, int size) {
     TTF_Font *font = NULL;
     for (int x = 0; x < fonts.size(); x++) {
+#ifdef SDL_PLATFORM_WINDOWS
+        TCHAR windir[MAX_PATH];
+        GetWindowsDirectory(windir, MAX_PATH);
+        std::string windir_s(windir);
+        windir_s.append("/fonts/");
+        windir_s.append(fonts[x]);
+        font = TTF_OpenFont(windir_s.c_str(), size);
+        if (font) {
+            return font;
+        }
+#endif
         for (int y = 0; y < font_path_count; y++) {
             std::string val(font_paths[y]);
             val.append(fonts[x]);
             font = TTF_OpenFont(val.c_str(), size);
-            if (font)
+            if (font) {
                 return font;
+            }
         }
     }
     return NULL;