|
|
@ -7,9 +7,29 @@ |
|
|
|
|
|
|
|
|
|
|
|
using namespace olc; |
|
|
|
using namespace olc; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#define TEST_MAP1 //Toggle to just play around on map 1.
|
|
|
|
|
|
|
|
//#define TEST_MAP2 //Toggle on to just play around on map 2.
|
|
|
|
|
|
|
|
|
|
|
|
#define STARTING_MAP "assets/maps/map1" |
|
|
|
#define STARTING_MAP "assets/maps/map1" |
|
|
|
#define STARTING_STATE CUTSCENE_1 |
|
|
|
#define STARTING_STATE CUTSCENE_1 |
|
|
|
#define MOVE_SPD 0.1 |
|
|
|
#define MOVE_SPD 0.075 |
|
|
|
|
|
|
|
#define PLAYER_X 14 |
|
|
|
|
|
|
|
#define PLAYER_Y 4 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef TEST_MAP1 |
|
|
|
|
|
|
|
#define STARTING_MAP "assets/maps/map1" |
|
|
|
|
|
|
|
#define STARTING_STATE GAMEWORLD |
|
|
|
|
|
|
|
#define MOVE_SPD 0.1 |
|
|
|
|
|
|
|
#define PLAYER_X 40 |
|
|
|
|
|
|
|
#define PLAYER_Y 31 |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
#ifdef TEST_MAP2 |
|
|
|
|
|
|
|
#define STARTING_MAP "assets/maps/map2" |
|
|
|
|
|
|
|
#define STARTING_STATE GAMEWORLD |
|
|
|
|
|
|
|
#define MOVE_SPD 0.1 |
|
|
|
|
|
|
|
#define PLAYER_X 16 |
|
|
|
|
|
|
|
#define PLAYER_Y 5 |
|
|
|
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
|
|
enum GAMESTATE{ |
|
|
|
enum GAMESTATE{ |
|
|
|
CUTSCENE_1, |
|
|
|
CUTSCENE_1, |
|
|
@ -281,7 +301,7 @@ public: |
|
|
|
int MAP_WIDTH=-1; |
|
|
|
int MAP_WIDTH=-1; |
|
|
|
int MAP_HEIGHT=-1; |
|
|
|
int MAP_HEIGHT=-1; |
|
|
|
Decal*TILES; |
|
|
|
Decal*TILES; |
|
|
|
float PLAYER_COORDS[2] = {14,4}; |
|
|
|
float PLAYER_COORDS[2] = {PLAYER_X,PLAYER_Y}; |
|
|
|
std::vector<Object*> OBJECTS; |
|
|
|
std::vector<Object*> OBJECTS; |
|
|
|
bool CUTSCENE_ACTIVE=false; |
|
|
|
bool CUTSCENE_ACTIVE=false; |
|
|
|
cutscene::CUTSCENE CURRENT_CUTSCENE=cutscene::NONE; |
|
|
|
cutscene::CUTSCENE CURRENT_CUTSCENE=cutscene::NONE; |
|
|
|