PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-07 21:56:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

put debug config into public config struct

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2018-12-15 01:09:44 +01:00
parent ce66ba8060
commit b9b231a438
No known key found for this signature in database
GPG key ID: E8F235CF3BDBC3FF
6 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/character.c
View file

@ -111,7 +111,7 @@ SYMBOL_EXPORT void LoadSpritesheets(struct Game* game, struct Character* charact
} }
for (int i = 0; i < tmp->frameCount; i++) { for (int i = 0; i < tmp->frameCount; i++) {
if ((!tmp->frames[i].source) && (tmp->frames[i].file)) { if ((!tmp->frames[i].source) && (tmp->frames[i].file)) {
if (game->config.debug) { if (game->config.debug.enabled) {
PrintConsole(game, " - %s", tmp->frames[i].file); PrintConsole(game, " - %s", tmp->frames[i].file);
} }
char filename[255] = {0}; char filename[255] = {0};

4
src/internal.c
View file

@ -249,7 +249,7 @@ SYMBOL_INTERNAL void* GamestateLoadingThread(void* arg) {
data->gamestate->data = data->gamestate->api->Gamestate_Load(data->game, &GamestateProgress); data->gamestate->data = data->gamestate->api->Gamestate_Load(data->game, &GamestateProgress);
if (data->game->_priv.loading.progress != data->gamestate->progressCount) { if (data->game->_priv.loading.progress != data->gamestate->progressCount) {
PrintConsole(data->game, "[%s] WARNING: Gamestate_ProgressCount does not match the number of progress invokations (%d)!", data->gamestate->name, data->game->_priv.loading.progress); PrintConsole(data->game, "[%s] WARNING: Gamestate_ProgressCount does not match the number of progress invokations (%d)!", data->gamestate->name, data->game->_priv.loading.progress);
if (data->game->config.debug) { if (data->game->config.debug.enabled) {
PrintConsole(data->game, "(sleeping for 3 seconds...)"); PrintConsole(data->game, "(sleeping for 3 seconds...)");
data->game->_priv.showconsole = true; data->game->_priv.showconsole = true;
al_rest(3.0); al_rest(3.0);
@ -277,7 +277,7 @@ SYMBOL_INTERNAL void* ScreenshotThread(void* arg) {
SYMBOL_INTERNAL void CalculateProgress(struct Game* game) { SYMBOL_INTERNAL void CalculateProgress(struct Game* game) {
struct Gamestate* tmp = game->_priv.loading.current; struct Gamestate* tmp = game->_priv.loading.current;
float progress = ((game->_priv.loading.progress / (float)(tmp->progressCount + 1)) / (float)game->_priv.loading.toLoad) + (game->_priv.loading.loaded / (float)game->_priv.loading.toLoad); float progress = ((game->_priv.loading.progress / (float)(tmp->progressCount + 1)) / (float)game->_priv.loading.toLoad) + (game->_priv.loading.loaded / (float)game->_priv.loading.toLoad);
if (game->config.debug) { if (game->config.debug.enabled) {
PrintConsole(game, "[%s] Progress: %d%% (%d/%d)", tmp->name, (int)(progress * 100), game->_priv.loading.progress, tmp->progressCount + 1); PrintConsole(game, "[%s] Progress: %d%% (%d/%d)", tmp->name, (int)(progress * 100), game->_priv.loading.progress, tmp->progressCount + 1);
} }
game->loading.progress = progress; game->loading.progress = progress;

10
src/libsuperderpy.c
View file

@ -108,17 +108,17 @@ SYMBOL_EXPORT struct Game* libsuperderpy_init(int argc, char** argv, const char*
game->config.voice = strtol(GetConfigOptionDefault(game, "SuperDerpy", "voice", "10"), NULL, 10); game->config.voice = strtol(GetConfigOptionDefault(game, "SuperDerpy", "voice", "10"), NULL, 10);
game->config.fx = strtol(GetConfigOptionDefault(game, "SuperDerpy", "fx", "10"), NULL, 10); game->config.fx = strtol(GetConfigOptionDefault(game, "SuperDerpy", "fx", "10"), NULL, 10);
game->config.mute = strtol(GetConfigOptionDefault(game, "SuperDerpy", "mute", "0"), NULL, 10); game->config.mute = strtol(GetConfigOptionDefault(game, "SuperDerpy", "mute", "0"), NULL, 10);
game->config.debug = strtol(GetConfigOptionDefault(game, "SuperDerpy", "debug", "0"), NULL, 10); game->config.debug.enabled = strtol(GetConfigOptionDefault(game, "SuperDerpy", "debug", "0"), NULL, 10);
game->config.width = strtol(GetConfigOptionDefault(game, "SuperDerpy", "width", GetDefaultWindowWidth(game)), NULL, 10); game->config.width = strtol(GetConfigOptionDefault(game, "SuperDerpy", "width", GetDefaultWindowWidth(game)), NULL, 10);
if (game->config.width < 100) { game->config.width = 100; } if (game->config.width < 100) { game->config.width = 100; }
game->config.height = strtol(GetConfigOptionDefault(game, "SuperDerpy", "height", GetDefaultWindowHeight(game)), NULL, 10); game->config.height = strtol(GetConfigOptionDefault(game, "SuperDerpy", "height", GetDefaultWindowHeight(game)), NULL, 10);
if (game->config.height < 100) { game->config.height = 100; } if (game->config.height < 100) { game->config.height = 100; }
game->_priv.debug.verbose = strtol(GetConfigOptionDefault(game, "debug", "verbose", "0"), NULL, 10); game->config.debug.verbose = strtol(GetConfigOptionDefault(game, "debug", "verbose", "0"), NULL, 10);
game->_priv.debug.livereload = strtol(GetConfigOptionDefault(game, "debug", "livereload", "1"), NULL, 10); game->config.debug.livereload = strtol(GetConfigOptionDefault(game, "debug", "livereload", "1"), NULL, 10);
game->_priv.debug.autopause = strtol(GetConfigOptionDefault(game, "debug", "autopause", "1"), NULL, 10); game->config.debug.autopause = strtol(GetConfigOptionDefault(game, "debug", "autopause", "1"), NULL, 10);
game->_priv.showconsole = game->config.debug; game->_priv.showconsole = game->config.debug.enabled;
game->_priv.showtimeline = false; game->_priv.showtimeline = false;
if (!al_init_image_addon()) { if (!al_init_image_addon()) {

11
src/libsuperderpy.h
View file

@ -157,9 +157,14 @@ struct Game {
int voice; /*!< Voice volume. */ int voice; /*!< Voice volume. */
bool mute; /*!< Whether audio should be muted globally. */ bool mute; /*!< Whether audio should be muted globally. */
bool fullscreen; /*!< Fullscreen toggle. */ bool fullscreen; /*!< Fullscreen toggle. */
bool debug; /*!< Toggles debug mode. */
int width; /*!< Width of window as being set in configuration. */ int width; /*!< Width of window as being set in configuration. */
int height; /*!< Height of window as being set in configuration. */ int height; /*!< Height of window as being set in configuration. */
struct {
bool enabled; /*!< Toggles debug mode. */
bool verbose; /*!< Prints file names and line numbers with every message. */
bool livereload; /*!< Automatically reloads gamestates on window focus. */
bool autopause; /*!< Pauses/resumes the game when the window loses/gains focus. */
} debug; /*!< Debug mode settings. */
} config; /*!< Configuration values from the config file. */ } config; /*!< Configuration values from the config file. */
struct { struct {
@ -237,10 +242,6 @@ struct Game {
bool shutting_down; /*!< If true then shut down of the game is pending. */ bool shutting_down; /*!< If true then shut down of the game is pending. */
bool restart; /*!< If true then restart of the game is pending. */ bool restart; /*!< If true then restart of the game is pending. */
struct {
bool verbose, livereload, autopause;
} debug;
ALLEGRO_TRANSFORM projection; /*!< Projection of the game canvas into the actual game window. */ ALLEGRO_TRANSFORM projection; /*!< Projection of the game canvas into the actual game window. */
#ifdef ALLEGRO_MACOSX #ifdef ALLEGRO_MACOSX

10
src/mainloop.c
View file

@ -59,7 +59,7 @@ static inline void HandleEvent(struct Game* game, ALLEGRO_EVENT* ev) {
if ((ev->keyboard.keycode == ALLEGRO_KEY_TILDE) || (ev->keyboard.keycode == ALLEGRO_KEY_BACKQUOTE)) { if ((ev->keyboard.keycode == ALLEGRO_KEY_TILDE) || (ev->keyboard.keycode == ALLEGRO_KEY_BACKQUOTE)) {
#endif #endif
game->_priv.showconsole = !game->_priv.showconsole; game->_priv.showconsole = !game->_priv.showconsole;
if ((ev->keyboard.modifiers & ALLEGRO_KEYMOD_CTRL) && (game->config.debug)) { if ((ev->keyboard.modifiers & ALLEGRO_KEYMOD_CTRL) && (game->config.debug.enabled)) {
game->_priv.showtimeline = game->_priv.showconsole; game->_priv.showtimeline = game->_priv.showconsole;
} }
} }
@ -131,15 +131,15 @@ static inline void HandleEvent(struct Game* game, ALLEGRO_EVENT* ev) {
static inline void HandleDebugEvent(struct Game* game, ALLEGRO_EVENT* ev) { static inline void HandleDebugEvent(struct Game* game, ALLEGRO_EVENT* ev) {
switch (ev->type) { switch (ev->type) {
case ALLEGRO_EVENT_DISPLAY_SWITCH_OUT: case ALLEGRO_EVENT_DISPLAY_SWITCH_OUT:
if (game->_priv.debug.autopause) { if (game->config.debug.autopause) {
PrintConsole(game, "DEBUG: autopause"); PrintConsole(game, "DEBUG: autopause");
PauseExecution(game); PauseExecution(game);
} }
break; break;
case ALLEGRO_EVENT_DISPLAY_SWITCH_IN: case ALLEGRO_EVENT_DISPLAY_SWITCH_IN:
if (game->_priv.debug.autopause) { if (game->config.debug.autopause) {
if (game->_priv.debug.livereload) { if (game->config.debug.livereload) {
ReloadCode(game); ReloadCode(game);
} }
ResumeExecution(game); ResumeExecution(game);
@ -424,7 +424,7 @@ static inline bool MainloopEvents(struct Game* game) {
HandleEvent(game, &ev); HandleEvent(game, &ev);
if (game->config.debug) { if (game->config.debug.enabled) {
HandleDebugEvent(game, &ev); HandleDebugEvent(game, &ev);
} }

4
src/utils.c
View file

@ -429,10 +429,10 @@ SYMBOL_EXPORT void PrintConsoleWithContext(struct Game* game, int line, const ch
SUPPRESS_END SUPPRESS_END
#if !defined(__EMSCRIPTEN__) && !defined(ALLEGRO_ANDROID) #if !defined(__EMSCRIPTEN__) && !defined(ALLEGRO_ANDROID)
if (game->config.debug) if (game->config.debug.enabled)
#endif #endif
{ {
if (game->_priv.debug.verbose) { if (game->config.debug.verbose) {
printf("%s:%d ", file, line); printf("%s:%d ", file, line);
} }
printf("[%s] %s\n", func, text); printf("[%s] %s\n", func, text);