Port buttonchat, buttonuse and cursor_active to ClientState

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index 39c0826656f41a8c2b553960c6f4d6e0922a3cf1..137da56b43de34202c949ad30d20efe76bb0ecc1 100644 (file)
--- a/qcsrc/common/physics/player.qh
+++ b/qcsrc/common/physics/player.qh
@@ -269,9 +269,9 @@ STATIC_INIT(PHYS_INPUT_BUTTON_DODGE)
        #define PHYS_INPUT_BUTTON_BUTTON6(s)        (CS(s).button6)
        #define PHYS_INPUT_BUTTON_BUTTON7(s)        (CS(s).button7)
        #define PHYS_INPUT_BUTTON_BUTTON8(s)        (CS(s).button8)
-       #define PHYS_INPUT_BUTTON_BUTTON_USE(s)     ((s).buttonuse)
-       #define PHYS_INPUT_BUTTON_BUTTON_CHAT(s)    ((s).buttonchat)
-       #define PHYS_INPUT_BUTTON_BUTTON_PRYDON(s)  ((s).cursor_active)
+       #define PHYS_INPUT_BUTTON_BUTTON_USE(s)     (CS(s).buttonuse)
+       #define PHYS_INPUT_BUTTON_BUTTON_CHAT(s)    (CS(s).buttonchat)
+       #define PHYS_INPUT_BUTTON_BUTTON_PRYDON(s)  (CS(s).cursor_active)
        #define PHYS_INPUT_BUTTON_BUTTON9(s)        (CS(s).button9)
        #define PHYS_INPUT_BUTTON_BUTTON10(s)       (CS(s).button10)
        #define PHYS_INPUT_BUTTON_BUTTON11(s)       (CS(s).button11)

diff --git a/qcsrc/server/playerdemo.qc b/qcsrc/server/playerdemo.qc
index 357f73c97778aa446ad4bb8fc583cfc6200945f0..427e5c32d4899ce6d7b5220673102807257337cd 100644 (file)
--- a/qcsrc/server/playerdemo.qc
+++ b/qcsrc/server/playerdemo.qc
@@ -64,7 +64,7 @@ void playerdemo_open_write(entity this, string f)
        PLAYERDEMO_FIELD(CS(ent),func,float,button3) /* TODO: PHYS_INPUT_BUTTON_ATCK2 */ \
        PLAYERDEMO_FIELD(CS(ent),func,float,button5) /* TODO: PHYS_INPUT_BUTTON_CROUCH */ \
        PLAYERDEMO_FIELD(CS(ent),func,float,button6) /* TODO: PHYS_INPUT_BUTTON_HOOK */ \
-       PLAYERDEMO_FIELD(ent,func,float,buttonuse) /* TODO: PHYS_INPUT_BUTTON_USE */ \
+       PLAYERDEMO_FIELD(CS(ent),func,float,buttonuse) /* TODO: PHYS_INPUT_BUTTON_USE */ \
        PLAYERDEMO_FIELD(ent,func,float,flags) \
        // end of list