bug fixes from Overhaul:

- Data type changes 
- Templates removed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-05-09 13:16:37 +00:00
parent 61d6152ce5
commit 0530b53b9c
256 changed files with 2000 additions and 2228 deletions
+5 -5
View File
@@ -46,11 +46,11 @@ MOUSE_REGION popupRegion;
UINT16 gusEntryHeight;
BOOLEAN fWaitingForLButtonRelease = FALSE;
extern UINT16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20];
extern CHAR16 gszScheduleActions[ NUM_SCHEDULE_ACTIONS ][20];
//Finds the string for any popup menu in JA2 -- the strings are stored
//in different ways in each instance.
INT16* GetPopupMenuString( UINT8 ubIndex )
STR16 GetPopupMenuString( UINT8 ubIndex )
{
switch( gPopup.ubPopupMenuID )
{
@@ -58,11 +58,11 @@ INT16* GetPopupMenuString( UINT8 ubIndex )
return gTilesets[ ubIndex ].zName;
case OWNERSHIPGROUP_POPUP: //civilian groups
case CHANGECIVGROUP_POPUP: //civilian groups
return (INT16 *)gszCivGroupNames[ ubIndex ];
return gszCivGroupNames[ ubIndex ];
case SCHEDULEACTION_POPUP: //setting scheduling actions
return (INT16 *)gszScheduleActions[ ubIndex ];
return gszScheduleActions[ ubIndex ];
case ACTIONITEM_POPUP:
return (INT16 *)gszActionItemDesc[ ubIndex ];
return gszActionItemDesc[ ubIndex ];
default:
return 0;
}