1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +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/Real Time Input.cpp
+30 -30
View File
@@ -81,7 +81,7 @@ extern UINT32 guiCurrentUICursor;
extern void DetermineWhichAssignmentMenusCanBeShown( void );
extern void DetermineWhichMilitiaControlMenusCanBeShown( void );
extern BOOLEAN gfIgnoreOnSelectedGuy;
extern INT16 gsOverItemsGridNo;
extern INT32 gsOverItemsGridNo;
extern INT16 gsOverItemsLevel;
extern UINT32 guiUITargetSoldierId;
extern BOOLEAN gfUIShowExitSouth;
@@ -112,17 +112,17 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
SOLDIERTYPE *pSoldier;
UINT32 uiMercFlags;
static UINT32 uiSingleClickTime;
INT16 sMapPos;
INT32 usMapPos;
static BOOLEAN fDoubleClickIntercepted = FALSE;
static BOOLEAN fValidDoubleClickPossible = FALSE;
static BOOLEAN fCanCheckForSpeechAdvance = FALSE;
static INT16 sMoveClickGridNo = 0;
static INT32 sMoveClickGridNo = 0;
// LEFT MOUSE BUTTON
if ( gViewportRegion.uiFlags & MSYS_MOUSE_IN_AREA )
{
if (!GetMouseMapPos( &sMapPos ) && !gfUIShowExitSouth )
if (!GetMouseMapPos( &usMapPos ) && !gfUIShowExitSouth )
{
return;
}
@@ -166,7 +166,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
{
if ( pSoldier->bDoBurst )
{
pSoldier->sStartGridNo = sMapPos;
pSoldier->sStartGridNo = usMapPos;
ResetBurstLocations( );
*puiNewEvent = A_CHANGE_TO_CONFIM_ACTION;
}
@@ -207,7 +207,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
{
INT8 bReturnCode;
bReturnCode = HandleMoveModeInteractiveClick( sMapPos, puiNewEvent );
bReturnCode = HandleMoveModeInteractiveClick( usMapPos, puiNewEvent );
if ( bReturnCode == -1 )
{
@@ -234,7 +234,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
if ( gusSelectedSoldier != NOBODY )
{
if ( ( fResult = UIOKMoveDestination( MercPtrs[ gusSelectedSoldier ], sMapPos ) ) == 1 )
if ( ( fResult = UIOKMoveDestination( MercPtrs[ gusSelectedSoldier ], usMapPos ) ) == 1 )
{
if ( gsCurrentActionPoints != 0 )
{
@@ -412,7 +412,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
{
if ( pSoldier->bDoBurst )
{
pSoldier->sEndGridNo = sMapPos;
pSoldier->sEndGridNo = usMapPos;
gfBeginBurstSpreadTracking = FALSE;
@@ -451,7 +451,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
{
if ( gpItemPointer != NULL )
{
if ( HandleItemPointerClick( sMapPos ) )
if ( HandleItemPointerClick( usMapPos ) )
{
// getout of mode
EndItemPointer( );
@@ -495,7 +495,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
case HANDCURSOR_MODE:
HandleHandCursorClick( sMapPos, puiNewEvent );
HandleHandCursorClick( usMapPos, puiNewEvent );
break;
case ACTION_MODE:
@@ -643,7 +643,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
{
INT8 bReturnCode;
bReturnCode = HandleMoveModeInteractiveClick( sMapPos, puiNewEvent );
bReturnCode = HandleMoveModeInteractiveClick( usMapPos, puiNewEvent );
if ( bReturnCode == -1 )
{
@@ -658,7 +658,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
//}/
//else
{
INT16 sIntTileGridNo;
INT32 sIntTileGridNo;
if( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
@@ -705,7 +705,7 @@ void QueryRTLeftButton( UINT32 *puiNewEvent )
if ( gusSelectedSoldier != NOBODY )
{
if ( ( fResult = UIOKMoveDestination( MercPtrs[ gusSelectedSoldier ], sMapPos ) ) == 1 )
if ( ( fResult = UIOKMoveDestination( MercPtrs[ gusSelectedSoldier ], usMapPos ) ) == 1 )
{
if ( gfUIAllMoveOn )
{
@@ -939,11 +939,11 @@ void QueryRTRightButton( UINT32 *puiNewEvent )
static BOOLEAN fValidDoubleClickPossible = FALSE;
SOLDIERTYPE *pSoldier;
INT16 sMapPos;
INT32 usMapPos;
if ( gViewportRegion.uiFlags & MSYS_MOUSE_IN_AREA )
{
if (!GetMouseMapPos( &sMapPos ) )
if (!GetMouseMapPos( &usMapPos ) )
{
return;
}
@@ -982,7 +982,7 @@ void QueryRTRightButton( UINT32 *puiNewEvent )
if ( gfUICanBeginAllMoveCycle )
{
// ATE: Here, check if we can do this....
if ( !UIOKMoveDestination( MercPtrs[ gusSelectedSoldier ], sMapPos ) )
if ( !UIOKMoveDestination( MercPtrs[ gusSelectedSoldier ], usMapPos ) )
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_UI_FEEDBACK, TacticalStr[ CANT_MOVE_THERE_STR ] );
gfRTClickLeftHoldIntercepted = TRUE;
@@ -1189,7 +1189,7 @@ void QueryRTRightButton( UINT32 *puiNewEvent )
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
HandleRightClickAdjustCursor( pSoldier, sMapPos );
HandleRightClickAdjustCursor( pSoldier, usMapPos );
}
fClickIntercepted = TRUE;
break;
@@ -1244,21 +1244,21 @@ void QueryRTRightButton( UINT32 *puiNewEvent )
}
extern BOOLEAN ConfirmActionCancel( INT16 sMapPos, UINT16 usOldMapPos );
extern BOOLEAN ConfirmActionCancel( INT32 usMapPos, INT32 usOldMapPos );
extern BOOLEAN gUIActionModeChangeDueToMouseOver;
void GetRTMousePositionInput( UINT32 *puiNewEvent )
{
INT16 sMapPos;
static UINT16 usOldMapPos = 0;
INT32 usMapPos;
static INT32 usOldMapPos = 0;
static UINT32 uiMoveTargetSoldierId = NOBODY;
SOLDIERTYPE *pSoldier;
static BOOLEAN fOnValidGuy = FALSE;
if (!GetMouseMapPos( &sMapPos ) )
if (!GetMouseMapPos( &usMapPos ) )
{
return;
}
@@ -1294,7 +1294,7 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent )
case JUMPOVER_MODE:
// ATE: Make sure!
if ( gsJumpOverGridNo != sMapPos )
if ( gsJumpOverGridNo != usMapPos )
{
*puiNewEvent = A_CHANGE_TO_MOVE;
}
@@ -1376,7 +1376,7 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent )
case MOVE_MODE:
if ( sMapPos != usOldMapPos )
if ( usMapPos != usOldMapPos )
{
// Set off ALL move....
gfUIAllMoveOn = FALSE;
@@ -1397,10 +1397,10 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent )
ubItemCursor = GetActionModeCursor( pSoldier );
//
if ( IsValidJumpLocation( pSoldier, sMapPos, TRUE ) )
if ( IsValidJumpLocation( pSoldier, usMapPos, TRUE ) )
{
*puiNewEvent = JP_ON_TERRAIN;
gsJumpOverGridNo = sMapPos;
gsJumpOverGridNo = usMapPos;
return;
}
else
@@ -1481,7 +1481,7 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent )
case CONFIRM_MOVE_MODE:
if ( sMapPos != usOldMapPos )
if ( usMapPos != usOldMapPos )
{
// Switch event out of confirm mode
// Set off ALL move....
@@ -1498,7 +1498,7 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent )
{
if ( pSoldier->bDoBurst )
{
pSoldier->sEndGridNo = sMapPos;
pSoldier->sEndGridNo = usMapPos;
if ( pSoldier->sEndGridNo != pSoldier->sStartGridNo && fLeftButtonDown )
@@ -1510,7 +1510,7 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent )
if ( pSoldier->flags.fDoSpread )
{
// Accumulate gridno
AccumulateBurstLocation( sMapPos );
AccumulateBurstLocation( usMapPos );
*puiNewEvent = CA_ON_TERRAIN;
break;
@@ -1533,7 +1533,7 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent )
}
else
{
if ( ConfirmActionCancel( sMapPos, usOldMapPos ) )
if ( ConfirmActionCancel( usMapPos, usOldMapPos ) )
{
// Switch event out of confirm mode
*puiNewEvent = CA_END_CONFIRM_ACTION;
@@ -1557,7 +1557,7 @@ void GetRTMousePositionInput( UINT32 *puiNewEvent )
// }
//}
usOldMapPos = sMapPos;
usOldMapPos = usMapPos;
}
}