OSDN > Find Software > Zandronum > SCM > hg > skulltag > Commit

Zandronum
Fork
zandronum-acc
zandronum-stable
zandronum-sandbox-stable
zandronum-installer
zandronum-zdoom-sync
zandronum-installer-resources
skulltag

skulltag: Commit

Revision	93e21c90ab5ae7475f2cd4410ce7a08d193b7794 (tree)
Time	2012-05-27 16:31:53
Author	Benjamin Berkels <torr.samaho@quan...>
Commiter	Benjamin Berkels

reduced net traffic needed if SERVERCOMMANDS_SetThingFrame is used to set the wound state (part of Dusk's wound state / custom damagetype fix patch)

diff -r 07ff1daea439 -r 93e21c90ab5a src/cl_main.cpp

--- a/src/cl_main.cpp Sat May 26 20:42:12 2012 +0200

+++ b/src/cl_main.cpp Sun May 27 09:31:53 2012 +0200

		@@ -6020,6 +6020,12 @@
6020	6020
6021	6021	pActor->SetIdle();
6022	6022	return;
	6023	+
	6024	+ // [Dusk]
	6025	+ case STATE_WOUND:
	6026	+
	6027	+ pNewState = pActor->FindState( NAME_Wound );
	6028	+ break;
6023	6029	default:
6024	6030
6025	6031	#ifdef CLIENT_WARNING_MESSAGES

diff -r 07ff1daea439 -r 93e21c90ab5a src/network.h

--- a/src/network.h Sat May 26 20:42:12 2012 +0200

+++ b/src/network.h Sun May 27 09:31:53 2012 +0200

		@@ -113,6 +113,7 @@
113	113	#define STATE_HEAL 9
114	114	#define STATE_CRASH 10
115	115	#define STATE_IDLE 11
	116	+#define STATE_WOUND 12 // [Dusk]
116	117
117	118	// Identifying player states (again, cheap & easy)
118	119	typedef enum

diff -r 07ff1daea439 -r 93e21c90ab5a src/sv_commands.cpp

--- a/src/sv_commands.cpp Sat May 26 20:42:12 2012 +0200

+++ b/src/sv_commands.cpp Sun May 27 09:31:53 2012 +0200

		@@ -2624,6 +2624,11 @@
2624	2624	SERVERCOMMANDS_SetThingState( pActor, STATE_MISSILE );
2625	2625	return;
2626	2626	}
	2627	+ else if ( pState == pActor->FindState( NAME_Wound ))
	2628	+ {
	2629	+ SERVERCOMMANDS_SetThingState( pActor, STATE_WOUND );
	2630	+ return;
	2631	+ }
2627	2632	}
2628	2633
2629	2634	// [BB] Try to find the state label and the correspoding offset belonging to the target state.