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 2fcf130fadadb920a7ca9f0b656efc47355b8c59..15f46d29c4d4e3a2413c235380ec73009dcad64e 100644 (file)
--- 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);
 
                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
                        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 02b57b2ca879bac2ddc4f54fb70327902b7e5de3..d3d3a6a9dcb30ae59eb103760e1f8cb5ca00c952 100644 (file)
--- 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))
 {
 
 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))
 }
 
 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 b5bf64a781c517db36bc15c2b8abeed5e868d5ce..bb4ae216a5a5d6db8a582404ec1a7779a4b39823 100644 (file)
--- 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)
 {
 #ifdef CSQC
 NET_HANDLE(wframe, bool isNew)
 {

-       int fr = ReadByte();
+       WFRAME fr = ReadByte();

        float t = ReadFloat();
     int slot = ReadByte();
        bool restartanim = ReadByte();
        float t = ReadFloat();
     int slot = ReadByte();
        bool restartanim = ReadByte();