From ab2c21317111cd25ebc124387fd4e5045a2f1b9d Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 16 Jul 2017 03:49:24 +1000 Subject: [PATCH] Port button0 and button3 (attack and attack2) to ClientState --- qcsrc/common/physics/player.qh | 4 ++-- qcsrc/server/playerdemo.qc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh index ad7cff228..4c3009a95 100644 --- 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 e3bb72955..bb8179c2b 100644 --- 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 */ \ -- 2.39.2