Port button0 and button3 (attack and attack2) to ClientState

diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh
index ad7cff228b20f0a2fecddde928cf414b9501a171..4c3009a95d1161a39766d9fff79d3872b95f4f28 100644 (file)
--- a/qcsrc/common/physics/player.qh
+++ b/qcsrc/common/physics/player.qh
@@ -261,9 +261,9 @@ STATIC_INIT(PHYS_INPUT_BUTTON_DODGE)
 
        #define PHYS_INPUT_MOVEVALUES(s)            ((s).movement)
 
-       #define PHYS_INPUT_BUTTON_BUTTON1(s)        ((s).button0)
+       #define PHYS_INPUT_BUTTON_BUTTON1(s)        (CS(s).button0)
        #define PHYS_INPUT_BUTTON_BUTTON2(s)        ((s).button2)
-       #define PHYS_INPUT_BUTTON_BUTTON3(s)        ((s).button3)
+       #define PHYS_INPUT_BUTTON_BUTTON3(s)        (CS(s).button3)
        #define PHYS_INPUT_BUTTON_BUTTON4(s)        ((s).button4)
        #define PHYS_INPUT_BUTTON_BUTTON5(s)        ((s).button5)
        #define PHYS_INPUT_BUTTON_BUTTON6(s)        ((s).button6)

diff --git a/qcsrc/server/playerdemo.qc b/qcsrc/server/playerdemo.qc
index e3bb7295554ca0c128e4c5871f0549489dfa7462..bb8179c2b5cda7fa7abe1a0676908c49793bec54 100644 (file)
--- a/qcsrc/server/playerdemo.qc
+++ b/qcsrc/server/playerdemo.qc
@@ -60,8 +60,8 @@ void playerdemo_open_write(entity this, string f)
        PLAYERDEMO_FIELD(ent,func,float,frame) \
        PLAYERDEMO_FIELD(ent,func,float,effects) \
        /* PLAYERDEMO_FIELD(ent,func,float,switchweapon) */ \
-       PLAYERDEMO_FIELD(ent,func,float,button0) /* TODO: PHYS_INPUT_BUTTON_ATCK */ \
-       PLAYERDEMO_FIELD(ent,func,float,button3) /* TODO: PHYS_INPUT_BUTTON_ATCK2 */ \
+       PLAYERDEMO_FIELD(CS(ent),func,float,button0) /* TODO: PHYS_INPUT_BUTTON_ATCK */ \
+       PLAYERDEMO_FIELD(CS(ent),func,float,button3) /* TODO: PHYS_INPUT_BUTTON_ATCK2 */ \
        PLAYERDEMO_FIELD(ent,func,float,button5) /* TODO: PHYS_INPUT_BUTTON_CROUCH */ \
        PLAYERDEMO_FIELD(ent,func,float,button6) /* TODO: PHYS_INPUT_BUTTON_HOOK */ \
        PLAYERDEMO_FIELD(ent,func,float,buttonuse) /* TODO: PHYS_INPUT_BUTTON_USE */ \