From 5197d7665a731f9694cc68e9988b8dca1219fe8b Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Tue, 17 Apr 2012 15:20:14 +0800 Subject: [PATCH] Skip rendering of OBJ_NONE objects to avoid a failed Assert (can happen when playing a demo then going to the editor) --- CHANGELOG.txt | 1 + main/render.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 2ad1dc019..bfd747904 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,7 @@ D2X-Rebirth Changelog main/game.c: Make sure Cursegp is initialised if using it to set an object when loading a game (EDITOR build). Thought I already committed this main/gameseq.c: Finish the game cleanly, closing Game_wind, if Current_level_num is 0 editor/med.c: Reset the player object for the editor, since demo playback mucks it up +main/render.c: Skip rendering of OBJ_NONE objects to avoid a failed Assert (can happen when playing a demo then going to the editor) 20120416 -------- diff --git a/main/render.c b/main/render.c index 506c26fbc..5c7f86ec5 100644 --- a/main/render.c +++ b/main/render.c @@ -1454,6 +1454,9 @@ void build_object_lists(int n_segs) int new_segnum,list_pos; obj = &Objects[objnum]; + + if (obj->type == OBJ_NONE) + continue; Assert( obj->segnum == segnum );