1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

- added new militia control command

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2007-06-29 21:19:11 +00:00
parent 6590737dde
commit 6cf3fbbe5a
10 changed files with 66 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ CHAR16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else
//RELEASE BUILD VERSION
CHAR16 zVersionLabel[256] = { L"Release v1.13.933" };
CHAR16 zVersionLabel[256] = { L"Release v1.13.1020" };
#endif
JA2.vcproj
+3 -5
View File
@@ -43,10 +43,9 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib lua51.lib"
OutputFile="C:\Games\Jagged Alliance 2\ja2_debug_933_en.exe"
OutputFile="C:\Games\Jagged Alliance 2\ja2_debug_1020_en.exe"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="&quot;.\..\..\Standard Gaming Platform\&quot;"
IgnoreDefaultLibraryNames="libcmt"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\Debug/ja2_cvs.pdb"
@@ -545,11 +544,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib lua51_vs2003.lib"
OutputFile="C:\games\Jagged Alliance 2\JA2 v1.13.933_EN.exe"
AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib lua51.lib"
OutputFile="D:\games\Jagged Alliance 2 v1.13\JA2 v1.13.1020_EN.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
IgnoreDefaultLibraryNames=""
GenerateMapFile="TRUE"
MapFileName=".\Release/ja2_cvs.map"
Strategic/Map Screen Interface.h
+1
View File
@@ -65,6 +65,7 @@ enum{
MILCON_MENU_ALL_HOLD,
MILCON_MENU_ALL_RETREAT,
MILCON_MENU_ALL_COMETOME,
MILCON_MENU_ALL_SPREAD,
MILCON_MENU_ALL_GETDOWN,
MILCON_MENU_ALL_TAKE_COVER,
//MILCON_MENU_ALL_TAKE_ITEMS,
Tactical/Militia Control.cpp
+55
View File
@@ -963,6 +963,7 @@ void HandleShadingOfLinesForMilitiaControlMenu( void )
UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_HOLD );
UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_RETREAT );
UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_COMETOME );
UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_SPREAD );
UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_GETDOWN );
UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_TAKE_COVER );
//UnShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_TAKE_ITEMS );
@@ -973,6 +974,7 @@ void HandleShadingOfLinesForMilitiaControlMenu( void )
ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_HOLD );
ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_RETREAT );
ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_COMETOME );
ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_SPREAD );
ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_GETDOWN );
ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_TAKE_COVER );
//ShadeStringInBox( ghMilitiaControlBox, MILCON_MENU_ALL_TAKE_ITEMS );
@@ -1590,6 +1592,59 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
}
break;
case( MILCON_MENU_ALL_SPREAD ):
{
UINT8 cnt;
INT16 sActionGridNo;
SOLDIERTYPE *pTeamSoldier;
cnt = gTacticalStatus.Team[ MILITIA_TEAM ].bFirstID;
for ( pTeamSoldier = MercPtrs[ cnt ]; cnt <= gTacticalStatus.Team[ MILITIA_TEAM ].bLastID; cnt++, pTeamSoldier++)
{
if ( (pTeamSoldier->bActive) && (pTeamSoldier->bInSector) && (pTeamSoldier->bLife >= OKLIFE) )
{
// See if we can get there
sActionGridNo = RandDestWithinRange( pTeamSoldier );
if ( sActionGridNo != -1 )
{
// SEND PENDING ACTION
pTeamSoldier->sPendingActionData2 = sActionGridNo;
//pTeamSoldier->bPendingActionData3 = ubDirection;
pTeamSoldier->ubPendingActionAnimCount = 0;
pTeamSoldier->usUIMovementMode = RUNNING;
// CHECK IF WE ARE AT THIS GRIDNO NOW
if ( pTeamSoldier->sGridNo != sActionGridNo )
{
// WALK UP TO DEST FIRST
SendGetNewSoldierPathEvent( pTeamSoldier, sActionGridNo, pTeamSoldier->usUIMovementMode );
}
}
}
}
if ( GetSoldier( &pSoldier, gusSelectedSoldier ) )
{
DeductPoints( pSoldier, AP_TALK, 0 );
StatChange( pSoldier, LDRAMT, 1, FALSE );
}
// stop showing menu
fShowMilitiaControlMenu = FALSE;
giAssignHighLine = -1;
// set dirty flag
fTeamPanelDirty = TRUE;
fMapScreenBottomDirty = TRUE;
}
break;
case( MILCON_MENU_ALL_GETDOWN ):
{
UINT8 cnt;
Utils/_DutchText.cpp
+1
View File
@@ -627,6 +627,7 @@ STR16 pMilitiaControlMenuStrings[] =
L"All: Hold Position",
L"All: Retreat",
L"All: Come to me",
L"All: Spread out",
L"All: Get down",
L"All: Take cover",
//L"All: Find items",
Utils/_EnglishText.cpp
+1
View File
@@ -642,6 +642,7 @@ STR16 pMilitiaControlMenuStrings[] =
L"All: Hold Position",
L"All: Retreat",
L"All: Come to me",
L"All: Spread out",
L"All: Get down",
L"All: Take cover",
//L"All: Find items",
Utils/_FrenchText.cpp
+1
View File
@@ -633,6 +633,7 @@ STR16 pMilitiaControlMenuStrings[] =
L"All: Hold Position",
L"All: Retreat",
L"All: Come to me",
L"All: Spread out",
L"All: Get down",
L"All: Take cover",
//L"All: Find items",
Utils/_ItalianText.cpp
+1
View File
@@ -626,6 +626,7 @@ STR16 pMilitiaControlMenuStrings[] =
L"All: Hold Position",
L"All: Retreat",
L"All: Come to me",
L"All: Spread out",
L"All: Get down",
L"All: Take cover",
//L"All: Find items",
Utils/_PolishText.cpp
+1
View File
@@ -627,6 +627,7 @@ STR16 pMilitiaControlMenuStrings[] =
L"All: Hold Position",
L"All: Retreat",
L"All: Come to me",
L"All: Spread out",
L"All: Get down",
L"All: Take cover",
//L"All: Find items",
Utils/_RussianText.cpp
+1
View File
@@ -637,6 +637,7 @@ STR16 pMilitiaControlMenuStrings[] =
L"All: Hold Position",
L"All: Retreat",
L"All: Come to me",
L"All: Spread out",
L"All: Get down",
L"All: Take cover",
//L"All: Find items",