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

Updates / Fixes by Arynn

Browse Source 
- Fixed: Mercs randomly drop aimed weapons automatically under some weird circumstances 
- Fixed: Merc are now a little more "talkactive"
- Update: New option screen with "Next" and "Prev" button. This allows "unlimited" of options in the option screen
- New: New "Forced turn base mode" option in the option screen and also available via keyboard shortcut (CTRL+ALT+SHIFT+T) in tactical.
This forces the game to go in turn based mode when there are enemies in the sector.

INFO: There is a new STI Graphic (OPTIONSCREENADDONS2.sti) which is needed for the updated option screen.
You can download the file from http://ja2.h758491.serverkompetenz.net/Wanne/NewOptionScreen/OPTIONSCREENADDONS2.sti
Put this file in your Data\Interface folder. If I build a new release I will upload the file to SVN GameDir and then remove it from my private download folder.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-02-28 09:16:25 +00:00
parent a64a66bdf3
commit c4e483539f
18 changed files with 619 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Handle UI.cpp
+17 -4
View File
@@ -1901,7 +1901,7 @@ UINT32 UIHandleCMoveMerc( UI_EVENT *pUIEvent )
//else
if ( pSoldier->EVENT_InternalGetNewSoldierPath( sMapPos, pSoldier->usUIMovementMode, TRUE, FALSE ) )
{
pSoldier->InternalSoldierReadyWeapon( BATTLE_SOUND_OK1, BATTLE_SND_LOWER_VOLUME );
pSoldier->InternalDoMercBattleSound( BATTLE_SOUND_OK1, BATTLE_SND_LOWER_VOLUME );
}
else
{
@@ -4703,7 +4703,20 @@ BOOLEAN MakeSoldierTurn( SOLDIERTYPE *pSoldier, INT16 sXPos, INT16 sYPos )
// ATE: make stationary if...
if ( pSoldier->flags.fNoAPToFinishMove )
{
pSoldier->SoldierGotoStationaryStance( );
// arynn : fix lower ready weapons
//previously "ready weapon" state was being dropped in a couple of cases
//the fix involves bypassing the reset animation state for the various "ready weapon" types
//since this is a reset animation function, we should be VERY specific about when and what we dont reset
UINT16 test;
test = pSoldier->usAnimState;
if (!( test == AIM_RIFLE_STAND || test == AIM_RIFLE_CROUCH ||
test == AIM_RIFLE_PRONE || test == AIM_DUAL_STAND ||
test == AIM_DUAL_CROUCH || test == AIM_DUAL_PRONE
))
{
pSoldier->SoldierGotoStationaryStance( );
}// arynn : fix lower ready weapon end_if
}
//DEF: made it an event
@@ -5100,7 +5113,7 @@ void EndMultiSoldierSelection( BOOLEAN fAcknowledge )
}
if( !gGameSettings.fOptions[ TOPTION_MUTE_CONFIRMATIONS ] && fAcknowledge )
pSoldier->InternalSoldierReadyWeapon( BATTLE_SOUND_ATTN1, BATTLE_SND_LOWER_VOLUME );
pSoldier->InternalDoMercBattleSound( BATTLE_SOUND_ATTN1, BATTLE_SND_LOWER_VOLUME );
if ( pSoldier->flags.fMercAsleep )
{
@@ -5227,7 +5240,7 @@ BOOLEAN HandleMultiSelectionMove( INT16 sDestGridNo )
if ( pSoldier->EVENT_InternalGetNewSoldierPath( sDestGridNo, pSoldier->usUIMovementMode , TRUE, pSoldier->flags.fNoAPToFinishMove ) )
{
pSoldier->InternalSoldierReadyWeapon( BATTLE_SOUND_OK1, BATTLE_SND_LOWER_VOLUME );
pSoldier->InternalDoMercBattleSound( BATTLE_SOUND_OK1, BATTLE_SND_LOWER_VOLUME );
}
else
{