summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2011-09-25 19:45:18 +0000
committerjoerg <joerg@pkgsrc.org>2011-09-25 19:45:18 +0000
commitf5e9b1d35c01869ea631f0306274ea713e8cb61f (patch)
treec2995ae5c9f1ba3148eeb38cd32e12eb6c1fdf2f
parent875924d13c84115a1beb2dc4b8ca0235853d3d22 (diff)
downloadpkgsrc-f5e9b1d35c01869ea631f0306274ea713e8cb61f.tar.gz
Resolve conflict with pipe2(2)
-rw-r--r--games/KoboDeluxe/distinfo4
-rw-r--r--games/KoboDeluxe/patches/patch-enemies.h22
-rw-r--r--games/KoboDeluxe/patches/patch-enemy.cpp53
3 files changed, 78 insertions, 1 deletions
diff --git a/games/KoboDeluxe/distinfo b/games/KoboDeluxe/distinfo
index 87cf03c46b7..adfb57e8a8a 100644
--- a/games/KoboDeluxe/distinfo
+++ b/games/KoboDeluxe/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.5 2009/07/15 21:46:17 tnn Exp $
+$NetBSD: distinfo,v 1.6 2011/09/25 19:45:18 joerg Exp $
SHA1 (KoboDeluxe-0.5.1.tar.bz2) = bc49dbbae562baffd312444b373c7ebbf5e233c6
RMD160 (KoboDeluxe-0.5.1.tar.bz2) = b196054f2220fe1b479a490723b1f5da4e74aa1f
Size (KoboDeluxe-0.5.1.tar.bz2) = 1781752 bytes
+SHA1 (patch-enemies.h) = a3e9fb60581d7a7bcb079ceda5d1271f923470cd
+SHA1 (patch-enemy.cpp) = dbec6a60bb6a26cac66498584b3f100c6acd5f21
diff --git a/games/KoboDeluxe/patches/patch-enemies.h b/games/KoboDeluxe/patches/patch-enemies.h
new file mode 100644
index 00000000000..57c0fe4afcb
--- /dev/null
+++ b/games/KoboDeluxe/patches/patch-enemies.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-enemies.h,v 1.1 2011/09/25 19:46:21 joerg Exp $
+
+--- enemies.h.orig 2011-09-24 20:34:52.000000000 +0000
++++ enemies.h
+@@ -72,7 +72,7 @@ extern const enemy_kind bombdeto;
+ extern const enemy_kind cannon;
+ extern const enemy_kind pipe1;
+ extern const enemy_kind core;
+-extern const enemy_kind pipe2;
++extern const enemy_kind my_pipe2;
+ extern const enemy_kind rock;
+ extern const enemy_kind ring;
+ extern const enemy_kind enemy_m1;
+@@ -430,7 +430,7 @@ inline int _enemy::realize()
+
+ inline int _enemy::is_pipe()
+ {
+- return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
++ return ((_state != notuse) && ((ek == &pipe1) || (ek == &my_pipe2)));
+ }
+
+
diff --git a/games/KoboDeluxe/patches/patch-enemy.cpp b/games/KoboDeluxe/patches/patch-enemy.cpp
new file mode 100644
index 00000000000..f3c8e8a5f68
--- /dev/null
+++ b/games/KoboDeluxe/patches/patch-enemy.cpp
@@ -0,0 +1,53 @@
+$NetBSD: patch-enemy.cpp,v 1.1 2011/09/25 19:46:21 joerg Exp $
+
+--- enemy.cpp.orig 2011-09-24 20:34:55.000000000 +0000
++++ enemy.cpp
+@@ -755,10 +755,10 @@ void _enemy::move_core()
+
+ void _enemy::kill_core()
+ {
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
++ enemies.make(&my_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
++ enemies.make(&my_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
++ enemies.make(&my_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
++ enemies.make(&my_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+ enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
+ sound.g_base_core_explo(x, y);
+ release();
+@@ -863,7 +863,7 @@ const enemy_kind pipe1 = {
+
+ /*
+ * ===========================================================================
+- * pipe2
++ * my_pipe2
+ * ===========================================================================
+ */
+ void _enemy::make_pipe2()
+@@ -978,19 +978,19 @@ void _enemy::move_pipe2()
+ }
+ p ^= a;
+ if(p & U_MASK)
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
++ enemies.make(&my_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+ if(p & R_MASK)
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
++ enemies.make(&my_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+ if(p & D_MASK)
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
++ enemies.make(&my_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+ if(p & L_MASK)
+- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
++ enemies.make(&my_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+ manage.add_score(10);
+ release();
+ }
+
+
+-const enemy_kind pipe2 = {
++const enemy_kind my_pipe2 = {
+ 0,
+ &_enemy::make_pipe2,
+ &_enemy::move_pipe2,