|
Line
Link Here
|
| 0 |
-- enemies.h |
0 |
++ enemies.h |
|
Lines 70-78
Link Here
|
| 70 |
extern const enemy_kind bomb2; |
70 |
extern const enemy_kind bomb2; |
| 71 |
extern const enemy_kind bombdeto; |
71 |
extern const enemy_kind bombdeto; |
| 72 |
extern const enemy_kind cannon; |
72 |
extern const enemy_kind cannon; |
| 73 |
extern const enemy_kind pipe1; |
73 |
extern const enemy_kind pipeone; |
| 74 |
extern const enemy_kind core; |
74 |
extern const enemy_kind core; |
| 75 |
extern const enemy_kind pipe2; |
75 |
extern const enemy_kind pipetwo; |
| 76 |
extern const enemy_kind rock; |
76 |
extern const enemy_kind rock; |
| 77 |
extern const enemy_kind ring; |
77 |
extern const enemy_kind ring; |
| 78 |
extern const enemy_kind enemy_m1; |
78 |
extern const enemy_kind enemy_m1; |
|
Lines 430-436
Link Here
|
| 430 |
|
430 |
|
| 431 |
inline int _enemy::is_pipe() |
431 |
inline int _enemy::is_pipe() |
| 432 |
{ |
432 |
{ |
| 433 |
return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2))); |
433 |
return ((_state != notuse) && ((ek == &pipeone) || (ek == &pipetwo))); |
| 434 |
} |
434 |
} |
| 435 |
|
435 |
|
| 436 |
|
436 |
|
| 437 |
-- enemy.cpp |
437 |
++ enemy.cpp |
|
Lines 713-719
Link Here
|
| 713 |
|
713 |
|
| 714 |
void _enemy::kill_cannon() |
714 |
void _enemy::kill_cannon() |
| 715 |
{ |
715 |
{ |
| 716 |
enemies.make(&pipe1, CS2PIXEL(x), CS2PIXEL(y)); |
716 |
enemies.make(&pipeone, CS2PIXEL(x), CS2PIXEL(y)); |
| 717 |
sound.g_base_node_explo(x, y); |
717 |
sound.g_base_node_explo(x, y); |
| 718 |
release(); |
718 |
release(); |
| 719 |
} |
719 |
} |
|
Lines 755-764
Link Here
|
| 755 |
|
755 |
|
| 756 |
void _enemy::kill_core() |
756 |
void _enemy::kill_core() |
| 757 |
{ |
757 |
{ |
| 758 |
enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); |
758 |
enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); |
| 759 |
enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); |
759 |
enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); |
| 760 |
enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); |
760 |
enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); |
| 761 |
enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); |
761 |
enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); |
| 762 |
enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y)); |
762 |
enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y)); |
| 763 |
sound.g_base_core_explo(x, y); |
763 |
sound.g_base_core_explo(x, y); |
| 764 |
release(); |
764 |
release(); |
|
Lines 851-857
Link Here
|
| 851 |
screen.set_map(x1, y1, m ^ a); |
851 |
screen.set_map(x1, y1, m ^ a); |
| 852 |
release(); |
852 |
release(); |
| 853 |
} |
853 |
} |
| 854 |
const enemy_kind pipe1 = { |
854 |
const enemy_kind pipeone = { |
| 855 |
0, |
855 |
0, |
| 856 |
&_enemy::make_pipe1, |
856 |
&_enemy::make_pipe1, |
| 857 |
&_enemy::move_pipe1, |
857 |
&_enemy::move_pipe1, |
|
Lines 978-996
Link Here
|
| 978 |
} |
978 |
} |
| 979 |
p ^= a; |
979 |
p ^= a; |
| 980 |
if(p & U_MASK) |
980 |
if(p & U_MASK) |
| 981 |
enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); |
981 |
enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1); |
| 982 |
if(p & R_MASK) |
982 |
if(p & R_MASK) |
| 983 |
enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); |
983 |
enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3); |
| 984 |
if(p & D_MASK) |
984 |
if(p & D_MASK) |
| 985 |
enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); |
985 |
enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5); |
| 986 |
if(p & L_MASK) |
986 |
if(p & L_MASK) |
| 987 |
enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); |
987 |
enemies.make(&pipetwo, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7); |
| 988 |
manage.add_score(10); |
988 |
manage.add_score(10); |
| 989 |
release(); |
989 |
release(); |
| 990 |
} |
990 |
} |
| 991 |
|
991 |
|
| 992 |
|
992 |
|
| 993 |
const enemy_kind pipe2 = { |
993 |
const enemy_kind pipetwo = { |
| 994 |
0, |
994 |
0, |
| 995 |
&_enemy::make_pipe2, |
995 |
&_enemy::make_pipe2, |
| 996 |
&_enemy::move_pipe2, |
996 |
&_enemy::move_pipe2, |
