From 604ad13963c4d6a38900f4c4912b56113fcfdd86 Mon Sep 17 00:00:00 2001 From: Wanne Date: Mon, 25 Mar 2013 12:16:59 +0000 Subject: [PATCH] Editor: Bugfix (by Buggler) - Fixed wrong code placement in editor for r5953 submission resulting in unable to build ja2.exe git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5958 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Editor/editscreen.cpp | 49 ++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/Editor/editscreen.cpp b/Editor/editscreen.cpp index 23b80e0df..10ef0af9a 100644 --- a/Editor/editscreen.cpp +++ b/Editor/editscreen.cpp @@ -4794,29 +4794,6 @@ void ShowHighGround(INT32 iShowHighGroundCommand)//dnl ch2 210909 gfRenderWorld = TRUE; } -#else //non-editor version - -#include "types.h" -#include "screenids.h" - -UINT32 EditScreenInit() -{ - return TRUE ; -} - -UINT32 EditScreenHandle( ) -{ - //If this screen ever gets set, then this is a bad thing -- endless loop - return ERROR_SCREEN ; -} - -UINT32 EditScreenShutdown( ) -{ - return TRUE ; -} - -#endif - void CreateKeyboardItemCreationUI() { gfKeyboardItemCreationUI = TRUE; @@ -4853,4 +4830,28 @@ void RemoveKeyboardItemCreationUI() AddSelectedItemToWorld( giCreateItemCursorMapIndex ); } MarkWorldDirty(); -} \ No newline at end of file +} + +#else //non-editor version + +#include "types.h" +#include "screenids.h" + +UINT32 EditScreenInit() +{ + return TRUE ; +} + +UINT32 EditScreenHandle( ) +{ + //If this screen ever gets set, then this is a bad thing -- endless loop + return ERROR_SCREEN ; +} + +UINT32 EditScreenShutdown( ) +{ + return TRUE ; +} + +#endif +