diff --git a/src/game/input/control.c b/src/game/input/control.c index d7ba3e1..2ab365f 100644 --- a/src/game/input/control.c +++ b/src/game/input/control.c @@ -54,10 +54,8 @@ control_tick(Control* self, Input* input) if (input->keyboard.current[KEYBOARD_KEY_M]) self->current[CONTROL_MUTE] = true; - /* if (input->keyboard.current[KEYBOARD_KEY_RCTRL] || input->keyboard.current[KEYBOARD_KEY_LCTRL]) self->current[CONTROL_CHEAT] = true; - */ } bool diff --git a/src/game/input/control.h b/src/game/input/control.h index 4b24ef9..ed23a87 100644 --- a/src/game/input/control.h +++ b/src/game/input/control.h @@ -2,8 +2,7 @@ #include "input.h" -#define CONTROL_COUNT CONTROL_MUTE + 1 -//#define CONTROL_COUNT CONTROL_CHEAT + 1 +#define CONTROL_COUNT CONTROL_CHEAT + 1 typedef enum ControlType { CONTROL_NONE, @@ -22,8 +21,8 @@ typedef enum ControlType CONTROL_PAUSE, CONTROL_RETRY, CONTROL_ESCAPE, - CONTROL_MUTE//, - //CONTROL_CHEAT + CONTROL_MUTE, + CONTROL_CHEAT } ControlType; typedef struct Control diff --git a/src/game/resource/RESOURCE_COMMON.h b/src/game/resource/RESOURCE_COMMON.h index 18596b7..b361ef1 100644 --- a/src/game/resource/RESOURCE_COMMON.h +++ b/src/game/resource/RESOURCE_COMMON.h @@ -182,8 +182,7 @@ static const u32 FONT_SIZES[FONT_COUNT] = 48 }; -#define SOUND_COUNT (SOUND_CANCEL + 1) -//#define SOUND_COUNT (SOUND_CHEAT + 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,8 @@ typedef enum SoundType SOUND_EXTEND, SOUND_FORESIGHT, SOUND_INVIGORATE, - SOUND_CANCEL//, - //SOUND_CHEAT + SOUND_CANCEL, + SOUND_CHEAT } SoundType; static const char* SOUND_PATHS[SOUND_COUNT] = @@ -262,8 +261,8 @@ 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", + "res/sound/cheat.ogg" }; #define MUSIC_COUNT MUSIC_VICTORY + 1 diff --git a/src/game/state/state.c b/src/game/state/state.c index 959c751..c05861f 100644 --- a/src/game/state/state.c +++ b/src/game/state/state.c @@ -195,14 +195,12 @@ 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: diff --git a/src/game/state/state.h b/src/game/state/state.h index c5b2af2..4ca868e 100644 --- a/src/game/state/state.h +++ b/src/game/state/state.h @@ -402,7 +402,6 @@ static const LevelData LEVEL_DATA_DEFAULT[LEVEL_COUNT] = }, }; -/* static const LevelData LEVEL_DATA_CHEAT[LEVEL_COUNT] = { { @@ -431,7 +430,6 @@ static const LevelData LEVEL_DATA_CHEAT[LEVEL_COUNT] = .time = -1 }, }; -*/ void state_change(State* self, StateType type); void state_init(State* self, ECS* ecs, StateType type);