OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: SecretTriggers that were activated in an OPEN script caused a crash.

Browse source 
SVN r389 (trunk)
This commit is contained in:
Christoph Oelckers 2006-11-26 00:09:17 +00:00
commit beca482a68
4 changed files with 37 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/g_shared/a_secrettrigger.cpp
View file

@ -62,19 +62,22 @@ void ASecretTrigger::PostBeginPlay ()
void ASecretTrigger::Activate (AActor *activator)
{
if (activator->CheckLocalView (consoleplayer))
if (activator != NULL)
{
if (args[0] <= 1)
if (activator->CheckLocalView (consoleplayer))
{
C_MidPrint (secretmessage);
}
if (args[0] == 0 || args[0] == 2)
{
S_Sound (activator, CHAN_AUTO, "misc/secret", 1, ATTN_NORM);
if (args[0] <= 1)
{
C_MidPrint (secretmessage);
}
if (args[0] == 0 || args[0] == 2)
{
S_Sound (activator, CHAN_AUTO, "misc/secret", 1, ATTN_NORM);
}
}
level.found_secrets++;
if (activator->player) activator->player->secretcount++;
Destroy ();
}
level.found_secrets++;
if (activator->player) activator->player->secretcount++;
Destroy ();
}