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

When setting up autobandage, use first aid kits before using medkits.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8576 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-07-14 19:41:51 +00:00
parent 8a82dae027
commit 0762a04501
2 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameVersion.cpp
+9 -9
View File
@@ -15,9 +15,9 @@
#ifdef JA2EDITOR
#ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8571 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8576 (Development Build)" };
#else
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8571 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8576 (Development Build)" };
#endif
// ------------------------------
@@ -27,11 +27,11 @@
//DEBUG BUILD VERSION
#ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8571 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.8576 (Development Build)" };
#elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8571 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8576 (Development Build)" };
#else
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8571 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8576 (Development Build)" };
#endif
#elif defined CRIPPLED_VERSION
@@ -46,16 +46,16 @@
//RELEASE BUILD VERSION
#ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8571 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8576 (Development Build)" };
#elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8571 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8576 (Development Build)" };
#else
CHAR16 zVersionLabel[256] = { L"Release v1.13.8571 (Development Build)" };
CHAR16 zVersionLabel[256] = { L"Release v1.13.8576 (Development Build)" };
#endif
#endif
CHAR8 czVersionNumber[16] = { "Build 18.06.11" }; //YY.MM.DD
CHAR8 czVersionNumber[16] = { "Build 18.07.14" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" };
// SAVE_GAME_VERSION is defined in header, change it there
TacticalAI/Medical.cpp
+9 -4
View File
@@ -421,11 +421,16 @@ INT8 DecideAutoBandage( SOLDIERTYPE * pSoldier )
return( AI_ACTION_NONE );
}
bSlot = FindObjClass( pSoldier, IC_MEDKIT );
if (bSlot == NO_SLOT)
// Flugente: when bandaging, use first aid kits first (it's their only usage, medkits can be used for healing and surgery as well)
bSlot = FindFirstAidKit( pSoldier );
if ( bSlot == NO_SLOT )
{
// no medical kit!
return( AI_ACTION_NONE );
bSlot = FindMedKit( pSoldier );
if ( bSlot == NO_SLOT )
{
// no medical kit!
return( AI_ACTION_NONE );
}
}
if (pSoldier->bBleeding)