projects / packages / KoboDeluxe.git / blame
| Commit | Line | Data |
|---|---|---|
| 03e5b3e6 SS |
1 | --- KoboDeluxe-0.5.1/enemies.h.orig 2010-05-24 18:53:21.647803692 +0200 |
| 2 | +++ KoboDeluxe-0.5.1/enemies.h 2010-05-24 18:54:37.847056344 +0200 | |
| 3 | @@ -72,7 +72,7 @@ extern const enemy_kind bombdeto; | |
| 4 | extern const enemy_kind cannon; | |
| 5 | extern const enemy_kind pipe1; | |
| 6 | extern const enemy_kind core; | |
| 7 | -extern const enemy_kind pipe2; | |
| 8 | +extern const enemy_kind kobo_pipe2; | |
| 9 | extern const enemy_kind rock; | |
| 10 | extern const enemy_kind ring; | |
| 11 | extern const enemy_kind enemy_m1; | |
| 12 | @@ -430,7 +430,7 @@ inline int _enemy::realize() | |
| 13 | ||
| 14 | inline int _enemy::is_pipe() | |
| 15 | { | |
| 16 | - return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2))); | |
| 17 | + return ((_state != notuse) && ((ek == &pipe1) || (ek == &kobo_pipe2))); | |
| 18 | } | |
| 19 | ||
| 20 | ||
| 21 | --- KoboDeluxe-0.5.1/enemy.cpp.orig 2010-05-24 19:04:08.577739047 +0200 | |
| 22 | +++ KoboDeluxe-0.5.1/enemy.cpp 2010-05-24 19:04:48.070235366 +0200 | |
| 23 | @@ -755,10 +755,10 @@ void _enemy::move_core() | |
| 24 | ||
| 25 | void _enemy::kill_core() | |
| 26 | { | |
| 27 | - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); | |
| 28 | - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); | |
| 29 | - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); | |
| 30 | - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); | |
| 31 | + enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); | |
| 32 | + enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); | |
| 33 | + enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); | |
| 34 | + enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); | |
| 35 | enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y)); | |
| 36 | sound.g_base_core_explo(x, y); | |
| 37 | release(); | |
| 38 | @@ -978,19 +978,19 @@ void _enemy::move_pipe2() | |
| 39 | } | |
| 40 | p ^= a; | |
| 41 | if(p & U_MASK) | |
| 42 | - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); | |
| 43 | + enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); | |
| 44 | if(p & R_MASK) | |
| 45 | - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); | |
| 46 | + enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); | |
| 47 | if(p & D_MASK) | |
| 48 | - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); | |
| 49 | + enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); | |
| 50 | if(p & L_MASK) | |
| 51 | - enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); | |
| 52 | + enemies.make(&kobo_pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); | |
| 53 | manage.add_score(10); | |
| 54 | release(); | |
| 55 | } | |
| 56 | ||
| 57 | ||
| 58 | -const enemy_kind pipe2 = { | |
| 59 | +const enemy_kind kobo_pipe2 = { | |
| 60 | 0, | |
| 61 | &_enemy::make_pipe2, | |
| 62 | &_enemy::move_pipe2, |