Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-04-28 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update strings for later; comment out vehicle-related enum entries again because the enum length is tied to the controls menu

Browse source
This commit is contained in:
Sezz 2022-07-14 00:11:03 +10:00
parent 8106c74372
commit f22cb6ef8c
5 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scripts/Strings.lua
View file

@ -149,8 +149,8 @@ local strings = {
"",
""
},
controls_dash = {
"Dash",
controls_sprint = {
"Sprint",
"",
"",
"",
@ -169,8 +169,8 @@ local strings = {
"",
""
},
controls_duck = {
"Duck",
controls_crouch = {
"Crouch",
"",
"",
"",

12
TombEngine/Game/gui.cpp
View file

@ -59,8 +59,8 @@ const char* ControlStrings[] =
STRING_CONTROLS_MOVE_BACKWARD,
STRING_CONTROLS_MOVE_LEFT,
STRING_CONTROLS_MOVE_RIGHT,
STRING_CONTROLS_DUCK,
STRING_CONTROLS_DASH,
STRING_CONTROLS_CROUCH,
STRING_CONTROLS_SPRINT,
STRING_CONTROLS_WALK,
STRING_CONTROLS_JUMP,
STRING_CONTROLS_ACTION,
@ -71,7 +71,13 @@ const char* ControlStrings[] =
STRING_CONTROLS_INVENTORY,
STRING_CONTROLS_PAUSE,
STRING_CONTROLS_STEP_LEFT,
STRING_CONTROLS_STEP_RIGHT
STRING_CONTROLS_STEP_RIGHT,
STRING_CONTROLS_ACCELERATE,
STRING_CONTROLS_REVERSE,
STRING_CONTROLS_SPEED,
STRING_CONTROLS_SLOW,
STRING_CONTROLS_BRAKE,
STRING_CONTROLS_FIRE
};
/*

10
TombEngine/Scripting/Internal/LanguageScript.h
View file

@ -80,8 +80,8 @@
#define STRING_CONTROLS_MOVE_BACKWARD "controls_move_backward"
#define STRING_CONTROLS_MOVE_LEFT "controls_move_left"
#define STRING_CONTROLS_MOVE_RIGHT "controls_move_right"
#define STRING_CONTROLS_DUCK "controls_duck"
#define STRING_CONTROLS_DASH "controls_dash"
#define STRING_CONTROLS_CROUCH "controls_crouch"
#define STRING_CONTROLS_SPRINT "controls_sprint"
#define STRING_CONTROLS_WALK "controls_walk"
#define STRING_CONTROLS_JUMP "controls_jump"
#define STRING_CONTROLS_ACTION "controls_action"
@ -93,6 +93,12 @@
#define STRING_CONTROLS_PAUSE "controls_pause"
#define STRING_CONTROLS_STEP_LEFT "controls_step_left"
#define STRING_CONTROLS_STEP_RIGHT "controls_step_right"
#define STRING_CONTROLS_ACCELERATE "controls_accelerate"
#define STRING_CONTROLS_REVERSE "controls_reverse"
#define STRING_CONTROLS_SPEED "controls_speed"
#define STRING_CONTROLS_SLOW "controls_slow"
#define STRING_CONTROLS_BRAKE "controls_brake"
#define STRING_CONTROLS_FIRE "controls_fire"
#define STRING_TITLE_ITEMS "items"
#define STRING_TITLE_PUZZLES "puzzles"
#define STRING_TITLE_SETTINGS "settings"

4
TombEngine/Specific/input.cpp
View file

@ -92,11 +92,11 @@ namespace TEN::Input
{
{
KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, KC_PERIOD, KC_SLASH, KC_RSHIFT, KC_RMENU, KC_RCONTROL, KC_SPACE, KC_COMMA, KC_NUMPAD0, KC_END, KC_ESCAPE, KC_P, KC_PGUP, KC_PGDOWN,
KC_RCONTROL, KC_DOWN, KC_SLASH, KC_RSHIFT, KC_RMENU, KC_SPACE
/*KC_RCONTROL, KC_DOWN, KC_SLASH, KC_RSHIFT, KC_RMENU, KC_SPACE*/
},
{
KC_UP, KC_DOWN, KC_LEFT, KC_RIGHT, KC_PERIOD, KC_SLASH, KC_RSHIFT, KC_RMENU, KC_RCONTROL, KC_SPACE, KC_COMMA, KC_NUMPAD0, KC_END, KC_ESCAPE, KC_P, KC_PGUP, KC_PGDOWN,
KC_RCONTROL, KC_DOWN, KC_SLASH, KC_RSHIFT, KC_RMENU, KC_SPACE
/*KC_RCONTROL, KC_DOWN, KC_SLASH, KC_RSHIFT, KC_RMENU, KC_SPACE*/
}
};

12
TombEngine/Specific/input.h
View file

@ -21,12 +21,12 @@ namespace TEN::Input
KEY_PAUSE,
KEY_LSTEP,
KEY_RSTEP,
KEY_ACCELERATE,
/*KEY_ACCELERATE,
KEY_REVERSE,
KEY_SPEED,
KEY_SLOW,
KEY_BRAKE,
KEY_FIRE,
KEY_FIRE,*/
KEY_COUNT
};
@ -51,12 +51,12 @@ namespace TEN::Input
IN_PAUSE = (1 << KEY_PAUSE),
IN_LSTEP = (1 << KEY_LSTEP),
IN_RSTEP = (1 << KEY_RSTEP),
IN_ACCELERATE = (1 << KEY_ACCELERATE),
/*IN_ACCELERATE = (1 << KEY_ACCELERATE),
IN_REVERSE = (1 << KEY_REVERSE),
IN_SPEED = (1 << KEY_SPEED),
IN_SLOW = (1 << KEY_SLOW),
IN_BRAKE = (1 << KEY_BRAKE),
IN_FIRE = (1 << KEY_FIRE),
IN_FIRE = (1 << KEY_FIRE),*/
// Additional input actions without direct key relation
@ -162,12 +162,12 @@ namespace TEN::Input
RightStep,
// Vehicle control
Accelerate,
/*Accelerate,
Reverse,
Speed,
Slow,
Brake,
Fire,
Fire,*/
// Hotkeys
Save,