Skip to content

Commit 9ca14b6

Browse files
authored
Merge pull request #4072 from Goober5000/patch_decals
prevent decals from being used on invalid objects
2 parents 4b50fe5 + bd1cf2d commit 9ca14b6

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

code/decals/decals.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,9 @@ struct Decal {
244244
if (!object.IsValid()) {
245245
return false;
246246
}
247+
if (object.objp->flags[Object::Object_Flags::Should_be_dead]) {
248+
return false;
249+
}
247250

248251
if (orig_obj_type != object.objp->type) {
249252
mprintf(("Decal object type for object %d has changed from %s to %s. Please let m!m know about this\n",
@@ -270,6 +273,9 @@ struct Decal {
270273
if (smi->blown_off) {
271274
return false;
272275
}
276+
} else {
277+
Assertion(false, "Only ships are currently supported for decals!");
278+
return false;
273279
}
274280

275281
return true;

0 commit comments

Comments
 (0)