Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

-don't apply game difficulty setting during multiplayer games, since it can negatively affect syncing. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4602 4a71c877-e1ca-e34f-864e-861f7616d084
master
Roman C 2008-04-14 15:48:56 +00:00
parent 11c5df9783
commit 49a6050b07
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/combat.c
View File

@ -26,6 +26,7 @@
#include "lib/framework/frame.h"
#include "lib/framework/math-help.h"
#include "lib/netplay/netplay.h"
#include "objects.h"
#include "combat.h"
@ -504,15 +505,20 @@ float objDamage(BASE_OBJECT *psObj, UDWORD damage, UDWORD originalhp, UDWORD wea
return 0;
}
if (psObj->player != selectedPlayer)
// apply game difficulty setting
if(!NetPlay.bComms) // ignore multiplayer games
{
// Player inflicting damage on enemy.
damage = (UDWORD) modifyForDifficultyLevel(damage,true);
}
else
{
// Enemy inflicting damage on player.
damage = (UDWORD) modifyForDifficultyLevel(damage,false);
if (psObj->player != selectedPlayer)
{
// Player inflicting damage on enemy.
damage = (UDWORD) modifyForDifficultyLevel(damage,true);
}
else
{
// Enemy inflicting damage on player.
damage = (UDWORD) modifyForDifficultyLevel(damage,false);
}
}
armour = psObj->armour[impactSide][weaponClass];