zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2025-01-31 10:40:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: Decal actors with an invalid decal texture caused a crash.

Browse source 
SVN r210 (trunk)
This commit is contained in:
Christoph Oelckers 2006-06-21 20:45:19 +00:00
parent e7f21912a5
commit 729e3b346d
2 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/rh-log.txt
View file

@ -1,4 +1,5 @@
June 21, 2006 (Changes by Graf Zahl) June 21, 2006 (Changes by Graf Zahl)
- Fixed: Decal actors with an invalid decal texture caused a crash.
- Fixed: Player could crouch while dead. - Fixed: Player could crouch while dead.
- Fixed: The sidedef loader could allocate insufficient memory if a map - Fixed: The sidedef loader could allocate insufficient memory if a map
contained unused sidedefs. contained unused sidedefs.

8
src/g_shared/a_decals.cpp
View file

@ -721,6 +721,13 @@ void ADecal::BeginPlay ()
// If no decal is specified, don't try to create one. // If no decal is specified, don't try to create one.
if (args[0] != 0 && (tpl = DecalLibrary.GetDecalByNum (args[0])) != 0) if (args[0] != 0 && (tpl = DecalLibrary.GetDecalByNum (args[0])) != 0)
{
if (tpl->PicNum == 65535)
{
Printf("Decal actor at (%ld,%ld) does not have a valid texture\n", x>>FRACBITS, y>>FRACBITS);
}
else
{ {
// Look for a wall within 64 units behind the actor. If none can be // Look for a wall within 64 units behind the actor. If none can be
// found, then no decal is created, and this actor is destroyed // found, then no decal is created, and this actor is destroyed
@ -747,6 +754,7 @@ void ADecal::BeginPlay ()
DPrintf ("Could not find a wall to stick decal to at (%ld,%ld)\n", x>>FRACBITS, y>>FRACBITS); DPrintf ("Could not find a wall to stick decal to at (%ld,%ld)\n", x>>FRACBITS, y>>FRACBITS);
} }
} }
}
else else
{ {
DPrintf ("Decal actor at (%ld,%ld) does not have a good template\n", x>>FRACBITS, y>>FRACBITS); DPrintf ("Decal actor at (%ld,%ld) does not have a good template\n", x>>FRACBITS, y>>FRACBITS);