zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 14:51:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

May 9, 2006 (Changes by Graf Zahl)

Browse source 
- Fixed: If you want to use a name as the missile parameter for the basic
  attack functions the type search in DoAttack must be case insensitive.
- Fixed: APowerup::DoEffect must do more thorough checks before resetting
  the fixed colormap.


SVN r89 (trunk)
This commit is contained in:
Christoph Oelckers 2006-05-09 08:58:30 +00:00
parent df17a60f5d
commit ace3ed1188
6 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/rh-log.txt
View file

@ -1,3 +1,9 @@
May 9, 2006 (Changes by Graf Zahl)
- Fixed: If you want to use a name as the missile parameter for the basic
attack functions the type search in DoAttack must be case insensitive.
- Fixed: APowerup::DoEffect must do more thorough checks before resetting
the fixed colormap.
May 8, 2006
- Fixed: The names in the Depths array in m_options.cpp were never freed.
- Fixed: FDoomEdMap needed a destructor.

6
src/g_shared/a_artifacts.cpp
View file

@ -98,7 +98,11 @@ void APowerup::Tick ()
if (BlendColor == INVERSECOLOR) Owner->player->fixedcolormap = INVERSECOLORMAP;
else if (BlendColor == GOLDCOLOR) Owner->player->fixedcolormap = GOLDCOLORMAP;
}
else Owner->player->fixedcolormap = 0;
else if ((BlendColor == INVERSECOLOR && Owner->player->fixedcolormap == INVERSECOLORMAP) ||
(BlendColor == GOLDCOLOR && Owner->player->fixedcolormap == GOLDCOLORMAP))
{
Owner->player->fixedcolormap = 0;
}
if (--EffectTics == 0)
{

1
src/r_data.cpp
View file

@ -1158,6 +1158,7 @@ void FPatchTexture::GetDimensions ()
if (dummy.width <= 0 || dummy.height <= 0 || dummy.width > 2048 || dummy.height > 2048)
{
delete lump;
lump = Wads.ReopenLumpNum ( Wads.GetNumForName("-BADPATC") );
(*lump) >> dummy.width >> dummy.height;
}

4
src/sound/i_music.cpp
View file

@ -307,9 +307,7 @@ void *I_RegisterSong (const char *filename, char * musiccache, int offset, int l
memcpy(header, musiccache, 0x23);
}
if (strncmp (header+4, "-SPC700 Sound File Data", 23) == 0 &&
header[0x21] == '\x1a' &&
header[0x22] == '\x1a')
if (strncmp (header+4, "-SPC700 Sound File Data", 23) == 0)
{
info = new SPCSong (file, musiccache, len);
}

7
src/thingdef.cpp
View file

@ -2076,8 +2076,13 @@ void ParseActorProperties (Baggage &bag)
const ActorProps *prop;
ChkBraceOpn ();
while (!TestBraceCls() && !sc_End)
while (!TestBraceCls())
{
if (sc_End)
{
SC_ScriptError("Unexpected end of file encountered");
}
SC_GetString ();
strlwr (sc_String);

2
src/thingdef_codeptr.cpp
View file

@ -204,7 +204,7 @@ static void DoAttack (AActor *self, bool domelee, bool domissile)
}
else if (domissile && MissileName != NAME_None)
{
const TypeInfo * ti=TypeInfo::FindType(MissileName);
const TypeInfo * ti=TypeInfo::IFindType(MissileName);
if (ti)
{
// Although there is a P_SpawnMissileZ function its