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

** 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
+8 -8
View File
@@ -73,7 +73,7 @@ typedef struct
UINT16 usHeight;
INT16 sX;
INT16 sY;
INT16 sAdditionalData;
INT32 sAdditionalData;//dnl ch56 151009
UINT8 ubFlags;
UINT8 ubLeaveSectorType;
UINT8 ubLeaveSectorCode;
@@ -106,23 +106,23 @@ EXIT_DIALOG_STRUCT gExitDialog;
UINT8 gubExitGUIDirection;
INT16 gsExitGUIAdditionalData;
INT32 gsExitGUIAdditionalData;//dnl ch56 151009
INT16 gsWarpWorldX;
INT16 gsWarpWorldY;
INT8 gbWarpWorldZ;
INT16 gsWarpGridNo;
INT32 gsWarpGridNo;
//KM: New method is coded for more sophistocated rules. All the information is stored within the gExitDialog struct
// and calculated upon entry to this function instead of passing in multiple arguments and calculating it prior.
BOOLEAN InternalInitSectorExitMenu( UINT8 ubDirection, INT16 sAdditionalData )
BOOLEAN InternalInitSectorExitMenu( UINT8 ubDirection, INT32 sAdditionalData )//dnl ch56 151009
{
UINT32 uiTraverseTimeInMinutes;
SOLDIERTYPE *pSoldier;
INT32 i;
SGPRect aRect;
UINT16 usTextBoxWidth, usTextBoxHeight;
INT16 sMapPos = 0;
INT32 usMapPos = 0;
INT8 bExitCode = -1;
BOOLEAN OkExitCode;
@@ -147,11 +147,11 @@ BOOLEAN InternalInitSectorExitMenu( UINT8 ubDirection, INT16 sAdditionalData )
break;
case DIRECTION_EXITGRID:
bExitCode = -1;
sMapPos = sAdditionalData;
usMapPos = sAdditionalData;
break;
}
OkExitCode = OKForSectorExit( bExitCode, sMapPos, &uiTraverseTimeInMinutes );
OkExitCode = OKForSectorExit( bExitCode, usMapPos, &uiTraverseTimeInMinutes );
if( uiTraverseTimeInMinutes <= 5 )
{ //if the traverse time is short, then traversal is percieved to be instantaneous.
@@ -441,7 +441,7 @@ void WarpToSurfaceCallback( UINT8 bExitValue )
}
BOOLEAN InitSectorExitMenu( UINT8 ubDirection, INT16 sAdditionalData )
BOOLEAN InitSectorExitMenu( UINT8 ubDirection, INT32 sAdditionalData )//dnl ch56 151009
{
gubExitGUIDirection = ubDirection;
gsExitGUIAdditionalData = sAdditionalData;