zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-11-15 08:41:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2015-05-04 08:56:04 +02:00
commit f8fd28118b
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/g_mapinfo.cpp
View file

@ -312,8 +312,13 @@ FString level_info_t::LookupLevelName()
{
mysnprintf (checkstring, countof(checkstring), "%d: ", atoi(&MapName[5]));
}
else
{
// make sure nothing is stripped.
checkstring[0] = '\0';
}
thename = strstr (lookedup, checkstring);
if (thename == NULL)
if (thename == NULL || thename == lookedup)
{
thename = lookedup;
}

15
src/thingdef/thingdef_codeptr.cpp
View file

@ -5895,8 +5895,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_JumpIfHigherOrLower)
//
// A_SetRipperLevel(int level)
//
// Sets the ripper level/requirement of the calling actor.
// Also sets the minimum and maximum levels to rip through.
// Sets the ripper level of the calling actor.
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetRipperLevel)
{
@ -5909,26 +5908,24 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetRipperLevel)
//
// A_SetRipMin(int min)
//
// Sets the ripper level/requirement of the calling actor.
// Also sets the minimum and maximum levels to rip through.
// Sets the minimum level a ripper must be in order to rip through this actor.
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetRipMin)
{
ACTION_PARAM_START(1);
ACTION_PARAM_INT(min, 1);
ACTION_PARAM_INT(min, 0);
self->RipLevelMin = min;
}
//===========================================================================
//
// A_SetRipMin(int min)
// A_SetRipMax(int max)
//
// Sets the ripper level/requirement of the calling actor.
// Also sets the minimum and maximum levels to rip through.
// Sets the minimum level a ripper must be in order to rip through this actor.
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_SetRipMax)
{
ACTION_PARAM_START(1);
ACTION_PARAM_INT(max, 1);
ACTION_PARAM_INT(max, 0);
self->RipLevelMax = max;
}