lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'control-selector' into tutorial-time

Browse source
This commit is contained in:
mazmazz 2018-11-12 16:54:49 -05:00
parent 8f7c1e7f71 31c1145cf3
commit 45381058b3
4 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/doomstat.h
View file

@ -131,6 +131,7 @@ extern INT16 bootmap; //bootmap for loading a map on startup
extern INT16 tutorialmap; // map to load for tutorial
extern boolean tutorialmode; // are we in a tutorial right now?
extern INT32 tutorialgcs; // which control scheme is loaded?
extern boolean looptitle;

1
src/g_game.c
View file

@ -129,6 +129,7 @@ INT16 bootmap; //bootmap for loading a map on startup
INT16 tutorialmap = 0; // map to load for tutorial
boolean tutorialmode = false; // are we in a tutorial right now?
INT32 tutorialgcs = gcs_custom; // which control scheme is loaded?
boolean looptitle = false;

28
src/g_input.c
View file

@ -659,20 +659,20 @@ void G_DefineDefaultControls(void)
gamecontroldefault[gcs_fps][gc_firenormal ][0] = 'c';
// Platform game controls (arrow keys)
// gamecontroldefault[gcs_platform][gc_forward ][0] = KEY_UPARROW;
// gamecontroldefault[gcs_platform][gc_backward ][0] = KEY_DOWNARROW;
// gamecontroldefault[gcs_platform][gc_strafeleft ][0] = 'a';
// gamecontroldefault[gcs_platform][gc_straferight][0] = 'd';
// gamecontroldefault[gcs_platform][gc_lookup ][0] = KEY_PGUP;
// gamecontroldefault[gcs_platform][gc_lookdown ][0] = KEY_PGDN;
// gamecontroldefault[gcs_platform][gc_turnleft ][0] = KEY_LEFTARROW;
// gamecontroldefault[gcs_platform][gc_turnright ][0] = KEY_RIGHTARROW;
// gamecontroldefault[gcs_platform][gc_centerview ][0] = KEY_END;
// gamecontroldefault[gcs_platform][gc_jump ][0] = KEY_SPACE;
// gamecontroldefault[gcs_platform][gc_use ][0] = KEY_LSHIFT;
// gamecontroldefault[gcs_platform][gc_fire ][0] = 's';
// gamecontroldefault[gcs_platform][gc_fire ][1] = KEY_MOUSE1+0;
// gamecontroldefault[gcs_platform][gc_firenormal ][0] = 'w';
gamecontroldefault[gcs_platform][gc_forward ][0] = KEY_UPARROW;
gamecontroldefault[gcs_platform][gc_backward ][0] = KEY_DOWNARROW;
gamecontroldefault[gcs_platform][gc_strafeleft ][0] = 'a';
gamecontroldefault[gcs_platform][gc_straferight][0] = 'd';
gamecontroldefault[gcs_platform][gc_lookup ][0] = KEY_PGUP;
gamecontroldefault[gcs_platform][gc_lookdown ][0] = KEY_PGDN;
gamecontroldefault[gcs_platform][gc_turnleft ][0] = KEY_LEFTARROW;
gamecontroldefault[gcs_platform][gc_turnright ][0] = KEY_RIGHTARROW;
gamecontroldefault[gcs_platform][gc_centerview ][0] = KEY_END;
gamecontroldefault[gcs_platform][gc_jump ][0] = KEY_SPACE;
gamecontroldefault[gcs_platform][gc_use ][0] = KEY_LSHIFT;
gamecontroldefault[gcs_platform][gc_fire ][0] = 's';
gamecontroldefault[gcs_platform][gc_fire ][1] = KEY_MOUSE1+0;
gamecontroldefault[gcs_platform][gc_firenormal ][0] = 'w';
for (i = 1; i < num_gamecontrolschemes; i++) // skip gcs_custom (0)
{

2
src/m_misc.c
View file

@ -542,7 +542,7 @@ void M_SaveConfig(const char *filename)
CV_SaveVariables(f);
if (!dedicated)
{
if (tutorialmode)
if (tutorialmode && tutorialgcs)
G_SaveKeySetting(f, gamecontroldefault[gcs_custom], gamecontrolbis); // using gcs_custom as temp storage
else
G_SaveKeySetting(f, gamecontrol, gamecontrolbis);