New gclists and const modifier; added tutorialmode declarations to this branch
This commit is contained in:
parent
9f1c40f881
commit
3f72e1bacf
|
@ -129,6 +129,9 @@ extern INT16 titlemap;
|
||||||
extern boolean hidetitlepics;
|
extern boolean hidetitlepics;
|
||||||
extern INT16 bootmap; //bootmap for loading a map on startup
|
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 boolean looptitle;
|
extern boolean looptitle;
|
||||||
|
|
||||||
// CTF colors.
|
// CTF colors.
|
||||||
|
|
|
@ -127,6 +127,9 @@ INT16 titlemap = 0;
|
||||||
boolean hidetitlepics = false;
|
boolean hidetitlepics = false;
|
||||||
INT16 bootmap; //bootmap for loading a map on startup
|
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 looptitle = false;
|
boolean looptitle = false;
|
||||||
|
|
||||||
UINT8 skincolor_redteam = SKINCOLOR_RED;
|
UINT8 skincolor_redteam = SKINCOLOR_RED;
|
||||||
|
|
|
@ -48,13 +48,25 @@ INT32 gamecontrolbis[num_gamecontrols][2]; // secondary splitscreen player
|
||||||
INT32 gamecontroldefault[num_gamecontrolschemes][num_gamecontrols][2]; // default control storage, use 0 (gcs_custom) for memory retention
|
INT32 gamecontroldefault[num_gamecontrolschemes][num_gamecontrols][2]; // default control storage, use 0 (gcs_custom) for memory retention
|
||||||
|
|
||||||
// lists of GC codes for selective operation
|
// lists of GC codes for selective operation
|
||||||
INT32 gcmovement[num_gcmovement] = {
|
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_movement[num_gclist_movement] = {
|
||||||
|
gc_forward, gc_backward, gc_strafeleft, gc_straferight
|
||||||
|
};
|
||||||
|
|
||||||
|
const INT32 gclist_camera[num_gclist_camera] = {
|
||||||
|
gc_lookup, gc_lookdown, gc_turnleft, gc_turnright
|
||||||
|
};
|
||||||
|
|
||||||
|
const INT32 gclist_jump[num_gclist_jump] = { gc_jump };
|
||||||
|
|
||||||
|
const INT32 gclist_use[num_gclist_use] = { gc_use };
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
UINT8 time;
|
UINT8 time;
|
||||||
|
@ -681,7 +693,7 @@ void G_DefineDefaultControls(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
INT32 G_GetControlScheme(INT32 (*fromcontrols)[2], INT32 gclist[], INT32 gclen)
|
INT32 G_GetControlScheme(INT32 (*fromcontrols)[2], const INT32 *gclist, INT32 gclen)
|
||||||
{
|
{
|
||||||
INT32 i, j, gc;
|
INT32 i, j, gc;
|
||||||
boolean skipscheme;
|
boolean skipscheme;
|
||||||
|
@ -708,7 +720,7 @@ INT32 G_GetControlScheme(INT32 (*fromcontrols)[2], INT32 gclist[], INT32 gclen)
|
||||||
return gcs_custom;
|
return gcs_custom;
|
||||||
}
|
}
|
||||||
|
|
||||||
void G_CopyControls(INT32 (*setupcontrols)[2], INT32 (*fromcontrols)[2], INT32 gclist[], INT32 gclen)
|
void G_CopyControls(INT32 (*setupcontrols)[2], INT32 (*fromcontrols)[2], const INT32 *gclist, INT32 gclen)
|
||||||
{
|
{
|
||||||
INT32 i, gc;
|
INT32 i, gc;
|
||||||
|
|
||||||
|
|
|
@ -128,8 +128,17 @@ 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_gcmovement 11 // 13
|
#define num_gclist_tutorial 8 // 13
|
||||||
extern INT32 gcmovement[num_gcmovement];
|
#define num_gclist_movement 4
|
||||||
|
#define num_gclist_camera 4
|
||||||
|
#define num_gclist_jump 1
|
||||||
|
#define num_gclist_use 1
|
||||||
|
|
||||||
|
extern const INT32 gclist_tutorial[num_gclist_tutorial];
|
||||||
|
extern const INT32 gclist_movement[num_gclist_movement];
|
||||||
|
extern const INT32 gclist_camera[num_gclist_camera];
|
||||||
|
extern const INT32 gclist_jump[num_gclist_jump];
|
||||||
|
extern const INT32 gclist_use[num_gclist_use];
|
||||||
|
|
||||||
// peace to my little coder fingers!
|
// peace to my little coder fingers!
|
||||||
// check a gamecontrol being active or not
|
// check a gamecontrol being active or not
|
||||||
|
@ -146,8 +155,8 @@ void G_ClearControlKeys(INT32 (*setupcontrols)[2], INT32 control);
|
||||||
void Command_Setcontrol_f(void);
|
void Command_Setcontrol_f(void);
|
||||||
void Command_Setcontrol2_f(void);
|
void Command_Setcontrol2_f(void);
|
||||||
void G_DefineDefaultControls(void);
|
void G_DefineDefaultControls(void);
|
||||||
INT32 G_GetControlScheme(INT32 (*fromcontrols)[2], INT32 gclist[], INT32 gclen);
|
INT32 G_GetControlScheme(INT32 (*fromcontrols)[2], const INT32 *gclist, INT32 gclen);
|
||||||
void G_CopyControls(INT32 (*setupcontrols)[2], INT32 (*fromcontrols)[2], INT32 gclist[], INT32 gclen);
|
void G_CopyControls(INT32 (*setupcontrols)[2], INT32 (*fromcontrols)[2], const INT32 *gclist, INT32 gclen);
|
||||||
void G_SaveKeySetting(FILE *f, INT32 (*fromcontrols)[2], INT32 (*fromcontrolsbis)[2]);
|
void G_SaveKeySetting(FILE *f, INT32 (*fromcontrols)[2], INT32 (*fromcontrolsbis)[2]);
|
||||||
void G_CheckDoubleUsage(INT32 keynum);
|
void G_CheckDoubleUsage(INT32 keynum);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue