PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-03-04 09:11:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

don't send events to gamestates that correspond to debug functions

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2012-12-27 01:02:47 +01:00
parent 5d3bb2d0d7
commit 00dd653a10
5 changed files with 47 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gamestate.c
View file

@ -62,7 +62,7 @@ struct Gamestate* FindGamestate(struct Game *game, const char* name) {
void LoadGamestate(struct Game *game, const char* name) {
struct Gamestate *gs = FindGamestate(game, name);
if (gs) {
if (!gs->loaded) {
if (gs->loaded) {
PrintConsole(game, "Gamestate %s already loaded.", name);
return;
}

5
src/gamestates/CMakeLists.txt
View file

@ -14,6 +14,7 @@ ENDMACRO()
GAMESTATE("disclaimer")
GAMESTATE("intro")
GAMESTATE("map")
##GAMESTATE("level")
#GAMESTATE("level")
GAMESTATE("about")
##GAMESTATE("pause")
#GAMESTATE("pause")
#GAMESTATE("loading")

1
src/gamestates/intro.c
View file

@ -260,6 +260,7 @@ void Gamestate_Stop(struct Game *game, struct IntroResources* data) {
if (data->audiostream) {
al_set_audio_stream_playing(data->audiostream, false);
}
al_stop_sample_instance(data->music);
}
void Gamestate_Pause(struct Game *game, struct IntroResources* data) {}

2
src/gamestates/loading.c
View file

@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <stdio.h>
#include "../allegro_utils.h"
#include "../utils.h"
#include "loading.h"
void Progress(struct Game *game, float p) {

82
src/main.c
View file

@ -312,6 +312,8 @@ int main(int argc, char **argv){
struct Gamestate *tmp = game._priv.gamestates;
bool gameActive = false;
// FIXME: move to function
// TODO: support dependences
while (tmp) {
if ((tmp->pending_start) && (tmp->started)) {
PrintConsole(&game, "Stopping gamestate \"%s\"...", tmp->name);
@ -402,47 +404,45 @@ int main(int argc, char **argv){
else if(ev.type == ALLEGRO_EVENT_DISPLAY_CLOSE) {
break;
}
else if (ev.type == ALLEGRO_EVENT_KEY_DOWN) {
/*PrintConsole(&game, "KEYCODE: %s", al_keycode_to_name(ev.keyboard.keycode));*/
#ifdef ALLEGRO_MACOSX
if (ev.keyboard.keycode == 104) { //TODO: report to upstream
#else
if (ev.keyboard.keycode == ALLEGRO_KEY_TILDE) {
#endif
game._priv.showconsole = !game._priv.showconsole;
}
else if ((game.config.debug) && (ev.keyboard.keycode == ALLEGRO_KEY_F1)) {
int i;
for (i=0; i<512; i++) {
LogicGamestates(&game);
}
game._priv.showconsole = true;
PrintConsole(&game, "DEBUG: 512 frames skipped...");
} else if ((game.config.debug) && (ev.keyboard.keycode == ALLEGRO_KEY_F10)) {
double speed = ALLEGRO_BPS_TO_SECS(al_get_timer_speed(game._priv.timer)); // inverting
speed -= 10;
if (speed<10) speed = 10;
al_set_timer_speed(game._priv.timer, ALLEGRO_BPS_TO_SECS(speed));
game._priv.showconsole = true;
PrintConsole(&game, "DEBUG: Gameplay speed: %.2fx", speed/60.0);
} else if ((game.config.debug) && (ev.keyboard.keycode == ALLEGRO_KEY_F11)) {
double speed = ALLEGRO_BPS_TO_SECS(al_get_timer_speed(game._priv.timer)); // inverting
speed += 10;
if (speed>600) speed = 600;
al_set_timer_speed(game._priv.timer, ALLEGRO_BPS_TO_SECS(speed));
game._priv.showconsole = true;
PrintConsole(&game, "DEBUG: Gameplay speed: %.2fx", speed/60.0);
} else if ((game.config.debug) && (ev.keyboard.keycode == ALLEGRO_KEY_F12)) {
ALLEGRO_PATH *path = al_get_standard_path(ALLEGRO_USER_DOCUMENTS_PATH);
char filename[255] = { };
sprintf(filename, "SuperDerpy_%ld_%ld.png", time(NULL), clock());
al_set_path_filename(path, filename);
al_save_bitmap(al_path_cstr(path, ALLEGRO_NATIVE_PATH_SEP), al_get_backbuffer(game.display));
PrintConsole(&game, "Screenshot stored in %s", al_path_cstr(path, ALLEGRO_NATIVE_PATH_SEP));
al_destroy_path(path);
}
#ifdef ALLEGRO_MACOSX
else if ((ev.type == ALLEGRO_EVENT_KEY_DOWN) && (ev.keyboard.keycode == 104)) { //TODO: report to upstream
#else
else if ((ev.type == ALLEGRO_EVENT_KEY_DOWN) && (ev.keyboard.keycode == ALLEGRO_KEY_TILDE)) {
#endif
game._priv.showconsole = !game._priv.showconsole;
}
else if ((ev.type == ALLEGRO_EVENT_KEY_DOWN) && (game.config.debug) && (ev.keyboard.keycode == ALLEGRO_KEY_F1)) {
int i;
for (i=0; i<512; i++) {
LogicGamestates(&game);
}
game._priv.showconsole = true;
PrintConsole(&game, "DEBUG: 512 frames skipped...");
} else if ((ev.type == ALLEGRO_EVENT_KEY_DOWN) && (game.config.debug) && (ev.keyboard.keycode == ALLEGRO_KEY_F10)) {
double speed = ALLEGRO_BPS_TO_SECS(al_get_timer_speed(game._priv.timer)); // inverting
speed -= 10;
if (speed<10) speed = 10;
al_set_timer_speed(game._priv.timer, ALLEGRO_BPS_TO_SECS(speed));
game._priv.showconsole = true;
PrintConsole(&game, "DEBUG: Gameplay speed: %.2fx", speed/60.0);
} else if ((ev.type == ALLEGRO_EVENT_KEY_DOWN) && (game.config.debug) && (ev.keyboard.keycode == ALLEGRO_KEY_F11)) {
double speed = ALLEGRO_BPS_TO_SECS(al_get_timer_speed(game._priv.timer)); // inverting
speed += 10;
if (speed>600) speed = 600;
al_set_timer_speed(game._priv.timer, ALLEGRO_BPS_TO_SECS(speed));
game._priv.showconsole = true;
PrintConsole(&game, "DEBUG: Gameplay speed: %.2fx", speed/60.0);
} else if ((ev.type == ALLEGRO_EVENT_KEY_DOWN) && (game.config.debug) && (ev.keyboard.keycode == ALLEGRO_KEY_F12)) {
ALLEGRO_PATH *path = al_get_standard_path(ALLEGRO_USER_DOCUMENTS_PATH);
char filename[255] = { };
sprintf(filename, "SuperDerpy_%ld_%ld.png", time(NULL), clock());
al_set_path_filename(path, filename);
al_save_bitmap(al_path_cstr(path, ALLEGRO_NATIVE_PATH_SEP), al_get_backbuffer(game.display));
PrintConsole(&game, "Screenshot stored in %s", al_path_cstr(path, ALLEGRO_NATIVE_PATH_SEP));
al_destroy_path(path);
} else {
EventGamestates(&game, &ev);
}
EventGamestates(&game, &ev);
}
}
game.shuttingdown = true;
@ -464,7 +464,7 @@ int main(int argc, char **argv){
tmp=tmp->next;
}
// TODO: unload loading
// TODO: proper loading state handling
al_clear_to_color(al_map_rgb(0,0,0));
PrintConsole(&game, "Shutting down...");
DrawConsole(&game);