From 36aeba165a4122f48ae5197a2d7c6cd9b1659d3f Mon Sep 17 00:00:00 2001
From: Chris Taylor <kreatordxx@dxx-rebirth.bzr.sourceforge.net>
Date: Tue, 17 Apr 2012 15:11:49 +0800
Subject: [PATCH] Reset the player object for the editor, since demo playback
 mucks it up

---
 CHANGELOG.txt | 1 +
 editor/med.c  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e7a128991..a2ef61f0c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20120417
 --------
 main/gameseq.c: Allow level progressing if playing the builtin mission with EDITOR compiled - only exit if Current_level_num is 0
+editor/med.c: Reset the player object for the editor, since demo playback mucks it up
 
 20120416
 --------
diff --git a/editor/med.c b/editor/med.c
index 849cfc3bd..892fb887d 100644
--- a/editor/med.c
+++ b/editor/med.c
@@ -447,6 +447,7 @@ void init_editor()
 	
 	Viewer = ConsoleObject;
 	slew_init(ConsoleObject);
+	init_player_object();
 	
 	Update_flags = UF_ALL;