1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Multiplayer: Override panel key is now bound only to key "7" instead of 5, 6 and 7

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2418 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2008-11-14 15:23:34 +00:00
parent 8f2201afe4
commit ac6de87d47
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/mapscreen.cpp
+2 -1
View File
@@ -6136,7 +6136,8 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
case '5': case '5':
case '6': case '6':
case '7': case '7':
if (is_networked) // WANNE: Only show the override panel when '7' is pressed
if (is_networked && InputEvent.usParam == '7')
{ {
// haydent // haydent
manual_overide(); manual_overide();
Tactical/Soldier Ani.cpp
+6 -4
View File
@@ -368,11 +368,13 @@ BOOLEAN AdjustToNextAnimationFrame( SOLDIERTYPE *pSoldier )
SFireWeapon.bTargetLevel = pSoldier->bTargetLevel; SFireWeapon.bTargetLevel = pSoldier->bTargetLevel;
SFireWeapon.bTargetCubeLevel= pSoldier->bTargetCubeLevel; SFireWeapon.bTargetCubeLevel= pSoldier->bTargetCubeLevel;
if((is_server && pSoldier->ubID<120) || (!is_server && is_client && pSoldier->ubID<20) || (!is_server && !is_client) ) if((is_server && pSoldier->ubID<120) || (!is_server && is_client && pSoldier->ubID<20) || (!is_server && !is_client) )
{//only carry on if own werc {
AddGameEvent( S_FIREWEAPON, 0, &SFireWeapon ); //only carry on if own werc
AddGameEvent( S_FIREWEAPON, 0, &SFireWeapon );
//hayden //hayden
if(is_server || (is_client && pSoldier->ubID <20) ) send_fireweapon( &SFireWeapon ); if(is_server || (is_client && pSoldier->ubID <20) )
send_fireweapon( &SFireWeapon );
} }
//DIGICRAB: Burst UnCap //DIGICRAB: Burst UnCap
//Loop around in the animation if we still have burst rounds to fire //Loop around in the animation if we still have burst rounds to fire
ja2_2005Express.vcproj
+1 -1
View File
@@ -99,7 +99,7 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory="\games\jagged alliance 2" OutputDirectory="C:\games\jagged alliance 2 EN"
IntermediateDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)"
ConfigurationType="1" ConfigurationType="1"
InheritedPropertySheets=".\ja2_2005Express.vsprops" InheritedPropertySheets=".\ja2_2005Express.vsprops"