From 8c8c3bf34842616c034545105bf7b7b43bacbaad Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 10 Dec 2014 15:18:03 +1100 Subject: [PATCH] Move physics stats loading into physics file --- qcsrc/common/physics.qc | 37 +++++++++++++++++++++++++++++++++++++ qcsrc/server/defs.qh | 15 --------------- qcsrc/server/g_world.qc | 20 +++----------------- 3 files changed, 40 insertions(+), 32 deletions(-) diff --git a/qcsrc/common/physics.qc b/qcsrc/common/physics.qc index 19d6692da..d0d69cc89 100644 --- a/qcsrc/common/physics.qc +++ b/qcsrc/common/physics.qc @@ -17,6 +17,43 @@ .float() PlayerPhysplug; +#ifdef SVQC +.float stat_dodging_frozen; +.float stat_sv_airaccel_qw; +.float stat_sv_airstrafeaccel_qw; +.float stat_sv_airspeedlimit_nonqw; +.float stat_sv_maxspeed; +.float stat_movement_highspeed; + +.float stat_jetpack_accel_side; +.float stat_jetpack_accel_up; +.float stat_jetpack_antigravity; +.float stat_jetpack_fuel; +.float stat_jetpack_maxspeed_up; +.float stat_jetpack_maxspeed_side; + +void Physics_AddStats() +{ + // g_movementspeed hack + addstat(STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW, AS_FLOAT, stat_sv_airspeedlimit_nonqw); + addstat(STAT_MOVEVARS_MAXSPEED, AS_FLOAT, stat_sv_maxspeed); + addstat(STAT_MOVEVARS_AIRACCEL_QW, AS_FLOAT, stat_sv_airaccel_qw); + addstat(STAT_MOVEVARS_AIRSTRAFEACCEL_QW, AS_FLOAT, stat_sv_airstrafeaccel_qw); + addstat(STAT_MOVEVARS_HIGHSPEED, AS_FLOAT, stat_movement_highspeed); + + // dodging + addstat(STAT_DODGING_FROZEN, AS_INT, stat_dodging_frozen); + + // jet pack + addstat(STAT_JETPACK_ACCEL_SIDE, AS_FLOAT, stat_jetpack_accel_side); + addstat(STAT_JETPACK_ACCEL_UP, AS_FLOAT, stat_jetpack_accel_up); + addstat(STAT_JETPACK_ANTIGRAVITY, AS_FLOAT, stat_jetpack_antigravity); + addstat(STAT_JETPACK_FUEL, AS_FLOAT, stat_jetpack_fuel); + addstat(STAT_JETPACK_MAXSPEED_UP, AS_FLOAT, stat_jetpack_maxspeed_up); + addstat(STAT_JETPACK_MAXSPEED_SIDE, AS_FLOAT, stat_jetpack_maxspeed_side); +} +#endif + // Client/server mappings #ifdef CSQC .float watertype; diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh index 6d3a1d705..547128d96 100644 --- a/qcsrc/server/defs.qh +++ b/qcsrc/server/defs.qh @@ -448,12 +448,6 @@ float round_starttime; //point in time when the countdown to round start is over .float stat_game_starttime; .float stat_round_starttime; -.float stat_sv_airaccel_qw; -.float stat_sv_airstrafeaccel_qw; -.float stat_sv_airspeedlimit_nonqw; -.float stat_sv_maxspeed; -.float stat_movement_highspeed; - void W_Porto_Remove (entity p); .float projectiledeathtype; @@ -593,8 +587,6 @@ float serverflags; .entity iceblock; .entity frozen_by; // for ice fields -.float stat_dodging_frozen; - .entity muzzle_flash; .float misc_bulletcounter; // replaces uzi & hlac bullet counter. @@ -609,13 +601,6 @@ typedef vector(entity player, entity spot, vector current) spawn_evalfunc_t; string modname; -.float stat_jetpack_accel_side; -.float stat_jetpack_accel_up; -.float stat_jetpack_antigravity; -.float stat_jetpack_fuel; -.float stat_jetpack_maxspeed_up; -.float stat_jetpack_maxspeed_side; - .float missile_flags; #define MIF_SPLASH 2 #define MIF_ARC 4 diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc index 3fea207ee..eb530afb8 100644 --- a/qcsrc/server/g_world.qc +++ b/qcsrc/server/g_world.qc @@ -557,6 +557,7 @@ void Nagger_Init(); void ClientInit_Spawn(); void WeaponStats_Init(); void WeaponStats_Shutdown(); +void Physics_AddStats(); void spawnfunc_worldspawn (void) { float fd, l, i, j, n; @@ -799,23 +800,8 @@ void spawnfunc_worldspawn (void) addstat(STAT_FROZEN, AS_INT, frozen); addstat(STAT_REVIVE_PROGRESS, AS_FLOAT, revive_progress); - // g_movementspeed hack - addstat(STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW, AS_FLOAT, stat_sv_airspeedlimit_nonqw); - addstat(STAT_MOVEVARS_MAXSPEED, AS_FLOAT, stat_sv_maxspeed); - addstat(STAT_MOVEVARS_AIRACCEL_QW, AS_FLOAT, stat_sv_airaccel_qw); - addstat(STAT_MOVEVARS_AIRSTRAFEACCEL_QW, AS_FLOAT, stat_sv_airstrafeaccel_qw); - addstat(STAT_MOVEVARS_HIGHSPEED, AS_FLOAT, stat_movement_highspeed); - - // jet pack - addstat(STAT_JETPACK_ACCEL_SIDE, AS_FLOAT, stat_jetpack_accel_side); - addstat(STAT_JETPACK_ACCEL_UP, AS_FLOAT, stat_jetpack_accel_up); - addstat(STAT_JETPACK_ANTIGRAVITY, AS_FLOAT, stat_jetpack_antigravity); - addstat(STAT_JETPACK_FUEL, AS_FLOAT, stat_jetpack_fuel); - addstat(STAT_JETPACK_MAXSPEED_UP, AS_FLOAT, stat_jetpack_maxspeed_up); - addstat(STAT_JETPACK_MAXSPEED_SIDE, AS_FLOAT, stat_jetpack_maxspeed_side); - - // dodging - addstat(STAT_DODGING_FROZEN, AS_INT, stat_dodging_frozen); + // physics + Physics_AddStats(); // secrets addstat(STAT_SECRETS_TOTAL, AS_FLOAT, stat_secrets_total); -- 2.39.2