1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

**********************************************************

Browse Source 
** Big Maps Projects code (incl. Multiplayer v1.5 **
**********************************************************
- Merged Big Maps Project code from BMP+MP trunk (Revision: 3340)
o Complete SVN Revision history: https://81.169.133.124/source/ja2/branches/Wanne/JA2%201.13%20MP
- Before THIS merge, I made a branch of the existing 1.13 source
o SVN Branch: https://81.169.133.124/source/ja2/branches/JA2_rev.3336/src
- Removed old VS 6.0 and VS 2003 project and solutions files, because compilation is broken long time ago
- I will add VS 2010 projects and solution file in the next few days

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2010-02-28 18:38:52 +00:00
parent a98c44ac78
commit 14750c6903
461 changed files with 23615 additions and 120157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Interface Panels.cpp
+21 -4
View File
@@ -594,7 +594,7 @@ INT16 GetUIApsToDisplay( SOLDIERTYPE *pSoldier )
void CheckForDisabledForGiveItem( )
{
INT16 sDist;
INT16 sDestGridNo;
INT32 sDestGridNo;
INT8 bDestLevel;
INT32 cnt;
SOLDIERTYPE *pSoldier;
@@ -794,8 +794,8 @@ void UpdateSMPanel( )
BOOLEAN fNearLowerLevel;
INT8 bDirection;
UINT8 ubStanceState;
if ( gpSMCurrentMerc->sGridNo == NOWHERE )
if (TileIsOutOfBounds(gpSMCurrentMerc->sGridNo))
{
return;
}
@@ -3851,7 +3851,7 @@ void MergeMessageBoxCallBack( UINT8 ubExitValue )
void HandleMouseOverSoldierFaceForContMove( SOLDIERTYPE *pSoldier, BOOLEAN fOn )
{
FACETYPE *pFace;
INT16 sGridNo;
INT32 sGridNo = NOWHERE;
if ( pSoldier == NULL )
{
@@ -5296,6 +5296,10 @@ void UpdateTEAMPanel( )
{
INT32 cnt;
// WANNE: In editor mode, always disable the Done button, because we dont have any merc!
#ifdef JA2EDITOR
DisableButton( iTEAMPanelButtons[ TEAM_DONE_BUTTON ] );
#else
if ( (gTacticalStatus.ubCurrentTeam != gbPlayerNum) || (gTacticalStatus.uiFlags & REALTIME ) || !(gTacticalStatus.uiFlags & INCOMBAT ) )
{
DisableButton( iTEAMPanelButtons[ TEAM_DONE_BUTTON ] );
@@ -5304,6 +5308,12 @@ void UpdateTEAMPanel( )
{
EnableButton( iTEAMPanelButtons[ TEAM_DONE_BUTTON ] );
}
#endif
// WANNE: In editor mode, always disable the strategy map button, because we dont have any merc!
#ifdef JA2EDITOR
DisableButton( iTEAMPanelButtons[ TEAM_MAP_SCREEN_BUTTON ] );
#else
if ( gTacticalStatus.uiFlags & ENGAGED_IN_CONV )
{
@@ -5313,6 +5323,7 @@ void UpdateTEAMPanel( )
{
EnableButton( iTEAMPanelButtons[ TEAM_MAP_SCREEN_BUTTON ] );
}
#endif
if ( gfDisableTacticalPanelButtons )
@@ -5341,7 +5352,13 @@ void UpdateTEAMPanel( )
}
else
{
// WANNE: In editor mode, always disable the squad button, because we dont have any merc!
#ifdef JA2EDITOR
DisableButton( iTEAMPanelButtons[ CHANGE_SQUAD_BUTTON ] );
#else
EnableButton( iTEAMPanelButtons[ CHANGE_SQUAD_BUTTON ] );
#endif
for ( cnt = 0; cnt < NUMBER_OF_SOLDIERS_PER_SQUAD; cnt++ )
{