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

merge Keydown methods with ProcessEvent

Browse source
This commit is contained in:
Sebastian Krzyszkowiak 2012-12-26 15:15:02 +01:00
parent 3934ca696b
commit 725918e3b4
3 changed files with 17 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gamestate.h
View file

@ -48,7 +48,6 @@ struct Gamestate {
void (*Gamestate_Unload)(struct Game *game, void* data);
void (*Gamestate_ProcessEvent)(struct Game *game, void* data, ALLEGRO_EVENT *ev);
void (*Gamestate_Keydown)(struct Game *game, void* data, ALLEGRO_EVENT *ev); // TODO: rly?
void (*Gamestate_Reload)(struct Game *game, void* data);
int *Gamestate_ProgressCount;

14
src/gamestates/disclaimer.c
View file

@ -39,12 +39,13 @@ void Gamestate_Start(struct Game *game, struct Disclaimer_Resources* data) {
FadeGamestate(game, true);
}
int Gamestate_Keydown(struct Game *game, struct Disclaimer_Resources* data, ALLEGRO_EVENT *ev) {
StopGamestate(game, "disclaimer");
UnloadGamestate(game, "disclaimer");
LoadGamestate(game, "intro");
StartGamestate(game, "intro");
return 0;
void Gamestate_ProcessEvent(struct Game *game, struct Disclaimer_Resources* data, ALLEGRO_EVENT *ev) {
if (ev->type==ALLEGRO_EVENT_KEY_DOWN) {
StopGamestate(game, "disclaimer");
UnloadGamestate(game, "disclaimer");
LoadGamestate(game, "intro");
StartGamestate(game, "intro");
}
}
void* Gamestate_Load(struct Game *game, void (*progress)(struct Game*)) {
@ -68,4 +69,3 @@ void Gamestate_Reload(struct Game *game, struct Disclaimer_Resources* data) {}
void Gamestate_Resume(struct Game *game, struct Disclaimer_Resources* data) {}
void Gamestate_Pause(struct Game *game, struct Disclaimer_Resources* data) {}
void Gamestate_ProcessEvent(struct Game *game, struct Disclaimer_Resources* data, ALLEGRO_EVENT *ev) {}

45
src/main.c
View file

@ -70,16 +70,6 @@ void LogicGamestates(struct Game *game) {
}
}
void KeydownGamestates(struct Game *game, ALLEGRO_EVENT *ev) {
struct Gamestate *tmp = game->_priv.gamestates;
while (tmp) {
if ((tmp->loaded) && (tmp->started) && (!tmp->paused)) {
(*tmp->api.Gamestate_Keydown)(game, tmp->data, ev);
}
tmp = tmp->next;
}
}
void EventGamestates(struct Game *game, ALLEGRO_EVENT *ev) {
struct Gamestate *tmp = game->_priv.gamestates;
while (tmp) {
@ -321,13 +311,13 @@ int main(int argc, char **argv){
while (tmp) {
if ((tmp->pending_load) && (!tmp->loaded)) {
PrintConsole(&game, "Loading gamestate %s...", tmp->name);
PrintConsole(&game, "Loading gamestate \"%s\"...", tmp->name);
// TODO: take proper game name
char libname[1024];
sprintf(libname, "libsuperderpy-%s-%s.so", "muffinattack", tmp->name);
tmp->handle = dlopen(libname,RTLD_NOW);
if (!tmp->handle) {
PrintConsole(&game, "Error while loading gamestate %s: %s", tmp->name, dlerror());
PrintConsole(&game, "Error while loading gamestate \"%s\": %s", tmp->name, dlerror());
tmp->pending_load = false;
} else {
@ -348,7 +338,6 @@ int main(int argc, char **argv){
if (!(tmp->api.Gamestate_Unload = dlsym(tmp->handle, "Gamestate_Unload"))) { gs_error(); continue; }
if (!(tmp->api.Gamestate_ProcessEvent = dlsym(tmp->handle, "Gamestate_ProcessEvent"))) { gs_error(); continue; }
if (!(tmp->api.Gamestate_Keydown = dlsym(tmp->handle, "Gamestate_Keydown"))) { gs_error(); continue; }
if (!(tmp->api.Gamestate_Reload = dlsym(tmp->handle, "Gamestate_Reload"))) { gs_error(); continue; }
if (!(tmp->api.Gamestate_ProgressCount = dlsym(tmp->handle, "Gamestate_ProgressCount"))) { gs_error(); continue; }
@ -359,13 +348,13 @@ int main(int argc, char **argv){
tmp->pending_load = false;
}
} else if ((tmp->pending_start) && (tmp->started)) {
PrintConsole(&game, "Stopping gamestate %s...", tmp->name);
PrintConsole(&game, "Stopping gamestate \"%s\"...", tmp->name);
(*tmp->api.Gamestate_Stop)(&game, tmp->data);
tmp->started = false;
tmp->pending_start = false;
}
else if ((tmp->pending_load) && (tmp->loaded)) {
PrintConsole(&game, "Unloading gamestate %s...", tmp->name);
PrintConsole(&game, "Unloading gamestate \"%s\"...", tmp->name);
tmp->loaded = false;
tmp->pending_load = false;
(*tmp->api.Gamestate_Unload)(&game, tmp->data);
@ -373,10 +362,10 @@ int main(int argc, char **argv){
tmp->handle = NULL;
} else if ((tmp->pending_start) && (!tmp->started)) {
if (!tmp->loaded) {
PrintConsole(&game, "Tried to start not loaded gamestate %s!", tmp->name);
PrintConsole(&game, "Tried to start not loaded gamestate \"%s\"!", tmp->name);
tmp->pending_start = false;
} else {
PrintConsole(&game, "Starting gamestate %s...", tmp->name);
PrintConsole(&game, "Starting gamestate \"%s\"...", tmp->name);
(*tmp->api.Gamestate_Start)(&game, tmp->data);
tmp->started = true;
tmp->pending_start = false;
@ -449,36 +438,22 @@ int main(int argc, char **argv){
PrintConsole(&game, "Screenshot stored in %s", al_path_cstr(path, ALLEGRO_NATIVE_PATH_SEP));
al_destroy_path(path);
}
// TODO: redirect keydown events to gamestates
KeydownGamestates(&game, &ev);
/*else {
game._priv.showconsole = true;
//PrintConsole(&game, "ERROR: Keystroke in unknown (%d) gamestate! (5 sec sleep)", game.gamestate);
DrawConsole(&game);
al_flip_display();
al_rest(5.0);
PrintConsole(&game, "Returning to menu...");
//game.gamestate = GAMESTATE_LOADING;
//game.loadstate = GAMESTATE_MENU;
}*/
} else {
EventGamestates(&game, &ev);
//Level_ProcessEvent(&game, &ev);
}
EventGamestates(&game, &ev);
}
}
game.shuttingdown = true;
// in case of reload
// in case of restart
struct Gamestate *tmp = game._priv.gamestates;
while (tmp) {
if (tmp->started) {
PrintConsole(&game, "Stopping gamestate %s...", tmp->name);
PrintConsole(&game, "Stopping gamestate \"%s\"...", tmp->name);
(*tmp->api.Gamestate_Stop)(&game, tmp->data);
tmp->started = false;
}
if (tmp->loaded) {
PrintConsole(&game, "Unloading gamestate %s...", tmp->name);
PrintConsole(&game, "Unloading gamestate \"%s\"...", tmp->name);
(*tmp->api.Gamestate_Unload)(&game, tmp->data);
dlclose(tmp->handle);
tmp->loaded = false;