From: Mario <mario.mario@y7mail.com>
Date: Fri, 7 Aug 2020 16:29:16 +0000 (+1000)
Subject: Port some minor code fixes from the default-erasable branch
X-Git-Tag: xonotic-v0.8.5~781
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c81add9e72e073dc3640e035651455bbc099d6c8;p=xonotic%2Fxonotic-data.pk3dir.git

Port some minor code fixes from the default-erasable branch
---

diff --git a/qcsrc/client/hud/panel/centerprint.qc b/qcsrc/client/hud/panel/centerprint.qc
index 2fcf130fa..15f46d29c 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 02b57b2ca..d3d3a6a9d 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 b5bf64a78..bb4ae216a 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();