From 13c5fee2da90c8500e54f537493cdc6d114cad6f Mon Sep 17 00:00:00 2001
From: Andrew Kesterson <andrew@aklabs.net>
Date: Wed, 13 May 2026 16:37:38 -0400
Subject: [PATCH] Launching a map from the menu works correctly now

---
 src/akgltest.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/akgltest.c b/src/akgltest.c
index 435d5bf..8c188a4 100644
--- a/src/akgltest.c
+++ b/src/akgltest.c
@@ -57,7 +57,7 @@ char *spritepaths[] = {
 
 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);
     PREPARE_ERROR(e);
@@ -70,10 +70,10 @@ akerr_ErrorContext AKERR_NOIGNORE *akgltest_set_gamemode_menu(void *appstate, SD
     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 *actorptr = SDL_GetPointerProperty(AKGL_REGISTRY_ACTOR, "actor", NULL);
+    akgl_Actor *actorptr = SDL_GetPointerProperty(AKGL_REGISTRY_ACTOR, "player", NULL);
     PREPARE_ERROR(e);
     FAIL_ZERO_RETURN(e, menupointer, 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;
 
     AKGL_BITMASK_DEL(game.state.flags, AKGLTEST_STATE_MAPMENU);
-    AKGL_BITMASK_ADD(game.state.flags, AKGLTEST_STATE_RUNNING);
     if ( menuselection == 0 ) {
 	strcpy((char *)&dirnamebuf, "assets/imagemap.tmj");
 	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_ADD(game.state.flags, AKGLTEST_STATE_QUIT);
     }
+    AKGL_BITMASK_ADD(game.state.flags, AKGLTEST_STATE_RUNNING);
     SUCCEED_RETURN(e);
 }    
 
@@ -349,7 +349,7 @@ akerr_ErrorContext AKERR_NOIGNORE *akgltest_iterate_mapmenu(void)
 		     AKGL_REGISTRY_FONT,
 		     "C64Pro",
 		     NULL),
-		 "TILE MAP DEMO",
+		 "IMAGE MAP DEMO",
 		 (SDL_Color){255, 255, 255, 255},
 		 0,
 		 150,
@@ -360,7 +360,7 @@ akerr_ErrorContext AKERR_NOIGNORE *akgltest_iterate_mapmenu(void)
 		     AKGL_REGISTRY_FONT,
 		     "C64Pro",
 		     NULL),
-		 "IMAGE MAP DEMO",
+		 "TILE MAP DEMO",
 		 (SDL_Color){255, 255, 255, 255},
 		 0,
 		 150,
@@ -371,7 +371,7 @@ akerr_ErrorContext AKERR_NOIGNORE *akgltest_iterate_mapmenu(void)
 		     AKGL_REGISTRY_FONT,
 		     "C64Pro",
 		     NULL),
-		 "LOAD SAVED GAME",
+		 "QUIT GAME",
 		 (SDL_Color){255, 255, 255, 255},
 		 0,
 		 150,