Gentoo Archives: gentoo-commits

From: "Azamat H. Hackimov" <winterheart@××××××.ru>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-arcade/prototype/files/, games-arcade/prototype/
Date: Thu, 08 Aug 2019 21:47:00
Message-Id: 1565294119.8ebdb20563d3acf75f930f521612c36039aa7e5b.winterheart@gentoo
1 commit: 8ebdb20563d3acf75f930f521612c36039aa7e5b
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Thu Aug 8 19:55:19 2019 +0000
4 Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
5 CommitDate: Thu Aug 8 19:55:19 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=8ebdb205
7
8 prototype/files/prototype: remove
9
10 Dead upstream, unmaintained, deprecated eclasses
11
12 .../prototype/files/prototype-1.0-hacks.patch | 111 ---------
13 .../prototype/files/prototype-1.0-homedir.patch | 234 ------------------
14 .../prototype/files/prototype-1.0-includes.patch | 202 ---------------
15 .../prototype/files/prototype-1.0-linuxfixes.patch | 110 ---------
16 .../prototype/files/prototype-1.0-makefile.patch | 33 ---
17 .../files/prototype-1.0-sdlrendertarget.patch | 104 --------
18 .../prototype/files/prototype-1.0-setstate.patch | 271 ---------------------
19 games-arcade/prototype/metadata.xml | 8 -
20 games-arcade/prototype/prototype-1.0.ebuild | 71 ------
21 9 files changed, 1144 deletions(-)
22
23 diff --git a/games-arcade/prototype/files/prototype-1.0-hacks.patch b/games-arcade/prototype/files/prototype-1.0-hacks.patch
24 deleted file mode 100644
25 index 91f0282..0000000
26 --- a/games-arcade/prototype/files/prototype-1.0-hacks.patch
27 +++ /dev/null
28 @@ -1,111 +0,0 @@
29 -diff -Naur Engine.cpp Engine.cpp
30 ---- Engine.cpp 2009-10-02 08:27:11.000000000 +0200
31 -+++ Engine.cpp 2009-10-02 08:40:26.000000000 +0200
32 -@@ -20,9 +20,9 @@
33 - winHeight = height;
34 - int vsync=0, bpp=32, log=1, joystick=1;
35 - int fullscreen = fscreen?1:0;
36 -- int renderTargets=1;
37 -+ int renderTargets=0;
38 - int FPS=0;
39 -- int scanlines = 1;
40 -+ int scanlines = 0;
41 - gSerializer.PutComment("Engine.cfg","[Display Properties]");
42 - /* gSerializer.ReadVariable("Engine.cfg","winWidth",winWidth);
43 - gSerializer.ReadVariable("Engine.cfg","winHeight",winHeight);
44 -@@ -1211,27 +1211,27 @@
45 - }
46 - void Engine::SaveScores()
47 - {
48 -- DeleteFile("score.dat");
49 -+// DeleteFile("score.dat");
50 - gSerializer.ReadVariable("score.dat","1a",iHiScore[0]);
51 -- gSerializer.ReadVariable("score.dat","1b",string(szHiScore[0]));
52 -+ gSerializer.ReadVariable("score.dat","1b",iHiScore[0]);
53 - gSerializer.ReadVariable("score.dat","2a",iHiScore[1]);
54 -- gSerializer.ReadVariable("score.dat","2b",string(szHiScore[1]));
55 -+ gSerializer.ReadVariable("score.dat","2b",iHiScore[1]);
56 - gSerializer.ReadVariable("score.dat","3a",iHiScore[2]);
57 -- gSerializer.ReadVariable("score.dat","3b",string(szHiScore[2]));
58 -+ gSerializer.ReadVariable("score.dat","3b",iHiScore[2]);
59 - gSerializer.ReadVariable("score.dat","4a",iHiScore[3]);
60 -- gSerializer.ReadVariable("score.dat","4b",string(szHiScore[3]));
61 -+ gSerializer.ReadVariable("score.dat","4b",iHiScore[3]);
62 - gSerializer.ReadVariable("score.dat","5a",iHiScore[4]);
63 -- gSerializer.ReadVariable("score.dat","5b",string(szHiScore[4]));
64 -+ gSerializer.ReadVariable("score.dat","5b",iHiScore[4]);
65 - gSerializer.ReadVariable("score.dat","6a",iHiScore[5]);
66 -- gSerializer.ReadVariable("score.dat","6b",string(szHiScore[5]));
67 -+ gSerializer.ReadVariable("score.dat","6b",iHiScore[5]);
68 - gSerializer.ReadVariable("score.dat","7a",iHiScore[6]);
69 -- gSerializer.ReadVariable("score.dat","7b",string(szHiScore[6]));
70 -+ gSerializer.ReadVariable("score.dat","7b",iHiScore[6]);
71 - gSerializer.ReadVariable("score.dat","8a",iHiScore[7]);
72 -- gSerializer.ReadVariable("score.dat","8b",string(szHiScore[7]));
73 -+ gSerializer.ReadVariable("score.dat","8b",iHiScore[7]);
74 - gSerializer.ReadVariable("score.dat","9a",iHiScore[8]);
75 -- gSerializer.ReadVariable("score.dat","9b",string(szHiScore[8]));
76 -+ gSerializer.ReadVariable("score.dat","9b",iHiScore[8]);
77 - gSerializer.ReadVariable("score.dat","10a",iHiScore[9]);
78 -- gSerializer.ReadVariable("score.dat","10b",string(szHiScore[9]));
79 -+ gSerializer.ReadVariable("score.dat","10b",iHiScore[9]);
80 - }
81 -
82 - void Engine::RenderScanLines()
83 -diff -Naur FrontEnd.cpp FrontEnd.cpp
84 ---- FrontEnd.cpp 2009-10-02 08:36:41.000000000 +0200
85 -+++ FrontEnd.cpp 2009-10-02 08:40:49.000000000 +0200
86 -@@ -418,7 +418,7 @@
87 -
88 - case 13://back to main
89 - //write out new cfg
90 -- DeleteFile("Controls.cfg");
91 -+// DeleteFile("Controls.cfg");
92 - gSerializer.PutComment("Controls.cfg","[Control Configuration]");
93 - for(int n=0; n<6;n++)
94 - {
95 -diff -Naur Serializer.cpp Serializer.cpp
96 ---- Serializer.cpp 2009-10-02 08:14:42.000000000 +0200
97 -+++ Serializer.cpp 2009-10-02 08:41:21.000000000 +0200
98 -@@ -46,11 +46,11 @@
99 - {
100 - getline(f,s);
101 - string tok;
102 -- stringstream(s) >> tok;
103 -+// stringstream(s) >> tok;
104 - if(tok == varname)
105 - {
106 - string tok2;
107 -- stringstream(s) >> tok >> tok2 >> value;
108 -+// stringstream(s) >> tok >> tok2 >> value;
109 - #ifdef PRINT_SERIAL
110 - printf("%s read from file %s\n",tok.c_str(),file.c_str());
111 - #endif
112 -@@ -84,11 +84,11 @@
113 - {
114 - getline(f,s);
115 - string tok;
116 -- stringstream(s) >> tok;
117 -+// stringstream(s) >> tok;
118 - if(tok == varname)
119 - {
120 - string tok2;
121 -- stringstream(s) >> tok >> tok2 >> value;
122 -+// stringstream(s) >> tok >> tok2 >> value;
123 - #ifdef PRINT_SERIAL
124 - printf("%s read from file %s\n",tok.c_str(),file.c_str());
125 - #endif
126 -@@ -123,11 +123,11 @@
127 - {
128 - getline(f,s);
129 - string tok;
130 -- stringstream(s) >> tok;
131 -+// stringstream(s) >> tok;
132 - if(tok == varname)
133 - {
134 - string tok2;
135 -- stringstream(s) >> tok >> tok2 >> value;
136 -+// stringstream(s) >> tok >> tok2 >> value;
137 - #ifdef PRINT_SERIAL
138 - printf("%s read from file %s\n",tok.c_str(),file.c_str());
139 - #endif
140
141 diff --git a/games-arcade/prototype/files/prototype-1.0-homedir.patch b/games-arcade/prototype/files/prototype-1.0-homedir.patch
142 deleted file mode 100644
143 index 4851804..0000000
144 --- a/games-arcade/prototype/files/prototype-1.0-homedir.patch
145 +++ /dev/null
146 @@ -1,234 +0,0 @@
147 -diff -Naur Engine.cpp Engine.cpp
148 ---- Engine.cpp 2009-10-02 08:40:26.000000000 +0200
149 -+++ Engine.cpp 2009-10-02 08:45:51.000000000 +0200
150 -@@ -23,18 +23,22 @@
151 - int renderTargets=0;
152 - int FPS=0;
153 - int scanlines = 0;
154 -- gSerializer.PutComment("Engine.cfg","[Display Properties]");
155 --/* gSerializer.ReadVariable("Engine.cfg","winWidth",winWidth);
156 -- gSerializer.ReadVariable("Engine.cfg","winHeight",winHeight);
157 -- gSerializer.ReadVariable("Engine.cfg","bpp",bpp);
158 --*/ gSerializer.ReadVariable("Engine.cfg","Vsync",vsync);
159 -- gSerializer.ReadVariable("Engine.cfg","PBuffers",renderTargets);
160 -- gSerializer.ReadVariable("Engine.cfg","ShowFPS",FPS);
161 -- gSerializer.ReadVariable("Engine.cfg","Fullscreen",fullscreen);
162 -- gSerializer.ReadVariable("Engine.cfg","Scanlines",scanlines);
163 -- gSerializer.PutComment("Engine.cfg","[Engine Properties]");
164 -- gSerializer.ReadVariable("Engine.cfg","Keeplog",log);
165 -- gSerializer.ReadVariable("Engine.cfg","Joystick",joystick);
166 -+
167 -+ char enginepath[PATH_MAX];
168 -+ snprintf(enginepath, PATH_MAX, "%s/.prototype/Engine.cfg", getenv("HOME"));
169 -+
170 -+ gSerializer.PutComment(enginepath,"[Display Properties]");
171 -+/* gSerializer.ReadVariable(enginepath,"winWidth",winWidth);
172 -+ gSerializer.ReadVariable(enginepath,"winHeight",winHeight);
173 -+ gSerializer.ReadVariable(enginepath,"bpp",bpp);
174 -+*/ gSerializer.ReadVariable(enginepath,"Vsync",vsync);
175 -+ gSerializer.ReadVariable(enginepath,"PBuffers",renderTargets);
176 -+ gSerializer.ReadVariable(enginepath,"ShowFPS",FPS);
177 -+ gSerializer.ReadVariable(enginepath,"Fullscreen",fullscreen);
178 -+ gSerializer.ReadVariable(enginepath,"Scanlines",scanlines);
179 -+ gSerializer.PutComment(enginepath,"[Engine Properties]");
180 -+ gSerializer.ReadVariable(enginepath,"Keeplog",log);
181 -+ gSerializer.ReadVariable(enginepath,"Joystick",joystick);
182 - FPS?bShowFps = true: bShowFps= false;
183 - scanlines?bScanlines=true:bScanlines=false;
184 - renderTargets? bRenderTargetSupport=true:bRenderTargetSupport=false;
185 -@@ -310,14 +314,17 @@
186 - mKeys[5].SecondaryKey = SDLK_SPACE;
187 - }
188 -
189 -- gSerializer.PutComment("Controls.cfg","[Control Configuration]");
190 -+ char controlspath[PATH_MAX];
191 -+ snprintf(controlspath, PATH_MAX, "%s/.prototype/Controls.cfg", getenv("HOME"));
192 -+
193 -+ gSerializer.PutComment(controlspath,"[Control Configuration]");
194 - for(int n=0; n<6;n++)
195 - {
196 - char sz[256];
197 - sprintf(sz,"%s_Primary",mKeys[n].KeyName);
198 -- gSerializer.ReadVariable("Controls.cfg",sz,mKeys[n].PrimaryKey);
199 -+ gSerializer.ReadVariable(controlspath,sz,mKeys[n].PrimaryKey);
200 - sprintf(sz,"%s_Secondary",mKeys[n].KeyName);
201 -- gSerializer.ReadVariable("Controls.cfg",sz,mKeys[n].SecondaryKey);
202 -+ gSerializer.ReadVariable(controlspath,sz,mKeys[n].SecondaryKey);
203 - }
204 - }
205 - //================================================================================================//
206 -@@ -1178,26 +1185,29 @@
207 - string s9("CHEAT");
208 - string s10("*****");
209 -
210 -- gSerializer.ReadVariable("score.dat","1a",iHiScore[0]);
211 -- gSerializer.ReadVariable("score.dat","1b",s1);
212 -- gSerializer.ReadVariable("score.dat","2a",iHiScore[1]);
213 -- gSerializer.ReadVariable("score.dat","2b",s2);
214 -- gSerializer.ReadVariable("score.dat","3a",iHiScore[2]);
215 -- gSerializer.ReadVariable("score.dat","3b",s3);
216 -- gSerializer.ReadVariable("score.dat","4a",iHiScore[3]);
217 -- gSerializer.ReadVariable("score.dat","4b",s4);
218 -- gSerializer.ReadVariable("score.dat","5a",iHiScore[4]);
219 -- gSerializer.ReadVariable("score.dat","5b",s5);
220 -- gSerializer.ReadVariable("score.dat","6a",iHiScore[5]);
221 -- gSerializer.ReadVariable("score.dat","6b",s6);
222 -- gSerializer.ReadVariable("score.dat","7a",iHiScore[6]);
223 -- gSerializer.ReadVariable("score.dat","7b",s7);
224 -- gSerializer.ReadVariable("score.dat","8a",iHiScore[7]);
225 -- gSerializer.ReadVariable("score.dat","8b",s8);
226 -- gSerializer.ReadVariable("score.dat","9a",iHiScore[8]);
227 -- gSerializer.ReadVariable("score.dat","9b",s9);
228 -- gSerializer.ReadVariable("score.dat","10a",iHiScore[9]);
229 -- gSerializer.ReadVariable("score.dat","10b",s10);
230 -+ char scorepath[PATH_MAX];
231 -+ snprintf(scorepath, PATH_MAX, "%s/.prototype/score.dat", getenv("HOME"));
232 -+
233 -+ gSerializer.ReadVariable(scorepath,"1a",iHiScore[0]);
234 -+ gSerializer.ReadVariable(scorepath,"1b",s1);
235 -+ gSerializer.ReadVariable(scorepath,"2a",iHiScore[1]);
236 -+ gSerializer.ReadVariable(scorepath,"2b",s2);
237 -+ gSerializer.ReadVariable(scorepath,"3a",iHiScore[2]);
238 -+ gSerializer.ReadVariable(scorepath,"3b",s3);
239 -+ gSerializer.ReadVariable(scorepath,"4a",iHiScore[3]);
240 -+ gSerializer.ReadVariable(scorepath,"4b",s4);
241 -+ gSerializer.ReadVariable(scorepath,"5a",iHiScore[4]);
242 -+ gSerializer.ReadVariable(scorepath,"5b",s5);
243 -+ gSerializer.ReadVariable(scorepath,"6a",iHiScore[5]);
244 -+ gSerializer.ReadVariable(scorepath,"6b",s6);
245 -+ gSerializer.ReadVariable(scorepath,"7a",iHiScore[6]);
246 -+ gSerializer.ReadVariable(scorepath,"7b",s7);
247 -+ gSerializer.ReadVariable(scorepath,"8a",iHiScore[7]);
248 -+ gSerializer.ReadVariable(scorepath,"8b",s8);
249 -+ gSerializer.ReadVariable(scorepath,"9a",iHiScore[8]);
250 -+ gSerializer.ReadVariable(scorepath,"9b",s9);
251 -+ gSerializer.ReadVariable(scorepath,"10a",iHiScore[9]);
252 -+ gSerializer.ReadVariable(scorepath,"10b",s10);
253 - strcpy(szHiScore[0],s1.c_str());
254 - strcpy(szHiScore[1],s2.c_str());
255 - strcpy(szHiScore[2],s3.c_str());
256 -@@ -1211,27 +1221,30 @@
257 - }
258 - void Engine::SaveScores()
259 - {
260 -+ char scorepath[PATH_MAX];
261 -+ snprintf(scorepath, PATH_MAX, "%s/.prototype/score.dat", getenv("HOME"));
262 -+
263 - // DeleteFile("score.dat");
264 -- gSerializer.ReadVariable("score.dat","1a",iHiScore[0]);
265 -- gSerializer.ReadVariable("score.dat","1b",iHiScore[0]);
266 -- gSerializer.ReadVariable("score.dat","2a",iHiScore[1]);
267 -- gSerializer.ReadVariable("score.dat","2b",iHiScore[1]);
268 -- gSerializer.ReadVariable("score.dat","3a",iHiScore[2]);
269 -- gSerializer.ReadVariable("score.dat","3b",iHiScore[2]);
270 -- gSerializer.ReadVariable("score.dat","4a",iHiScore[3]);
271 -- gSerializer.ReadVariable("score.dat","4b",iHiScore[3]);
272 -- gSerializer.ReadVariable("score.dat","5a",iHiScore[4]);
273 -- gSerializer.ReadVariable("score.dat","5b",iHiScore[4]);
274 -- gSerializer.ReadVariable("score.dat","6a",iHiScore[5]);
275 -- gSerializer.ReadVariable("score.dat","6b",iHiScore[5]);
276 -- gSerializer.ReadVariable("score.dat","7a",iHiScore[6]);
277 -- gSerializer.ReadVariable("score.dat","7b",iHiScore[6]);
278 -- gSerializer.ReadVariable("score.dat","8a",iHiScore[7]);
279 -- gSerializer.ReadVariable("score.dat","8b",iHiScore[7]);
280 -- gSerializer.ReadVariable("score.dat","9a",iHiScore[8]);
281 -- gSerializer.ReadVariable("score.dat","9b",iHiScore[8]);
282 -- gSerializer.ReadVariable("score.dat","10a",iHiScore[9]);
283 -- gSerializer.ReadVariable("score.dat","10b",iHiScore[9]);
284 -+ gSerializer.ReadVariable(scorepath,"1a",iHiScore[0]);
285 -+ gSerializer.ReadVariable(scorepath,"1b",iHiScore[0]);
286 -+ gSerializer.ReadVariable(scorepath,"2a",iHiScore[1]);
287 -+ gSerializer.ReadVariable(scorepath,"2b",iHiScore[1]);
288 -+ gSerializer.ReadVariable(scorepath,"3a",iHiScore[2]);
289 -+ gSerializer.ReadVariable(scorepath,"3b",iHiScore[2]);
290 -+ gSerializer.ReadVariable(scorepath,"4a",iHiScore[3]);
291 -+ gSerializer.ReadVariable(scorepath,"4b",iHiScore[3]);
292 -+ gSerializer.ReadVariable(scorepath,"5a",iHiScore[4]);
293 -+ gSerializer.ReadVariable(scorepath,"5b",iHiScore[4]);
294 -+ gSerializer.ReadVariable(scorepath,"6a",iHiScore[5]);
295 -+ gSerializer.ReadVariable(scorepath,"6b",iHiScore[5]);
296 -+ gSerializer.ReadVariable(scorepath,"7a",iHiScore[6]);
297 -+ gSerializer.ReadVariable(scorepath,"7b",iHiScore[6]);
298 -+ gSerializer.ReadVariable(scorepath,"8a",iHiScore[7]);
299 -+ gSerializer.ReadVariable(scorepath,"8b",iHiScore[7]);
300 -+ gSerializer.ReadVariable(scorepath,"9a",iHiScore[8]);
301 -+ gSerializer.ReadVariable(scorepath,"9b",iHiScore[8]);
302 -+ gSerializer.ReadVariable(scorepath,"10a",iHiScore[9]);
303 -+ gSerializer.ReadVariable(scorepath,"10b",iHiScore[9]);
304 - }
305 -
306 - void Engine::RenderScanLines()
307 -diff -Naur FrontEnd.cpp FrontEnd.cpp
308 ---- FrontEnd.cpp 2009-10-02 08:40:49.000000000 +0200
309 -+++ FrontEnd.cpp 2009-10-02 08:46:44.000000000 +0200
310 -@@ -419,14 +419,17 @@
311 - case 13://back to main
312 - //write out new cfg
313 - // DeleteFile("Controls.cfg");
314 -- gSerializer.PutComment("Controls.cfg","[Control Configuration]");
315 -+
316 -+ char controlspath[PATH_MAX];
317 -+ snprintf(controlspath, PATH_MAX, "%s/.prototype/Controls.cfg", getenv("HOME"));
318 -+ gSerializer.PutComment(controlspath,"[Control Configuration]");
319 - for(int n=0; n<6;n++)
320 - {
321 - char sz[256];
322 - sprintf(sz,"%s_Primary",mKeys[n].KeyName);
323 -- gSerializer.ReadVariable("Controls.cfg",sz,mKeys[n].PrimaryKey);
324 -+ gSerializer.ReadVariable(controlspath,sz,mKeys[n].PrimaryKey);
325 - sprintf(sz,"%s_Secondary",mKeys[n].KeyName);
326 -- gSerializer.ReadVariable("Controls.cfg",sz,mKeys[n].SecondaryKey);
327 -+ gSerializer.ReadVariable(controlspath,sz,mKeys[n].SecondaryKey);
328 - }
329 - //back to main
330 - SetState(&Engine::UpdateSplash2,&Engine::RenderConfig);
331 SetStateTimed(&Engine::UpdateSplash,&Engine::RenderSplash,0.25f,&Engine::StartFadeIn);
332 -diff -Naur Log.cpp Log.cpp
333 ---- Log.cpp 2009-10-02 08:14:42.000000000 +0200
334 -+++ Log.cpp 2009-10-02 08:47:53.000000000 +0200
335 -@@ -1,4 +1,6 @@
336 - #include "Log.h"
337 -+#include <sys/stat.h>
338 -+#include "stdafx.h"
339 - //================================================================================================//
340 - /**************************
341 - ** global logging system **
342 -@@ -9,6 +11,8 @@
343 -
344 - void Log::OutPut(string str)
345 - {
346 -+ char logpath[PATH_MAX];
347 -+ snprintf(logpath, PATH_MAX, "%s/.prototype/Logfile.txt", getenv("HOME"));
348 - if(!bKeepLog)
349 - return;
350 - #ifdef PRINT_TO_CONSOLE
351 -@@ -17,11 +21,11 @@
352 - ofstream f;
353 - if(!lcount)
354 - {
355 -- f.open("Logfile.txt");
356 -+ f.open(logpath);
357 - f << "Logfile created on " << __DATE__ << endl;
358 - }
359 - else
360 -- f.open("Logfile.txt",ios::app);
361 -+ f.open(logpath,ios::app);
362 -
363 - if(f.is_open())
364 - {
365 -diff -Naur ProtoType.cpp ProtoType.cpp
366 ---- ProtoType.cpp 2009-10-02 08:36:58.000000000 +0200
367 -+++ ProtoType.cpp 2009-10-02 08:48:22.000000000 +0200
368 -@@ -2,9 +2,13 @@
369 - //
370 -
371 - #include "stdafx.h"
372 -+#include <sys/stat.h>
373 -
374 - int main(int argc, char* argv[])
375 - {
376 -+ char cfg_path[PATH_MAX];
377 -+ snprintf(cfg_path, PATH_MAX, "%s/.prototype/", getenv("HOME"));
378 -+ mkdir(cfg_path, 0755);
379 - Engine engine(640,480,false,"PROTOTYPE");
380 -
381 - return 0;
382
383 diff --git a/games-arcade/prototype/files/prototype-1.0-includes.patch b/games-arcade/prototype/files/prototype-1.0-includes.patch
384 deleted file mode 100644
385 index 9dc3d4e..0000000
386 --- a/games-arcade/prototype/files/prototype-1.0-includes.patch
387 +++ /dev/null
388 @@ -1,202 +0,0 @@
389 -diff -Naur Bug.cpp Bug.cpp
390 ---- Bug.cpp 2009-10-02 08:14:42.000000000 +0200
391 -+++ Bug.cpp 2009-10-02 08:17:08.000000000 +0200
392 -@@ -1,6 +1,6 @@
393 - #include "Bug.h"
394 - #include "Engine.h"
395 --#include "debris.h"
396 -+#include "Debris.h"
397 -
398 - Bug::Bug()
399 - {
400 -diff -Naur Bullet.cpp Bullet.cpp
401 ---- Bullet.cpp 2009-10-02 08:14:42.000000000 +0200
402 -+++ Bullet.cpp 2009-10-02 08:17:25.000000000 +0200
403 -@@ -1,4 +1,4 @@
404 --#include "engine.h"
405 -+#include "Engine.h"
406 - #include "Debris.h"
407 - #include "RandExplosion.h"
408 - //================================================================================================//
409 -diff -Naur Editor.cpp Editor.cpp
410 ---- Editor.cpp 2009-10-02 08:14:42.000000000 +0200
411 -+++ Editor.cpp 2009-10-02 08:17:41.000000000 +0200
412 -@@ -1,5 +1,5 @@
413 - #include "Engine.h"
414 --#include "UTIL_BitOp.h"
415 -+#include "UTIL_bitop.h"
416 - //================================================================================================//
417 - /************************
418 - ** Set editor defaults **
419 -diff -Naur Engine.cpp Engine.cpp
420 ---- Engine.cpp 2009-10-02 08:14:42.000000000 +0200
421 -+++ Engine.cpp 2009-10-02 08:17:54.000000000 +0200
422 -@@ -1,4 +1,4 @@
423 --#include "engine.h"
424 -+#include "Engine.h"
425 - //#define PROFILE_TIME 100//set your profile time here (if you want to profile for specific set length)
426 - //================================================================================================//
427 - /***********************
428 -diff -Naur Engine.h Engine.h
429 ---- Engine.h 2009-10-02 08:14:42.000000000 +0200
430 -+++ Engine.h 2009-10-02 08:18:49.000000000 +0200
431 -@@ -2,7 +2,7 @@
432 - #ifdef WIN32
433 - #include <windows.h>
434 - #endif
435 --#include <sdl.h>
436 -+#include <SDL/SDL.h>
437 - #include <fstream>
438 -
439 - #include "Sound.h"
440 -@@ -49,7 +49,7 @@
441 - #include "TriggerSlowDown.h"
442 - #include "Fire.h"
443 - #include "SolarFlare.h"
444 --#include "FireBug.h"
445 -+#include "fireBug.h"
446 - #include "SpaceTrash.h"
447 - #include <list>
448 - using namespace std;
449 -diff -Naur Entity.h Entity.h
450 ---- Entity.h 2009-10-02 08:14:42.000000000 +0200
451 -+++ Entity.h 2009-10-02 08:19:12.000000000 +0200
452 -@@ -1,10 +1,10 @@
453 - #pragma once
454 - #include "Vector.h"
455 - #include "Button.h"
456 --#include "UTIL_Bitop.h"
457 -+#include "UTIL_bitop.h"
458 - #include "Sprite.h"
459 - #include "UTIL_Misc.h"
460 --#include "Geo2d.h"
461 -+#include "Geo2D.h"
462 - #include "Geo2D_Draw.h"
463 - #include "FileIO.h"
464 - #include <list>
465 -diff -Naur firebug.cpp firebug.cpp
466 ---- firebug.cpp 2009-10-02 08:14:42.000000000 +0200
467 -+++ firebug.cpp 2009-10-02 08:22:25.000000000 +0200
468 -@@ -1,4 +1,4 @@
469 --#include "FireBug.h"
470 -+#include "fireBug.h"
471 - #include "Engine.h"
472 - #include "Debris.h"
473 - FireBug::FireBug()
474 -diff -Naur Map.cpp Map.cpp
475 ---- Map.cpp 2009-10-02 08:14:42.000000000 +0200
476 -+++ Map.cpp 2009-10-02 08:19:25.000000000 +0200
477 -@@ -1,5 +1,5 @@
478 - #include "Engine.h"
479 --#include "UTIL_Bitop.h"
480 -+#include "UTIL_bitop.h"
481 - //================================================================================================//
482 - /*********************************
483 - ** Little cleanup of the arrays **
484 -diff -Naur PostEffects.cpp PostEffects.cpp
485 ---- PostEffects.cpp 2009-10-02 08:14:42.000000000 +0200
486 -+++ PostEffects.cpp 2009-10-02 08:19:42.000000000 +0200
487 -@@ -1,4 +1,4 @@
488 --#include "engine.h"
489 -+#include "Engine.h"
490 - //================================================================================================//
491 - /*************************************************************************
492 - ** if we have pbuffer support, we'll copy the main frame into one image **
493 -diff -Naur Profiler.h Profiler.h
494 ---- Profiler.h 2009-10-02 08:14:42.000000000 +0200
495 -+++ Profiler.h 2009-10-02 08:19:55.000000000 +0200
496 -@@ -1,5 +1,5 @@
497 - #pragma
498 --#include <sdl.h>
499 -+#include <SDL/SDL.h>
500 - #include <vector>
501 - #include <string>
502 - #include <fstream>
503 -diff -Naur Sound.h Sound.h
504 ---- Sound.h 2009-10-02 08:14:42.000000000 +0200
505 -+++ Sound.h 2009-10-02 08:20:12.000000000 +0200
506 -@@ -1,5 +1,5 @@
507 - #pragma once
508 --#include <FMOD/fmod.h>
509 -+#include <fmod.h>
510 - #include <stdio.h>
511 -
512 - class Sound
513 -diff -Naur SpriteEffect.cpp SpriteEffect.cpp
514 ---- SpriteEffect.cpp 2009-10-02 08:14:42.000000000 +0200
515 -+++ SpriteEffect.cpp 2009-10-02 08:20:39.000000000 +0200
516 -@@ -1,6 +1,6 @@
517 - #include "SpriteEffect.h"
518 - #include "UTIL_openGL.h"
519 --#include "UTIL_misc.h"
520 -+#include "UTIL_Misc.h"
521 - #include "Sprite.h"
522 - #include "Engine.h"
523 - SpriteEffect::SpriteEffect()
524 -diff -Naur Sprite.h Sprite.h
525 ---- Sprite.h 2009-10-02 08:14:42.000000000 +0200
526 -+++ Sprite.h 2009-10-02 08:20:25.000000000 +0200
527 -@@ -1,5 +1,5 @@
528 - #pragma once
529 --#include "UTIL_OpenGL.h"
530 -+#include "UTIL_openGL.h"
531 - #include "SpriteSheet.h"
532 -
533 - void RenderSprite(SpriteSheet spr, int frame, float x, float y, float w, float h);
534 -diff -Naur Timer.h Timer.h
535 ---- Timer.h 2009-10-02 08:14:42.000000000 +0200
536 -+++ Timer.h 2009-10-02 08:20:55.000000000 +0200
537 -@@ -1,5 +1,5 @@
538 - #pragma once
539 --#include <sdl.h>
540 -+#include <SDL/SDL.h>
541 - class Timer
542 - {
543 - private:
544 -diff -Naur UTIL_Fade.cpp UTIL_Fade.cpp
545 ---- UTIL_Fade.cpp 2009-10-02 08:14:42.000000000 +0200
546 -+++ UTIL_Fade.cpp 2009-10-02 08:21:13.000000000 +0200
547 -@@ -1,6 +1,6 @@
548 - #include "UTIL_Fade.h"
549 - #include "UTIL_Misc.h"
550 --#include "UTIL_OpenGL.h"
551 -+#include "UTIL_openGL.h"
552 -
553 - Fade::Fade()
554 - {
555 -diff -Naur UTIL_openGL.h UTIL_openGL.h
556 ---- UTIL_openGL.h 2009-10-02 08:14:42.000000000 +0200
557 -+++ UTIL_openGL.h 2009-10-02 08:22:12.000000000 +0200
558 -@@ -3,14 +3,14 @@
559 - #ifdef _WIN32
560 - #include <windows.h>
561 - #endif
562 --#include <gl/gl.h>
563 --#include <gl/glu.h>
564 --#include <gl/glext.h>
565 --#include <gl/wglext.h>
566 --#include <il/il.h>
567 --#include <il/ilu.h>
568 --#include <il/ilut.h>
569 --#include <string>
570 -+#include <GL/gl.h>
571 -+#include <GL/glu.h>
572 -+#include <GL/glext.h>
573 -+//#include <gl/wglext.h>
574 -+#include <IL/il.h>
575 -+#include <IL/ilu.h>
576 -+#include <IL/ilut.h>
577 -+#include <cstring>
578 - #include <sstream>
579 - #include "Log.h"
580 - //#define EXTENSION_SUPPORT_1_1
581 -diff -Naur UTIL_SDL.h UTIL_SDL.h
582 ---- UTIL_SDL.h 2009-10-02 08:14:42.000000000 +0200
583 -+++ UTIL_SDL.h 2009-10-02 08:21:29.000000000 +0200
584 -@@ -1,5 +1,5 @@
585 - #pragma once
586 --#include <sdl.h>
587 -+#include <SDL/SDL.h>
588 - #include "UTIL_openGL.h"
589 - #include "Log.h"
590 - #define SDL_VERSION_1_3
591
592 diff --git a/games-arcade/prototype/files/prototype-1.0-linuxfixes.patch b/games-arcade/prototype/files/prototype-1.0-linuxfixes.patch
593 deleted file mode 100644
594 index c8a2658..0000000
595 --- a/games-arcade/prototype/files/prototype-1.0-linuxfixes.patch
596 +++ /dev/null
597 @@ -1,110 +0,0 @@
598 -diff -Naur FileIO.h FileIO.h
599 ---- FileIO.h 2009-10-02 08:14:42.000000000 +0200
600 -+++ FileIO.h 2009-10-02 08:36:02.000000000 +0200
601 -@@ -207,4 +207,4 @@
602 - };
603 -
604 -
605 --#endif _FILEIO_H_
606 -+#endif
607 -diff -Naur Font.h Font.h
608 ---- Font.h 2009-10-02 08:14:42.000000000 +0200
609 -+++ Font.h 2009-10-02 08:36:14.000000000 +0200
610 -@@ -35,7 +35,7 @@
611 - /*************************************
612 - ** Methods **
613 - *************************************/
614 -- bool Font::GenerateGlyphs(char* name);
615 -+ bool GenerateGlyphs(char* name);
616 - void GenerateOffsets(unsigned char* data, int w, int h);//variable widths
617 - void GenerateCoords();//texture coordinate per glyph
618 - /*************************************
619 -@@ -50,4 +50,4 @@
620 - int mAlign;
621 - float sine,sineMulti;
622 - bool bSineWave;
623 --};
624 -\ Kein Zeilenumbruch am Dateiende.
625 -+};
626 -diff -Naur FrontEnd.cpp FrontEnd.cpp
627 ---- FrontEnd.cpp 2009-10-02 08:33:58.000000000 +0200
628 -+++ FrontEnd.cpp 2009-10-02 08:36:41.000000000 +0200
629 -@@ -1017,21 +1017,21 @@
630 - mFade.StartFadeOut(mTimer.GetTime(),2,3.1f);
631 - IntroTimer = mTimer.GetTime()+1;
632 - fUIDelay = mTimer.GetTime()+1;
633 -- if(stricmp(szHiScore[iHiScoreOverWrite],"AAAAA")==0)
634 -+ if(strcmp(szHiScore[iHiScoreOverWrite],"AAAAA")==0)
635 - {
636 - strcpy(szHiScore[iHiScoreOverWrite],"SHMUP");
637 - }
638 -- if(stricmp(szHiScore[iHiScoreOverWrite],"hyper")==0)
639 -+ if(strcmp(szHiScore[iHiScoreOverWrite],"hyper")==0)
640 - {
641 - bHyperMode = true;
642 - SND_LARGEEXPLODE2;
643 - }
644 -- if(stricmp(szHiScore[iHiScoreOverWrite],"wimps")==0)
645 -+ if(strcmp(szHiScore[iHiScoreOverWrite],"wimps")==0)
646 - {
647 - bWimpMode = !bWimpMode;
648 - SND_LARGEEXPLODE2;
649 - }
650 -- if(stricmp(szHiScore[iHiScoreOverWrite],"bossy")==0)
651 -+ if(strcmp(szHiScore[iHiScoreOverWrite],"bossy")==0)
652 - {
653 - bBossFight = !bBossFight;
654 - SND_LARGEEXPLODE2;
655 -diff -Naur ProtoType.cpp ProtoType.cpp
656 ---- ProtoType.cpp 2009-10-02 08:14:42.000000000 +0200
657 -+++ ProtoType.cpp 2009-10-02 08:36:58.000000000 +0200
658 -@@ -3,7 +3,7 @@
659 -
660 - #include "stdafx.h"
661 -
662 --int _tmain(int argc, _TCHAR* argv[])
663 -+int main(int argc, char* argv[])
664 - {
665 - Engine engine(640,480,false,"PROTOTYPE");
666 -
667 -diff -Naur stdafx.h stdafx.h
668 ---- stdafx.h 2009-10-02 08:14:42.000000000 +0200
669 -+++ stdafx.h 2009-10-02 08:37:56.000000000 +0200
670 -@@ -7,7 +7,7 @@
671 -
672 -
673 - #include <iostream>
674 --#include <tchar.h>
675 -+//#include <tchar.h>
676 -
677 - // TODO: reference additional headers your program requires here
678 - #include "Engine.h"
679 -diff -Naur UTIL_openGL.h UTIL_openGL.h
680 ---- UTIL_openGL.h 2009-10-02 08:22:12.000000000 +0200
681 -+++ UTIL_openGL.h 2009-10-02 08:37:49.000000000 +0200
682 -@@ -1,3 +1,4 @@
683 -+#define ILUT_USE_OPENGL
684 - #pragma once
685 - //#include <gl/glew.h>
686 - #ifdef _WIN32
687 -diff -Naur UTIL_SDL.cpp UTIL_SDL.cpp
688 ---- UTIL_SDL.cpp 2009-10-02 08:14:42.000000000 +0200
689 -+++ UTIL_SDL.cpp 2009-10-02 08:37:32.000000000 +0200
690 -@@ -42,7 +42,7 @@
691 - stringstream(str);
692 - str << "Resolution Set: " << width << "x" << height << "x" << bpp << endl;
693 - gLog.OutPut(str.str());
694 -- if(!vsync)
695 -+/* if(!vsync)
696 - {
697 - PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
698 - if(wglSwapIntervalEXT==NULL)
699 -@@ -50,7 +50,7 @@
700 - wglSwapIntervalEXT(0);
701 - gLog.OutPut("Vsync Disabled.\n");
702 - }
703 --/* else
704 -+ else
705 - {
706 - PFNWGLSWAPINTERVALEXTPROC wglSwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) wglGetProcAddress("wglSwapIntervalEXT");
707 - if(wglSwapIntervalEXT==NULL)
708
709 diff --git a/games-arcade/prototype/files/prototype-1.0-makefile.patch b/games-arcade/prototype/files/prototype-1.0-makefile.patch
710 deleted file mode 100644
711 index 75df461..0000000
712 --- a/games-arcade/prototype/files/prototype-1.0-makefile.patch
713 +++ /dev/null
714 @@ -1,33 +0,0 @@
715 -diff -Naur Makefile Makefile
716 ---- Makefile 1970-01-01 01:00:00.000000000 +0100
717 -+++ Makefile 2009-10-01 11:01:40.000000000 +0200
718 -@@ -0,0 +1,29 @@
719 -+CPP = g++
720 -+CXXFLAGS = -O2 -g -I/usr/include/ -I./ -I/usr/include/GL
721 -+LDFLAGS = -lGL -lGLU -lILUT -ILU -lIL -lfmod
722 -+
723 -+DEST = .
724 -+
725 -+LD = gcc
726 -+
727 -+SDL_LDFLAGS = $(shell sdl-config --libs)
728 -+SDL_CFLAGS = $(shell sdl-config --cflags) $(CXXFLAGS)
729 -+
730 -+MAKEFILE = Makefile
731 -+
732 -+OBJS = AnimGenerator.o Font.o Serpent.o Beam.o FrontEnd.o SolarFlare.o Boss.o Game.o Sound.o BrainBoss.o Generator.o SpaceTrash.o BrainCell.o Geo2D.o Sperm.o BreakScenery.o Geo2D_Draw.o Sprite.o Bug.o HUD.o SpriteEffect.o Bullet.o LadyBird.o SpriteSheet.o Button.o Log.o StarBurst.o CheckPoint.o Map.o stdafx.o Debris.o MidBoss.o SuperTurret.o Demo.o Orb.o Timer.o Editor_Anims.o Player.o TriggerSlowDown.o Editor.o PostEffects.o TriggerSpeedUp.o Editor_EntityProperties.o PowerDroid.o Turret.o Engine.o PowerUp.o UTIL_bitop.o Engine_Generators.o Profiler.o UTIL_Fade.o Entity.o ProtoType.o UTIL_Misc.o Explosion.o RandExplosion.o UTIL_openG
733 L.o Fighter.o Rhino.o UTIL_SDL.o firebug.o Rocket.o Fire.o Serializer.o
734 -+
735 -+PRINT = pr
736 -+
737 -+PROGRAM = prototype
738 -+
739 -+SHELL = /bin/sh
740 -+
741 -+%.o: %.cpp
742 -+ $(CPP) -O2 -g $(CXXFLAGS) -c $<
743 -+all: $(PROGRAM)
744 -+
745 -+$(PROGRAM): $(OBJS) $(LIBS)
746 -+ @echo "Linking $(PROGRAM) ..."
747 -+ $(LD) -o $(PROGRAM) $(OBJS) -lGL -lGLU $(LDFLAGS) $(SDL_LDFLAGS)
748 -+
749
750 diff --git a/games-arcade/prototype/files/prototype-1.0-sdlrendertarget.patch b/games-arcade/prototype/files/prototype-1.0-sdlrendertarget.patch
751 deleted file mode 100644
752 index a980402..0000000
753 --- a/games-arcade/prototype/files/prototype-1.0-sdlrendertarget.patch
754 +++ /dev/null
755 @@ -1,104 +0,0 @@
756 -diff -Naur Engine.h Engine.h
757 ---- Engine.h 2009-10-02 08:18:49.000000000 +0200
758 -+++ Engine.h 2009-10-02 08:24:25.000000000 +0200
759 -@@ -183,7 +183,7 @@
760 - void RenderWaterTransparent(const float interp);
761 -
762 - // render target related
763 -- SDL_RenderTarget *pMainTarget,*pPostTarget, *p64x64Target, *p256x256Target;
764 -+// SDL_RenderTarget *pMainTarget,*pPostTarget, *p64x64Target, *p256x256Target;
765 -
766 - void BindMainContext();
767 - void FinalizeMainContext();
768 -diff -Naur PostEffects.cpp PostEffects.cpp
769 ---- PostEffects.cpp 2009-10-02 08:19:42.000000000 +0200
770 -+++ PostEffects.cpp 2009-10-02 08:25:09.000000000 +0200
771 -@@ -12,9 +12,9 @@
772 - return;
773 - }
774 - glEnable(GL_TEXTURE_2D);
775 --//#ifdef SDL_VERSION_1_3
776 -+#ifdef SDL_VERSION_1_3
777 - UTIL_SDL::Lock_pBuffer(pMainTarget);
778 --//#endif
779 -+#endif
780 - UTIL_GL::GL2D::SetOrtho(1024,512);
781 -
782 - }
783 -@@ -29,9 +29,9 @@
784 - return;
785 -
786 - glEnable(GL_TEXTURE_2D);
787 --//#ifdef SDL_VERSION_1_3
788 -+#ifdef SDL_VERSION_1_3
789 - UTIL_SDL::Unlock_pBuffer(pMainTarget);
790 --//#endif
791 -+#endif
792 - RenderMainContext();
793 - }
794 - //================================================================================================//
795 -@@ -42,10 +42,10 @@
796 - void Engine::RenderMainContext()
797 - {
798 - glEnable(GL_TEXTURE_2D);
799 --//#ifdef SDL_VERSION_1_3
800 -+#ifdef SDL_VERSION_1_3
801 - UTIL_SDL::Bind_pBuffer(*pMainTarget);
802 --//#endif
803 --// UTIL_GL::GL2D::SetOrtho(640,480);
804 -+#endif
805 -+ UTIL_GL::GL2D::SetOrtho(640,480);
806 - glColor4f(1,1,1,1);
807 - glDisable(GL_BLEND);
808 - glBegin(GL_QUADS);
809 -@@ -83,11 +83,11 @@
810 - if(!bRenderTargetSupport)
811 - return;
812 -
813 --//#ifdef SDL_VERSION_1_3
814 -+#ifdef SDL_VERSION_1_3
815 - UTIL_SDL::Unlock_pBuffer(pMainTarget);
816 - glEnable(GL_TEXTURE_2D);
817 - UTIL_SDL::Lock_pBuffer(p64x64Target);
818 --//#endif
819 -+#endif
820 - glClearColor(0,0,0,0);
821 - glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
822 - glViewport(0,0,64,64);
823 -@@ -101,11 +101,11 @@
824 -
825 - px+=64;
826 - glEnable(GL_TEXTURE_2D);
827 --//#ifdef SDL_VERSION_1_3
828 -+#ifdef SDL_VERSION_1_3
829 - UTIL_SDL::Unlock_pBuffer(p64x64Target);
830 - BindMainContext();
831 - UTIL_SDL::Bind_pBuffer(*p64x64Target);
832 --//#endif
833 -+#endif
834 - glDisable(GL_BLEND);
835 - float hpx = (1.0f/64.0f)*0.5f;
836 - float hpy = (1.0f/64.0f)*0.5f;
837 -@@ -183,9 +183,9 @@
838 - if(x1<0)x1=0;
839 - x2=(x2-x1)+32;
840 - if(x2>640)x2=640;
841 --//#ifdef SDL_VERSION_1_3
842 -+#ifdef SDL_VERSION_1_3
843 - UTIL_SDL::Bind_pBuffer(*pMainTarget);
844 --//#endif
845 -+#endif
846 - UTIL_GL::SetBlend(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA);
847 - glColor4f(1,1.0f,1,1);
848 -
849 -diff -Naur UTIL_SDL.h UTIL_SDL.h
850 ---- UTIL_SDL.h 2009-10-02 08:21:29.000000000 +0200
851 -+++ UTIL_SDL.h 2009-10-02 08:25:33.000000000 +0200
852 -@@ -3,6 +3,7 @@
853 - #include "UTIL_openGL.h"
854 - #include "Log.h"
855 - #define SDL_VERSION_1_3
856 -+#undef SDL_VERSION_1_3
857 - //================================================================================================//
858 - /*****************
859 - ** SDL helpers **
860
861 diff --git a/games-arcade/prototype/files/prototype-1.0-setstate.patch b/games-arcade/prototype/files/prototype-1.0-setstate.patch
862 deleted file mode 100644
863 index b7af9f9..0000000
864 --- a/games-arcade/prototype/files/prototype-1.0-setstate.patch
865 +++ /dev/null
866 @@ -1,271 +0,0 @@
867 -diff -Naur Engine.cpp Engine.cpp
868 ---- Engine.cpp 2009-10-02 08:17:54.000000000 +0200
869 -+++ Engine.cpp 2009-10-02 08:56:20.000000000 +0200
870 -@@ -97,7 +97,7 @@
871 - bBossFight = false;
872 - bCompileWithEditor = false;
873 - StartFrontEnd();
874 -- SetState(UpdateIntro,RenderIntro);
875 -+ SetState(&Engine::UpdateIntro,&Engine::RenderIntro);
876 -
877 - //start rolling
878 - Pump();
879 -@@ -430,8 +430,7 @@
880 - bHyperMode = false;
881 - bBossFight = false;
882 - StartFrontEnd();
883 -- SetState(UpdateSplash,RenderSplash);
884 -- SetStateTimed(UpdateSplash,RenderSplash,0);
885 -+ SetState(&Engine::UpdateSplash,&Engine::RenderSplash);
886 SetStateTimed(&Engine::UpdateSplash,&Engine::RenderSplash,0);
887 - mFade.StartFadeIn(mTimer.GetTime(),2,0.5f);
888 - fUIDelay = mTimer.GetTime();
889 - iOption = 0;
890 -diff -Naur FrontEnd.cpp FrontEnd.cpp
891 ---- FrontEnd.cpp 2009-10-02 08:14:42.000000000 +0200
892 -+++ FrontEnd.cpp 2009-10-02 08:58:02.000000000 +0200
893 -@@ -33,7 +33,7 @@
894 - mbTimedState = false;
895 - fGameOverFrame = 0;
896 - StartFadeIn();
897 -- SetState(UpdateIntro,RenderIntro);
898 -+ SetState(&Engine::UpdateIntro,&Engine::RenderIntro);
899 - // gLog.OutPut("StartFrontEnd END\n");
900 - }
901 - //================================================================================================//
902 -@@ -213,15 +213,13 @@
903 - case 0://start game
904 - stmSplash.Stop(30);
905 - smpUIselect.Play(1);
906 -- SetState(UpdateSplash2,RenderSplash);
907 -- SetStateTimed(UpdateGame,RenderGame,2,StartGame);
908 -+ SetState(&Engine::UpdateSplash2,&Engine::RenderSplash);
909 SetStateTimed(&Engine::UpdateGame,&Engine::RenderGame,2,&Engine::StartGame);
910 - mFade.StartFadeOut(mTimer.GetTime(),0,2.15f);
911 - KEY_ATTACK1.state = RELEASED;
912 - break;
913 - case 1://configure
914 - smpUImove.Play(1);
915 -- SetState(UpdateSplash2,RenderSplash);
916 -- SetStateTimed(UpdateConfig,RenderConfig,0.25f,StartFadeIn);
917 -+ SetState(&Engine::UpdateSplash2,&Engine::RenderSplash);
918 SetStateTimed(&Engine::UpdateConfig,&Engine::RenderConfig,0.25f,&Engine::StartFadeIn);
919 - mFade.StartFadeOut(mTimer.GetTime(),2,0.3f);
920 - break;
921 - case 2://editor
922 -@@ -234,15 +232,13 @@
923 - if(!LoadEditorData())
924 - return;
925 - bUseEditor = true;
926 -- SetState(NULL,RenderSplash);
927 -- SetStateTimed(UpdateEditor,RenderEditor,0.25f);
928 -+ SetState(NULL,&Engine::RenderSplash);
929 SetStateTimed(&Engine::UpdateEditor,&Engine::RenderEditor,0.25f);
930 - StartEditor();
931 - }
932 - else
933 - {
934 - smpUImove.Play(1);
935 -- SetState(UpdateSplash2,RenderSplash);
936 -- SetStateTimed(UpdateHowToPlay,RenderHowToPlay,0.25f,StartFadeIn);
937 -+ SetState(NULL,&Engine::RenderSplash);
938 SetStateTimed(&Engine::UpdateEditor,&Engine::RenderEditor,0.25f);
939 - mFade.StartFadeOut(mTimer.GetTime(),2,0.3f);
940 - }
941 - break;
942 -@@ -433,8 +429,7 @@
943 - gSerializer.ReadVariable("Controls.cfg",sz,mKeys[n].SecondaryKey);
944 - }
945 - //back to main
946 -- SetState(UpdateSplash2,RenderConfig);
947 -- SetStateTimed(UpdateSplash,RenderSplash,0.25f,StartFadeIn);
948 -+ SetState(&Engine::UpdateSplash2,&Engine::RenderConfig);
949 SetStateTimed(&Engine::UpdateSplash,&Engine::RenderSplash,0.25f,&Engine::StartFadeIn);
950 - mFade.StartFadeOut(mTimer.GetTime(),2,0.3f);
951 - break;
952 -
953 -@@ -577,13 +572,13 @@
954 - bHyperMode = false;
955 - bBossFight = false;
956 - bWimpMode = false;
957 -- SetState(UpdateGameOver,RenderGameOver);
958 -+ SetState(&Engine::UpdateGameOver,&Engine::RenderGameOver);
959 - stmSplash.Load("Data/Sound/GameOver.ogg",false);
960 - stmSplash.Play(30);
961 - StartFadeIn();
962 - fGameOverFrame = 0;
963 - bGameOverFrame = false;
964 -- SetStateTimed(UpdateGameOver,RenderGameOver,10,EndGameOver);
965 -+ SetStateTimed(&Engine::UpdateGameOver,&Engine::RenderGameOver,10,&Engine::EndGameOver);
966 - }
967 - void Engine::EndGameOver()
968 - {
969 -@@ -591,12 +586,12 @@
970 - {
971 - if(mPlayer.iScore>iHiScore[n])
972 - {
973 -- SetStateTimed(UpdateEnterHiScore,RenderEnterHiScore,3,StartEnterHiScore);
974 -+ SetStateTimed(&Engine::UpdateEnterHiScore,&Engine::RenderEnterHiScore,3,&Engine::StartEnterHiScore);
975 - mFade.StartFadeOut(mTimer.GetTime(),2,3.5f);
976 - return;
977 - }
978 - }
979 -- SetStateTimed(UpdateIntro,RenderIntro,3,StartFrontEnd);
980 -+ SetStateTimed(&Engine::UpdateIntro,&Engine::RenderIntro,3,&Engine::StartFrontEnd);
981 - mFade.StartFadeOut(mTimer.GetTime(),2,3.5f);
982 - }
983 - void Engine::UpdateGameOver(float delta)
984 -@@ -642,7 +637,7 @@
985 - {
986 - if(mTimer.GetTime()>IntroTimer+20)
987 - {
988 -- SetStateTimed(UpdateIntro2,RenderIntro2,1,StartFadeIn);
989 -+ SetStateTimed(&Engine::UpdateIntro2,&Engine::RenderIntro2,1,&Engine::StartFadeIn);
990 - mFade.StartFadeOut(mTimer.GetTime(),2,1.1f);
991 - IntroTimer= mTimer.GetTime()+1;
992 - fUIDelay = mTimer.GetTime();
993 -@@ -650,8 +645,7 @@
994 - }
995 - if(KEY_ATTACK1.state == JUST_PRESSED || KEY_ATTACK2.state == JUST_PRESSED || KEY_UI_SELECT.state == JUST_PRESSED || KEY_UI_SELECT2.state == JUST_PRESSED)
996 - {
997 -- SetState(UpdateSplash,RenderSplash);
998 -- SetStateTimed(UpdateSplash,RenderSplash,0);
999 -+ SetState(&Engine::UpdateSplash,&Engine::RenderSplash);
1000 SetStateTimed(&Engine::UpdateSplash,&Engine::RenderSplash,0);
1001 - mFade.StartFadeIn(mTimer.GetTime(),2,0.5f);
1002 - fUIDelay = mTimer.GetTime();
1003 - iOption = 0;
1004 -@@ -707,7 +701,7 @@
1005 - {
1006 - if(mTimer.GetTime()>IntroTimer+5)
1007 - {
1008 -- SetStateTimed(UpdateIntro3,RenderIntro3,1,StartFadeIn);
1009 -+ SetStateTimed(&Engine::UpdateIntro3,&Engine::RenderIntro3,1,&Engine::StartFadeIn);
1010 - mFade.StartFadeOut(mTimer.GetTime(),2,1.1f);
1011 - IntroTimer= mTimer.GetTime()+1;
1012 - fUIDelay = mTimer.GetTime();
1013 -@@ -715,8 +709,7 @@
1014 - }
1015 - if(KEY_ATTACK1.state == JUST_PRESSED || KEY_ATTACK2.state == JUST_PRESSED || KEY_UI_SELECT.state == JUST_PRESSED || KEY_UI_SELECT2.state == JUST_PRESSED)
1016 - {
1017 -- SetState(UpdateSplash,RenderSplash);
1018 -- SetStateTimed(UpdateSplash,RenderSplash,0);
1019 -+ SetState(&Engine::UpdateSplash,&Engine::RenderSplash);
1020 SetStateTimed(&Engine::UpdateSplash,&Engine::RenderSplash,0);
1021 - mFade.StartFadeIn(mTimer.GetTime(),2,0.5f);
1022 - fUIDelay = mTimer.GetTime();
1023 - iOption = 0;
1024 -@@ -753,7 +746,7 @@
1025 - }
1026 - if(mTimer.GetTime()>IntroTimer+6)
1027 - {
1028 -- SetStateTimed(UpdateIntro4,RenderIntro4,1,StartFadeIn);
1029 -+ SetStateTimed(&Engine::UpdateIntro4,&Engine::RenderIntro4,1,&Engine::StartFadeIn);
1030 - IntroTimer = mTimer.GetTime();
1031 - mFade.StartFadeOut(mTimer.GetTime(),2,1.1f);
1032 - return;
1033 -@@ -761,8 +754,7 @@
1034 - fGameOverFrame>15? fGameOverFrame-=15:fGameOverFrame += 0.25f;
1035 - if(KEY_ATTACK1.state == JUST_PRESSED || KEY_ATTACK2.state == JUST_PRESSED || KEY_UI_SELECT.state == JUST_PRESSED || KEY_UI_SELECT2.state == JUST_PRESSED)
1036 - {
1037 -- SetState(UpdateSplash,RenderSplash);
1038 -- SetStateTimed(UpdateSplash,RenderSplash,0);
1039 -+ SetState(&Engine::UpdateSplash,&Engine::RenderSplash);
1040 SetStateTimed(&Engine::UpdateSplash,&Engine::RenderSplash,0);
1041 - mFade.StartFadeIn(mTimer.GetTime(),2,0.5f);
1042 - fUIDelay = mTimer.GetTime();
1043 - iOption = 0;
1044 -@@ -823,7 +815,7 @@
1045 - fGameOverFrame>6? fGameOverFrame-=6:fGameOverFrame += 0.25f;
1046 - if(mTimer.GetTime()>IntroTimer+6)
1047 - {
1048 -- SetStateTimed(UpdateHiScores,RenderHiScores,1,StartFadeIn);
1049 -+ SetStateTimed(&Engine::UpdateHiScores,&Engine::RenderHiScores,1,&Engine::StartFadeIn);
1050 - mFade.StartFadeOut(mTimer.GetTime(),2,1.1f);
1051 - IntroTimer = mTimer.GetTime()+1;
1052 - fUIDelay = mTimer.GetTime()+1;
1053 -@@ -832,8 +824,7 @@
1054 - }
1055 - if(KEY_ATTACK1.state == JUST_PRESSED || KEY_ATTACK2.state == JUST_PRESSED || KEY_UI_SELECT.state == JUST_PRESSED || KEY_UI_SELECT2.state == JUST_PRESSED)
1056 - {
1057 -- SetState(UpdateSplash,RenderSplash);
1058 -- SetStateTimed(UpdateSplash,RenderSplash,0);
1059 -+ SetState(&Engine::UpdateSplash,&Engine::RenderSplash);
1060 SetStateTimed(&Engine::UpdateSplash,&Engine::RenderSplash,0);
1061 - mFade.StartFadeIn(mTimer.GetTime(),2,0.5f);
1062 - fUIDelay = mTimer.GetTime();
1063 - return;
1064 -@@ -901,16 +892,14 @@
1065 - IntroTimer = mTimer.GetTime()+2;
1066 - fUIDelay = mTimer.GetTime()+2;
1067 - bDemo = true;
1068 -- SetState(UpdateSplash2,RenderHiScores);
1069 -- SetStateTimed(UpdateGame,RenderGame,2,StartGame);
1070 -+ SetState(&Engine::UpdateSplash2,&Engine::RenderHiScores);
1071 SetStateTimed(&Engine::UpdateGame,&Engine::RenderGame,2,&Engine::StartGame);
1072 - mFade.StartFadeOut(mTimer.GetTime(),0,2.1f);
1073 - fGameDifficulty = 2;
1074 - return;
1075 - }
1076 - if(KEY_ATTACK1.state == JUST_PRESSED || KEY_ATTACK2.state == JUST_PRESSED || KEY_UI_SELECT.state == JUST_PRESSED || KEY_UI_SELECT2.state == JUST_PRESSED)
1077 - {
1078 -- SetState(UpdateSplash,RenderSplash);
1079 -- SetStateTimed(UpdateSplash,RenderSplash,0);
1080 -+ SetState(&Engine::UpdateSplash,&Engine::RenderSplash);
1081 SetStateTimed(&Engine::UpdateSplash,&Engine::RenderSplash,0);
1082 - mFade.StartFadeIn(mTimer.GetTime(),2,0.5f);
1083 - fUIDelay = mTimer.GetTime();
1084 - iOption = 0;
1085 -@@ -957,7 +946,7 @@
1086 - //================================================================================================//
1087 - void Engine::StartEnterHiScore()
1088 - {
1089 -- SetState(UpdateEnterHiScore,RenderEnterHiScore);
1090 -+ SetState(&Engine::UpdateEnterHiScore,&Engine::RenderEnterHiScore);
1091 - stmSplash.Load("Data/Sound/HiScores.ogg",false);
1092 - stmSplash.Play(30);
1093 - StartFadeIn();
1094 -@@ -1024,8 +1013,7 @@
1095 - iScoreEntryDigit++;
1096 - if(iScoreEntryDigit>4)
1097 - {
1098 -- SetState(UpdateSplash2,RenderEnterHiScore);
1099 -- SetStateTimed(UpdateIntro,RenderIntro,3,StartFrontEnd);
1100 -+ SetState(&Engine::UpdateSplash2,&Engine::RenderEnterHiScore);
1101 SetStateTimed(&Engine::UpdateIntro,&Engine::RenderIntro,3,&Engine::StartFrontEnd);
1102 - mFade.StartFadeOut(mTimer.GetTime(),2,3.1f);
1103 - IntroTimer = mTimer.GetTime()+1;
1104 - fUIDelay = mTimer.GetTime()+1;
1105 -@@ -1171,8 +1159,7 @@
1106 - if(KEY_UI_SELECT.state == JUST_PRESSED || KEY_ATTACK1.state == JUST_PRESSED || KEY_ATTACK2.state == JUST_PRESSED || KEY_UI_SELECT2.state == JUST_PRESSED)
1107 - {
1108 - smpUImove.Play(1);
1109 -- SetState(UpdateSplash2,RenderHowToPlay);
1110 -- SetStateTimed(UpdateSplash,RenderSplash,0.25f,StartFadeIn);
1111 -+ SetState(&Engine::UpdateSplash2,&Engine::RenderHowToPlay);
1112 SetStateTimed(&Engine::UpdateSplash,&Engine::RenderSplash,0.25f,&Engine::StartFadeIn);
1113 - mFade.StartFadeOut(mTimer.GetTime(),2,0.3f);
1114 - }
1115 - }
1116 -diff -Naur Game.cpp Game.cpp
1117 ---- Game.cpp 2009-10-02 08:14:42.000000000 +0200
1118 -+++ Game.cpp 2009-10-02 08:56:20.000000000 +0200
1119 -@@ -184,8 +184,7 @@
1120 - }
1121 - if(KEY_ATTACK1.state == JUST_PRESSED || KEY_ATTACK2.state == JUST_PRESSED || KEY_UI_SELECT.state == JUST_PRESSED || KEY_UI_SELECT2.state == JUST_PRESSED)
1122 - {
1123 -- SetState(UpdateSplash,RenderSplash);
1124 -- SetStateTimed(UpdateSplash,RenderSplash,0);
1125 -+ SetState(&Engine::UpdateSplash,&Engine::RenderSplash);
1126 SetStateTimed(&Engine::UpdateSplash,&Engine::RenderSplash,0);
1127 - mFade.StartFadeIn(mTimer.GetTime(),2,0.5f);
1128 - fUIDelay = mTimer.GetTime();
1129 - bDemo = false;
1130 -@@ -644,7 +643,7 @@
1131 - void Engine::StartCompleted()
1132 - {
1133 - bGameCompleted = true;
1134 -- SetStateTimed(UpdateCongratulations,RenderCongratulations,5,FadeInEndCompleted);
1135 -+ SetStateTimed(&Engine::UpdateCongratulations,&Engine::RenderCongratulations,5,&Engine::FadeInEndCompleted);
1136 - mFade.StartFadeOut(mTimer.GetTime(),2,5.1f);
1137 - fUIDelay = mTimer.GetTime()+5;
1138 - stmStage.Stop(FSOUND_ALL);
1139 -@@ -657,11 +656,11 @@
1140 - void Engine::FadeInEndCompleted()
1141 - {
1142 - StartFadeIn();
1143 -- SetStateTimed(UpdateCongratulations,RenderCongratulations,20,EndCompleted);
1144 -+ SetStateTimed(&Engine::UpdateCongratulations,&Engine::RenderCongratulations,20,&Engine::EndCompleted);
1145 - }
1146 - void Engine::EndCompleted()
1147 - {
1148 -- SetStateTimed(NULL,RenderIntro,3,StartGameOver);
1149 -+ SetStateTimed(NULL,&Engine::RenderIntro,3,&Engine::StartGameOver);
1150 - mFade.StartFadeOut(mTimer.GetTime(),2,3.1f);
1151 - IntroTimer = mTimer.GetTime()+1;
1152 - fUIDelay = mTimer.GetTime()+1;
1153
1154 diff --git a/games-arcade/prototype/metadata.xml b/games-arcade/prototype/metadata.xml
1155 deleted file mode 100644
1156 index 5d0ede2..0000000
1157 --- a/games-arcade/prototype/metadata.xml
1158 +++ /dev/null
1159 @@ -1,8 +0,0 @@
1160 -<?xml version="1.0" encoding="UTF-8"?>
1161 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1162 -<pkgmetadata>
1163 -<maintainer>
1164 - <email>frostworks@×××.de</email>
1165 - <name>Marcel Unbehaun</name>
1166 -</maintainer>
1167 -</pkgmetadata>
1168
1169 diff --git a/games-arcade/prototype/prototype-1.0.ebuild b/games-arcade/prototype/prototype-1.0.ebuild
1170 deleted file mode 100644
1171 index d084ee8..0000000
1172 --- a/games-arcade/prototype/prototype-1.0.ebuild
1173 +++ /dev/null
1174 @@ -1,71 +0,0 @@
1175 -# Copyright 1999-2009 Gentoo Foundation
1176 -# Distributed under the terms of the GNU General Public License v2
1177 -# $Header: $
1178 -
1179 -EAPI="2"
1180 -
1181 -inherit eutils games
1182 -
1183 -DESCRIPTION="awarded winning RType clone"
1184 -HOMEPAGE="http://xout.blackened-interactive.com/ProtoType.html"
1185 -SRC_URI="http://xout.blackened-interactive.com/dump/new/ProtoType_src.zip
1186 - http://xout.blackened-interactive.com/ProtoType/ProtoType.zip"
1187 -LICENSE="public-domain"
1188 -KEYWORDS="~x86"
1189 -IUSE=""
1190 -SLOT="0"
1191 -
1192 -RDEPEND="virtual/opengl
1193 - virtual/glu
1194 - media-libs/libsdl
1195 - media-libs/devil
1196 - =media-libs/fmod-3*"
1197 -DEPEND="${RDEPEND}"
1198 -
1199 -S=${WORKDIR}/${PN}_${PV}
1200 -
1201 -src_prepare(){
1202 - edos2unix *.{cpp,h}
1203 - epatch ${FILESDIR}/"${P}-makefile.patch"
1204 - epatch ${FILESDIR}/"${P}-includes.patch"
1205 - epatch ${FILESDIR}/"${P}-sdlrendertarget.patch"
1206 - epatch ${FILESDIR}/"${P}-setstate.patch"
1207 - epatch ${FILESDIR}/"${P}-linuxfixes.patch"
1208 - epatch ${FILESDIR}/"${P}-hacks.patch"
1209 - epatch ${FILESDIR}/"${P}-homedir.patch"
1210 - for i in "${WORKDIR}"/*.cpp; do sed -i "$i" -e "s:Data/:"${GAMES_DATADIR}"/"${PN}"/:g"; done
1211 -}
1212 -
1213 -src_install() {
1214 - dogamesbin ${PN}
1215 - local datadir="${GAMES_DATADIR}"/"${PN}"
1216 - dodir ${datadir}
1217 - insinto "${GAMES_DATADIR}"/"${PN}"
1218 - mv ProtoType/Data/Gfx/forcecharge.png ProtoType/Data/Gfx/ForceCharge.png
1219 - mv ProtoType/Data/Gfx/chainParticle.png ProtoType/Data/Gfx/ChainParticle.png
1220 - mv ProtoType/Data/Gfx/Ladybird.png ProtoType/Data/Gfx/LadyBird.png
1221 - mv ProtoType/Data/Gfx/Turret1.png ProtoType/Data/Gfx/turret1.png
1222 - mv ProtoType/Data/Gfx/StarBurst.png ProtoType/Data/Gfx/Starburst.png
1223 - mv ProtoType/Data/Gfx/forceblast.png ProtoType/Data/Gfx/Forceblast.png
1224 - mv ProtoType/Data/Gfx/Fireball.png ProtoType/Data/Gfx/FireBall.png
1225 - mv ProtoType/Data/Gfx/anim_back1.png ProtoType/Data/Gfx/Anim_back1.png
1226 - mv ProtoType/Data/Gfx/anim_back2.png ProtoType/Data/Gfx/Anim_back2.png
1227 - mv ProtoType/Data/Gfx/anim_Fore1.png ProtoType/Data/Gfx/Anim_Fore1.png
1228 - mv ProtoType/Data/Gfx/anim_Fore2.png ProtoType/Data/Gfx/Anim_Fore2.png
1229 - mv ProtoType/Data/Gfx/anim_Fore3.png ProtoType/Data/Gfx/Anim_Fore3.png
1230 - mv ProtoType/Data/Gfx/WaterSplash.png ProtoType/Data/Gfx/watersplash.png
1231 - mv ProtoType/Data/Gfx/PrototypeMk1.png ProtoType/Data/Gfx/Prototypemk1.png
1232 - mv ProtoType/Data/Sound/deflection.wav ProtoType/Data/Sound/Deflection.wav
1233 - mv ProtoType/Data/Sound/smallExplosion.wav ProtoType/Data/Sound/SmallExplosion.wav
1234 - mv ProtoType/Data/Sound/PickUp.wav ProtoType/Data/Sound/Pickup.wav
1235 - mv ProtoType/Data/Sound/UI_Select.wav ProtoType/Data/Sound/UI_select.wav
1236 - doins -r ProtoType/Data/* || die
1237 - newicon ProtoType/Data/Gfx/FireBug.png "${PN}.png"
1238 - make_desktop_entry "${PN}" "${PN}"
1239 - prepgamesdirs
1240 -}
1241 -
1242 -pkg_postinst() {
1243 - games_pkg_postinst
1244 -
1245 -}
1246 \ No newline at end of file