]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
change hceck back to WIP1, it's harmless
authorRudolf Polzer <divverent@alientrap.org>
Mon, 9 Jan 2012 12:13:49 +0000 (13:13 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 9 Jan 2012 12:13:49 +0000 (13:13 +0100)
qcsrc/csqcmodellib/cl_player.qc
qcsrc/dpdefs/csprogsdefs.qc

index b581a5baaf31179fe67295a4bc822d58bc78960e..d9a2782c44c5eb2c5543f5dcb3da042a8aac33ed 100644 (file)
@@ -219,7 +219,7 @@ void CSQCPlayer_SetCamera()
        }
 
 #ifdef COMPAT_XON050_ENGINE
-       if(view && !(checkextension("DP_CSQC_V_CALCREFDEF") || checkextension("DP_CSQC_V_CALCREFDEF_WIP2")))
+       if(view && !(checkextension("DP_CSQC_V_CALCREFDEF") || checkextension("DP_CSQC_V_CALCREFDEF_WIP1")))
        {
                // legacy code, not totally correct, but good enough for not having V_CalcRefdef
                setproperty(VF_ORIGIN, view.origin + '0 0 1' * getstati(STAT_VIEWHEIGHT));
@@ -237,6 +237,7 @@ void CSQCPlayer_SetCamera()
                if(input_buttons & 4)
                        refdefflags |= REFDEFFLAG_JUMPING;
 
+               // note: these two only work in WIP2, but are harmless in WIP1
                if(getstati(STAT_HEALTH) <= 0)
                        refdefflags |= REFDEFFLAG_DEAD;
 
index 182568fa24c0a6540b865e121dd0b46d2dc1cef8..623fb01c781a6db13f031fb69c6a16dcb3c307e4 100644 (file)
@@ -925,8 +925,8 @@ float REFDEFFLAG_INTERMISSION = 8;
 //- use this on the player entity after performing prediction
 //- pass REFDEFFLAG_TELEPORTED if the player teleported since last frame
 //- pass REFDEFFLAG_JUMPING if jump button is pressed
-//- pass REFDEFFLAG_DEAD if dead
-//- pass REFDEFFLAG_INTERMISSION if in intermission
+//- pass REFDEFFLAG_DEAD if dead (DP_CSQC_V_CALCREFDEF_WIP2)
+//- pass REFDEFFLAG_INTERMISSION if in intermission (DP_CSQC_V_CALCREFDEF_WIP2)
 //- the player entity needs to have origin, velocity, pmove_flags set according
 //  to prediction (the above two PMF_ flags are used in the player's pmove_flags)
 //- NOTE: to check for this, ALSO OR a check with DP_CSQC_V_CALCREFDEF to also support