From 47acdae8e65562f665a75bf675b996e78f376289 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 26 Oct 2019 09:05:17 +0200 Subject: [PATCH] - moved binding files to subdirectory - fixed search/replace error. --- source/blood/src/_functio.h | 116 +++++++++--------- .../game-blood/{ => demolition}/defbinds.txt | 0 .../game-blood/{ => demolition}/origbinds.txt | 0 .../game-duke/{ => demolition}/defbinds.txt | 0 .../game-duke/{ => demolition}/origbinds.txt | 0 .../{ => demolition}/defbinds.txt | 0 .../{ => demolition}/origbinds.txt | 0 .../game-nam/{ => demolition}/defbinds.txt | 0 .../game-nam/{ => demolition}/origbinds.txt | 0 .../{ => demolition}/defbinds.txt | 0 .../{ => demolition}/origbinds.txt | 0 .../{ => demolition}/defbinds.txt | 0 .../{ => demolition}/origbinds.txt | 0 .../{ => demolition}/defbinds.txt | 0 .../{ => demolition}/origbinds.txt | 0 .../game-ww2gi/{ => demolition}/defbinds.txt | 0 .../game-ww2gi/{ => demolition}/origbinds.txt | 0 17 files changed, 58 insertions(+), 58 deletions(-) rename wadsrc/static/filter/game-blood/{ => demolition}/defbinds.txt (100%) rename wadsrc/static/filter/game-blood/{ => demolition}/origbinds.txt (100%) rename wadsrc/static/filter/game-duke/{ => demolition}/defbinds.txt (100%) rename wadsrc/static/filter/game-duke/{ => demolition}/origbinds.txt (100%) rename wadsrc/static/filter/game-ionfury/{ => demolition}/defbinds.txt (100%) rename wadsrc/static/filter/game-ionfury/{ => demolition}/origbinds.txt (100%) rename wadsrc/static/filter/game-nam/{ => demolition}/defbinds.txt (100%) rename wadsrc/static/filter/game-nam/{ => demolition}/origbinds.txt (100%) rename wadsrc/static/filter/game-redneck/{ => demolition}/defbinds.txt (100%) rename wadsrc/static/filter/game-redneck/{ => demolition}/origbinds.txt (100%) rename wadsrc/static/filter/game-redneckrides/{ => demolition}/defbinds.txt (100%) rename wadsrc/static/filter/game-redneckrides/{ => demolition}/origbinds.txt (100%) rename wadsrc/static/filter/game-shadowwarrior/{ => demolition}/defbinds.txt (100%) rename wadsrc/static/filter/game-shadowwarrior/{ => demolition}/origbinds.txt (100%) rename wadsrc/static/filter/game-ww2gi/{ => demolition}/defbinds.txt (100%) rename wadsrc/static/filter/game-ww2gi/{ => demolition}/origbinds.txt (100%) diff --git a/source/blood/src/_functio.h b/source/blood/src/_functio.h index 77af00c35..cbbd9f2e8 100644 --- a/source/blood/src/_functio.h +++ b/source/blood/src/_functio.h @@ -40,12 +40,12 @@ BEGIN_BLD_NS static const char * mousedefaults[MAXMOUSEBUTTONS] = { - "Weapon_Fire" - "Weapon_Special_Fire" - "" - "" - "Previous_Weapon" - "Next_Weapon" + "Weapon_Fire", + "Weapon_Special_Fire", + "", + "", + "Previous_Weapon", + "Next_Weapon", }; @@ -56,8 +56,8 @@ static const char * mouseclickeddefaults[MAXMOUSEBUTTONS] = static const char * mouseanalogdefaults[MAXMOUSEAXES] = { - "analog_turning" - "analog_moving" + "analog_turning", + "analog_moving", }; @@ -67,71 +67,71 @@ static const char * mousedigitaldefaults[MAXMOUSEDIGITAL] = static const char * joystickdefaults[MAXJOYBUTTONSANDHATS] = { - "Fire" - "Strafe" - "Run" - "Open" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "" - "Aim_Down" - "Look_Right" - "Aim_Up" - "Look_Left" + "Fire", + "Strafe", + "Run", + "Open", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "Aim_Down", + "Look_Right", + "Aim_Up", + "Look_Left", }; static const char * joystickclickeddefaults[MAXJOYBUTTONSANDHATS] = { - "" - "Inventory" - "Jump" - "Crouch" + "", + "Inventory", + "Jump", + "Crouch", }; static const char * joystickanalogdefaults[MAXJOYAXES] = { - "analog_turning" - "analog_moving" - "analog_strafing" + "analog_turning", + "analog_moving", + "analog_strafing", }; static const char * joystickdigitaldefaults[MAXJOYDIGITAL] = { - "" - "" - "" - "" - "" - "" - "Run" + "", + "", + "", + "", + "", + "", + "Run", }; #endif diff --git a/wadsrc/static/filter/game-blood/defbinds.txt b/wadsrc/static/filter/game-blood/demolition/defbinds.txt similarity index 100% rename from wadsrc/static/filter/game-blood/defbinds.txt rename to wadsrc/static/filter/game-blood/demolition/defbinds.txt diff --git a/wadsrc/static/filter/game-blood/origbinds.txt b/wadsrc/static/filter/game-blood/demolition/origbinds.txt similarity index 100% rename from wadsrc/static/filter/game-blood/origbinds.txt rename to wadsrc/static/filter/game-blood/demolition/origbinds.txt diff --git a/wadsrc/static/filter/game-duke/defbinds.txt b/wadsrc/static/filter/game-duke/demolition/defbinds.txt similarity index 100% rename from wadsrc/static/filter/game-duke/defbinds.txt rename to wadsrc/static/filter/game-duke/demolition/defbinds.txt diff --git a/wadsrc/static/filter/game-duke/origbinds.txt b/wadsrc/static/filter/game-duke/demolition/origbinds.txt similarity index 100% rename from wadsrc/static/filter/game-duke/origbinds.txt rename to wadsrc/static/filter/game-duke/demolition/origbinds.txt diff --git a/wadsrc/static/filter/game-ionfury/defbinds.txt b/wadsrc/static/filter/game-ionfury/demolition/defbinds.txt similarity index 100% rename from wadsrc/static/filter/game-ionfury/defbinds.txt rename to wadsrc/static/filter/game-ionfury/demolition/defbinds.txt diff --git a/wadsrc/static/filter/game-ionfury/origbinds.txt b/wadsrc/static/filter/game-ionfury/demolition/origbinds.txt similarity index 100% rename from wadsrc/static/filter/game-ionfury/origbinds.txt rename to wadsrc/static/filter/game-ionfury/demolition/origbinds.txt diff --git a/wadsrc/static/filter/game-nam/defbinds.txt b/wadsrc/static/filter/game-nam/demolition/defbinds.txt similarity index 100% rename from wadsrc/static/filter/game-nam/defbinds.txt rename to wadsrc/static/filter/game-nam/demolition/defbinds.txt diff --git a/wadsrc/static/filter/game-nam/origbinds.txt b/wadsrc/static/filter/game-nam/demolition/origbinds.txt similarity index 100% rename from wadsrc/static/filter/game-nam/origbinds.txt rename to wadsrc/static/filter/game-nam/demolition/origbinds.txt diff --git a/wadsrc/static/filter/game-redneck/defbinds.txt b/wadsrc/static/filter/game-redneck/demolition/defbinds.txt similarity index 100% rename from wadsrc/static/filter/game-redneck/defbinds.txt rename to wadsrc/static/filter/game-redneck/demolition/defbinds.txt diff --git a/wadsrc/static/filter/game-redneck/origbinds.txt b/wadsrc/static/filter/game-redneck/demolition/origbinds.txt similarity index 100% rename from wadsrc/static/filter/game-redneck/origbinds.txt rename to wadsrc/static/filter/game-redneck/demolition/origbinds.txt diff --git a/wadsrc/static/filter/game-redneckrides/defbinds.txt b/wadsrc/static/filter/game-redneckrides/demolition/defbinds.txt similarity index 100% rename from wadsrc/static/filter/game-redneckrides/defbinds.txt rename to wadsrc/static/filter/game-redneckrides/demolition/defbinds.txt diff --git a/wadsrc/static/filter/game-redneckrides/origbinds.txt b/wadsrc/static/filter/game-redneckrides/demolition/origbinds.txt similarity index 100% rename from wadsrc/static/filter/game-redneckrides/origbinds.txt rename to wadsrc/static/filter/game-redneckrides/demolition/origbinds.txt diff --git a/wadsrc/static/filter/game-shadowwarrior/defbinds.txt b/wadsrc/static/filter/game-shadowwarrior/demolition/defbinds.txt similarity index 100% rename from wadsrc/static/filter/game-shadowwarrior/defbinds.txt rename to wadsrc/static/filter/game-shadowwarrior/demolition/defbinds.txt diff --git a/wadsrc/static/filter/game-shadowwarrior/origbinds.txt b/wadsrc/static/filter/game-shadowwarrior/demolition/origbinds.txt similarity index 100% rename from wadsrc/static/filter/game-shadowwarrior/origbinds.txt rename to wadsrc/static/filter/game-shadowwarrior/demolition/origbinds.txt diff --git a/wadsrc/static/filter/game-ww2gi/defbinds.txt b/wadsrc/static/filter/game-ww2gi/demolition/defbinds.txt similarity index 100% rename from wadsrc/static/filter/game-ww2gi/defbinds.txt rename to wadsrc/static/filter/game-ww2gi/demolition/defbinds.txt diff --git a/wadsrc/static/filter/game-ww2gi/origbinds.txt b/wadsrc/static/filter/game-ww2gi/demolition/origbinds.txt similarity index 100% rename from wadsrc/static/filter/game-ww2gi/origbinds.txt rename to wadsrc/static/filter/game-ww2gi/demolition/origbinds.txt