zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +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 2014-04-15 09:18:04 +02:00
commit 2205ca606f
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/p_acs.cpp
View file

@ -4260,6 +4260,7 @@ enum EACSFunctions
ACSF_CheckFlag,
ACSF_SetLineActivation,
ACSF_GetLineActivation,
ACSF_GetActorPowerupTics,
// ZDaemon
ACSF_GetTeamScore = 19620, // (int team)
@ -5325,6 +5326,27 @@ doplaysound: if (funcIndex == ACSF_PlayActorSound)
}
break;
case ACSF_GetActorPowerupTics:
if (argCount >= 2)
{
const PClass *powerupclass = PClass::FindClass(FBehavior::StaticLookupString(args[1]));
if (powerupclass == NULL || !RUNTIME_CLASS(APowerup)->IsAncestorOf(powerupclass))
{
Printf("'%s' is not a type of Powerup.\n", FBehavior::StaticLookupString(args[1]));
return 0;
}
AActor *actor = SingleActorFromTID(args[0], activator);
if (actor != NULL)
{
APowerup* powerup = (APowerup*)actor->FindInventory(powerupclass);
if (powerup != NULL)
return powerup->EffectTics;
}
return 0;
}
break;
default:
break;
}

2
src/resourcefiles/file_directory.cpp
View file

@ -198,7 +198,7 @@ int FDirectory::AddDirectory(const char *dirpath)
return count;
}
#elif defined(__sun)
#elif defined(__sun) || defined(__APPLE__)
int FDirectory::AddDirectory(const char *dirpath)
{