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

text-prompts gclist -> gcl refactor

This commit is contained in:
mazmazz 2018-11-12 23:31:10 -05:00
parent 3a00439f3a
commit f4ad5ebfba
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/f_finale.c
View File

@ -2306,36 +2306,25 @@ static boolean F_GetTextPromptTutorialTag(char *tag, INT32 length)
return false; return false;
if (!strncmp(tag, "TAM", 3)) // Movement if (!strncmp(tag, "TAM", 3)) // Movement
gcs = G_GetControlScheme(gamecontrol, gclist_movement, num_gclist_movement); gcs = G_GetControlScheme(gamecontrol, gcl_movement, num_gcl_movement);
else if (!strncmp(tag, "TAC", 3)) // Camera else if (!strncmp(tag, "TAC", 3)) // Camera
{ {
gcs = G_GetControlScheme(gamecontrol, gclist_camera, num_gclist_camera); gcs = G_GetControlScheme(gamecontrol, gcl_camera, num_gcl_camera);
if (gcs == gcs_fps && !cv_usemouse.value) if (gcs == gcs_fps && !cv_usemouse.value)
gcs = gcs_platform; // Platform (arrow) scheme is stand-in for no mouse gcs = gcs_platform; // Platform (arrow) scheme is stand-in for no mouse
} }
else if (!strncmp(tag, "TAD", 3)) // Movement and Camera else if (!strncmp(tag, "TAD", 3)) // Movement and Camera
gcs = G_GetControlScheme(gamecontrol, gclist_tutorial_check, num_gclist_tutorial_check); // mobement + camera gcs = G_GetControlScheme(gamecontrol, gcl_movement_camera, num_gcl_movement_camera);
else if (!strncmp(tag, "TAJ", 3)) // Jump else if (!strncmp(tag, "TAJ", 3)) // Jump
gcs = G_GetControlScheme(gamecontrol, gclist_jump, num_gclist_jump); gcs = G_GetControlScheme(gamecontrol, gcl_jump, num_gcl_jump);
else if (!strncmp(tag, "TAS", 3)) // Spin else if (!strncmp(tag, "TAS", 3)) // Spin
gcs = G_GetControlScheme(gamecontrol, gclist_use, num_gclist_use); gcs = G_GetControlScheme(gamecontrol, gcl_use, num_gcl_use);
else if (!strncmp(tag, "TAA", 3)) // Char ability else if (!strncmp(tag, "TAA", 3)) // Char ability
gcs = G_GetControlScheme(gamecontrol, gclist_jump, num_gclist_jump); gcs = G_GetControlScheme(gamecontrol, gcl_jump, num_gcl_jump);
else if (!strncmp(tag, "TAW", 3)) // Shield ability else if (!strncmp(tag, "TAW", 3)) // Shield ability
{ gcs = G_GetControlScheme(gamecontrol, gcl_jump_use, num_gcl_jump_use);
const INT32 gclist[2] = {
gc_jump, gc_use
};
gcs = G_GetControlScheme(gamecontrol, gclist, 2);
}
else else
{ gcs = G_GetControlScheme(gamecontrol, gcl_tutorial_used, num_gcl_tutorial_used);
const INT32 gclist[8] = {
gc_forward, gc_backward, gc_strafeleft, gc_straferight,
gc_turnleft, gc_turnright, gc_jump, gc_use
};
gcs = G_GetControlScheme(gamecontrol, gclist, 8);
}
switch (gcs) switch (gcs)
{ {