OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/d_player.h
	src/g_doom/a_archvile.cpp
	src/thingdef/thingdef.h
	src/thingdef/thingdef_properties.cpp
This commit is contained in:
Christoph Oelckers 2013-08-09 13:03:28 +02:00
commit bba092cc0b
44 changed files with 821 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/c_cmds.cpp
View file

@ -49,6 +49,7 @@
#include "i_system.h"
#include "doomerrors.h"
#include "doomstat.h"
#include "gstrings.h"
#include "s_sound.h"
@ -341,22 +342,30 @@ CCMD (changemap)
if (argv.argc() > 1)
{
if (!P_CheckMapData(argv[1]))
try
{
Printf ("No map %s\n", argv[1]);
}
else
{
if (argv.argc() > 2)
if (!P_CheckMapData(argv[1]))
{
Net_WriteByte (DEM_CHANGEMAP2);
Net_WriteByte (atoi(argv[2]));
Printf ("No map %s\n", argv[1]);
}
else
{
Net_WriteByte (DEM_CHANGEMAP);
if (argv.argc() > 2)
{
Net_WriteByte (DEM_CHANGEMAP2);
Net_WriteByte (atoi(argv[2]));
}
else
{
Net_WriteByte (DEM_CHANGEMAP);
}
Net_WriteString (argv[1]);
}
Net_WriteString (argv[1]);
}
catch(CRecoverableError &error)
{
if (error.GetMessage())
Printf("%s", error.GetMessage());
}
}
else