mirror of
https://github.com/1dot13/source.git
synced 2026-07-22 13:40:22 +02:00
Merged New Inventory Project into main branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
@@ -34,7 +34,7 @@
|
||||
|
||||
// extern to anchored button in winbart97
|
||||
extern GUI_BUTTON *gpAnchoredButton;
|
||||
extern BOOLEAN gfAnchoredState;
|
||||
extern BOOLEAN gfAnchoredState;
|
||||
|
||||
// mouse levels
|
||||
MOUSE_REGION LevelMouseRegions[ 4 ];
|
||||
@@ -130,7 +130,7 @@ void DrawTextOnMapBorder( void )
|
||||
|
||||
SetFontDestBuffer( guiSAVEBUFFER, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, FALSE );
|
||||
|
||||
//FindFontCenterCoordinates( MAP_INV_X_OFFSET + MAP_INVENTORY_POOL_SLOT_START_X, MAP_INVENTORY_POOL_SLOT_START_Y - 20, 630 - MAP_INVENTORY_POOL_SLOT_START_X, GetFontHeight( FONT14ARIAL ), sString, FONT14ARIAL, &sX, &sY );
|
||||
//FindFontCenterCoordinates( MAP_INV_X_OFFSET + MAP_INVENTORY_POOL_SLOT_START_X, MAP_INVENTORY_POOL_SLOT_START_Y - 20, 630 - MAP_INVENTORY_POOL_SLOT_START_X, GetFontHeight( FONT14ARIAL ), sString, FONT14ARIAL, &sX, &sY );
|
||||
|
||||
FindFontCenterCoordinates( 271, 18, SCREEN_WIDTH - 271, GetFontHeight( FONT14ARIAL ), sString, FONT14ARIAL, &sX, &sY );
|
||||
|
||||
@@ -147,10 +147,10 @@ void DrawTextOnMapBorder( void )
|
||||
|
||||
BOOLEAN LoadMapBorderGraphics( void )
|
||||
{
|
||||
// this procedure will load the graphics needed for the map border
|
||||
VOBJECT_DESC VObjectDesc;
|
||||
// this procedure will load the graphics needed for the map border
|
||||
VOBJECT_DESC VObjectDesc;
|
||||
|
||||
// will load map border
|
||||
// will load map border
|
||||
VObjectDesc.fCreateFlags=VOBJECT_CREATE_FROMFILE;
|
||||
|
||||
if (iResolution == 0)
|
||||
@@ -176,7 +176,7 @@ BOOLEAN LoadMapBorderGraphics( void )
|
||||
|
||||
fCursorIsOnMapScrollButtons = FALSE;
|
||||
*/
|
||||
|
||||
|
||||
|
||||
return ( TRUE );
|
||||
}
|
||||
@@ -184,7 +184,7 @@ BOOLEAN LoadMapBorderGraphics( void )
|
||||
|
||||
void DeleteMapBorderGraphics( void )
|
||||
{
|
||||
// procedure will delete graphics loaded for map border
|
||||
// procedure will delete graphics loaded for map border
|
||||
|
||||
DeleteVideoObjectFromIndex( guiMapBorder );
|
||||
// DeleteVideoObjectFromIndex( guiMapBorderCorner );
|
||||
@@ -197,9 +197,9 @@ void DeleteMapBorderGraphics( void )
|
||||
void RenderMapBorder( void )
|
||||
{
|
||||
// renders the actual border to the guiSAVEBUFFER
|
||||
HVOBJECT hHandle;
|
||||
HVOBJECT hHandle;
|
||||
|
||||
/*
|
||||
/*
|
||||
if( fDisabledMapBorder )
|
||||
{
|
||||
return;
|
||||
@@ -214,7 +214,7 @@ void RenderMapBorder( void )
|
||||
}
|
||||
|
||||
// get and blt border
|
||||
GetVideoObject(&hHandle, guiMapBorder );
|
||||
GetVideoObject(&hHandle, guiMapBorder );
|
||||
BltVideoObject( guiSAVEBUFFER , hHandle, 0, MAP_BORDER_X, MAP_BORDER_Y, VO_BLT_SRCTRANSPARENCY,NULL );
|
||||
|
||||
if (iResolution == 1 || iResolution == 2)
|
||||
@@ -223,11 +223,11 @@ void RenderMapBorder( void )
|
||||
}
|
||||
|
||||
RestoreExternBackgroundRect( MAP_BORDER_X, MAP_BORDER_Y, SCREEN_WIDTH - MAP_BORDER_X, SCREEN_HEIGHT );
|
||||
|
||||
|
||||
// show the level marker
|
||||
DisplayCurrentLevelMarker( );
|
||||
|
||||
|
||||
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -237,12 +237,12 @@ void RenderMapBorderCorner( void )
|
||||
{
|
||||
// renders map border corner to the FRAME_BUFFER
|
||||
HVOBJECT hHandle;
|
||||
|
||||
|
||||
if( fDisabledMapBorder )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if( fShowMapInventoryPool )
|
||||
{
|
||||
return;
|
||||
@@ -250,9 +250,9 @@ void RenderMapBorderCorner( void )
|
||||
|
||||
|
||||
// get and blt corner
|
||||
GetVideoObject(&hHandle, guiMapBorderCorner );
|
||||
GetVideoObject(&hHandle, guiMapBorderCorner );
|
||||
BltVideoObject( FRAME_BUFFER , hHandle, 0,MAP_BORDER_CORNER_X, MAP_BORDER_CORNER_Y, VO_BLT_SRCTRANSPARENCY,NULL );
|
||||
|
||||
|
||||
InvalidateRegion( MAP_BORDER_CORNER_X, MAP_BORDER_CORNER_Y, 635, 315);
|
||||
|
||||
return;
|
||||
@@ -284,14 +284,14 @@ void RenderMapBorderEtaPopUp( void )
|
||||
}
|
||||
|
||||
// get and blt ETA box
|
||||
GetVideoObject(&hHandle, guiMapBorderEtaPopUp );
|
||||
GetVideoObject(&hHandle, guiMapBorderEtaPopUp );
|
||||
|
||||
/*BltVideoObject( FRAME_BUFFER , hHandle, 0, MAP_BORDER_X + 215, 291, VO_BLT_SRCTRANSPARENCY,NULL );
|
||||
|
||||
|
||||
InvalidateRegion( MAP_BORDER_X + 215, 291, MAP_BORDER_X + 215 + 100 , 310);*/
|
||||
|
||||
BltVideoObject( FRAME_BUFFER , hHandle, 0, MAP_BORDER_X + MAP_BORDER_X_OFFSET + 215, MAP_BORDER_Y_OFFSET + 291, VO_BLT_SRCTRANSPARENCY,NULL );
|
||||
|
||||
|
||||
InvalidateRegion( MAP_BORDER_X + MAP_BORDER_X_OFFSET + 215, MAP_BORDER_Y_OFFSET + 291, MAP_BORDER_X + MAP_BORDER_X_OFFSET + 215 + 100 , MAP_BORDER_Y_OFFSET + 310);
|
||||
|
||||
return;
|
||||
@@ -304,25 +304,25 @@ BOOLEAN CreateButtonsForMapBorder( void )
|
||||
/*
|
||||
// up button
|
||||
guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_UP ] = LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,11,4,-1,6,-1 );
|
||||
guiMapBorderScrollButtons[ ZOOM_MAP_SCROLL_UP ] = QuickCreateButton( guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_UP ], 602, 303,
|
||||
guiMapBorderScrollButtons[ ZOOM_MAP_SCROLL_UP ] = QuickCreateButton( guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_UP ], 602, 303,
|
||||
BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnScrollNorthMapScreenCallback);
|
||||
|
||||
// dwn button
|
||||
guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_DWN ] = LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,12,5,-1,7,-1 );
|
||||
guiMapBorderScrollButtons[ ZOOM_MAP_SCROLL_DWN ] = QuickCreateButton( guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_DWN ], 602, 338,
|
||||
guiMapBorderScrollButtons[ ZOOM_MAP_SCROLL_DWN ] = QuickCreateButton( guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_DWN ], 602, 338,
|
||||
BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnScrollSouthMapScreenCallback);
|
||||
|
||||
|
||||
// left button
|
||||
guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_LEFT ] = LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,9,0,-1,2,-1 );
|
||||
guiMapBorderScrollButtons[ ZOOM_MAP_SCROLL_LEFT ] = QuickCreateButton( guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_LEFT ], 584, 322,
|
||||
guiMapBorderScrollButtons[ ZOOM_MAP_SCROLL_LEFT ] = QuickCreateButton( guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_LEFT ], 584, 322,
|
||||
BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnScrollWestMapScreenCallback);
|
||||
|
||||
|
||||
// right button
|
||||
guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_RIGHT ] = LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,10,1,-1,3,-1 );
|
||||
guiMapBorderScrollButtons[ ZOOM_MAP_SCROLL_RIGHT ] = QuickCreateButton( guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_RIGHT ], 619, 322,
|
||||
guiMapBorderScrollButtons[ ZOOM_MAP_SCROLL_RIGHT ] = QuickCreateButton( guiMapBorderScrollButtonsImage[ ZOOM_MAP_SCROLL_RIGHT ], 619, 322,
|
||||
BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)BtnGenericMouseMoveButtonCallback, (GUI_CALLBACK)BtnScrollEastMapScreenCallback);
|
||||
|
||||
@@ -335,38 +335,38 @@ BOOLEAN CreateButtonsForMapBorder( void )
|
||||
|
||||
// towns
|
||||
giMapBorderButtonsImage[ MAP_BORDER_TOWN_BTN ] = LoadButtonImage( "INTERFACE\\map_border_buttons.sti" ,-1,5,-1,14,-1 );
|
||||
giMapBorderButtons[ MAP_BORDER_TOWN_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_TOWN_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 - 152), (SCREEN_HEIGHT - 160),
|
||||
giMapBorderButtons[ MAP_BORDER_TOWN_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_TOWN_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 - 152), (SCREEN_HEIGHT - 160),
|
||||
BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)MSYS_NO_CALLBACK, (GUI_CALLBACK)BtnTownCallback);
|
||||
|
||||
|
||||
|
||||
// mines
|
||||
giMapBorderButtonsImage[ MAP_BORDER_MINE_BTN ] = LoadButtonImage( "INTERFACE\\map_border_buttons.sti" ,-1,4,-1,13,-1 );
|
||||
giMapBorderButtons[ MAP_BORDER_MINE_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_MINE_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 - 109), (SCREEN_HEIGHT - 160),
|
||||
giMapBorderButtons[ MAP_BORDER_MINE_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_MINE_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 - 109), (SCREEN_HEIGHT - 160),
|
||||
BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)MSYS_NO_CALLBACK, (GUI_CALLBACK)BtnMineCallback);
|
||||
|
||||
|
||||
// people
|
||||
giMapBorderButtonsImage[ MAP_BORDER_TEAMS_BTN ] = LoadButtonImage( "INTERFACE\\map_border_buttons.sti" ,-1,3,-1,12,-1 );
|
||||
giMapBorderButtons[ MAP_BORDER_TEAMS_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_TEAMS_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 - 66), (SCREEN_HEIGHT - 160),
|
||||
giMapBorderButtons[ MAP_BORDER_TEAMS_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_TEAMS_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 - 66), (SCREEN_HEIGHT - 160),
|
||||
BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)MSYS_NO_CALLBACK, (GUI_CALLBACK)BtnTeamCallback);
|
||||
|
||||
|
||||
// militia
|
||||
giMapBorderButtonsImage[ MAP_BORDER_MILITIA_BTN ] = LoadButtonImage( "INTERFACE\\map_border_buttons.sti" ,-1,8,-1,17,-1 );
|
||||
giMapBorderButtons[ MAP_BORDER_MILITIA_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_MILITIA_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 - 23), (SCREEN_HEIGHT - 160),
|
||||
giMapBorderButtons[ MAP_BORDER_MILITIA_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_MILITIA_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 - 23), (SCREEN_HEIGHT - 160),
|
||||
BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)MSYS_NO_CALLBACK, (GUI_CALLBACK)BtnMilitiaCallback);
|
||||
|
||||
|
||||
// airspace
|
||||
giMapBorderButtonsImage[ MAP_BORDER_AIRSPACE_BTN ] = LoadButtonImage( "INTERFACE\\map_border_buttons.sti" ,-1,2,-1,11,-1 );
|
||||
giMapBorderButtons[ MAP_BORDER_AIRSPACE_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_AIRSPACE_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 + 20), (SCREEN_HEIGHT - 160),
|
||||
giMapBorderButtons[ MAP_BORDER_AIRSPACE_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_AIRSPACE_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 + 20), (SCREEN_HEIGHT - 160),
|
||||
BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)MSYS_NO_CALLBACK, (GUI_CALLBACK)BtnAircraftCallback);
|
||||
|
||||
|
||||
// items
|
||||
giMapBorderButtonsImage[ MAP_BORDER_ITEM_BTN ] = LoadButtonImage( "INTERFACE\\map_border_buttons.sti" ,-1,1,-1,10,-1 );
|
||||
giMapBorderButtons[ MAP_BORDER_ITEM_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_ITEM_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 + 63), (SCREEN_HEIGHT - 160),
|
||||
giMapBorderButtons[ MAP_BORDER_ITEM_BTN ] = QuickCreateButton( giMapBorderButtonsImage[ MAP_BORDER_ITEM_BTN ], MAP_BORDER_X + ((SCREEN_WIDTH - MAP_BORDER_X) / 2 + 63), (SCREEN_HEIGHT - 160),
|
||||
BUTTON_NO_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)MSYS_NO_CALLBACK, (GUI_CALLBACK)BtnItemCallback);
|
||||
|
||||
@@ -381,7 +381,7 @@ BOOLEAN CreateButtonsForMapBorder( void )
|
||||
(GUI_CALLBACK)MSYS_NO_CALLBACK, (GUI_CALLBACK)BtnRaiseLevelBtnCallback);
|
||||
|
||||
// lower
|
||||
guiMapBorderLandRaiseButtonsImage[ MAP_BORDER_LOWER_LEVEL ] = LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,12,5,-1,7,-1 );
|
||||
guiMapBorderLandRaiseButtonsImage[ MAP_BORDER_LOWER_LEVEL ] = LoadButtonImage( "INTERFACE\\map_screen_bottom_arrows.sti" ,12,5,-1,7,-1 );
|
||||
guiMapBorderLandRaiseButtons[ MAP_BORDER_LOWER_LEVEL ] = QuickCreateButton( guiMapBorderLandRaiseButtonsImage[ MAP_BORDER_LOWER_LEVEL ], MAP_BORDER_X + 264, 340,
|
||||
BUTTON_TOGGLE, MSYS_PRIORITY_HIGH,
|
||||
(GUI_CALLBACK)MSYS_NO_CALLBACK, (GUI_CALLBACK)BtnLowerLevelBtnCallback);
|
||||
@@ -468,7 +468,7 @@ void DeleteMapBorderButtons( void )
|
||||
/*
|
||||
void BtnLowerLevelBtnCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
{
|
||||
|
||||
|
||||
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
@@ -480,19 +480,19 @@ void BtnLowerLevelBtnCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
|
||||
MarkButtonsDirty( );
|
||||
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
|
||||
// go down one level
|
||||
GoDownOneLevelInMap( );
|
||||
// go down one level
|
||||
GoDownOneLevelInMap( );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void BtnRaiseLevelBtnCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
@@ -505,21 +505,21 @@ void BtnRaiseLevelBtnCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
fMapPanelDirty = TRUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
MarkButtonsDirty( );
|
||||
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
// go up one level
|
||||
GoUpOneLevelInMap( );
|
||||
GoUpOneLevelInMap( );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
@@ -548,7 +548,7 @@ void BtnTeamCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
{
|
||||
CommonBtnCallbackBtnDownChecks();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void BtnTownCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
@@ -557,12 +557,12 @@ void BtnTownCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
{
|
||||
CommonBtnCallbackBtnDownChecks();
|
||||
ToggleShowTownsMode();
|
||||
}
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_RBUTTON_DWN )
|
||||
{
|
||||
CommonBtnCallbackBtnDownChecks();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void BtnMineCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
@@ -576,17 +576,17 @@ void BtnMineCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
{
|
||||
CommonBtnCallbackBtnDownChecks();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void BtnAircraftCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
{
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
CommonBtnCallbackBtnDownChecks();
|
||||
|
||||
ToggleAirspaceMode();
|
||||
}
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_RBUTTON_DWN )
|
||||
{
|
||||
CommonBtnCallbackBtnDownChecks();
|
||||
@@ -596,17 +596,17 @@ void BtnAircraftCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
|
||||
void BtnItemCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
{
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
CommonBtnCallbackBtnDownChecks();
|
||||
|
||||
ToggleItemsFilter();
|
||||
}
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_RBUTTON_DWN )
|
||||
{
|
||||
CommonBtnCallbackBtnDownChecks();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
@@ -622,40 +622,40 @@ void BtnZoomCallback(GUI_BUTTON *btn,INT32 reason)
|
||||
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
fZoomFlag=FALSE;
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
fZoomFlag=FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
fZoomFlag=TRUE;
|
||||
if( sSelMapX > 14 )
|
||||
{
|
||||
iZoomX = ( ( sSelMapX + 2 ) / 2 ) * ( MAP_GRID_X * 2 );
|
||||
}
|
||||
else
|
||||
{
|
||||
iZoomX=sSelMapX/2*MAP_GRID_X*2;
|
||||
}
|
||||
|
||||
if( sOldSelMapY > 14 )
|
||||
{
|
||||
iZoomY = ( ( sSelMapY + 2 ) / 2 ) * ( MAP_GRID_Y * 2 );
|
||||
}
|
||||
else
|
||||
{
|
||||
iZoomY=sSelMapY/2*MAP_GRID_Y*2;
|
||||
}
|
||||
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
fZoomFlag=TRUE;
|
||||
if( sSelMapX > 14 )
|
||||
{
|
||||
iZoomX = ( ( sSelMapX + 2 ) / 2 ) * ( MAP_GRID_X * 2 );
|
||||
}
|
||||
else
|
||||
{
|
||||
iZoomX=sSelMapX/2*MAP_GRID_X*2;
|
||||
}
|
||||
|
||||
fMapPanelDirty=TRUE;
|
||||
}
|
||||
if( sOldSelMapY > 14 )
|
||||
{
|
||||
iZoomY = ( ( sSelMapY + 2 ) / 2 ) * ( MAP_GRID_Y * 2 );
|
||||
}
|
||||
else
|
||||
{
|
||||
iZoomY=sSelMapY/2*MAP_GRID_Y*2;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
fMapPanelDirty=TRUE;
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_RBUTTON_DWN )
|
||||
{
|
||||
CommonBtnCallbackBtnDownChecks();
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
@@ -864,15 +864,15 @@ void ShowDestinationOfPlottedPath( STR16 pLoc )
|
||||
INT16 sFontX, sFontY;
|
||||
|
||||
SetFontDestBuffer( FRAME_BUFFER, 0, 0, 640, 480, FALSE );
|
||||
|
||||
|
||||
SetFont( COMPFONT );
|
||||
SetFontForeground( 183 );
|
||||
SetFontBackground( FONT_BLACK );
|
||||
|
||||
VarFindFontCenterCoordinates( 461, 344, 70, 12, COMPFONT, &sFontX, &sFontY, pLoc );
|
||||
VarFindFontCenterCoordinates( 461, 344, 70, 12, COMPFONT, &sFontX, &sFontY, pLoc );
|
||||
gprintfdirty(sFontX, sFontY, pLoc );
|
||||
mprintf(sFontX, sFontY, pLoc );
|
||||
|
||||
mprintf(sFontX, sFontY, pLoc );
|
||||
|
||||
return;
|
||||
}
|
||||
*/
|
||||
@@ -882,9 +882,9 @@ void BtnScrollNorthMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
|
||||
{
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
|
||||
|
||||
// not zoomed in?...don't push down
|
||||
if( fZoomFlag == FALSE )
|
||||
if( fZoomFlag == FALSE )
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -895,21 +895,21 @@ void BtnScrollNorthMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
|
||||
fMapPanelDirty = TRUE;
|
||||
}
|
||||
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
giScrollButtonState = NORTH_DIR;
|
||||
fMapScrollDueToPanelButton = TRUE;
|
||||
}
|
||||
}
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
giScrollButtonState = NORTH_DIR;
|
||||
fMapScrollDueToPanelButton = TRUE;
|
||||
}
|
||||
}
|
||||
if( reason & MSYS_CALLBACK_REASON_LBUTTON_REPEAT )
|
||||
{
|
||||
giScrollButtonState = NORTH_DIR;
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -918,45 +918,9 @@ void BtnScrollSouthMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
|
||||
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
|
||||
|
||||
// not zoomed in?...don't push down
|
||||
if( fZoomFlag == FALSE )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// are help messages being displayed?..redraw
|
||||
if( ScrollButtonsDisplayingHelpMessage( ) )
|
||||
{
|
||||
fMapPanelDirty = TRUE;
|
||||
}
|
||||
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
giScrollButtonState = SOUTH_DIR;
|
||||
fMapScrollDueToPanelButton = TRUE;
|
||||
|
||||
}
|
||||
}
|
||||
if( reason & MSYS_CALLBACK_REASON_LBUTTON_REPEAT )
|
||||
{
|
||||
giScrollButtonState = SOUTH_DIR;
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
}
|
||||
|
||||
void BtnScrollEastMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
|
||||
{
|
||||
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
// not zoomed in?...don't push down
|
||||
if( fZoomFlag == FALSE )
|
||||
if( fZoomFlag == FALSE )
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -967,22 +931,58 @@ void BtnScrollEastMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
|
||||
fMapPanelDirty = TRUE;
|
||||
}
|
||||
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
giScrollButtonState = EAST_DIR;
|
||||
fMapScrollDueToPanelButton = TRUE;
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
giScrollButtonState = SOUTH_DIR;
|
||||
fMapScrollDueToPanelButton = TRUE;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if( reason & MSYS_CALLBACK_REASON_LBUTTON_REPEAT )
|
||||
{
|
||||
giScrollButtonState = EAST_DIR;
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
giScrollButtonState = SOUTH_DIR;
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
}
|
||||
|
||||
void BtnScrollEastMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
|
||||
{
|
||||
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
// not zoomed in?...don't push down
|
||||
if( fZoomFlag == FALSE )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// are help messages being displayed?..redraw
|
||||
if( ScrollButtonsDisplayingHelpMessage( ) )
|
||||
{
|
||||
fMapPanelDirty = TRUE;
|
||||
}
|
||||
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
giScrollButtonState = EAST_DIR;
|
||||
fMapScrollDueToPanelButton = TRUE;
|
||||
|
||||
}
|
||||
}
|
||||
if( reason & MSYS_CALLBACK_REASON_LBUTTON_REPEAT )
|
||||
{
|
||||
giScrollButtonState = EAST_DIR;
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -992,8 +992,8 @@ void BtnScrollWestMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
|
||||
if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
|
||||
{
|
||||
|
||||
// not zoomed in?...don't push down
|
||||
if( fZoomFlag == FALSE )
|
||||
// not zoomed in?...don't push down
|
||||
if( fZoomFlag == FALSE )
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -1004,47 +1004,47 @@ void BtnScrollWestMapScreenCallback( GUI_BUTTON *btn,INT32 reason )
|
||||
fMapPanelDirty = TRUE;
|
||||
}
|
||||
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
if (btn->uiFlags & BUTTON_CLICKED_ON)
|
||||
{
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
giScrollButtonState = WEST_DIR;
|
||||
fMapScrollDueToPanelButton = TRUE;
|
||||
btn->uiFlags&=~(BUTTON_CLICKED_ON);
|
||||
giScrollButtonState = WEST_DIR;
|
||||
fMapScrollDueToPanelButton = TRUE;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if( reason & MSYS_CALLBACK_REASON_LBUTTON_REPEAT )
|
||||
{
|
||||
giScrollButtonState = WEST_DIR;
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
giScrollButtonState = WEST_DIR;
|
||||
btn->uiFlags|=(BUTTON_CLICKED_ON);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void MapScrollButtonMvtCheck( void )
|
||||
void MapScrollButtonMvtCheck( void )
|
||||
{
|
||||
// run through each button's mouse region, if mouse cursor there...don't show map white sector highlight
|
||||
fCursorIsOnMapScrollButtons = FALSE;
|
||||
|
||||
if( ButtonList[ guiMapBorderScrollButtons[ 0 ] ] ->Area.uiFlags & MSYS_MOUSE_IN_AREA )
|
||||
if( ButtonList[ guiMapBorderScrollButtons[ 0 ] ]->Area.uiFlags & MSYS_MOUSE_IN_AREA )
|
||||
{
|
||||
fCursorIsOnMapScrollButtons = TRUE;
|
||||
}
|
||||
|
||||
if( ButtonList[ guiMapBorderScrollButtons[ 1 ] ] ->Area.uiFlags & MSYS_MOUSE_IN_AREA )
|
||||
if( ButtonList[ guiMapBorderScrollButtons[ 1 ] ]->Area.uiFlags & MSYS_MOUSE_IN_AREA )
|
||||
{
|
||||
fCursorIsOnMapScrollButtons = TRUE;
|
||||
}
|
||||
|
||||
if( ButtonList[ guiMapBorderScrollButtons[ 2 ] ] ->Area.uiFlags & MSYS_MOUSE_IN_AREA )
|
||||
if( ButtonList[ guiMapBorderScrollButtons[ 2 ] ]->Area.uiFlags & MSYS_MOUSE_IN_AREA )
|
||||
{
|
||||
fCursorIsOnMapScrollButtons = TRUE;
|
||||
}
|
||||
|
||||
if( ButtonList[ guiMapBorderScrollButtons[ 3 ] ] ->Area.uiFlags & MSYS_MOUSE_IN_AREA )
|
||||
if( ButtonList[ guiMapBorderScrollButtons[ 3 ] ]->Area.uiFlags & MSYS_MOUSE_IN_AREA )
|
||||
{
|
||||
fCursorIsOnMapScrollButtons = TRUE;
|
||||
}
|
||||
@@ -1082,21 +1082,21 @@ void HandleMapScrollButtonStates( void )
|
||||
if( fZoomFlag )
|
||||
{
|
||||
EnableButton( guiMapBorderScrollButtons[ 0 ]);
|
||||
EnableButton( guiMapBorderScrollButtons[ 1 ]);
|
||||
EnableButton( guiMapBorderScrollButtons[ 2 ]);
|
||||
EnableButton( guiMapBorderScrollButtons[ 3 ]);
|
||||
|
||||
UpdateScrollButtonStatesWhileScrolling( );
|
||||
EnableButton( guiMapBorderScrollButtons[ 1 ]);
|
||||
EnableButton( guiMapBorderScrollButtons[ 2 ]);
|
||||
EnableButton( guiMapBorderScrollButtons[ 3 ]);
|
||||
|
||||
UpdateScrollButtonStatesWhileScrolling( );
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
DisableButton( guiMapBorderScrollButtons[ 0 ]);
|
||||
DisableButton( guiMapBorderScrollButtons[ 1 ]);
|
||||
DisableButton( guiMapBorderScrollButtons[ 2 ]);
|
||||
DisableButton( guiMapBorderScrollButtons[ 3 ]);
|
||||
|
||||
DisableButton( guiMapBorderScrollButtons[ 1 ]);
|
||||
DisableButton( guiMapBorderScrollButtons[ 2 ]);
|
||||
DisableButton( guiMapBorderScrollButtons[ 3 ]);
|
||||
|
||||
}
|
||||
|
||||
// check mvt too
|
||||
@@ -1112,15 +1112,15 @@ void HandleMapScrollButtonStates( void )
|
||||
void BtnGenericMouseMoveButtonCallbackForMapBorder(GUI_BUTTON *btn,INT32 reason)
|
||||
{
|
||||
//If the button isn't the anchored button, then we don't want to modify the button state.
|
||||
|
||||
|
||||
if( btn != gpAnchoredButton )
|
||||
{
|
||||
if( reason & MSYS_CALLBACK_REASON_LOST_MOUSE )
|
||||
{
|
||||
if( btn->Area.uiFlags & MSYS_FASTHELP )
|
||||
{
|
||||
// redraw area
|
||||
fMapPanelDirty = TRUE;
|
||||
{
|
||||
// redraw area
|
||||
fMapPanelDirty = TRUE;
|
||||
}
|
||||
}
|
||||
return;
|
||||
@@ -1129,15 +1129,15 @@ void BtnGenericMouseMoveButtonCallbackForMapBorder(GUI_BUTTON *btn,INT32 reason)
|
||||
if( reason & MSYS_CALLBACK_REASON_LOST_MOUSE )
|
||||
{
|
||||
if( !gfAnchoredState )
|
||||
btn->uiFlags &= (~BUTTON_CLICKED_ON );
|
||||
btn->uiFlags &= (~BUTTON_CLICKED_ON );
|
||||
InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
|
||||
}
|
||||
else if( reason & MSYS_CALLBACK_REASON_GAIN_MOUSE )
|
||||
{
|
||||
btn->uiFlags |= BUTTON_CLICKED_ON ;
|
||||
btn->uiFlags |= BUTTON_CLICKED_ON ;
|
||||
InvalidateRegion(btn->Area.RegionTopLeftX, btn->Area.RegionTopLeftY, btn->Area.RegionBottomRightX, btn->Area.RegionBottomRightY);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
@@ -1162,7 +1162,7 @@ void DisplayCurrentLevelMarker( void )
|
||||
{
|
||||
// display the current level marker on the map border
|
||||
HVOBJECT hHandle;
|
||||
|
||||
|
||||
/*
|
||||
if( fDisabledMapBorder )
|
||||
{
|
||||
@@ -1171,7 +1171,7 @@ void DisplayCurrentLevelMarker( void )
|
||||
*/
|
||||
|
||||
// it's actually a white rectangle, not a green arrow!
|
||||
GetVideoObject(&hHandle, guiLEVELMARKER );
|
||||
GetVideoObject(&hHandle, guiLEVELMARKER );
|
||||
BltVideoObject( guiSAVEBUFFER , hHandle, 0, MAP_LEVEL_MARKER_X + 1, MAP_LEVEL_MARKER_Y + ( MAP_LEVEL_MARKER_DELTA * ( INT16 )iCurrentMapSectorZ ), VO_BLT_SRCTRANSPARENCY,NULL );
|
||||
|
||||
RestoreExternBackgroundRect(MAP_LEVEL_MARKER_X + 1, MAP_LEVEL_MARKER_Y + ( MAP_LEVEL_MARKER_DELTA * ( INT16 )iCurrentMapSectorZ ), 55, 9);
|
||||
@@ -1185,17 +1185,17 @@ void CreateMouseRegionsForLevelMarkers( void )
|
||||
{
|
||||
INT16 sCounter = 0;
|
||||
CHAR16 sString[ 64 ];
|
||||
|
||||
for( sCounter = 0; sCounter < 4 ; sCounter++ )
|
||||
|
||||
for( sCounter = 0; sCounter < 4 ; sCounter++ )
|
||||
{
|
||||
MSYS_DefineRegion(&LevelMouseRegions[ sCounter ], MAP_LEVEL_MARKER_X, ( INT16 )( MAP_LEVEL_MARKER_Y + ( MAP_LEVEL_MARKER_DELTA * sCounter ) ), MAP_LEVEL_MARKER_X + MAP_LEVEL_MARKER_WIDTH, ( INT16 )( MAP_LEVEL_MARKER_Y + ( MAP_LEVEL_MARKER_DELTA * ( sCounter + 1 ) ) ), MSYS_PRIORITY_HIGH, MSYS_NO_CURSOR,
|
||||
MSYS_DefineRegion(&LevelMouseRegions[ sCounter ], MAP_LEVEL_MARKER_X, ( INT16 )( MAP_LEVEL_MARKER_Y + ( MAP_LEVEL_MARKER_DELTA * sCounter ) ), MAP_LEVEL_MARKER_X + MAP_LEVEL_MARKER_WIDTH, ( INT16 )( MAP_LEVEL_MARKER_Y + ( MAP_LEVEL_MARKER_DELTA * ( sCounter + 1 ) ) ), MSYS_PRIORITY_HIGH, MSYS_NO_CURSOR,
|
||||
MSYS_NO_CALLBACK, LevelMarkerBtnCallback );
|
||||
|
||||
MSYS_SetRegionUserData(&LevelMouseRegions[sCounter],0,sCounter);
|
||||
|
||||
swprintf( sString, L"%s %d", zMarksMapScreenText[ 0 ], sCounter + 1 );
|
||||
SetRegionFastHelpText( &LevelMouseRegions[ sCounter ], sString );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -1208,7 +1208,7 @@ void DeleteMouseRegionsForLevelMarkers( void )
|
||||
|
||||
for( sCounter = 0; sCounter < 4; sCounter++ )
|
||||
{
|
||||
MSYS_RemoveRegion( &LevelMouseRegions[ sCounter ] );
|
||||
MSYS_RemoveRegion( &LevelMouseRegions[ sCounter ] );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1216,7 +1216,7 @@ void LevelMarkerBtnCallback(MOUSE_REGION * pRegion, INT32 iReason )
|
||||
{
|
||||
// btn callback handler for assignment screen mask region
|
||||
INT32 iCounter = 0;
|
||||
|
||||
|
||||
iCounter = MSYS_GetRegionUserData( pRegion, 0 );
|
||||
|
||||
if( ( iReason & MSYS_CALLBACK_REASON_LBUTTON_UP ) )
|
||||
@@ -1352,7 +1352,7 @@ void TurnOnAirSpaceMode( void )
|
||||
}
|
||||
|
||||
|
||||
// if showing underground
|
||||
// if showing underground
|
||||
if ( iCurrentMapSectorZ != 0 )
|
||||
{
|
||||
// switch to the surface
|
||||
@@ -1507,7 +1507,7 @@ void InitializeMapBorderButtonStates( void )
|
||||
{
|
||||
MapBorderButtonOff( MAP_BORDER_MINE_BTN );
|
||||
}
|
||||
|
||||
|
||||
if( fShowTeamFlag )
|
||||
{
|
||||
MapBorderButtonOn( MAP_BORDER_TEAMS_BTN );
|
||||
@@ -1516,7 +1516,7 @@ void InitializeMapBorderButtonStates( void )
|
||||
{
|
||||
MapBorderButtonOff( MAP_BORDER_TEAMS_BTN );
|
||||
}
|
||||
|
||||
|
||||
if( fShowAircraftFlag )
|
||||
{
|
||||
MapBorderButtonOn( MAP_BORDER_AIRSPACE_BTN );
|
||||
@@ -1547,7 +1547,7 @@ BOOLEAN DoesPlayerHaveAnyMilitia( void )
|
||||
{
|
||||
for( sY = 1; sY < MAP_WORLD_Y - 1; sY++ )
|
||||
{
|
||||
if( ( SectorInfo[ SECTOR( sX, sY )].ubNumberOfCivsAtLevel[ GREEN_MILITIA ] + SectorInfo[ SECTOR( sX, sY )].ubNumberOfCivsAtLevel[ REGULAR_MILITIA ]
|
||||
if( ( SectorInfo[ SECTOR( sX, sY )].ubNumberOfCivsAtLevel[ GREEN_MILITIA ] + SectorInfo[ SECTOR( sX, sY )].ubNumberOfCivsAtLevel[ REGULAR_MILITIA ]
|
||||
+ SectorInfo[ SECTOR( sX, sY )].ubNumberOfCivsAtLevel[ ELITE_MILITIA ] ) > 0 )
|
||||
{
|
||||
// found at least one
|
||||
|
||||
Reference in New Issue
Block a user