mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 23:46:13 -05:00
a56145e1fa
* gnu/packages/games.scm (kobodeluxe): New variable. * gnu/packages/patches/kobodeluxe-paths.patch: New file. * gnu/packages/patches/kobodeluxe-enemies-pipe-decl.patch: New file. * gnu/packages/patches/kobodeluxe-const-charp-conversion.patch: New file. * gnu/packages/patches/kobodeluxe-manpage-minus-not-hyphen.patch: New file. * gnu/packages/patches/kobodeluxe-midicon-segmentation-fault.patch: New file. * gnu/packages/patches/kobodeluxe-graphics-window-signed-char.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it.
67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
# Authhor: Damyan Ivanov <dmn@debian.org>
|
|
# Description: rename pipe2 symbol to pipe2_kbdl to avoid clashes with the one
|
|
# declared in system unistd.h
|
|
# Debian-Bug: 527705
|
|
# Upstream-Report: http://www.freelists.org/post/olofsonprojects/kobodeluxe-failing-to-build-in-Debian-enemiesh75-error-const-enemy-kind-pipe2-redeclared-as-different-kind-of-symbol
|
|
--- a/enemies.h
|
|
+++ b/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 pipe2_kbdl;
|
|
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 == &pipe2_kbdl)));
|
|
}
|
|
|
|
|
|
--- a/enemy.cpp
|
|
+++ b/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(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
|
|
+ enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
|
|
+ enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
|
|
+ enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
|
|
enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
|
|
sound.g_base_core_explo(x, y);
|
|
release();
|
|
@@ -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(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
|
|
if(p & R_MASK)
|
|
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
|
|
+ enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
|
|
if(p & D_MASK)
|
|
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
|
|
+ enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
|
|
if(p & L_MASK)
|
|
- enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
|
|
+ enemies.make(&pipe2_kbdl, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
|
|
manage.add_score(10);
|
|
release();
|
|
}
|
|
|
|
|
|
-const enemy_kind pipe2 = {
|
|
+const enemy_kind pipe2_kbdl = {
|
|
0,
|
|
&_enemy::make_pipe2,
|
|
&_enemy::move_pipe2,
|