diff options
| author | XaviDCR92 <xavi.dcr@gmail.com> | 2017-11-05 04:16:32 +0100 |
|---|---|---|
| committer | XaviDCR92 <xavi.dcr@gmail.com> | 2017-11-05 04:16:32 +0100 |
| commit | 2cf2d608af862e812e7fd3ac580f869141a96fa7 (patch) | |
| tree | 29a356a46635e4bc14e9e7342eb5a41defcab899 /Gameplay.cpp | |
| parent | b764612a79100271270012053bdb1e4302cd93b7 (diff) | |
| download | pocketempires-2cf2d608af862e812e7fd3ac580f869141a96fa7.tar.gz | |
+ Added copy of BitmapEncoder
+ New sprite and unit "Town center"
* Provisional collision checking.
* Many other modifications.
Diffstat (limited to 'Gameplay.cpp')
| -rw-r--r-- | Gameplay.cpp | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/Gameplay.cpp b/Gameplay.cpp index bcada48..aceca8f 100644 --- a/Gameplay.cpp +++ b/Gameplay.cpp @@ -3,8 +3,9 @@ * **************************************/ #include "Gameplay.h" -#include "MouseSpr.c" +#include "MouseSpr.i" #include "Pad.h" +#include "Camera.h" /* ************************************** * Defines * @@ -24,7 +25,7 @@ static const char PauseMenuOption_0[] PROGMEM = "Resume"; static const char PauseMenuOption_1[] PROGMEM = "Quit"; static TYPE_SPRITE MouseSpr; -static const char* const PauseMenuOptions[] PROGMEM = {PauseMenuOption_0, +static const char* const PauseMenuOptions[] PROGMEM = { PauseMenuOption_0, PauseMenuOption_1 }; /* ************************************** @@ -36,48 +37,9 @@ static void GameGraphics(void); static bool GamePause(void); static void GameLoop(void); -/* - -const byte TowerSpr[] PROGMEM = {16,32, -0xF,0xF0, -0x8,0x10, -0x8,0x10, -0xF,0xF0, -0x8,0x10, -0x8,0x10, -0x8,0x10, -0x8,0x10, -0x1B,0xD8, -0x2A,0x54, -0x4A,0x52, -0xFB,0xDF, -0x8,0x10, -0x8,0x10, -0x8,0x10, -0x9,0x90, -0x9,0x90, -0x8,0x10, -0x8,0x10, -0x8,0x10, -0x8,0x10, -0x9,0x90, -0x9,0x90, -0x8,0x10, -0x8,0x10, -0x8,0x10, -0x8,0x10, -0x8,0x10, -0xB,0xD0, -0xA,0x50, -0xA,0x50, -0xF,0xF0, -};*/ - void GameInit(void) { - uint8_t i; - - for (i = 0; i < GAME_MAX_PLAYERS; i++) + for (uint8_t i = 0; i < GAME_MAX_PLAYERS; i++) { GamePlayers[i].Init(); } @@ -100,7 +62,6 @@ bool GamePause(void) { if (PadButtonReleased(PAD_C) == true) { - //int8_t menu(const char* const* items, uint8_t length); uint8_t choice = gb.menu(PauseMenuOptions, 2); if (choice != 0) |