From 548d85319e4438fd0bd6969bbb686544011f5db5 Mon Sep 17 00:00:00 2001 From: silversurfer Date: Sat, 27 Jul 2019 12:38:39 +0000 Subject: [PATCH] Fix: Civ Group popups in map editor weren't working correctly and debugger showed incorrect data for popups git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8683 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Editor/popupmenu.cpp | 234 +++++++++++++++++++------------------- Editor/popupmenu.h | 2 +- GameVersion.cpp | 4 +- Tactical/Overhead Types.h | 1 - 4 files changed, 120 insertions(+), 121 deletions(-) diff --git a/Editor/popupmenu.cpp b/Editor/popupmenu.cpp index 3c47575c..1746376f 100644 --- a/Editor/popupmenu.cpp +++ b/Editor/popupmenu.cpp @@ -39,7 +39,7 @@ #include "Item Statistics.h" #endif -CurrentPopupMenuInformation gPopup; +CurrentPopupMenuInformation gPopupData; MOUSE_REGION popupRegion; @@ -52,7 +52,7 @@ extern CHAR16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20]; //in different ways in each instance. STR16 GetPopupMenuString( UINT8 ubIndex ) { - switch( gPopup.ubPopupMenuID ) + switch( gPopupData.ubPopupMenuID ) { case CHANGETSET_POPUP: //tile sets return gTilesets[ ubIndex ].zName; @@ -101,8 +101,8 @@ void InitPopupMenu( INT32 iButtonID, UINT8 ubPopupMenuID, UINT8 ubDirection ) //calculate the location of the menu based on the button position. //This also calculates the menu's direction based on position. - gPopup.usFont = (UINT16)SMALLFONT1; - gusEntryHeight = GetFontHeight( gPopup.usFont ); + gPopupData.usFont = (UINT16)SMALLFONT1; + gusEntryHeight = GetFontHeight( gPopupData.usFont ); button = ButtonList[ iButtonID ]; MSYS_DisableRegion( &gBottomPanalRegion ); @@ -134,52 +134,52 @@ void InitPopupMenu( INT32 iButtonID, UINT8 ubPopupMenuID, UINT8 ubDirection ) switch( ubPopupMenuID ) { case CHANGETSET_POPUP: //change tileset - gPopup.ubNumEntries = gubNumSets; + gPopupData.ubNumEntries = gubNumSets; break; case OWNERSHIPGROUP_POPUP: case CHANGECIVGROUP_POPUP: - gPopup.ubNumEntries = NUM_CIV_GROUPS; + gPopupData.ubNumEntries = NUM_CIV_GROUPS; break; case SCHEDULEACTION_POPUP: - gPopup.ubNumEntries = NUM_SCHEDULE_ACTIONS; + gPopupData.ubNumEntries = NUM_SCHEDULE_ACTIONS; break; case ACTIONITEM_POPUP: - gPopup.ubNumEntries = NUM_ACTIONITEMS; + gPopupData.ubNumEntries = NUM_ACTIONITEMS; break; default: return; } - gPopup.usFont = (UINT16)SMALLFONT1; - gusEntryHeight = GetFontHeight( gPopup.usFont ); + gPopupData.usFont = (UINT16)SMALLFONT1; + gusEntryHeight = GetFontHeight( gPopupData.usFont ); button = ButtonList[ iButtonID ]; MSYS_DisableRegion( &gBottomPanalRegion ); - gPopup.ubPopupMenuID = ubPopupMenuID; - gPopup.ubSelectedIndex = 0; - gPopup.ubActiveType = POPUP_ACTIVETYPE_NOT_YET_DETERMINED; - gPopup.fActive = TRUE; + gPopupData.ubPopupMenuID = ubPopupMenuID; + gPopupData.ubSelectedIndex = 0; + gPopupData.ubActiveType = POPUP_ACTIVETYPE_NOT_YET_DETERMINED; + gPopupData.fActive = TRUE; fWaitingForLButtonRelease = FALSE; - gPopup.fUseKeyboardInfoUntilMouseMoves = FALSE; + gPopupData.fUseKeyboardInfoUntilMouseMoves = FALSE; //Initialize the last mouse position to be out of bounds. - gPopup.usLastMouseX = 1000; - gPopup.usLastMouseY = 1000; + gPopupData.usLastMouseX = 1000; + gPopupData.usLastMouseY = 1000; //clear the column widths. for( ubColumn = 0; ubColumn < MAX_COLUMNS; ubColumn++ ) - gPopup.ubColumnWidth[ ubColumn ] = 0; + gPopupData.ubColumnWidth[ ubColumn ] = 0; //1) Calc total entry height of the popup region. - gPopup.ubColumns = 1; - gPopup.ubMaxEntriesPerColumn = gPopup.ubNumEntries; - usMenuHeight = gPopup.ubNumEntries * gusEntryHeight + 3; + gPopupData.ubColumns = 1; + gPopupData.ubMaxEntriesPerColumn = gPopupData.ubNumEntries; + usMenuHeight = gPopupData.ubNumEntries * gusEntryHeight + 3; while( usMenuHeight >= usY && ( ubDirection == DIR_UPLEFT || ubDirection == DIR_UPRIGHT ) || 480-usMenuHeight >= usY && ( ubDirection == DIR_DOWNLEFT || ubDirection == DIR_DOWNRIGHT ) ) { //menu has too many entries. Increase the number of columns until the height is //less than the max height. - gPopup.ubMaxEntriesPerColumn = (gPopup.ubNumEntries+gPopup.ubColumns)/(gPopup.ubColumns+1); - usMenuHeight = gPopup.ubMaxEntriesPerColumn * gusEntryHeight + 3; - gPopup.ubColumns++; + gPopupData.ubMaxEntriesPerColumn = (gPopupData.ubNumEntries+gPopupData.ubColumns)/(gPopupData.ubColumns+1); + usMenuHeight = gPopupData.ubMaxEntriesPerColumn * gusEntryHeight + 3; + gPopupData.ubColumns++; } //now we have the number of columns as well as the max number of entries per column, and //the total menu height. @@ -187,48 +187,48 @@ void InitPopupMenu( INT32 iButtonID, UINT8 ubPopupMenuID, UINT8 ubDirection ) //We now calculate the total width of the menu as well as the max width of each column. ubCounter = 0; usMenuWidth = 0; - for( ubColumn = 0; ubColumn < gPopup.ubColumns; ubColumn++ ) + for( ubColumn = 0; ubColumn < gPopupData.ubColumns; ubColumn++ ) { - for( ubEntry = 0; ubEntry < gPopup.ubMaxEntriesPerColumn; ubEntry++ ) + for( ubEntry = 0; ubEntry < gPopupData.ubMaxEntriesPerColumn; ubEntry++ ) { - if( ubCounter >= gPopup.ubNumEntries ) + if( ubCounter >= gPopupData.ubNumEntries ) break; //done (don't want to process undefined entries...) - usCurrStrWidth = 16 + StringPixLength( GetPopupMenuString( ubCounter ) , gPopup.usFont ); - if( usCurrStrWidth > gPopup.ubColumnWidth[ ubColumn ] ) + usCurrStrWidth = 16 + StringPixLength( GetPopupMenuString( ubCounter ) , gPopupData.usFont ); + if( usCurrStrWidth > gPopupData.ubColumnWidth[ ubColumn ] ) { - gPopup.ubColumnWidth[ ubColumn ] = (UINT8)usCurrStrWidth; + gPopupData.ubColumnWidth[ ubColumn ] = (UINT8)usCurrStrWidth; } ubCounter++; } - usMenuWidth += gPopup.ubColumnWidth[ ubColumn ]; + usMenuWidth += gPopupData.ubColumnWidth[ ubColumn ]; } //Calculate popup menu boundaries based on direction from argument point. switch( ubDirection ) { case DIR_UPRIGHT: - gPopup.usLeft = usX; - gPopup.usTop = usY - usMenuHeight - 1; - gPopup.usRight = usX + usMenuWidth; - gPopup.usBottom = usY - 1; + gPopupData.usLeft = usX; + gPopupData.usTop = usY - usMenuHeight - 1; + gPopupData.usRight = usX + usMenuWidth; + gPopupData.usBottom = usY - 1; break; case DIR_UPLEFT: - gPopup.usLeft = usX - usMenuWidth; - gPopup.usTop = usY - usMenuHeight - 1; - gPopup.usRight = usX; - gPopup.usBottom = usY - 1; + gPopupData.usLeft = usX - usMenuWidth; + gPopupData.usTop = usY - usMenuHeight - 1; + gPopupData.usRight = usX; + gPopupData.usBottom = usY - 1; break; case DIR_DOWNRIGHT: - gPopup.usLeft = usX; - gPopup.usTop = usY + 1; - gPopup.usRight = usX + usMenuWidth; - gPopup.usBottom = usY + usMenuHeight + 1; + gPopupData.usLeft = usX; + gPopupData.usTop = usY + 1; + gPopupData.usRight = usX + usMenuWidth; + gPopupData.usBottom = usY + usMenuHeight + 1; break; case DIR_DOWNLEFT: - gPopup.usLeft = usX - usMenuWidth; - gPopup.usTop = usY + 1; - gPopup.usRight = usX; - gPopup.usBottom = usY + usMenuHeight + 1; + gPopupData.usLeft = usX - usMenuWidth; + gPopupData.usTop = usY + 1; + gPopupData.usRight = usX; + gPopupData.usBottom = usY + usMenuHeight + 1; break; } MSYS_DefineRegion(&popupRegion, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, MSYS_PRIORITY_HIGHEST, CURSOR_NORMAL, MSYS_NO_CALLBACK, MSYS_NO_CALLBACK);//dnl ch34 090909 @@ -247,45 +247,45 @@ void RenderPopupMenu() //Draw the menu ColorFillVideoSurfaceArea(FRAME_BUFFER, - gPopup.usLeft, gPopup.usTop, gPopup.usRight, gPopup.usBottom, + gPopupData.usLeft, gPopupData.usTop, gPopupData.usRight, gPopupData.usBottom, Get16BPPColor(FROMRGB(128, 128, 128) ) ); pDestBuf = LockVideoSurface( FRAME_BUFFER, &uiDestPitchBYTES ); SetClippingRegionAndImageWidth( uiDestPitchBYTES, 0, 0, 640, 480 ); usLineColor = Get16BPPColor( FROMRGB( 64, 64, 64 ) ); - RectangleDraw( TRUE, gPopup.usLeft, gPopup.usTop, gPopup.usRight, gPopup.usBottom, + RectangleDraw( TRUE, gPopupData.usLeft, gPopupData.usTop, gPopupData.usRight, gPopupData.usBottom, usLineColor, pDestBuf ); - if( gPopup.ubColumns > 1 ) + if( gPopupData.ubColumns > 1 ) { //draw a vertical line between each column - usStart = gPopup.usLeft + gPopup.ubColumnWidth[ 0 ]; - for( ubColumn = 1; ubColumn < gPopup.ubColumns; ubColumn++ ) + usStart = gPopupData.usLeft + gPopupData.ubColumnWidth[ 0 ]; + for( ubColumn = 1; ubColumn < gPopupData.ubColumns; ubColumn++ ) { - LineDraw( TRUE, usStart, gPopup.usTop, usStart, gPopup.usBottom, usLineColor, pDestBuf ); + LineDraw( TRUE, usStart, gPopupData.usTop, usStart, gPopupData.usBottom, usLineColor, pDestBuf ); } - usStart += (UINT16)gPopup.ubColumnWidth[ ubColumn ]; + usStart += (UINT16)gPopupData.ubColumnWidth[ ubColumn ]; } UnLockVideoSurface( FRAME_BUFFER ); //Set up the text attributes. - SetFont( gPopup.usFont); + SetFont( gPopupData.usFont); SetFontBackground( FONT_MCOLOR_BLACK ); SetFontForeground( FONT_MCOLOR_WHITE ); - usX = gPopup.usLeft + 1; + usX = gPopupData.usLeft + 1; ubCounter = 0; - usStart = gPopup.usLeft; - for( ubColumn = 0; ubColumn < gPopup.ubColumns; ubColumn++ ) + usStart = gPopupData.usLeft; + for( ubColumn = 0; ubColumn < gPopupData.ubColumns; ubColumn++ ) { - for( ubEntry = 0; ubEntry < gPopup.ubMaxEntriesPerColumn; ubEntry++ ) + for( ubEntry = 0; ubEntry < gPopupData.ubMaxEntriesPerColumn; ubEntry++ ) { - if( ubCounter >= gPopup.ubNumEntries ) + if( ubCounter >= gPopupData.ubNumEntries ) return; //done //Calc current string's width in pixels. Adding 14 pixels which is the width of - //two padded gPopup.usFont spaces not stored in the string. - usStringWidth = 14 + StringPixLength( GetPopupMenuString( ubCounter ), gPopup.usFont ); + //two padded gPopupData.usFont spaces not stored in the string. + usStringWidth = 14 + StringPixLength( GetPopupMenuString( ubCounter ), gPopupData.usFont ); //Horizontally center the string inside the popup menu - usX = usStart + ( gPopup.ubColumnWidth[ ubColumn ] - usStringWidth ) / 2; - usY = gPopup.usTop + 1 + ubEntry * gusEntryHeight; - if( ubCounter == gPopup.ubSelectedIndex - 1 ) + usX = usStart + ( gPopupData.ubColumnWidth[ ubColumn ] - usStringWidth ) / 2; + usY = gPopupData.usTop + 1 + ubEntry * gusEntryHeight; + if( ubCounter == gPopupData.ubSelectedIndex - 1 ) { //This is the highlighted menu entry. SetFontForeground( FONT_MCOLOR_LTBLUE ); @@ -298,7 +298,7 @@ void RenderPopupMenu() } ubCounter++; } - usStart += gPopup.ubColumnWidth[ ubColumn ]; + usStart += gPopupData.ubColumnWidth[ ubColumn ]; } } @@ -310,26 +310,26 @@ UINT8 GetPopupIndexFromMousePosition() UINT8 ubNumEntriesDown; UINT16 usRelX; UINT8 ubCount; - if( gusMouseXPos >= gPopup.usLeft - && gusMouseXPos <= gPopup.usRight - && gusMouseYPos > gPopup.usTop //one pixel gap on top ignored - && gusMouseYPos < gPopup.usBottom - 2 ) //two pixel gap on bottom ignored + if( gusMouseXPos >= gPopupData.usLeft + && gusMouseXPos <= gPopupData.usRight + && gusMouseYPos > gPopupData.usTop //one pixel gap on top ignored + && gusMouseYPos < gPopupData.usBottom - 2 ) //two pixel gap on bottom ignored { //subtract the top y coord of the popup region from the mouse's yPos as well //as an extra pixel at the top of the region which is ignored in menu selection, //divide this number by the height of a menu entry, then add one. This will //return the menu index from 1 (at the top) to n (at the bottom). - ubNumEntriesDown = (gusMouseYPos - gPopup.usTop - 1) / gusEntryHeight + 1; - usRelX = gusMouseXPos - gPopup.usLeft; + ubNumEntriesDown = (gusMouseYPos - gPopupData.usTop - 1) / gusEntryHeight + 1; + usRelX = gusMouseXPos - gPopupData.usLeft; ubCount=0; - while( usRelX > gPopup.ubColumnWidth[ ubCount ] ) + while( usRelX > gPopupData.ubColumnWidth[ ubCount ] ) { - usRelX -= gPopup.ubColumnWidth[ ubCount ]; + usRelX -= gPopupData.ubColumnWidth[ ubCount ]; ubCount++; - ubNumEntriesDown += gPopup.ubMaxEntriesPerColumn; + ubNumEntriesDown += gPopupData.ubMaxEntriesPerColumn; } - if( ubNumEntriesDown >= gPopup.ubNumEntries ) - ubNumEntriesDown = gPopup.ubNumEntries; + if( ubNumEntriesDown >= gPopupData.ubNumEntries ) + ubNumEntriesDown = gPopupData.ubNumEntries; return ubNumEntriesDown; } return 0; //mouse not in valid region. @@ -339,15 +339,15 @@ void PopupMenuHandle() { InputAtom InputEvent; - if( gPopup.ubActiveType == POPUP_ACTIVETYPE_NOT_YET_DETERMINED ) + if( gPopupData.ubActiveType == POPUP_ACTIVETYPE_NOT_YET_DETERMINED ) { //Attempt to determine if the menu will be persistant or not. //Determination is made when the mouse's left button is released or if //the mouse cursor enters the menu region. - if( gusMouseXPos >= gPopup.usLeft - && gusMouseXPos <= gPopup.usRight - && gusMouseYPos > gPopup.usTop //one pixel gap on top ignored - && gusMouseYPos < gPopup.usBottom - 1 ) //two pixel gap on bottom ignored + if( gusMouseXPos >= gPopupData.usLeft + && gusMouseXPos <= gPopupData.usRight + && gusMouseYPos > gPopupData.usTop //one pixel gap on top ignored + && gusMouseYPos < gPopupData.usBottom - 1 ) //two pixel gap on bottom ignored { //mouse cursor has just entered the menu region -- nonpersistant. @@ -355,42 +355,42 @@ void PopupMenuHandle() //Disabled this because Linda doesn't like it... (I like it though, and it works) //!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! //UNCOMMENT IF NONPERSISTANT IS ALLOWED - //gPopup.ubActiveType = POPUP_ACTIVETYPE_NONPERSISTANT; + //gPopupData.ubActiveType = POPUP_ACTIVETYPE_NONPERSISTANT; return; } else if( !gfLeftButtonState ) { //left button has been released before entering region -- persistant - gPopup.ubActiveType = POPUP_ACTIVETYPE_PERSISTANT; + gPopupData.ubActiveType = POPUP_ACTIVETYPE_PERSISTANT; return; } } - if( !gPopup.fUseKeyboardInfoUntilMouseMoves ) + if( !gPopupData.fUseKeyboardInfoUntilMouseMoves ) { //check menu entry based on mouse position - gPopup.ubSelectedIndex = GetPopupIndexFromMousePosition(); + gPopupData.ubSelectedIndex = GetPopupIndexFromMousePosition(); } - else if( gusMouseXPos != gPopup.usLastMouseX || gusMouseYPos != gPopup.usLastMouseY ) + else if( gusMouseXPos != gPopupData.usLastMouseX || gusMouseYPos != gPopupData.usLastMouseY ) { //The keyboard determined the last entry, but the mouse has moved, //so use the mouse to determine the new entry. - gPopup.fUseKeyboardInfoUntilMouseMoves = FALSE; - gPopup.ubSelectedIndex = GetPopupIndexFromMousePosition(); + gPopupData.fUseKeyboardInfoUntilMouseMoves = FALSE; + gPopupData.ubSelectedIndex = GetPopupIndexFromMousePosition(); } //Check terminating conditions for persistant states. - if( gfLeftButtonState && gPopup.ubActiveType == POPUP_ACTIVETYPE_PERSISTANT ) + if( gfLeftButtonState && gPopupData.ubActiveType == POPUP_ACTIVETYPE_PERSISTANT ) fWaitingForLButtonRelease = TRUE; - if( gfLeftButtonState && gPopup.ubActiveType == POPUP_ACTIVETYPE_PERSISTANT - || !gfLeftButtonState && gPopup.ubActiveType == POPUP_ACTIVETYPE_NONPERSISTANT ) + if( gfLeftButtonState && gPopupData.ubActiveType == POPUP_ACTIVETYPE_PERSISTANT + || !gfLeftButtonState && gPopupData.ubActiveType == POPUP_ACTIVETYPE_NONPERSISTANT ) { //Selection conditions via mouse have been met whether the mouse is in the //menu region or not. - gPopup.ubSelectedIndex = GetPopupIndexFromMousePosition(); - if( gPopup.ubSelectedIndex ) + gPopupData.ubSelectedIndex = GetPopupIndexFromMousePosition(); + if( gPopupData.ubSelectedIndex ) { ProcessPopupMenuSelection(); } - gPopup.fActive = FALSE; + gPopupData.fActive = FALSE; MSYS_RemoveRegion( &popupRegion ); gfRenderWorld = TRUE; gfRenderTaskbar = TRUE; @@ -406,37 +406,37 @@ void PopupMenuHandle() switch( InputEvent.usParam ) { case DNARROW: - gPopup.fUseKeyboardInfoUntilMouseMoves = TRUE; - gPopup.usLastMouseX = gusMouseXPos; - gPopup.usLastMouseY = gusMouseYPos; - gPopup.ubSelectedIndex++; - if( gPopup.ubSelectedIndex > gPopup.ubNumEntries ) + gPopupData.fUseKeyboardInfoUntilMouseMoves = TRUE; + gPopupData.usLastMouseX = gusMouseXPos; + gPopupData.usLastMouseY = gusMouseYPos; + gPopupData.ubSelectedIndex++; + if( gPopupData.ubSelectedIndex > gPopupData.ubNumEntries ) { - gPopup.ubSelectedIndex = 1; + gPopupData.ubSelectedIndex = 1; } break; case UPARROW: - gPopup.fUseKeyboardInfoUntilMouseMoves = TRUE; - gPopup.usLastMouseX = gusMouseXPos; - gPopup.usLastMouseY = gusMouseYPos; - if( gPopup.ubSelectedIndex < 2 ) + gPopupData.fUseKeyboardInfoUntilMouseMoves = TRUE; + gPopupData.usLastMouseX = gusMouseXPos; + gPopupData.usLastMouseY = gusMouseYPos; + if( gPopupData.ubSelectedIndex < 2 ) { - gPopup.ubSelectedIndex = gPopup.ubNumEntries; + gPopupData.ubSelectedIndex = gPopupData.ubNumEntries; } else { - gPopup.ubSelectedIndex--; + gPopupData.ubSelectedIndex--; } break; case ESC: - gPopup.fActive = FALSE; + gPopupData.fActive = FALSE; MSYS_RemoveRegion( &popupRegion ); gfRenderWorld = TRUE; gfRenderTaskbar = TRUE; break; case ENTER: ProcessPopupMenuSelection(); - gPopup.fActive = FALSE; + gPopupData.fActive = FALSE; MSYS_RemoveRegion( &popupRegion ); gfRenderWorld = TRUE; gfRenderTaskbar = TRUE; @@ -449,31 +449,31 @@ void PopupMenuHandle() void ProcessPopupMenuSelection() { - switch( gPopup.ubPopupMenuID ) + switch( gPopupData.ubPopupMenuID ) { case CHANGETSET_POPUP: //change the tileset here. - ReloadTileset( (UINT8)(gPopup.ubSelectedIndex - 1 ) ); + ReloadTileset( (UINT8)(gPopupData.ubSelectedIndex - 1 ) ); InitJA2SelectionWindow( ); break; case CHANGECIVGROUP_POPUP: - ChangeCivGroup( (UINT8)(gPopup.ubSelectedIndex - 1) ); + ChangeCivGroup( (UINT8)(gPopupData.ubSelectedIndex - 1) ); break; case SCHEDULEACTION_POPUP: - UpdateScheduleAction( (UINT8)(gPopup.ubSelectedIndex - 1) ); + UpdateScheduleAction( (UINT8)(gPopupData.ubSelectedIndex - 1) ); break; case ACTIONITEM_POPUP: - UpdateActionItem( (UINT8)(gPopup.ubSelectedIndex - 1) ); + UpdateActionItem( (UINT8)(gPopupData.ubSelectedIndex - 1) ); break; case OWNERSHIPGROUP_POPUP: - SetOwnershipGroup( (UINT8)(gPopup.ubSelectedIndex - 1) ); + SetOwnershipGroup( (UINT8)(gPopupData.ubSelectedIndex - 1) ); break; } } BOOLEAN ProcessPopupMenuIfActive( ) { - if( !gPopup.fActive && !fWaitingForLButtonRelease ) + if( !gPopupData.fActive && !fWaitingForLButtonRelease ) return FALSE; if( fWaitingForLButtonRelease ) { @@ -486,7 +486,7 @@ BOOLEAN ProcessPopupMenuIfActive( ) } PopupMenuHandle(); RenderPopupMenu(); - InvalidateRegion( gPopup.usLeft, gPopup.usTop, gPopup.usRight, gPopup.usBottom ); + InvalidateRegion( gPopupData.usLeft, gPopupData.usTop, gPopupData.usRight, gPopupData.usBottom ); ExecuteBaseDirtyRectQueue(); EndFrameBufferRender( ); return TRUE; diff --git a/Editor/popupmenu.h b/Editor/popupmenu.h index 516b715b..94c2ec3f 100644 --- a/Editor/popupmenu.h +++ b/Editor/popupmenu.h @@ -84,7 +84,7 @@ typedef struct currentPopupMenuInformation{ }CurrentPopupMenuInformation; //A global var that keeps the popup menu information. -extern CurrentPopupMenuInformation gPopup; +extern CurrentPopupMenuInformation gPopupData; extern STR16 popupMenuStrings[5]; //These are the two main functions that outside users would call. diff --git a/GameVersion.cpp b/GameVersion.cpp index 56fce5c9..ea6ed53e 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -55,8 +55,8 @@ #endif -CHAR8 czVersionNumber[16] = { "Build 19.07.05" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 19.07.27" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; -CHAR16 zRevisionNumber[16] = { L"Revision 8682" }; +CHAR16 zRevisionNumber[16] = { L"Revision 8683" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/Tactical/Overhead Types.h b/Tactical/Overhead Types.h index f55c2416..a7e4326d 100644 --- a/Tactical/Overhead Types.h +++ b/Tactical/Overhead Types.h @@ -374,7 +374,6 @@ enum ADMINISTRATIVE_STAFF_GROUP, LOYAL_CIV_GROUP, // civil population deeply loyal to the queen BLACKMARKET_GROUP, // black market dealer and bodyguards - UNNAMED_CIV_GROUP_34, UNNAMED_CIV_GROUP_35, UNNAMED_CIV_GROUP_36, UNNAMED_CIV_GROUP_37,