Mortal Kombat Game ELEC2645
Dependencies: mbed N5110 ShiftReg Joystick
Diff: Fighter.cpp
- Revision:
- 17:928edcdd1058
- Parent:
- 15:7fd2d34f3be5
- Child:
- 18:22bda659c70a
--- a/Fighter.cpp Tue Apr 27 22:46:33 2021 +0000 +++ b/Fighter.cpp Tue Apr 27 23:21:21 2021 +0000 @@ -101,7 +101,6 @@ } - // ************************************************************************ void Fighter::move_right(N5110 &lcd) { @@ -151,7 +150,7 @@ // ************************************************************************ -void Fighter::kick_right(N5110 &lcd) { +int Fighter::kick_right(N5110 &lcd) { const int kick[12][10] = { { 0,1,1,0,0,0,0,0,0,0 }, { 0,1,1,0,1,1,0,0,0,0 }, @@ -167,11 +166,12 @@ { 0,0,1,1,0,0,0,0,0,0 }, }; lcd.drawSprite(_x,_y,12,10,(int *)kick); +return 1; //confirm collision } // ************************************************************************ -void Fighter::kick_left(N5110 &lcd) { +int Fighter::kick_left(N5110 &lcd) { const int kick[12][10] = { { 0,0,0,0,0,0,0,1,1,0 }, { 0,0,0,0,1,1,0,1,1,0 }, @@ -187,11 +187,12 @@ { 0,0,0,0,1,1,0,0,0,0 }, }; lcd.drawSprite(_x,_y,12,10,(int *)kick); +return 1; //confirm collision } // ************************************************************************ -void Fighter::punch_right(N5110 &lcd) { +int Fighter::punch_right(N5110 &lcd) { const int punch[12][10] = { { 0,0,0,0,1,1,0,0,0,1 }, { 0,0,0,0,1,1,0,0,1,1 }, @@ -207,11 +208,12 @@ { 1,1,0,0,0,1,1,0,0,0 }, }; lcd.drawSprite(_x,_y,12,10,(int *)punch); +return 1; //confirm collision } // ************************************************************************ -void Fighter::punch_left(N5110 &lcd) { +int Fighter::punch_left(N5110 &lcd) { const int punch[12][10] = { { 1,0,0,0,1,1,0,0,0,0 }, { 1,1,0,0,1,1,0,0,0,0 }, @@ -227,6 +229,7 @@ { 0,0,0,1,1,0,0,0,1,1 }, }; lcd.drawSprite(_x,_y,12,10,(int *)punch); +return 1; //confirm collision } // ************************************************************************