OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added more options to Light_ForceLightning: Setting the first arg to 0

Browse source 
will behave as before, setting it to 1 will create exactly one lighting
  and setting it to 2 will terminate lightning for the current level
  completely. And it will also work on maps that don't have lightning set
  in MAPINFO now.


SVN r837 (trunk)
This commit is contained in:
Christoph Oelckers 2008-03-22 12:41:36 +00:00
commit eef724b58e
5 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/g_shared/a_lightning.cpp
View file

@ -14,6 +14,7 @@ IMPLEMENT_CLASS (DLightningThinker)
DLightningThinker::DLightningThinker ()
: DThinker (STAT_LIGHTNING)
{
Stopped = false;
LightningLightLevels = NULL;
LightningFlashCount = 0;
NextLightningFlash = ((pr_lightning()&15)+5)*35; // don't flash at level start
@ -37,7 +38,7 @@ void DLightningThinker::Serialize (FArchive &arc)
Super::Serialize (arc);
arc << NextLightningFlash << LightningFlashCount;
arc << Stopped << NextLightningFlash << LightningFlashCount;
if (arc.IsLoading ())
{
@ -63,6 +64,7 @@ void DLightningThinker::Tick ()
else
{
--NextLightningFlash;
if (Stopped) Destroy();
}
}
@ -166,9 +168,21 @@ void DLightningThinker::LightningFlash ()
}
}
void DLightningThinker::ForceLightning ()
void DLightningThinker::ForceLightning (int mode)
{
NextLightningFlash = 0;
switch (mode)
{
default:
NextLightningFlash = 0;
break;
case 1:
NextLightningFlash = 0;
// Fall through
case 2:
Stopped = true;
break;
}
}
static DLightningThinker *LocateLightning ()
@ -186,20 +200,15 @@ void P_StartLightning ()
}
}
void P_StopLightning ()
void P_ForceLightning (int mode)
{
DLightningThinker *lightning = LocateLightning ();
if (lightning == NULL)
{
lightning = new DLightningThinker ();
}
if (lightning != NULL)
{
lightning->Destroy ();
}
}
void P_ForceLightning ()
{
DLightningThinker *lightning = LocateLightning ();
if (lightning != NULL)
{
lightning->ForceLightning ();
lightning->ForceLightning (mode);
}
}