From: Mario Date: Sat, 15 Jul 2017 17:49:24 +0000 (+1000) Subject: Port button0 and button3 (attack and attack2) to ClientState X-Git-Tag: xonotic-v0.8.5~2629 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ab2c21317111cd25ebc124387fd4e5045a2f1b9d;p=xonotic%2Fxonotic-data.pk3dir.git Port button0 and button3 (attack and attack2) to ClientState --- 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 */ \