diff --git a/src/game/input/control.h b/src/game/input/control.h index 4b24ef9..e275a6a 100644 --- a/src/game/input/control.h +++ b/src/game/input/control.h @@ -3,7 +3,6 @@ #include "input.h" #define CONTROL_COUNT CONTROL_MUTE + 1 -//#define CONTROL_COUNT CONTROL_CHEAT + 1 typedef enum ControlType { CONTROL_NONE, @@ -22,8 +21,7 @@ typedef enum ControlType CONTROL_PAUSE, CONTROL_RETRY, CONTROL_ESCAPE, - CONTROL_MUTE//, - //CONTROL_CHEAT + CONTROL_MUTE } ControlType; typedef struct Control diff --git a/src/game/resource/RESOURCE_COMMON.h b/src/game/resource/RESOURCE_COMMON.h index 18596b7..2d2a8ee 100644 --- a/src/game/resource/RESOURCE_COMMON.h +++ b/src/game/resource/RESOURCE_COMMON.h @@ -183,7 +183,6 @@ static const u32 FONT_SIZES[FONT_COUNT] = }; #define SOUND_COUNT (SOUND_CANCEL + 1) -//#define SOUND_COUNT (SOUND_CHEAT + 1) #define SOUND_BURP_COUNT 3 #define SOUND_GURGLE_COUNT 3 #define SOUND_LUNGE_COUNT 3 @@ -223,8 +222,7 @@ typedef enum SoundType SOUND_EXTEND, SOUND_FORESIGHT, SOUND_INVIGORATE, - SOUND_CANCEL//, - //SOUND_CHEAT + SOUND_CANCEL } SoundType; static const char* SOUND_PATHS[SOUND_COUNT] = @@ -262,8 +260,7 @@ static const char* SOUND_PATHS[SOUND_COUNT] = "res/sound/extend.ogg", "res/sound/foresight.ogg", "res/sound/invigorate.ogg", - "res/sound/cancel.ogg"//, - //"res/sound/cheat.ogg" + "res/sound/cancel.ogg" }; #define MUSIC_COUNT MUSIC_VICTORY + 1 diff --git a/src/game/state/state.c b/src/game/state/state.c index 959c751..62dd152 100644 --- a/src/game/state/state.c +++ b/src/game/state/state.c @@ -195,15 +195,6 @@ state_tick(State* self) if (self->states.title.isLevelSelected) _state_set(self, STATE_CUTSCENE_ONE + self->states.title.levelSelected); - /* - if (control_released(self->ecs->control, CONTROL_CHEAT)) - { - memcpy(self->levelData, LEVEL_DATA_CHEAT, sizeof(LEVEL_DATA_CHEAT)); - sound_play(&self->ecs->resources->sounds[SOUND_CHEAT]); - _state_set(self, STATE_TITLE); - } - */ - break; case STATE_CUTSCENE_ONE: cutscene_tick(&self->states.cutscene); diff --git a/src/game/state/state.h b/src/game/state/state.h index c5b2af2..f2f3314 100644 --- a/src/game/state/state.h +++ b/src/game/state/state.h @@ -402,37 +402,6 @@ static const LevelData LEVEL_DATA_DEFAULT[LEVEL_COUNT] = }, }; -/* -static const LevelData LEVEL_DATA_CHEAT[LEVEL_COUNT] = -{ - { - .status = LEVEL_STATUS_UNLOCKED, - .score = -1, - .time = -1 - }, - { - .status = LEVEL_STATUS_UNLOCKED, - .score = -1, - .time = -1 - }, - { - .status = LEVEL_STATUS_UNLOCKED, - .score = -1, - .time = -1 - }, - { - .status = LEVEL_STATUS_UNLOCKED, - .score = -1, - .time = -1 - }, - { - .status = LEVEL_STATUS_UNLOCKED, - .score = -1, - .time = -1 - }, -}; -*/ - void state_change(State* self, StateType type); void state_init(State* self, ECS* ecs, StateType type); void state_free(State* self);