1 diff -Naur fftrader-0.65.ori/fftfile.cpp fftrader-0.65.mod/fftfile.cpp
2 --- fftrader-0.65.ori/fftfile.cpp 2004-04-10 16:10:14.000000000 +0000
3 +++ fftrader-0.65.mod/fftfile.cpp 2004-04-30 00:06:53.000000000 +0000
9 + temp="/usr/share/fftrader/fpk/";
11 PHYSFS_addToSearchPath(temp.c_str(), 1);
18 + temp="/usr/share/fftrader/fpk/";
20 PHYSFS_addToSearchPath(temp.c_str(), 1);
23 PHYSFS_freeList(fpklist);
24 - fpksave.erase(0,4); // get rid of "fpk/" prefix
25 + fpksave.erase(0,4); // get rid of "/usr/share/fftrader/fpk/" prefix
28 void FPK_Invalid(std::string fpk, std::string message)
30 - TTF_Font *font=TTF_OpenFont("fonts/arial.ttf", 12);
31 + TTF_Font *font=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 12);
32 SDL_Color white = { 0xFF, 0xFF, 0xFF, 0 };
33 SDL_Surface *screen=SDL_GetVideoSurface();
36 PHYSFS_removeFromSearchPath(temp.c_str());
38 PHYSFS_freeList(spath);
39 - temp="fpk/"; temp+=fpksave;
40 + temp="/usr/share/fftrader/fpk/"; temp+=fpksave;
41 PHYSFS_addToSearchPath(temp.c_str(), 1);
42 //read the fpk objects file for the
43 //player ship designated by num
49 + temp="/usr/share/fftrader/fpk/";
51 PHYSFS_addToSearchPath(temp.c_str(), 1);
54 PHYSFS_freeList(spath);
57 - temp="fpk/"; temp+=fpksave;
58 + temp="/usr/share/fftrader/fpk/"; temp+=fpksave;
59 PHYSFS_addToSearchPath(temp.c_str(), 1);
60 surface=LoadIMG(imgsave);
61 PHYSFS_removeFromSearchPath(temp.c_str());
67 + temp="/usr/share/fftrader/fpk/";
69 PHYSFS_addToSearchPath(temp.c_str(), 1);
76 + temp="/usr/share/fftrader/fpk/";
85 + temp="/usr/share/fftrader/fpk/";
87 PHYSFS_addToSearchPath(temp.c_str(), 1);
90 PHYSFS_removeFromSearchPath(temp.c_str());
92 PHYSFS_freeList(spath);
93 - temp="fpk/"; temp+=fpk;
94 + temp="/usr/share/fftrader/fpk/"; temp+=fpk;
95 PHYSFS_addToSearchPath(temp.c_str(), 1);
97 SDL_FreeSurface(image);
103 + temp="/usr/share/fftrader/fpk/";
105 PHYSFS_addToSearchPath(temp.c_str(), 1);
107 diff -Naur fftrader-0.65.ori/gui.cpp fftrader-0.65.mod/gui.cpp
108 --- fftrader-0.65.ori/gui.cpp 2004-04-05 02:44:38.000000000 +0000
109 +++ fftrader-0.65.mod/gui.cpp 2004-04-30 00:06:53.000000000 +0000
111 buttondown=LoadIMG("gfx/gui/buttondown.png");
112 buttonuphover=LoadIMG("gfx/gui/buttonuphover.png");
113 buttondownhover=LoadIMG("gfx/gui/buttondownhover.png");
114 - font10=TTF_OpenFont("fonts/arial.ttf", 10);
115 - font12=TTF_OpenFont("fonts/arial.ttf", 12);
116 - font14=TTF_OpenFont("fonts/arial.ttf", 14);
117 - font16=TTF_OpenFont("fonts/arial.ttf", 16);
118 - font18=TTF_OpenFont("fonts/arial.ttf", 18);
119 + font10=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 10);
120 + font12=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 12);
121 + font14=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 14);
122 + font16=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 16);
123 + font18=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 18);
126 int GUI::MakeWindow(int x, int y, int w, int h)
127 diff -Naur fftrader-0.65.ori/guiapply.cpp fftrader-0.65.mod/guiapply.cpp
128 --- fftrader-0.65.ori/guiapply.cpp 2004-04-10 03:57:30.000000000 +0000
129 +++ fftrader-0.65.mod/guiapply.cpp 2004-04-30 00:06:53.000000000 +0000
131 int sQuit=startingGUI->MakeButton(100,280,w-200, "Quit");
133 SDL_Color white = { 0xFF, 0xFF, 0xFF, 0 };
134 - TTF_Font *font=TTF_OpenFont("fonts/arial.ttf", 14);
135 + TTF_Font *font=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 14);
137 int getx, gety, click, temp;
140 bool showinuse=false;
142 SDL_Color white = { 0xFF, 0xFF, 0xFF, 0 };
143 - TTF_Font *font=TTF_OpenFont("fonts/arial.ttf", 14);
144 + TTF_Font *font=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 14);
149 int sCancel=optionsGUI->MakeButton(100,280,w-200, "Back to Main Menu");
151 SDL_Color white = { 0xFF, 0xFF, 0xFF, 0 };
152 - TTF_Font *font=TTF_OpenFont("fonts/arial.ttf", 14);
153 + TTF_Font *font=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 14);
155 int getx, gety, click;
157 diff -Naur fftrader-0.65.ori/main.cpp fftrader-0.65.mod/main.cpp
158 --- fftrader-0.65.ori/main.cpp 2004-04-13 00:51:54.000000000 +0000
159 +++ fftrader-0.65.mod/main.cpp 2004-04-30 00:06:53.000000000 +0000
160 @@ -139,14 +139,14 @@
161 if (LOG) printf("SDL_ttf initialized successfully\n");
164 - font=LoadTTF("fonts/arial.ttf", 10);
165 + font=LoadTTF("/usr/share/fftrader/arial.ttf", 10);
167 - printf("Unable to Open font 'fonts/arial.ttf' - TTF_OpenFont: %s\n", TTF_GetError());
168 + printf("Unable to Open font '/usr/share/fftrader/arial.ttf' - TTF_OpenFont: %s\n", TTF_GetError());
171 - font2=LoadTTF("fonts/arial.ttf", 14);
172 + font2=LoadTTF("/usr/share/fftrader/arial.ttf", 14);
174 - printf("Unable to Open font 'fonts/arial.ttf' - TTF_OpenFont: %s\n", TTF_GetError());
175 + printf("Unable to Open font '/usr/share/fftrader/arial.ttf' - TTF_OpenFont: %s\n", TTF_GetError());
178 if (LOG) printf("Main Fonts loaded\n");
181 if (strcmp(fpktemp.c_str(),"base.fpk") && IsFPK(*k))
184 + fpktemp="/usr/share/fftrader/fpk/";
186 PHYSFS_addToSearchPath(fpktemp.c_str(), 1);
189 map->CheckSectors(sx, sy);
191 if (LOG) printf("Variables set, displaying opening message\n");
192 - TTF_Font *font9=TTF_OpenFont("fonts/arial.ttf", 9);
193 + TTF_Font *font9=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 9);
197 diff -Naur fftrader-0.65.ori/scenario.cpp fftrader-0.65.mod/scenario.cpp
198 --- fftrader-0.65.ori/scenario.cpp 2004-04-10 03:01:30.000000000 +0000
199 +++ fftrader-0.65.mod/scenario.cpp 2004-04-30 00:06:53.000000000 +0000
203 SDL_Color white = { 0xFF, 0xFF, 0xFF, 0 };
204 - TTF_Font *font=TTF_OpenFont("fonts/arial.ttf", 12);
205 - TTF_Font *font14=TTF_OpenFont("fonts/arial.ttf", 14);
206 + TTF_Font *font=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 12);
207 + TTF_Font *font14=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 14);
211 @@ -1139,8 +1139,8 @@
212 SDL_Surface *screen=SDL_GetVideoSurface();
214 SDL_Color white = { 0xFF, 0xFF, 0xFF, 0 };
215 - TTF_Font *font=TTF_OpenFont("fonts/arial.ttf", 12);
216 - TTF_Font *font14=TTF_OpenFont("fonts/arial.ttf", 14);
217 + TTF_Font *font=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 12);
218 + TTF_Font *font14=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 14);
222 @@ -1456,7 +1456,7 @@
224 void SCN_Invalid(std::string scn, std::string message)
226 - TTF_Font *font=TTF_OpenFont("fonts/arial.ttf", 12);
227 + TTF_Font *font=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 12);
228 SDL_Color white = { 0xFF, 0xFF, 0xFF, 0 };
229 SDL_Surface *screen=SDL_GetVideoSurface();
231 diff -Naur fftrader-0.65.ori/units.cpp fftrader-0.65.mod/units.cpp
232 --- fftrader-0.65.ori/units.cpp 2004-04-13 01:08:10.000000000 +0000
233 +++ fftrader-0.65.mod/units.cpp 2004-04-30 00:06:53.000000000 +0000
234 @@ -1336,8 +1336,8 @@
236 SDL_BlitSurface(screen, NULL, bg, &dest);
237 SDL_Color white = { 0xFF, 0xFF, 0xFF, 0 };
238 - TTF_Font *font=TTF_OpenFont("fonts/arial.ttf", 14);
239 - TTF_Font *font12=TTF_OpenFont("fonts/arial.ttf", 12);
240 + TTF_Font *font=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 14);
241 + TTF_Font *font12=TTF_OpenFont("/usr/share/fftrader/arial.ttf", 12);