From 2b5fbfdf6d4986b88c35b45176a7b6422600356a Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 16 Jul 2017 03:53:09 +1000 Subject: [PATCH] Port button2-16 to ClientState --- qcsrc/common/physics/player.qh | 28 ++++++++++++++-------------- qcsrc/server/playerdemo.qc | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qcsrc/common/physics/player.qh b/qcsrc/common/physics/player.qh index 4c3009a95..39c082665 100644 --- a/qcsrc/common/physics/player.qh +++ b/qcsrc/common/physics/player.qh @@ -262,24 +262,24 @@ STATIC_INIT(PHYS_INPUT_BUTTON_DODGE) #define PHYS_INPUT_MOVEVALUES(s) ((s).movement) #define PHYS_INPUT_BUTTON_BUTTON1(s) (CS(s).button0) - #define PHYS_INPUT_BUTTON_BUTTON2(s) ((s).button2) + #define PHYS_INPUT_BUTTON_BUTTON2(s) (CS(s).button2) #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) - #define PHYS_INPUT_BUTTON_BUTTON7(s) ((s).button7) - #define PHYS_INPUT_BUTTON_BUTTON8(s) ((s).button8) + #define PHYS_INPUT_BUTTON_BUTTON4(s) (CS(s).button4) + #define PHYS_INPUT_BUTTON_BUTTON5(s) (CS(s).button5) + #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_BUTTON9(s) ((s).button9) - #define PHYS_INPUT_BUTTON_BUTTON10(s) ((s).button10) - #define PHYS_INPUT_BUTTON_BUTTON11(s) ((s).button11) - #define PHYS_INPUT_BUTTON_BUTTON12(s) ((s).button12) - #define PHYS_INPUT_BUTTON_BUTTON13(s) ((s).button13) - #define PHYS_INPUT_BUTTON_BUTTON14(s) ((s).button14) - #define PHYS_INPUT_BUTTON_BUTTON15(s) ((s).button15) - #define PHYS_INPUT_BUTTON_BUTTON16(s) ((s).button16) + #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) + #define PHYS_INPUT_BUTTON_BUTTON12(s) (CS(s).button12) + #define PHYS_INPUT_BUTTON_BUTTON13(s) (CS(s).button13) + #define PHYS_INPUT_BUTTON_BUTTON14(s) (CS(s).button14) + #define PHYS_INPUT_BUTTON_BUTTON15(s) (CS(s).button15) + #define PHYS_INPUT_BUTTON_BUTTON16(s) (CS(s).button16) #define IS_DUCKED(s) ((s).crouch) #define SET_DUCKED(s) ((s).crouch = true) diff --git a/qcsrc/server/playerdemo.qc b/qcsrc/server/playerdemo.qc index bb8179c2b..357f73c97 100644 --- a/qcsrc/server/playerdemo.qc +++ b/qcsrc/server/playerdemo.qc @@ -62,8 +62,8 @@ void playerdemo_open_write(entity this, string f) /* PLAYERDEMO_FIELD(ent,func,float,switchweapon) */ \ 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(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(ent,func,float,flags) \ // end of list -- 2.39.2