1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00: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.cpp
+16 -39
View File
@@ -56,8 +56,11 @@
#include "gamesettings.h"
#include "Squads.h"
#include "message.h"
#endif
#include "InterfaceItemImages.h"
#include "connect.h"
//const UINT32 INTERFACE_START_X = 0;
//const UINT32 INTERFACE_START_Y = ( SCREEN_HEIGHT - INTERFACE_HEIGHT );
@@ -152,7 +155,6 @@ extern BOOLEAN gfUserTurnRegionActive;
extern UINT8 gubSelectSMPanelToMerc;
extern BOOLEAN gfIgnoreOnSelectedGuy;
typedef enum
{
WALK_IMAGES = 0,
@@ -221,10 +223,7 @@ UINT32 guiINTEXT;
UINT32 guiCLOSE;
UINT32 guiDEAD;
UINT32 guiHATCH;
UINT32 guiGUNSM;
UINT32 guiP1ITEMS;
UINT32 guiP2ITEMS;
UINT32 guiP3ITEMS;
UINT32 guiBUTTONBORDER;
UINT32 guiSILHOUETTE;
UINT32 guiRADIO;
@@ -258,7 +257,7 @@ void PopupDoorOpenMenu( BOOLEAN fClosingDoor );
BOOLEAN fFirstTimeInGameScreen = TRUE;
BOOLEAN fInterfacePanelDirty = DIRTYLEVEL2;
INT16 gsInterfaceLevel = I_GROUND_LEVEL;
INT16 gsCurrentSoldierGridNo = 0;
INT32 gsCurrentSoldierGridNo = 0;
INT16 gsCurInterfacePanel = TEAM_PANEL;
// LOCAL FUCTIONS
@@ -361,29 +360,7 @@ BOOLEAN InitializeTacticalInterface( )
if( !AddVideoObject( &VObjectDesc, &guiHATCH ) )
AssertMsg(0, "Missing INTERFACE\\hatch.sti" );
// LOAD INTERFACE GUN PICTURES
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP("INTERFACE\\mdguns.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &guiGUNSM ) )
AssertMsg(0, "Missing INTERFACE\\mdguns.sti" );
// LOAD INTERFACE ITEM PICTURES
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP("INTERFACE\\mdp1items.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &guiP1ITEMS ) )
AssertMsg(0, "Missing INTERFACE\\mdplitems.sti" );
// LOAD INTERFACE ITEM PICTURES
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP("INTERFACE\\mdp2items.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &guiP2ITEMS ) )
AssertMsg(0, "Missing INTERFACE\\mdp2items.sti" );
// LOAD INTERFACE ITEM PICTURES
VObjectDesc.fCreateFlags = VOBJECT_CREATE_FROMFILE;
FilenameForBPP("INTERFACE\\mdp3items.sti", VObjectDesc.ImageFile);
if( !AddVideoObject( &VObjectDesc, &guiP3ITEMS ) )
AssertMsg(0, "Missing INTERFACE\\mdp3items.sti" );
THROWIFFALSE( RegisterItemImages(), L"Registering Item Images failed" );
// CHRISL:
// LOAD INTERFACE POCKET SILHOUETTES
@@ -1508,8 +1485,8 @@ void DrawSelectedUIAboveGuy( UINT16 usSoldierID )
{
return;
}
if ( pSoldier->sGridNo == NOWHERE )
if (TileIsOutOfBounds(pSoldier->sGridNo))
{
return;
}
@@ -3651,7 +3628,7 @@ typedef struct
{
INT8 bHeight;
INT8 bPower;
INT16 sGridNo;
INT32 sGridNo;
UINT8 ubLevel;
SOLDIERTYPE *pSoldier;
BOOLEAN fShowHeight;
@@ -3659,7 +3636,7 @@ typedef struct
BOOLEAN fActiveHeightBar;
BOOLEAN fActivePowerBar;
BOOLEAN fAtEndHeight;
INT16 sTargetGridNo;
INT32 sTargetGridNo;
FLOAT dInitialForce;
FLOAT dForce;
FLOAT dDegrees;
@@ -3706,7 +3683,7 @@ void CalculateAimCubeUIPhysics( )
}
INT16 GetInAimCubeUIGridNo( )
INT32 GetInAimCubeUIGridNo( )
{
return( gCubeUIData.sGridNo );
}
@@ -3738,7 +3715,7 @@ BOOLEAN AimCubeUIClick( )
}
}
void BeginAimCubeUI( SOLDIERTYPE *pSoldier, INT16 sGridNo, INT8 ubLevel, UINT8 bStartPower, INT8 bStartHeight )
void BeginAimCubeUI( SOLDIERTYPE *pSoldier, INT32 sGridNo, INT8 ubLevel, UINT8 bStartPower, INT8 bStartHeight )
{
gfInAimCubeUI = TRUE;
@@ -3915,11 +3892,11 @@ void GetLaunchItemParamsFromUI( )
static BOOLEAN gfDisplayPhysicsUI = FALSE;
static INT16 gsPhysicsImpactPointGridNo;
static INT32 gsPhysicsImpactPointGridNo;
static INT8 gbPhysicsImpactPointLevel;
static BOOLEAN gfBadPhysicsCTGT = FALSE;
void BeginPhysicsTrajectoryUI( INT16 sGridNo, INT8 bLevel, BOOLEAN fBadCTGT )
void BeginPhysicsTrajectoryUI( INT32 sGridNo, INT8 bLevel, BOOLEAN fBadCTGT )
{
gfDisplayPhysicsUI = TRUE;
gsPhysicsImpactPointGridNo = sGridNo;
@@ -3996,11 +3973,11 @@ UINT32 CalcUIMessageDuration( STR16 wString )
BOOLEAN gfMultipurposeLocatorOn = FALSE;
UINT32 guiMultiPurposeLocatorLastUpdate;
INT8 gbMultiPurposeLocatorFrame;
INT16 gsMultiPurposeLocatorGridNo;
INT32 gsMultiPurposeLocatorGridNo;
INT8 gbMultiPurposeLocatorLevel;
INT8 gbMultiPurposeLocatorCycles;
void BeginMultiPurposeLocator( INT16 sGridNo, INT8 bLevel, BOOLEAN fSlideTo )
void BeginMultiPurposeLocator( INT32 sGridNo, INT8 bLevel, BOOLEAN fSlideTo )
{
guiMultiPurposeLocatorLastUpdate = 0;
gbMultiPurposeLocatorCycles = 0;