zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/coelckers/gzdoom

This commit is contained in:
Rachael Alexanderson 2017-04-28 22:14:15 -04:00
parent 9fc2f805de ec1aeaf384
commit 1d980b87b4
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/c_cmds.cpp
View File

@ -364,11 +364,14 @@ CCMD (changemap)
if (argv.argc() > 1)
{
const char *mapname = argv[1];
if (!strcmp(mapname, "*")) mapname = level.MapName.GetChars();
try
{
if (!P_CheckMapData(argv[1]))
if (!P_CheckMapData(mapname))
{
Printf ("No map %s\n", argv[1]);
Printf ("No map %s\n", mapname);
}
else
{
@ -381,7 +384,7 @@ CCMD (changemap)
{
Net_WriteByte (DEM_CHANGEMAP);
}
Net_WriteString (argv[1]);
Net_WriteString (mapname);
}
}
catch(CRecoverableError &error)

18
src/g_level.cpp
View File

@ -182,11 +182,14 @@ CCMD (map)
}
if (argv.argc() > 1)
{
const char *mapname = argv[1];
if (!strcmp(mapname, "*")) mapname = level.MapName.GetChars();
try
{
if (!P_CheckMapData(argv[1]))
if (!P_CheckMapData(mapname))
{
Printf ("No map %s\n", argv[1]);
Printf ("No map %s\n", mapname);
}
else
{
@ -200,7 +203,7 @@ CCMD (map)
deathmatch = true;
multiplayernext = true;
}
G_DeferedInitNew (argv[1]);
G_DeferedInitNew (mapname);
}
}
catch(CRecoverableError &error)
@ -229,11 +232,14 @@ CCMD(recordmap)
}
if (argv.argc() > 2)
{
const char *mapname = argv[2];
if (!strcmp(mapname, "*")) mapname = level.MapName.GetChars();
try
{
if (!P_CheckMapData(argv[2]))
if (!P_CheckMapData(mapname))
{
Printf("No map %s\n", argv[2]);
Printf("No map %s\n", mapname);
}
else
{
@ -247,7 +253,7 @@ CCMD(recordmap)
deathmatch = true;
multiplayernext = true;
}
G_DeferedInitNew(argv[2]);
G_DeferedInitNew(mapname);
gameaction = ga_recordgame;
newdemoname = argv[1];
newdemomap = argv[2];