stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-02 09:12:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'tutorial-time' into tutorial-time-firstprompt

Browse source
This commit is contained in:
mazmazz 2018-11-11 09:37:36 -05:00
commit 3f1ade35f3
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/g_input.c
View file

@ -50,9 +50,14 @@ INT32 gamecontroldefault[num_gamecontrolschemes][num_gamecontrols][2]; // defaul
// lists of GC codes for selective operation // lists of GC codes for selective operation
const INT32 gclist_tutorial[num_gclist_tutorial] = { const INT32 gclist_tutorial[num_gclist_tutorial] = {
gc_forward, gc_backward, gc_strafeleft, gc_straferight, gc_forward, gc_backward, gc_strafeleft, gc_straferight,
gc_lookup, gc_lookdown, gc_turnleft, gc_turnright //, gc_centerview, gc_lookup, gc_lookdown, gc_turnleft, gc_turnright, gc_centerview,
//gc_jump, gc_use, gc_jump, gc_use,
//gc_fire, gc_firenormal gc_fire, gc_firenormal
};
const INT32 gclist_tutorial_check[num_gclist_tutorial_check] = {
gc_forward, gc_backward, gc_strafeleft, gc_straferight,
gc_turnleft, gc_turnright
}; };
const INT32 gclist_movement[num_gclist_movement] = { const INT32 gclist_movement[num_gclist_movement] = {

4
src/g_input.h
View file

@ -128,13 +128,15 @@ extern INT32 gamecontroldefault[num_gamecontrolschemes][num_gamecontrols][2]; //
#define PLAYER1INPUTDOWN(gc) (gamekeydown[gamecontrol[gc][0]] || gamekeydown[gamecontrol[gc][1]]) #define PLAYER1INPUTDOWN(gc) (gamekeydown[gamecontrol[gc][0]] || gamekeydown[gamecontrol[gc][1]])
#define PLAYER2INPUTDOWN(gc) (gamekeydown[gamecontrolbis[gc][0]] || gamekeydown[gamecontrolbis[gc][1]]) #define PLAYER2INPUTDOWN(gc) (gamekeydown[gamecontrolbis[gc][0]] || gamekeydown[gamecontrolbis[gc][1]])
#define num_gclist_tutorial 8 // 13 #define num_gclist_tutorial 13
#define num_gclist_tutorial_check 6
#define num_gclist_movement 4 #define num_gclist_movement 4
#define num_gclist_camera 2 #define num_gclist_camera 2
#define num_gclist_jump 1 #define num_gclist_jump 1
#define num_gclist_use 1 #define num_gclist_use 1
extern const INT32 gclist_tutorial[num_gclist_tutorial]; extern const INT32 gclist_tutorial[num_gclist_tutorial];
extern const INT32 gclist_tutorial_check[num_gclist_tutorial_check];
extern const INT32 gclist_movement[num_gclist_movement]; extern const INT32 gclist_movement[num_gclist_movement];
extern const INT32 gclist_camera[num_gclist_camera]; extern const INT32 gclist_camera[num_gclist_camera];
extern const INT32 gclist_jump[num_gclist_jump]; extern const INT32 gclist_jump[num_gclist_jump];

2
src/m_menu.c
View file

@ -6169,7 +6169,7 @@ static void M_StartTutorial(INT32 choice)
if (!tutorialmap) if (!tutorialmap)
return; // no map to go to, don't bother return; // no map to go to, don't bother
if (choice != INT32_MAX && G_GetControlScheme(gamecontrol, gclist_tutorial, num_gclist_tutorial) == gcs_custom) if (choice != INT32_MAX && G_GetControlScheme(gamecontrol, gclist_tutorial_check, num_gclist_tutorial_check) == gcs_custom)
{ {
M_StartMessage("Do you want to try the \202recommended \202movement controls\x80?\n\nWe will set them just for this tutorial.\n\nPress 'Y' or 'Enter' to confirm, \nor any key to keep \nyour current controls.\n",M_TutorialControlResponse,MM_YESNO); M_StartMessage("Do you want to try the \202recommended \202movement controls\x80?\n\nWe will set them just for this tutorial.\n\nPress 'Y' or 'Enter' to confirm, \nor any key to keep \nyour current controls.\n",M_TutorialControlResponse,MM_YESNO);
return; return;