Added sign

This commit is contained in:
2024-10-06 22:23:26 -05:00
parent b5d7b7e229
commit bf3912bb7f
15 changed files with 180 additions and 112 deletions

View File

@ -9,7 +9,6 @@
#include "game/time.h"
#include "input.h"
#include "display/display.h"
#include "rpg/world/maps/testmap.h"
#include "ui/textbox.h"
#include "asset/asset.h"
#include "asset/assetmap.h"
@ -27,12 +26,10 @@ void gameInit() {
textboxInit();
assetMapLoad("testmap.json", &MAP);
// testMapInit(&MAP);
gameSetMap(&MAP);
}
uint8_t gameUpdate(const float_t delta) {
gameupdateresult_t gameUpdate(const float_t delta) {
timeUpdate(delta);
inputUpdate();
@ -50,9 +47,6 @@ uint8_t gameUpdate(const float_t delta) {
case GAME_STATE_PAUSED:
if(inputWasPressed(INPUT_BIND_PAUSE)) GAME.state = GAME_STATE_OVERWORLD;
break;
default:
assertUnreachable("Invalid game state.");
}
// Perform render.

View File

@ -8,16 +8,20 @@
#pragma once
#include "rpg/world/map.h"
#define GAME_UPDATE_RESULT_CONTINUE 0
#define GAME_UPDATE_RESULT_EXIT 1
typedef enum {
GAME_UPDATE_RESULT_CONTINUE = 0,
GAME_UPDATE_RESULT_EXIT = 1
} gameupdateresult_t;
#define GAME_STATE_INITIAL 0
#define GAME_STATE_OVERWORLD 1
#define GAME_STATE_PAUSED 2
typedef enum {
GAME_STATE_INITIAL = 0,
GAME_STATE_OVERWORLD = 1,
GAME_STATE_PAUSED = 2
} gamestate_t;
typedef struct {
map_t *currentMap;
uint8_t state;
gamestate_t state;
bool_t shouldExit;
} game_t;
@ -34,7 +38,7 @@ void gameInit();
* @param delta Time since last update.
* @return Game update result, 0 for continue, 1 for exit, else for failure.
*/
uint8_t gameUpdate(const float_t delta);
gameupdateresult_t gameUpdate(const float_t delta);
/**
* Sets the current map, does not take ownership.