Fixed DOOMII level mess

Daivuk · Oct 16, 2023 · 06278cd · 06278cd
1 parent b3da889
commit 06278cd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 19 deletions.
diff --git a/Launcher/APDoomLauncher/Form1.Designer.cs b/Launcher/APDoomLauncher/Form1.Designer.cs
diff --git a/ap_gen_tool/data/DOOM II.json b/ap_gen_tool/data/DOOM II.json
diff --git a/src/archipelago/apdoom.h b/src/archipelago/apdoom.h
@@ -26,9 +26,9 @@ extern "C"
 
 
 
-#define APDOOM_MAJOR 0
-#define APDOOM_MINOR 13
-#define APDOOM_PATCH 2
+#define APDOOM_MAJOR 1
+#define APDOOM_MINOR 0
+#define APDOOM_PATCH 1
 #define APDOOM_STR(x) APDOOM_STR2(x)
 #define APDOOM_STR2(x) #x
 #define APDOOM_VERSION APDOOM_STR(APDOOM_MAJOR) "." APDOOM_STR(APDOOM_MINOR) "." APDOOM_STR(APDOOM_PATCH)

diff --git a/src/doom/level_select.c b/src/doom/level_select.c
@@ -598,8 +598,9 @@ void DrawEpisodicLevelSelectStats()
     for (int i = 0; i < map_count; ++i)
     {
         const level_pos_t* level_pos = get_level_pos_info(selected_ep, i);
-        ap_level_info_t* ap_level_info = ap_get_level_info(ap_make_level_index(selected_ep + 1, i + 1));
-        ap_level_state_t* ap_level_state = ap_get_level_state(ap_make_level_index(selected_ep + 1, i + 1));
+        ap_level_index_t idx = {selected_ep, i};
+        ap_level_info_t* ap_level_info = ap_get_level_info(idx);
+        ap_level_state_t* ap_level_state = ap_get_level_state(idx);
 
         x = level_pos->x;
         y = level_pos->y;