Merge remote-tracking branch 'SRB2-PLUS/plus_v2.1.17_main' into toast_fixes

This commit is contained in:
Alam Ed Arias 2017-03-28 14:17:16 -04:00
commit d9f81ee03f

View file

@ -1002,7 +1002,7 @@ static const char *credits[] = {
"",
"\1Sprite Artists",
"Odi \"Iceman404\" Atunzu",
"Victor \"VAdaPEGA\" Ara\x1Fjo", // Araújo -- sorry for our limited font! D:
"Victor \"VAdaPEGA\" Ara\x1Fjo", // Arajo -- sorry for our limited font! D:
"Jim \"MotorRoach\" DeMello",
"Desmond \"Blade\" DesJardins",
"Sherman \"CoatRack\" DesJardins",
@ -1427,7 +1427,7 @@ void F_StartTitleScreen(void)
if (titlemap)
{
gamestate_t prevwipegamestate = wipegamestate;
titlemapinaction = true;
titlemapinaction = true;
gamemap = titlemap;