- Fixed: Weapons did not give you double ammo at baby and nightmare skills.

- Fixed: SetTexture() in p_setup.cpp assumed that all color values were
  six characters. Although this was the intended way to specify colors,
  earlier versions did no error checking, so other lengths worked too.
- Fixed: FPatchTexture waited until MakeTexture() to call CalcBitSize(),
  so the width and height bit sizes weren't available when using it as a
  source for a warp texture.
- Fixed: R_InitSkyMap() should only warn about two sky textures not being
  the same height when they are used as part of a double sky.
- Added a NULL state check in AActor::Tick() before advancing the current
  state. Note that this should not happen, so there's an assert there for
  the debug build as well as a regular check for the release build.


SVN r324 (trunk)
This commit is contained in:
Randy Heit 2006-09-09 01:14:13 +00:00
commit 4999c3b4aa
8 changed files with 52 additions and 17 deletions

View file

@ -2479,6 +2479,13 @@ void AActor::Tick ()
AActor *onmo;
int i;
assert (state != NULL);
if (state == NULL)
{
Destroy();
return;
}
PrevX = x;
PrevY = y;
PrevZ = z;
@ -2895,6 +2902,12 @@ void AActor::Tick ()
// of 0 tics work as expected.
if (tics <= 0)
{
assert (state != NULL);
if (state == NULL)
{
Destroy();
return;
}
if (!SetState (state->GetNextState()))
return; // freed itself
}