]> git.pld-linux.org Git - packages/fftrader.git/blame - fftrader-path.patch
- tabs in preamble
[packages/fftrader.git] / fftrader-path.patch
CommitLineData
4717cb16
MP
1diff -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
4@@ -420,7 +420,7 @@
5 {
6 if(IsFPK(*i))
7 {
8- temp="fpk/";
9+ temp="/usr/share/fftrader/fpk/";
10 temp+=*i;
11 PHYSFS_addToSearchPath(temp.c_str(), 1);
12 }
13@@ -468,18 +468,18 @@
14 {
15 if(IsFPK(*i))
16 {
17- temp="fpk/";
18+ temp="/usr/share/fftrader/fpk/";
19 temp+=*i;
20 PHYSFS_addToSearchPath(temp.c_str(), 1);
21 }
22 }
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
26 return fpksave;
27 }
28 void FPK_Invalid(std::string fpk, std::string message)
29 {
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();
34 std::string msg[20];
35@@ -548,7 +548,7 @@
36 PHYSFS_removeFromSearchPath(temp.c_str());
37 }
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
44@@ -579,7 +579,7 @@
45 {
46 if(IsFPK(*i))
47 {
48- temp="fpk/";
49+ temp="/usr/share/fftrader/fpk/";
50 temp+=*i;
51 PHYSFS_addToSearchPath(temp.c_str(), 1);
52 }
53@@ -609,7 +609,7 @@
54 PHYSFS_freeList(spath);
55 //get surface
56 SDL_Surface *surface;
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());
62@@ -621,7 +621,7 @@
63 {
64 if(IsFPK(*i))
65 {
66- temp="fpk/";
67+ temp="/usr/share/fftrader/fpk/";
68 temp+=*i;
69 PHYSFS_addToSearchPath(temp.c_str(), 1);
70 }
71@@ -707,7 +707,7 @@
72 if (listindex==cur)
73 {
74 fpk=*i;
75- temp="fpk/";
76+ temp="/usr/share/fftrader/fpk/";
77 temp+=fpk;
78 }
79 cur++;
80@@ -883,7 +883,7 @@
81 {
82 if(IsFPK(*i))
83 {
84- temp="fpk/";
85+ temp="/usr/share/fftrader/fpk/";
86 temp+=*i;
87 PHYSFS_addToSearchPath(temp.c_str(), 1);
88 }
89@@ -1005,7 +1005,7 @@
90 PHYSFS_removeFromSearchPath(temp.c_str());
91 }
92 PHYSFS_freeList(spath);
93- temp="fpk/"; temp+=fpk;
94+ temp="/usr/share/fftrader/fpk/"; temp+=fpk;
95 PHYSFS_addToSearchPath(temp.c_str(), 1);
96
97 SDL_FreeSurface(image);
98@@ -1021,7 +1021,7 @@
99 {
100 if(IsFPK(*i))
101 {
102- temp="fpk/";
103+ temp="/usr/share/fftrader/fpk/";
104 temp+=*i;
105 PHYSFS_addToSearchPath(temp.c_str(), 1);
106 }
107diff -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
110@@ -83,11 +83,11 @@
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);
124 buttonisdown=false;
125 }
126 int GUI::MakeWindow(int x, int y, int w, int h)
127diff -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
130@@ -20,7 +20,7 @@
131 int sQuit=startingGUI->MakeButton(100,280,w-200, "Quit");
132
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);
136 int done=0;
137 int getx, gety, click, temp;
138 double x=0;
139@@ -169,7 +169,7 @@
140 bool showinuse=false;
141 bool wasinuse=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);
145
146 while(!done)
147 {
148@@ -565,7 +565,7 @@
149 int sCancel=optionsGUI->MakeButton(100,280,w-200, "Back to Main Menu");
150
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);
154 int done=0;
155 int getx, gety, click;
156 while(!done)
157diff -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");
162
163 // load font
164- font=LoadTTF("fonts/arial.ttf", 10);
165+ font=LoadTTF("/usr/share/fftrader/arial.ttf", 10);
166 if(!font) {
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());
169 // handle error
170 }
171- font2=LoadTTF("fonts/arial.ttf", 14);
172+ font2=LoadTTF("/usr/share/fftrader/arial.ttf", 14);
173 if(!font2) {
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());
176 // handle error
177 }
178 if (LOG) printf("Main Fonts loaded\n");
179@@ -199,7 +199,7 @@
180 {
181 if (strcmp(fpktemp.c_str(),"base.fpk") && IsFPK(*k))
182 {
183- fpktemp="fpk/";
184+ fpktemp="/usr/share/fftrader/fpk/";
185 fpktemp+=*k;
186 PHYSFS_addToSearchPath(fpktemp.c_str(), 1);
187 }
188@@ -662,7 +662,7 @@
189 map->CheckSectors(sx, sy);
190 float zoom=1;
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);
194 while(!done)
195 {
196 Slock();
197diff -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
200@@ -974,8 +974,8 @@
201 int h=screen->h;
202 GUI *sGUI=new GUI;
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);
208 char **scnlist;
209 char **k;
210 std::string retval;
211@@ -1139,8 +1139,8 @@
212 SDL_Surface *screen=SDL_GetVideoSurface();
213 GUI *sGUI=new GUI;
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);
219 char **fpklist;
220 char **k;
221 Uint8 cr[6];
222@@ -1456,7 +1456,7 @@
223 }
224 void SCN_Invalid(std::string scn, std::string message)
225 {
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();
230 std::string msg[20];
231diff -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 @@
235 dest.y = 0;
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);
242
243 int choice=0;
244 int buycur=0;
This page took 0.179738 seconds and 4 git commands to generate.