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

- bugfix: Enemies do not wear NVGs at night

Browse Source 
- add: Missing option screen text for "Random I.M.P personality"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2006-09-20 09:23:48 +00:00
parent 860caec123
commit 67663339a3
10 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+1 -1
View File
@@ -536,7 +536,7 @@ void LoadGameExternalOptions()
gGameExternalOptions.fVehicleInventory = iniReader.ReadBoolean("JA2 Gameplay Settings", "VEHICLE_INVENTORY", TRUE);
// ShadoWarrior: Tooltip changes (start)
gGameExternalOptions.ubSoldierTooltipDetailLevel = iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 2);
gGameExternalOptions.ubSoldierTooltipDetailLevel = iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 1);
gGameExternalOptions.fEnableDynamicSoldierTooltips = iniReader.ReadBoolean("JA2 Tactical Settings", "DYNAMIC_SOLDIER_TOOLTIPS", TRUE);
gGameExternalOptions.fEnableSoldierTooltipLocation = iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_LOCATION", TRUE);
GameVersion.cpp
+2 -2
View File
@@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else
//RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.538" };
INT16 zVersionLabel[256] = { L"Release v1.13.541" };
#endif
INT8 czVersionNumber[16] = { "Build 06.09.19" };
INT8 czVersionNumber[16] = { "Build 06.09.20" };
INT16 zTrackingNumber[16] = { L"Z" };
JA2.suo
BIN
View File
Binary file not shown.
Tactical/Inventory Choosing.cpp
+32 -1
View File
@@ -2978,6 +2978,7 @@ UINT16 PickARandomItem(UINT8 typeIndex, UINT8 maxCoolness, BOOLEAN getMatchingCo
UINT16 usItem = 0;
UINT32 uiChoice;
UINT16 defaultItem = 0;
BOOLEAN pickItem = FALSE;
if ( gArmyItemChoices[ typeIndex ].ubChoices <= 0 )
return 0;
@@ -2991,6 +2992,7 @@ UINT16 PickARandomItem(UINT8 typeIndex, UINT8 maxCoolness, BOOLEAN getMatchingCo
// a chance for nothing!
uiChoice = Random(gArmyItemChoices[ typeIndex ].ubChoices + (int) ( gArmyItemChoices[ typeIndex ].ubChoices / 3 ));
if ( uiChoice >= gArmyItemChoices[ typeIndex ].ubChoices )
{
if ( !getMatchingCoolness )
@@ -3000,8 +3002,37 @@ UINT16 PickARandomItem(UINT8 typeIndex, UINT8 maxCoolness, BOOLEAN getMatchingCo
}
usItem = gArmyItemChoices[ typeIndex ].bItemNo[ uiChoice ];
// WANNE
if (usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem))
{
// On day
if (DayTime() == TRUE)
{
// Only pick items, that have not a negative day vision bonus range
// So we only pick normal items and day items (sun googles, ...)
if (Item[usItem].dayvisionrangebonus >= 0 )
{
pickItem = TRUE;
}
}
// At night
else
{
// Only pick items, that have not a negative night vision bonus range
// So we only pick normal items and night items (NVG, ...)
if (Item[usItem].nightvisionrangebonus >= 0 )
{
pickItem = TRUE;
}
}
}
//Madd: quickfix: don't use NVGs during the day, and no sungoggles at night either
if ( usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem) && (( DayTime() && Item[usItem].nightvisionrangebonus == 0 ) || ( NightTime() && Item[usItem].dayvisionrangebonus == 0 )))
//if ( usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem) && (( DayTime() && Item[usItem].nightvisionrangebonus == 0 ) || ( NightTime() && Item[usItem].dayvisionrangebonus == 0 )))
// WANNE
if (pickItem == TRUE)
{
// pick a default item in case we don't find anything with a matching coolness, but pick the coolest item we can find
if ( defaultItem == 0 || Item[usItem].ubCoolness > Item[defaultItem].ubCoolness )
Utils/_DutchText.cpp
+1
View File
@@ -3460,6 +3460,7 @@ STR16 zOptionsToggleText[] =
L"Show Weapon Ranges in Tiles",
L"Tracer effect for single shot",
L"Rain noises",
L"Random I.M.P personality",
};
//This is the help text associated with the above toggles.
Utils/_FrenchText.cpp
+1
View File
@@ -3449,6 +3449,7 @@ STR16 zOptionsToggleText[] =
L"Show Weapon Ranges in Tiles",
L"Tracer effect for single shot",
L"Rain noises",
L"Random I.M.P personality",
};
//This is the help text associated with the above toggles.
Utils/_GermanText.cpp
+1
View File
@@ -3269,6 +3269,7 @@ STR16 zOptionsToggleText[] =
L"Tracereffekte für Einzelschüsse",
L"Regengeräusche",
L"Krähen erlauben",
L"Zufällige B.S.E Personalität",
};
//This is the help text associated with the above toggles.
Utils/_ItalianText.cpp
+2 -1
View File
@@ -3442,6 +3442,7 @@ STR16 zOptionsToggleText[] =
L"Show Weapon Ranges in Tiles",
L"Tracer effect for single shot",
L"Rain noises",
L"Random I.M.P personality",
};
//This is the help text associated with the above toggles.
@@ -3517,7 +3518,7 @@ STR16 zOptionsScreenHelpText[] =
L"When ON, weapon ranges will be shown in tiles.",
L"When ON, tracer effect will be shown for single shots.",
L"When ON, you will hear rain noises when it is raining.",
L"When ON, I.M.P characters will get random personality and attitude.",
};
Utils/_PolishText.cpp
+1
View File
@@ -3442,6 +3442,7 @@ STR16 zOptionsToggleText[] =
L"Show Weapon Ranges in Tiles",
L"Tracer effect for single shot",
L"Rain noises",
L"Random I.M.P personality",
};
//This is the help text associated with the above toggles.
Utils/_RussianText.cpp
+1
View File
@@ -3453,6 +3453,7 @@ STR16 zOptionsToggleText[] =
L"Tracer effect for single shot",
L"Rain noises",
L"Allow crows",
L"Random I.M.P personality",
};
//This is the help text associated with the above toggles.