shweet/frillrun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

last commit fucked up the windows build apparently? great, let's try this

Browse Source
This commit is contained in:
shweet 2024-08-30 04:06:16 -04:00
parent 19f8b51be9
commit 53c2fa722f
6 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/input/control.c
View File

@ -54,8 +54,10 @@ control_tick(Control* self, Input* input)
if (input->keyboard.current[KEYBOARD_KEY_M]) if (input->keyboard.current[KEYBOARD_KEY_M])
self->current[CONTROL_MUTE] = true; self->current[CONTROL_MUTE] = true;
/*
if (input->keyboard.current[KEYBOARD_KEY_RCTRL] || input->keyboard.current[KEYBOARD_KEY_LCTRL]) if (input->keyboard.current[KEYBOARD_KEY_RCTRL] || input->keyboard.current[KEYBOARD_KEY_LCTRL])
self->current[CONTROL_CHEAT] = true; self->current[CONTROL_CHEAT] = true;
*/
} }
bool bool

7
src/game/input/control.h
View File

@ -2,7 +2,8 @@
#include "input.h" #include "input.h"
#define CONTROL_COUNT CONTROL_CHEAT + 1 #define CONTROL_COUNT CONTROL_MUTE + 1
//#define CONTROL_COUNT CONTROL_CHEAT + 1
typedef enum ControlType typedef enum ControlType
{ {
CONTROL_NONE, CONTROL_NONE,
@ -21,8 +22,8 @@ typedef enum ControlType
CONTROL_PAUSE, CONTROL_PAUSE,
CONTROL_RETRY, CONTROL_RETRY,
CONTROL_ESCAPE, CONTROL_ESCAPE,
CONTROL_MUTE, CONTROL_MUTE//,
CONTROL_CHEAT //CONTROL_CHEAT
} ControlType; } ControlType;
typedef struct Control typedef struct Control

15
src/game/resource/RESOURCE_COMMON.h
View File

@ -91,7 +91,7 @@ typedef enum TextureType
TEXTURE_CUTSCENE_FINAL_SCENE_THIRTEEN, TEXTURE_CUTSCENE_FINAL_SCENE_THIRTEEN,
TEXTURE_ENDING, TEXTURE_ENDING,
TEXTURE_ENDING_TWO, TEXTURE_ENDING_TWO,
TEXTURE_ENDING_THREE, TEXTURE_ENDING_THREE
} TextureType; } TextureType;
static const char* TEXTURE_PATHS[TEXTURE_COUNT] = static const char* TEXTURE_PATHS[TEXTURE_COUNT] =
@ -157,7 +157,7 @@ static const char* TEXTURE_PATHS[TEXTURE_COUNT] =
"res/gfx/cutscene/c06s13.png", "res/gfx/cutscene/c06s13.png",
"res/gfx/cutscene/ending.png", "res/gfx/cutscene/ending.png",
"res/gfx/cutscene/ending2.png", "res/gfx/cutscene/ending2.png",
"res/gfx/cutscene/ending3.png", "res/gfx/cutscene/ending3.png"
}; };
#define FONT_COUNT FONT_BIG + 1 #define FONT_COUNT FONT_BIG + 1
@ -182,7 +182,8 @@ static const u32 FONT_SIZES[FONT_COUNT] =
48 48
}; };
#define SOUND_COUNT (SOUND_CHEAT + 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
@ -222,8 +223,8 @@ typedef enum SoundType
SOUND_EXTEND, SOUND_EXTEND,
SOUND_FORESIGHT, SOUND_FORESIGHT,
SOUND_INVIGORATE, SOUND_INVIGORATE,
SOUND_CANCEL, SOUND_CANCEL//,
SOUND_CHEAT //SOUND_CHEAT
} SoundType; } SoundType;
static const char* SOUND_PATHS[SOUND_COUNT] = static const char* SOUND_PATHS[SOUND_COUNT] =
@ -261,8 +262,8 @@ 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", //"res/sound/cheat.ogg"
}; };
#define MUSIC_COUNT MUSIC_VICTORY + 1 #define MUSIC_COUNT MUSIC_VICTORY + 1

2
src/game/state/level/LEVEL_COMMON.h
View File

@ -19,7 +19,7 @@
#include "../../ecs/entity/visual/entity_text_disappearing.h" #include "../../ecs/entity/visual/entity_text_disappearing.h"
#include "../../ecs/entity/visual/entity_text_queue_entry.h" #include "../../ecs/entity/visual/entity_text_queue_entry.h"
static const vec4 LEVEL_SUNSET_COLOR = {0.15f, 0.10f, 0.10f, 1.0f}; static const vec4 LEVEL_SUNSET_COLOR = {0.35f, 0.20f, 0.20f, 1.0f};
#define LEVEL_TUTORIAL_TEXT_COUNT 3 #define LEVEL_TUTORIAL_TEXT_COUNT 3

2
src/game/state/state.c
View File

@ -195,12 +195,14 @@ 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)) if (control_released(self->ecs->control, CONTROL_CHEAT))
{ {
memcpy(self->levelData, LEVEL_DATA_CHEAT, sizeof(LEVEL_DATA_CHEAT)); memcpy(self->levelData, LEVEL_DATA_CHEAT, sizeof(LEVEL_DATA_CHEAT));
sound_play(&self->ecs->resources->sounds[SOUND_CHEAT]); sound_play(&self->ecs->resources->sounds[SOUND_CHEAT]);
_state_set(self, STATE_TITLE); _state_set(self, STATE_TITLE);
} }
*/
break; break;
case STATE_CUTSCENE_ONE: case STATE_CUTSCENE_ONE:

2
src/game/state/state.h
View File

@ -402,6 +402,7 @@ static const LevelData LEVEL_DATA_DEFAULT[LEVEL_COUNT] =
}, },
}; };
/*
static const LevelData LEVEL_DATA_CHEAT[LEVEL_COUNT] = static const LevelData LEVEL_DATA_CHEAT[LEVEL_COUNT] =
{ {
{ {
@ -430,6 +431,7 @@ static const LevelData LEVEL_DATA_CHEAT[LEVEL_COUNT] =
.time = -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);