Commit MetaInfo

Revision936d69a1888f41341bfc89e5cce3b1f621809556 (tree)
Time2012-05-27 17:05:28
AuthorBenjamin Berkels <torr.samaho@quan...>
CommiterBenjamin Berkels

Log Message

Fixed: Wound state changes weren't sent to clients. (part of Dusk's wound state / custom damagetype fix patch, but modified so that clients don't touch the wound state on their own)

Change Summary

Incremental Difference

diff -r 1014cf620e99 -r 936d69a1888f docs/Skulltag Version History.txt
--- a/docs/Skulltag Version History.txt Sun May 27 09:47:04 2012 +0200
+++ b/docs/Skulltag Version History.txt Sun May 27 10:05:28 2012 +0200
@@ -228,6 +228,7 @@
228228 - - Fixed problems with the LAN broadcast under Linux. [Koromix]
229229 - - Fixed: Console icon would stick on a player's head if the server missed the packet to remove the icon. [TIHan]
230230 - - Fixed: Medals weren't announced on spied players. [Dusk]
231+- - Fixed: Wound state changes weren't sent to clients. [Dusk, Torr Samaho]
231232 ! - Changed F12 to allow spectators full spying, with the exception of during LMS if it's disabled. [Eruanna]
232233 ! - Changed F12 to allow full demo spying. [Eruanna]
233234 ! - Players aren't forced to spectate after a "changemap" map change on a server with a join password anymore. [Torr Samaho]
diff -r 1014cf620e99 -r 936d69a1888f src/p_interaction.cpp
--- a/src/p_interaction.cpp Sun May 27 09:47:04 2012 +0200
+++ b/src/p_interaction.cpp Sun May 27 10:05:28 2012 +0200
@@ -1598,12 +1598,17 @@
15981598 }
15991599
16001600 FState * woundstate = target->FindState(NAME_Wound, mod);
1601- if (woundstate != NULL)
1601+ // [BB] The server takes care of this.
1602+ if ( (woundstate != NULL) && ( NETWORK_InClientMode( ) == false ) )
16021603 {
16031604 int woundhealth = RUNTIME_TYPE(target)->Meta.GetMetaInt (AMETA_WoundHealth, 6);
16041605
16051606 if (target->health <= woundhealth)
16061607 {
1608+ // [Dusk] As the server, update the clients on the state
1609+ if ( NETWORK_GetState( ) == NETSTATE_SERVER )
1610+ SERVERCOMMANDS_SetThingFrame( target, woundstate );
1611+
16071612 target->SetState (woundstate);
16081613 return;
16091614 }
Show on old repository browser