vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Clean up misc warnings.

Browse source
This commit is contained in:
Marco Cawthorne 2022-04-04 09:40:35 -07:00
parent 75a1c8ce6c
commit 0d93a22b58
Signed by: eukara
GPG key ID: C196CD8BA993248A
4 changed files with 8 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/client/entry.qc
View file

@ -146,6 +146,7 @@ CSQC_UpdateView(float w, float h, float focus)
base_client cl = __NULL__; base_client cl = __NULL__;
spectator spec; spectator spec;
int s; int s;
entity c;
if (w == 0 || h == 0) { if (w == 0 || h == 0) {
return; return;
@ -257,7 +258,7 @@ CSQC_UpdateView(float w, float h, float focus)
spec = (spectator)self; spec = (spectator)self;
if (spec.spec_mode == SPECMODE_FIRSTPERSON || spec.spec_mode == SPECMODE_THIRDPERSON) { if (spec.spec_mode == SPECMODE_FIRSTPERSON || spec.spec_mode == SPECMODE_THIRDPERSON) {
entity c = findfloat(world, ::entnum, spec.spec_ent); c = findfloat(world, ::entnum, spec.spec_ent);
pSeat->m_vecPredictedOrigin = c.origin; pSeat->m_vecPredictedOrigin = c.origin;
pSeat->m_vecPredictedVelocity = c.velocity; pSeat->m_vecPredictedVelocity = c.velocity;
pSeat->m_flPredictedFlags = c.flags; pSeat->m_flPredictedFlags = c.flags;
@ -318,7 +319,7 @@ CSQC_UpdateView(float w, float h, float focus)
setproperty(VF_ORIGIN, trace_endpos + (v_forward * 5)); setproperty(VF_ORIGIN, trace_endpos + (v_forward * 5));
break; break;
case SPECMODE_FIRSTPERSON: case SPECMODE_FIRSTPERSON:
entity c = findfloat(world, ::entnum, spec.spec_ent); c = findfloat(world, ::entnum, spec.spec_ent);
if (c.classname == "player") { if (c.classname == "player") {
player bp = (player)c; player bp = (player)c;
@ -358,10 +359,11 @@ CSQC_UpdateView(float w, float h, float focus)
View_DrawViewModel(); View_DrawViewModel();
} else { } else {
if (Client_IsSpectator(pl)) { if (Client_IsSpectator(pl)) {
spec = (spectator)self;
/* 0 means world */ /* 0 means world */
if (spec.spec_ent) { if (spec.spec_ent) {
spec = (spectator)self; c = findfloat(world, ::entnum, spec.spec_ent);
entity c = findfloat(world, ::entnum, spec.spec_ent);
/* we found them */ /* we found them */
if (c && c != spec) { if (c && c != spec) {
@ -726,6 +728,8 @@ CSQC_Ent_Remove(void)
NSEntity me = (NSEntity)self; NSEntity me = (NSEntity)self;
me.ClientRemove(); me.ClientRemove();
remove(self); remove(self);
} else {
remove(self);
} }
} }

10
src/gs-entbase/server/func_button.qc
View file

@ -210,12 +210,6 @@ func_button::Arrived(void)
UseOutput(this, m_strOnIn); UseOutput(this, m_strOnIn);
m_iState = STATE_RAISED; m_iState = STATE_RAISED;
if (HasSpawnFlags(SF_BTT_TOUCH_ONLY)) {
touch = Touch;
} else {
touch = __NULL__;
}
if (HasSpawnFlags(SF_BTT_TOGGLE)) { if (HasSpawnFlags(SF_BTT_TOGGLE)) {
return; return;
} }
@ -234,10 +228,6 @@ func_button::Returned(void)
velocity = [0,0,0]; velocity = [0,0,0];
nextthink = 0; nextthink = 0;
if (HasSpawnFlags(SF_BTT_TOUCH_ONLY)) {
touch = Touch;
}
m_iState = STATE_LOWERED; m_iState = STATE_LOWERED;
SetFrame(FRAME_OFF); SetFrame(FRAME_OFF);
} }

7
src/gs-entbase/server/func_door.qc
View file

@ -164,9 +164,6 @@ func_door::Arrived(void)
if (m_strSndMove) if (m_strSndMove)
sound(this, CHAN_WEAPON, "common/null.wav", 1.0f, ATTN_NORM); sound(this, CHAN_WEAPON, "common/null.wav", 1.0f, ATTN_NORM);
if (!HasSpawnFlags(SF_MOV_USE)) {
touch = Touch;
}
if (m_flWait < 0) { if (m_flWait < 0) {
return; return;
} }
@ -201,10 +198,6 @@ func_door::Returned(void)
if (m_strSndMove) if (m_strSndMove)
sound(this, CHAN_WEAPON, "common/null.wav", 1.0f, ATTN_NORM); sound(this, CHAN_WEAPON, "common/null.wav", 1.0f, ATTN_NORM);
if (!HasSpawnFlags(SF_MOV_USE)) {
touch = Touch;
}
m_iState = DOORSTATE_LOWERED; m_iState = DOORSTATE_LOWERED;
PortalClose(); PortalClose();
} }

8
src/gs-entbase/server/func_door_rotating.qc
View file

@ -159,10 +159,6 @@ func_door_rotating::Arrived(void)
sound(this, CHAN_VOICE, "common/null.wav", 1.0f, ATTN_NORM); sound(this, CHAN_VOICE, "common/null.wav", 1.0f, ATTN_NORM);
} }
if (!HasSpawnFlags(SF_ROT_USE)) {
touch = Touch;
}
if (HasSpawnFlags(SF_ROT_TOGGLE) || m_flWait < 0) if (HasSpawnFlags(SF_ROT_TOGGLE) || m_flWait < 0)
return; return;
@ -177,10 +173,6 @@ func_door_rotating::Returned(void)
avelocity = [0,0,0]; avelocity = [0,0,0];
nextthink = 0.0f; nextthink = 0.0f;
if (!HasSpawnFlags(SF_ROT_USE)) {
touch = Touch;
}
if (m_strSndStop) { if (m_strSndStop) {
Sound_Play(this, CHAN_VOICE, m_strSndStop); Sound_Play(this, CHAN_VOICE, m_strSndStop);
} else { } else {