Reimplemented quick build menu debug feature.

klei1984 · Jul 9, 2024 · 6bab091 · 6bab091
1 parent 9f8db49
commit 6bab091
Show file tree

Hide file tree

Showing 9 changed files with 247 additions and 33 deletions.
diff --git a/src/access.cpp b/src/access.cpp
@@ -1365,7 +1365,7 @@ bool Access_IsChildOfUnitInList(UnitInfo* unit, SmartList<UnitInfo>* list, Smart
     return *it != list->End();
 }
 
-UnitInfo* Access_GetUnit5(int32_t grid_x, int32_t grid_y) {
+UnitInfo* Access_GetQuickBuilderUnit(int32_t grid_x, int32_t grid_y) {
     UnitInfo* unit;
 
     unit = nullptr;

diff --git a/src/access.hpp b/src/access.hpp
@@ -78,7 +78,7 @@ void Access_UpdateResourcesTotal(Complex *complex);
 void Access_DestroyUtilities(int32_t grid_x, int32_t grid_y, bool remove_slabs, bool remove_rubble, bool remove_connectors,
                              bool remove_road);
 void Access_DestroyGroundCovers(int32_t grid_x, int32_t grid_y);
-UnitInfo *Access_GetUnit5(int32_t grid_x, int32_t grid_y);
+UnitInfo *Access_GetQuickBuilderUnit(int32_t grid_x, int32_t grid_y);
 UnitInfo *Access_GetUnit3(int32_t grid_x, int32_t grid_y, uint32_t flags);
 UnitInfo *Access_GetUnit1(int32_t grid_x, int32_t grid_y);
 UnitInfo *Access_GetUnit2(int32_t grid_x, int32_t grid_y, uint16_t team);

diff --git a/src/game_manager.cpp b/src/game_manager.cpp
diff --git a/src/game_manager.hpp b/src/game_manager.hpp
@@ -84,7 +84,7 @@ extern bool GameManager_DisplayControlsInitialized;
 extern bool GameManager_RenderMinimapDisplay;
 extern bool GameManager_PlayFlic;
 extern bool GameManager_MaxSurvey;
-extern bool GameManager_UnknownFlag3;
+extern bool GameManager_QuickBuildMenuActive;
 extern bool GameManager_IsMainMenuEnabled;
 extern bool GameManager_WrapUpGame;
 extern Button* Gamemanager_FlicButton;

diff --git a/src/gnw.c b/src/gnw.c
@@ -447,7 +447,7 @@ void win_set_bk_color(int32_t color) {
     }
 }
 
-void win_print(WinID id, char *str, int32_t field_width, int32_t x, int32_t y, int32_t color) {
+void win_print(WinID id, const char *str, int32_t field_width, int32_t x, int32_t y, int32_t color) {
     GNW_Window *w;
     uint8_t *buf;
 

diff --git a/src/gnw.h b/src/gnw.h
@@ -95,7 +95,7 @@ void win_delete(WinID id);
 void win_buffering(int32_t state);
 void win_border(WinID id);
 void win_set_bk_color(int32_t color);
-void win_print(WinID id, char* str, int32_t field_width, int32_t x, int32_t y, int32_t color);
+void win_print(WinID id, const char* str, int32_t field_width, int32_t x, int32_t y, int32_t color);
 void win_text(WinID id, char** list, int32_t num, int32_t field_width, int32_t x, int32_t y, int32_t color);
 void win_line(WinID id, int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t color);
 void win_box(WinID id, int32_t ulx, int32_t uly, int32_t lrx, int32_t lry, int32_t color);

diff --git a/src/remote.cpp b/src/remote.cpp
@@ -1844,13 +1844,13 @@ void Remote_ReceiveNetPacket_14(NetPacket& packet) {
     packet >> grid_x;
     packet >> grid_y;
 
-    bool state_backup = GameManager_UnknownFlag3;
+    bool state_backup = GameManager_QuickBuildMenuActive;
 
-    GameManager_UnknownFlag3 = true;
+    GameManager_QuickBuildMenuActive = true;
 
     GameManager_DeployUnit(entity_id, unit_type, grid_x, grid_y);
 
-    GameManager_UnknownFlag3 = state_backup;
+    GameManager_QuickBuildMenuActive = state_backup;
 }
 
 void Remote_SendNetPacket_16(const char* file_name, const char* file_title) {

diff --git a/src/resource_manager.cpp b/src/resource_manager.cpp
@@ -765,12 +765,10 @@ int32_t ResourceManager_InitResManager() {
 uint8_t *ResourceManager_ReadResource(ResourceID id) {
     uint8_t *resource_buffer;
 
-    SDL_assert(id < RESOURCE_E);
-
     if (id == INVALID_ID) {
         resource_buffer = nullptr;
     } else {
-        SDL_assert(id > MEM_END);
+        SDL_assert(id > MEM_END && id < RESOURCE_E);
 
         if (ResourceManager_ResMetaTable[id].res_file_item_index == INVALID_ID) {
             resource_buffer = nullptr;

diff --git a/src/units_manager.cpp b/src/units_manager.cpp
@@ -4126,7 +4126,7 @@ SmartPointer<UnitInfo> UnitsManager_DeployUnit(ResourceID unit_type, uint16_t te
         }
     }
 
-    if (GameManager_GameState != GAME_STATE_12 && !GameManager_UnknownFlag3 && !is_existing_unit) {
+    if (GameManager_GameState != GAME_STATE_12 && !GameManager_QuickBuildMenuActive && !is_existing_unit) {
         unit->storage = 0;
     }
 
@@ -5636,7 +5636,7 @@ void UnitsManager_BuildClearing(UnitInfo* unit, bool mode) {
     }
 
     if ((unit_flags & (BUILDING | STANDALONE)) || unit_orders == ORDER_BUILD || unit_orders == ORDER_CLEAR) {
-        if (unit_type == CONSTRCT && unit_orders == ORDER_BUILD) {
+        if (unit_type == CONSTRCT && unit_orders == ORDER_BUILD && rubble_type == SMLRUBLE) {
             SmartPointer<UnitInfo> utility_unit(Access_GetConstructionUtility(unit_team, unit_grid_x, unit_grid_y));
 
             unit_grid_x = utility_unit->grid_x;