mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
minor changes
This commit is contained in:
parent
90b005a44a
commit
5a93d301b6
3 changed files with 18 additions and 9 deletions
|
@ -98,6 +98,8 @@ char gamefunctions[NUMGAMEFUNCTIONS][MAXGAMEFUNCLEN] =
|
|||
"Last_Used_Weapon",
|
||||
"Quick_Save",
|
||||
"Quick_Load",
|
||||
"Third_Person_View",
|
||||
"Toggle_Crouch",
|
||||
};
|
||||
|
||||
#ifdef __SETUP__
|
||||
|
@ -109,7 +111,7 @@ char keydefaults[NUMGAMEFUNCTIONS*2][MAXGAMEFUNCLEN] =
|
|||
"Left", "Kpad4",
|
||||
"Right", "KPad6",
|
||||
"LAlt", "RAlt",
|
||||
"", "RCtrl",
|
||||
"RCtrl", "",
|
||||
"E", "",
|
||||
"LShift", "RShift",
|
||||
"CapLck", "",
|
||||
|
@ -150,8 +152,8 @@ char keydefaults[NUMGAMEFUNCTIONS*2][MAXGAMEFUNCLEN] =
|
|||
"Y", "",
|
||||
"F", "",
|
||||
"K", "",
|
||||
"U", "",
|
||||
"I", "",
|
||||
"", "",
|
||||
"", "",
|
||||
"R", "",
|
||||
"Q", "",
|
||||
"'", "",
|
||||
|
@ -161,9 +163,11 @@ char keydefaults[NUMGAMEFUNCTIONS*2][MAXGAMEFUNCLEN] =
|
|||
"", "",
|
||||
"", "",
|
||||
"", "",
|
||||
"", "",
|
||||
"X", "",
|
||||
"F6", "",
|
||||
"F9", "",
|
||||
"F7", "",
|
||||
"", "",
|
||||
};
|
||||
|
||||
char oldkeydefaults[NUMGAMEFUNCTIONS*2][MAXGAMEFUNCLEN] =
|
||||
|
@ -228,13 +232,15 @@ char oldkeydefaults[NUMGAMEFUNCTIONS*2][MAXGAMEFUNCLEN] =
|
|||
"", "",
|
||||
"F6", "",
|
||||
"F9", "",
|
||||
"F7", "",
|
||||
"", "",
|
||||
};
|
||||
|
||||
static const char * mousedefaults[MAXMOUSEBUTTONS] =
|
||||
{
|
||||
"Fire",
|
||||
"MedKit",
|
||||
"Jetpack",
|
||||
"MedKit",
|
||||
"",
|
||||
"Previous_Weapon",
|
||||
"Next_Weapon",
|
||||
|
|
|
@ -34,7 +34,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define NUMGAMEFUNCTIONS 60
|
||||
#define NUMGAMEFUNCTIONS 62
|
||||
#define MAXGAMEFUNCLEN 32
|
||||
|
||||
extern char gamefunctions[NUMGAMEFUNCTIONS][MAXGAMEFUNCLEN];
|
||||
|
@ -103,6 +103,7 @@ enum GameFunction_t
|
|||
gamefunc_Last_Weapon,
|
||||
gamefunc_Quick_Save,
|
||||
gamefunc_Quick_Load,
|
||||
gamefunc_Third_Person_View,
|
||||
gamefunc_Toggle_Crouch, // TODO: Implement properly for mp
|
||||
};
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -6477,10 +6477,10 @@ FAKE_F3:
|
|||
G_SavePlayerMaybeMulti(sv);
|
||||
}
|
||||
}
|
||||
|
||||
if (KB_UnBoundKeyPressed(sc_F7))
|
||||
|
||||
if (BUTTON(gamefunc_Third_Person_View))
|
||||
{
|
||||
KB_ClearKeyDown(sc_F7);
|
||||
CONTROL_ClearButton(gamefunc_Third_Person_View);
|
||||
|
||||
if (!RRRA || (!g_player[myconnectindex].ps->on_motorcycle && !g_player[myconnectindex].ps->on_boat))
|
||||
{
|
||||
|
@ -8873,4 +8873,6 @@ static void G_SetupGameButtons(void)
|
|||
CONTROL_DefineFlag(gamefunc_Last_Weapon,FALSE);
|
||||
CONTROL_DefineFlag(gamefunc_Quick_Save, FALSE);
|
||||
CONTROL_DefineFlag(gamefunc_Quick_Load, FALSE);
|
||||
CONTROL_DefineFlag(gamefunc_Third_Person_View, FALSE);
|
||||
CONTROL_DefineFlag(gamefunc_Toggle_Crouch, FALSE);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue