Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-arcade/kobodeluxe/files: kobodeluxe-0.5.1-glibc29.patch kobodeluxe-0.4_pre10-gcc41.patch
Date: Tue, 13 Jan 2009 01:01:14
Message-Id: E1LMXeY-0001bQ-Jv@stork.gentoo.org
1 mr_bones_ 09/01/13 01:01:10
2
3 Added: kobodeluxe-0.5.1-glibc29.patch
4 Removed: kobodeluxe-0.4_pre10-gcc41.patch
5 Log:
6 add patch to build with glibc29 from Martin Väth via bug #251121
7 (Portage version: 2.1.6.4/cvs/Linux 2.6.27.8 i686)
8
9 Revision Changes Path
10 1.1 games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch?rev=1.1&content-type=text/plain
14
15 Index: kobodeluxe-0.5.1-glibc29.patch
16 ===================================================================
17 --- enemies.h
18 +++ enemies.h
19 @@ -70,9 +70,9 @@
20 extern const enemy_kind bomb2;
21 extern const enemy_kind bombdeto;
22 extern const enemy_kind cannon;
23 -extern const enemy_kind pipe1;
24 +extern const enemy_kind pipeone;
25 extern const enemy_kind core;
26 -extern const enemy_kind pipe2;
27 +extern const enemy_kind pipetwo;
28 extern const enemy_kind rock;
29 extern const enemy_kind ring;
30 extern const enemy_kind enemy_m1;
31 @@ -430,7 +430,7 @@
32
33 inline int _enemy::is_pipe()
34 {
35 - return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
36 + return ((_state != notuse) && ((ek == &pipeone) || (ek == &pipetwo)));
37 }
38
39
40 --- enemy.cpp
41 +++ enemy.cpp
42 @@ -713,7 +713,7 @@
43
44 void _enemy::kill_cannon()
45 {
46 - enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y));
47 + enemies.make(&pipeone, CS2PIXEL(x), CS2PIXEL(y));
48 sound.g_base_node_explo(x, y);
49 release();
50 }
51 @@ -755,10 +755,10 @@
52
53 void _enemy::kill_core()
54 {
55 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
56 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
57 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
58 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
59 + enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
60 + enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
61 + enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
62 + enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
63 enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
64 sound.g_base_core_explo(x, y);
65 release();
66 @@ -851,7 +851,7 @@
67 screen.set_map(x1, y1, m ^ a);
68 release();
69 }
70 -const enemy_kind pipe1 = {
71 +const enemy_kind pipeone = {
72 0,
73 &_enemy::make_pipe1,
74 &_enemy::move_pipe1,
75 @@ -978,19 +978,19 @@
76 }
77 p ^= a;
78 if(p & U_MASK)
79 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
80 + enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
81 if(p & R_MASK)
82 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
83 + enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
84 if(p & D_MASK)
85 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
86 + enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
87 if(p & L_MASK)
88 - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
89 + enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
90 manage.add_score(10);
91 release();
92 }
93
94
95 -const enemy_kind pipe2 = {
96 +const enemy_kind pipetwo = {
97 0,
98 &_enemy::make_pipe2,
99 &_enemy::move_pipe2,