From 224f3b1b35d12a7f0ab6f82a4a35b0022e90c7af Mon Sep 17 00:00:00 2001 From: kreatordxx <> Date: Mon, 8 Feb 2010 05:34:43 +0000 Subject: [PATCH] Don't make another Game_wind when advancing a level, fixing failed asserts / slow turning --- CHANGELOG.txt | 1 + main/gameseq.c | 3 ++- main/newdemo.c | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6accc76fd..32c80ecd8 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,7 @@ D1X-Rebirth Changelog 20100208 -------- main/menu.c, main/scores.c, main/scores.h: Move all globals in scores.c into struct members/local variables +main/game.c, main/newdemo.c: Don't make another Game_wind when advancing a level, fixing failed asserts / slow turning 20100207 -------- diff --git a/main/gameseq.c b/main/gameseq.c index 6a493b5b4..535fdc045 100644 --- a/main/gameseq.c +++ b/main/gameseq.c @@ -1247,7 +1247,8 @@ void StartNewLevelSub(int level_num, int page_in_textures) if (!((Game_mode & GM_MULTI) && (Newdemo_state != ND_STATE_PLAYBACK))) palette_save(); - game(); + if (!Game_wind) + game(); } //called when the player is starting a new level for normal game model diff --git a/main/newdemo.c b/main/newdemo.c index f171e7559..77f2c16c1 100644 --- a/main/newdemo.c +++ b/main/newdemo.c @@ -3374,7 +3374,8 @@ void newdemo_start_playback(char * filename) HUD_clear_messages(); newdemo_playback_one_frame(); // this one loads new level newdemo_playback_one_frame(); // get all of the objects to renderb game - game(); // create game environment + if (!Game_wind) + game(); // create game environment } void newdemo_stop_playback()