andrew/akgl-test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Launching a map from the menu works correctly now

Browse Source
This commit is contained in:
Andrew Kesterson
2026-05-13 16:37:38 -04:00
parent b30fbee605
commit 13c5fee2da
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/akgltest.c
View File

@@ -57,7 +57,7 @@ char *spritepaths[] = {
char dirnamebuf[1024]; char dirnamebuf[1024];
akerr_ErrorContext AKERR_NOIGNORE *akgltest_set_gamemode_menu(void *appstate, SDL_Event *event) akerr_ErrorContext AKERR_NOIGNORE *akgltest_set_gamemode_menu(akgl_Actor *appstate, SDL_Event *event)
{ {
akgl_Actor *menupointer = SDL_GetPointerProperty(AKGL_REGISTRY_ACTOR, "menupointer", NULL); akgl_Actor *menupointer = SDL_GetPointerProperty(AKGL_REGISTRY_ACTOR, "menupointer", NULL);
PREPARE_ERROR(e); PREPARE_ERROR(e);
@@ -70,10 +70,10 @@ akerr_ErrorContext AKERR_NOIGNORE *akgltest_set_gamemode_menu(void *appstate, SD
SUCCEED_RETURN(e); SUCCEED_RETURN(e);
} }
akerr_ErrorContext AKERR_NOIGNORE *akgltest_set_gamemode_running(void *appstate, SDL_Event *event) akerr_ErrorContext AKERR_NOIGNORE *akgltest_set_gamemode_running(akgl_Actor *appstate, SDL_Event *event)
{ {
akgl_Actor *menupointer = SDL_GetPointerProperty(AKGL_REGISTRY_ACTOR, "menupointer", NULL); akgl_Actor *menupointer = SDL_GetPointerProperty(AKGL_REGISTRY_ACTOR, "menupointer", NULL);
akgl_Actor *actorptr = SDL_GetPointerProperty(AKGL_REGISTRY_ACTOR, "actor", NULL); akgl_Actor *actorptr = SDL_GetPointerProperty(AKGL_REGISTRY_ACTOR, "player", NULL);
PREPARE_ERROR(e); PREPARE_ERROR(e);
FAIL_ZERO_RETURN(e, menupointer, AKERR_NULLPOINTER, "missing actor"); FAIL_ZERO_RETURN(e, menupointer, AKERR_NULLPOINTER, "missing actor");
FAIL_ZERO_RETURN(e, actorptr, AKERR_NULLPOINTER, "missing actor"); FAIL_ZERO_RETURN(e, actorptr, AKERR_NULLPOINTER, "missing actor");
@@ -85,7 +85,6 @@ akerr_ErrorContext AKERR_NOIGNORE *akgltest_set_gamemode_running(void *appstate,
actorptr->visible = true; actorptr->visible = true;
AKGL_BITMASK_DEL(game.state.flags, AKGLTEST_STATE_MAPMENU); AKGL_BITMASK_DEL(game.state.flags, AKGLTEST_STATE_MAPMENU);
AKGL_BITMASK_ADD(game.state.flags, AKGLTEST_STATE_RUNNING);
if ( menuselection == 0 ) { if ( menuselection == 0 ) {
strcpy((char *)&dirnamebuf, "assets/imagemap.tmj"); strcpy((char *)&dirnamebuf, "assets/imagemap.tmj");
PASS(e, akgl_tilemap_load((char *)&dirnamebuf, (akgl_Tilemap *)&gamemap)); PASS(e, akgl_tilemap_load((char *)&dirnamebuf, (akgl_Tilemap *)&gamemap));
@@ -96,6 +95,7 @@ akerr_ErrorContext AKERR_NOIGNORE *akgltest_set_gamemode_running(void *appstate,
AKGL_BITMASK_DEL(game.state.flags, AKGLTEST_STATE_RUNNING); AKGL_BITMASK_DEL(game.state.flags, AKGLTEST_STATE_RUNNING);
AKGL_BITMASK_ADD(game.state.flags, AKGLTEST_STATE_QUIT); AKGL_BITMASK_ADD(game.state.flags, AKGLTEST_STATE_QUIT);
} }
AKGL_BITMASK_ADD(game.state.flags, AKGLTEST_STATE_RUNNING);
SUCCEED_RETURN(e); SUCCEED_RETURN(e);
} }
@@ -349,7 +349,7 @@ akerr_ErrorContext AKERR_NOIGNORE *akgltest_iterate_mapmenu(void)
AKGL_REGISTRY_FONT, AKGL_REGISTRY_FONT,
"C64Pro", "C64Pro",
NULL), NULL),
"TILE MAP DEMO", "IMAGE MAP DEMO",
(SDL_Color){255, 255, 255, 255}, (SDL_Color){255, 255, 255, 255},
0, 0,
150, 150,
@@ -360,7 +360,7 @@ akerr_ErrorContext AKERR_NOIGNORE *akgltest_iterate_mapmenu(void)
AKGL_REGISTRY_FONT, AKGL_REGISTRY_FONT,
"C64Pro", "C64Pro",
NULL), NULL),
"IMAGE MAP DEMO", "TILE MAP DEMO",
(SDL_Color){255, 255, 255, 255}, (SDL_Color){255, 255, 255, 255},
0, 0,
150, 150,
@@ -371,7 +371,7 @@ akerr_ErrorContext AKERR_NOIGNORE *akgltest_iterate_mapmenu(void)
AKGL_REGISTRY_FONT, AKGL_REGISTRY_FONT,
"C64Pro", "C64Pro",
NULL), NULL),
"LOAD SAVED GAME", "QUIT GAME",
(SDL_Color){255, 255, 255, 255}, (SDL_Color){255, 255, 255, 255},
0, 0,
150, 150,