From 9b45490b9b06f85f30c3b1a0da0bdb3a9032b8eb Mon Sep 17 00:00:00 2001 From: divverent Date: Sun, 8 May 2011 15:25:44 +0000 Subject: [PATCH] fix naming of two fields git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11127 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=b6b3148dd653325f5018c5911f44c23bbf8be477 --- dpdefs/source_compare.txt | 4 ---- progsvm.h | 4 ++-- prvm_edict.c | 4 ++-- sv_user.c | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dpdefs/source_compare.txt b/dpdefs/source_compare.txt index 0491f211..4fb6d6b1 100644 --- a/dpdefs/source_compare.txt +++ b/dpdefs/source_compare.txt @@ -6,8 +6,6 @@ // progs: Builtin #492 declared but not defined // progs: Builtin #493 declared but not defined // progs: Builtin #608 declared but not defined -// progs: Field ping_packetloss declared but not defined -// progs: Field ping_movementloss declared but not defined // progs: Field frame2 declared but not defined // progs: Field frame3 declared but not defined // progs: Field frame4 declared but not defined @@ -429,8 +427,6 @@ float require_spawnfunc_prefix; // DP_UNKNOWN .float fullbright; // DP_UNKNOWN .float hull; // DP_UNKNOWN .float items2; // DP_UNKNOWN -.float movementloss; // DP_UNKNOWN -.float packetloss; // DP_UNKNOWN .float pmodel; // DP_UNKNOWN .float renderamt; // DP_UNKNOWN .float rendermode; // DP_UNKNOWN diff --git a/progsvm.h b/progsvm.h index 1dc25e81..ac5dd228 100644 --- a/progsvm.h +++ b/progsvm.h @@ -226,8 +226,8 @@ typedef struct prvm_prog_fieldoffsets_s int nodrawtoclient; // ssqc int pflags; // ssqc int ping; // ssqc - int packetloss; // ssqc - int movementloss; // ssqc + int ping_packetloss; // ssqc + int ping_movementloss; // ssqc int pitch_speed; // ssqc / csqc int playermodel; // ssqc int playerskin; // ssqc diff --git a/prvm_edict.c b/prvm_edict.c index 6d99792b..7ad872f4 100644 --- a/prvm_edict.c +++ b/prvm_edict.c @@ -1616,8 +1616,8 @@ void PRVM_FindOffsets(void) prog->fieldoffsets.nodrawtoclient = PRVM_ED_FindFieldOffset("nodrawtoclient"); prog->fieldoffsets.pflags = PRVM_ED_FindFieldOffset("pflags"); prog->fieldoffsets.ping = PRVM_ED_FindFieldOffset("ping"); - prog->fieldoffsets.packetloss = PRVM_ED_FindFieldOffset("ping_packetloss"); - prog->fieldoffsets.movementloss = PRVM_ED_FindFieldOffset("ping_movementloss"); + prog->fieldoffsets.ping_packetloss = PRVM_ED_FindFieldOffset("ping_packetloss"); + prog->fieldoffsets.ping_movementloss = PRVM_ED_FindFieldOffset("ping_movementloss"); prog->fieldoffsets.pitch_speed = PRVM_ED_FindFieldOffset("pitch_speed"); prog->fieldoffsets.playermodel = PRVM_ED_FindFieldOffset("playermodel"); prog->fieldoffsets.playerskin = PRVM_ED_FindFieldOffset("playerskin"); diff --git a/sv_user.c b/sv_user.c index 548a1298..1158d2e7 100644 --- a/sv_user.c +++ b/sv_user.c @@ -762,8 +762,8 @@ void SV_ApplyClientMove (void) if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_trace_endpos))) VectorCopy(move->cursor_impact, val->vector); if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.cursor_trace_ent))) val->edict = PRVM_EDICT_TO_PROG(PRVM_EDICT_NUM(move->cursor_entitynumber)); if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ping))) val->_float = host_client->ping * 1000.0; - if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.packetloss))) val->_float = packetloss / (float) NETGRAPH_PACKETS; - if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.movementloss))) val->_float = movementloss / (float) NETGRAPH_PACKETS; + if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ping_packetloss))) val->_float = packetloss / (float) NETGRAPH_PACKETS; + if ((val = PRVM_EDICTFIELDVALUE(host_client->edict, prog->fieldoffsets.ping_movementloss))) val->_float = movementloss / (float) NETGRAPH_PACKETS; } void SV_FrameLost(int framenum) -- 2.39.2