diff --git a/src/doomstat.h b/src/doomstat.h index 421b6579f..c4fda93ae 100644 --- a/src/doomstat.h +++ b/src/doomstat.h @@ -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; diff --git a/src/g_game.c b/src/g_game.c index 891a17d13..28a8a8d0a 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -129,7 +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? -boolean tutorialgcs = gcs_custom; // which control scheme is loaded? +INT32 tutorialgcs = gcs_custom; // which control scheme is loaded? boolean looptitle = false; diff --git a/src/g_input.c b/src/g_input.c index d8a99c97d..35a0b82cf 100644 --- a/src/g_input.c +++ b/src/g_input.c @@ -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) {