*sigh*
This commit is contained in:
parent
53c2fa722f
commit
8931fe54d4
@ -3,7 +3,6 @@
|
|||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
|
||||||
#define CONTROL_COUNT CONTROL_MUTE + 1
|
#define CONTROL_COUNT CONTROL_MUTE + 1
|
||||||
//#define CONTROL_COUNT CONTROL_CHEAT + 1
|
|
||||||
typedef enum ControlType
|
typedef enum ControlType
|
||||||
{
|
{
|
||||||
CONTROL_NONE,
|
CONTROL_NONE,
|
||||||
@ -22,8 +21,7 @@ typedef enum ControlType
|
|||||||
CONTROL_PAUSE,
|
CONTROL_PAUSE,
|
||||||
CONTROL_RETRY,
|
CONTROL_RETRY,
|
||||||
CONTROL_ESCAPE,
|
CONTROL_ESCAPE,
|
||||||
CONTROL_MUTE//,
|
CONTROL_MUTE
|
||||||
//CONTROL_CHEAT
|
|
||||||
} ControlType;
|
} ControlType;
|
||||||
|
|
||||||
typedef struct Control
|
typedef struct Control
|
||||||
|
@ -183,7 +183,6 @@ static const u32 FONT_SIZES[FONT_COUNT] =
|
|||||||
};
|
};
|
||||||
|
|
||||||
#define SOUND_COUNT (SOUND_CANCEL + 1)
|
#define SOUND_COUNT (SOUND_CANCEL + 1)
|
||||||
//#define SOUND_COUNT (SOUND_CHEAT + 1)
|
|
||||||
#define SOUND_BURP_COUNT 3
|
#define SOUND_BURP_COUNT 3
|
||||||
#define SOUND_GURGLE_COUNT 3
|
#define SOUND_GURGLE_COUNT 3
|
||||||
#define SOUND_LUNGE_COUNT 3
|
#define SOUND_LUNGE_COUNT 3
|
||||||
@ -223,8 +222,7 @@ typedef enum SoundType
|
|||||||
SOUND_EXTEND,
|
SOUND_EXTEND,
|
||||||
SOUND_FORESIGHT,
|
SOUND_FORESIGHT,
|
||||||
SOUND_INVIGORATE,
|
SOUND_INVIGORATE,
|
||||||
SOUND_CANCEL//,
|
SOUND_CANCEL
|
||||||
//SOUND_CHEAT
|
|
||||||
} SoundType;
|
} SoundType;
|
||||||
|
|
||||||
static const char* SOUND_PATHS[SOUND_COUNT] =
|
static const char* SOUND_PATHS[SOUND_COUNT] =
|
||||||
@ -262,8 +260,7 @@ static const char* SOUND_PATHS[SOUND_COUNT] =
|
|||||||
"res/sound/extend.ogg",
|
"res/sound/extend.ogg",
|
||||||
"res/sound/foresight.ogg",
|
"res/sound/foresight.ogg",
|
||||||
"res/sound/invigorate.ogg",
|
"res/sound/invigorate.ogg",
|
||||||
"res/sound/cancel.ogg"//,
|
"res/sound/cancel.ogg"
|
||||||
//"res/sound/cheat.ogg"
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#define MUSIC_COUNT MUSIC_VICTORY + 1
|
#define MUSIC_COUNT MUSIC_VICTORY + 1
|
||||||
|
@ -195,15 +195,6 @@ state_tick(State* self)
|
|||||||
if (self->states.title.isLevelSelected)
|
if (self->states.title.isLevelSelected)
|
||||||
_state_set(self, STATE_CUTSCENE_ONE + self->states.title.levelSelected);
|
_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;
|
break;
|
||||||
case STATE_CUTSCENE_ONE:
|
case STATE_CUTSCENE_ONE:
|
||||||
cutscene_tick(&self->states.cutscene);
|
cutscene_tick(&self->states.cutscene);
|
||||||
|
@ -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_change(State* self, StateType type);
|
||||||
void state_init(State* self, ECS* ecs, StateType type);
|
void state_init(State* self, ECS* ecs, StateType type);
|
||||||
void state_free(State* self);
|
void state_free(State* self);
|
||||||
|
Loading…
Reference in New Issue
Block a user