Mortal Kombat Game ELEC2645
Dependencies: mbed N5110 ShiftReg Joystick
Diff: main.cpp
- Revision:
- 9:8c840b08a633
- Parent:
- 7:737fb0c3dbef
- Child:
- 10:e83899f11e8a
--- a/main.cpp Thu Apr 22 18:33:23 2021 +0000 +++ b/main.cpp Fri Apr 23 22:20:24 2021 +0000 @@ -4,11 +4,11 @@ #include "Fighter.h" #include "Joystick.h" #include "Menu.h" -// #include "Enemy.h" +#include "Enemy.h" #include "GameEngine.h" ///////////// defines ///////////////////// #define GROUND 34 -///////////// objects /////////////////// +///////////// objects ///////////////////// GameEngine game; Fighter fighter; Menu menu; @@ -36,8 +36,8 @@ while(1) { lcd.clear(); draw_background(); - // fighter.draw(lcd, buttonA, buttonB, buttonC, buttonD, joy_v, joy_h); - game.start(lcd, buttonA, buttonB, buttonC, buttonD, joy_v, joy_h); + fighter.move_fighter(lcd, buttonA, buttonB, buttonC, buttonD, joy_v, joy_h); + // game.start(lcd, buttonA, buttonB, buttonC, buttonD, joy_v, joy_h); } } @@ -45,7 +45,8 @@ void init() { // initialize all devices lcd.init(); lcd.setContrast(0.5); - game.init(); + // game.init(); + fighter.init(); } void menu_screen() {