From c81add9e72e073dc3640e035651455bbc099d6c8 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 8 Aug 2020 02:29:16 +1000 Subject: [PATCH] Port some minor code fixes from the default-erasable branch --- qcsrc/client/hud/panel/centerprint.qc | 2 +- qcsrc/common/gamemodes/gamemode/nexball/sv_weapon.qc | 2 +- qcsrc/common/weapons/all.qc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc index 2fcf130fad..15f46d29c4 100644 --- a/qcsrc/client/hud/panel/centerprint.qc +++ b/qcsrc/client/hud/panel/centerprint.qc @@ -281,7 +281,7 @@ void HUD_CenterPrint() else // Expiring soon, so fade it out. a = (centerprint_expire_time[j] - time) / max(0.0001, autocvar_hud_panel_centerprint_fade_out); - if(centerprint_msgID[j] == CPID_TIMEIN) + if(centerprint_msgID[j] == ORDINAL(CPID_TIMEIN)) a = 1; // while counting down show it anyway in order to hold the current message position diff --git a/qcsrc/common/gamemodes/gamemode/nexball/sv_weapon.qc b/qcsrc/common/gamemodes/gamemode/nexball/sv_weapon.qc index 02b57b2ca8..d3d3a6a9dc 100644 --- a/qcsrc/common/gamemodes/gamemode/nexball/sv_weapon.qc +++ b/qcsrc/common/gamemodes/gamemode/nexball/sv_weapon.qc @@ -44,7 +44,7 @@ METHOD(BallStealer, wr_setup, void(BallStealer this, entity actor, .entity weapo METHOD(BallStealer, wr_reload, void(entity thiswep, entity actor, .entity weaponentity)) { - TC(BallStealer, this); + TC(BallStealer, thiswep); } METHOD(BallStealer, wr_checkammo1, bool(BallStealer this, entity actor, .entity weaponentity)) diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc index b5bf64a781..bb4ae216a5 100644 --- a/qcsrc/common/weapons/all.qc +++ b/qcsrc/common/weapons/all.qc @@ -565,7 +565,7 @@ REGISTER_NET_TEMP(wframe) #ifdef CSQC NET_HANDLE(wframe, bool isNew) { - int fr = ReadByte(); + WFRAME fr = ReadByte(); float t = ReadFloat(); int slot = ReadByte(); bool restartanim = ReadByte(); -- 2.39.2