/[pkgs]/devel/KoboDeluxe/KoboDeluxe-0.5.1-avoid-unistd-pipe-collision.patch
ViewVC logotype

Contents of /devel/KoboDeluxe/KoboDeluxe-0.5.1-avoid-unistd-pipe-collision.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Wed Sep 24 17:24:24 2008 UTC (14 months ago) by spot
Branch: MAIN
CVS Tags: F-12-split, KoboDeluxe-0_5_1-7_fc12, KoboDeluxe-0_5_1-6_fc12, KoboDeluxe-0_5_1-4_fc11, KoboDeluxe-0_5_1-5_fc11, F-11-split, F-10-split, KoboDeluxe-0_5_1-3_fc10, HEAD
File MIME type: text/x-patch 
fix FTBFS
1 diff -up KoboDeluxe-0.5.1/enemies.h.pipe-unistd KoboDeluxe-0.5.1/enemies.h
2 --- KoboDeluxe-0.5.1/enemies.h.pipe-unistd 2007-12-24 03:18:52.000000000 -0500
3 +++ KoboDeluxe-0.5.1/enemies.h 2008-09-24 13:06:16.000000000 -0400
4 @@ -70,9 +70,9 @@ extern const enemy_kind bomb1;
5 extern const enemy_kind bomb2;
6 extern const enemy_kind bombdeto;
7 extern const enemy_kind cannon;
8 -extern const enemy_kind pipe1;
9 +extern const enemy_kind pipe_1;
10 extern const enemy_kind core;
11 -extern const enemy_kind pipe2;
12 +extern const enemy_kind pipe_2;
13 extern const enemy_kind rock;
14 extern const enemy_kind ring;
15 extern const enemy_kind enemy_m1;
16 @@ -430,7 +430,7 @@ inline int _enemy::realize()
17
18 inline int _enemy::is_pipe()
19 {
20 - return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
21 + return ((_state != notuse) && ((ek == &pipe_1) || (ek == &pipe_2)));
22 }
23
24
25 diff -up KoboDeluxe-0.5.1/enemy.cpp.pipe-unistd KoboDeluxe-0.5.1/enemy.cpp
26 --- KoboDeluxe-0.5.1/enemy.cpp.pipe-unistd 2007-12-24 05:36:46.000000000 -0500
27 +++ KoboDeluxe-0.5.1/enemy.cpp 2008-09-24 13:07:54.000000000 -0400
28 @@ -713,7 +713,7 @@ void _enemy::move_cannon()
29
30 void _enemy::kill_cannon()
31 {
32 - enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y));
33 + enemies.make(&pipe_1, CS2PIXEL(x), CS2PIXEL(y));
34 sound.g_base_node_explo(x, y);
35 release();
36 }
37 @@ -755,10 +755,10 @@ void _enemy::move_core()
38
39 void _enemy::kill_core()
40 {
41 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
42 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
43 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
44 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
45 + enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
46 + enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
47 + enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
48 + enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
49 enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
50 sound.g_base_core_explo(x, y);
51 release();
52 @@ -777,7 +777,7 @@ const enemy_kind core = {
53
54 /*
55 * ===========================================================================
56 - * pipe1
57 + * pipe_1
58 * ===========================================================================
59 */
60 void _enemy::make_pipe1()
61 @@ -851,7 +851,7 @@ void _enemy::move_pipe1()
62 screen.set_map(x1, y1, m ^ a);
63 release();
64 }
65 -const enemy_kind pipe1 = {
66 +const enemy_kind pipe_1 = {
67 0,
68 &_enemy::make_pipe1,
69 &_enemy::move_pipe1,
70 @@ -863,7 +863,7 @@ const enemy_kind pipe1 = {
71
72 /*
73 * ===========================================================================
74 - * pipe2
75 + * pipe_2
76 * ===========================================================================
77 */
78 void _enemy::make_pipe2()
79 @@ -978,19 +978,19 @@ void _enemy::move_pipe2()
80 }
81 p ^= a;
82 if(p & U_MASK)
83 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
84 + enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
85 if(p & R_MASK)
86 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
87 + enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
88 if(p & D_MASK)
89 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
90 + enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
91 if(p & L_MASK)
92 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
93 + enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
94 manage.add_score(10);
95 release();
96 }
97
98
99 -const enemy_kind pipe2 = {
100 +const enemy_kind pipe_2 = {
101 0,
102 &_enemy::make_pipe2,
103 &_enemy::move_pipe2,
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2