* rebased llvm/hotfix-sparcv9-not-64.diff
[t2sde.git] / package / games / kobo_deluxe / hotfix.patch
blob6b65f99a8e798a8ad825030db3609ace4c5583bf
1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
2 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
3 #
4 # T2 SDE: package/.../kobo_deluxe/compile-fix.patch
5 # Copyright (C) 2009 The T2 SDE Project
6 #
7 # More information can be found in the files COPYING and README.
8 #
9 # This patch file is dual-licensed. It is available under the license the
10 # patched project is licensed under, as long as it is an OpenSource license
11 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
12 # of the GNU General Public License as published by the Free Software
13 # Foundation; either version 2 of the License, or (at your option) any later
14 # version.
15 # --- T2-COPYRIGHT-NOTE-END ---
17 diff -Nur KoboDeluxe-0.5.1-orig/enemies.h KoboDeluxe-0.5.1/enemies.h
18 --- KoboDeluxe-0.5.1-orig/enemies.h 2009-10-20 18:03:48.000000000 +0000
19 +++ KoboDeluxe-0.5.1/enemies.h 2009-10-20 18:04:47.000000000 +0000
20 @@ -72,7 +72,7 @@
21 extern const enemy_kind cannon;
22 extern const enemy_kind pipe1;
23 extern const enemy_kind core;
24 -extern const enemy_kind pipe2;
25 +extern const enemy_kind pipe2_kbdl;
26 extern const enemy_kind rock;
27 extern const enemy_kind ring;
28 extern const enemy_kind enemy_m1;
29 @@ -430,7 +430,7 @@
31 inline int _enemy::is_pipe()
33 - return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
34 + return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2_kbdl)));
38 diff -Nur KoboDeluxe-0.5.1-orig/enemy.cpp KoboDeluxe-0.5.1/enemy.cpp
39 --- KoboDeluxe-0.5.1-orig/enemy.cpp 2009-10-20 18:03:48.000000000 +0000
40 +++ KoboDeluxe-0.5.1/enemy.cpp 2009-10-20 18:07:31.000000000 +0000
41 @@ -755,10 +755,10 @@
43 void _enemy::kill_core()
45 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
46 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
47 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
48 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
49 + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
50 + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
51 + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
52 + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
53 enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
54 sound.g_base_core_explo(x, y);
55 release();
56 @@ -978,19 +978,19 @@
58 p ^= a;
59 if(p & U_MASK)
60 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
61 + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
62 if(p & R_MASK)
63 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
64 + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
65 if(p & D_MASK)
66 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
67 + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
68 if(p & L_MASK)
69 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
70 + enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
71 manage.add_score(10);
72 release();
76 -const enemy_kind pipe2 = {
77 +const enemy_kind pipe2_kbdl = {
79 &_enemy::make_pipe2,
80 &_enemy::move_pipe2,