Mercurial > mm7

diff Engine/Graphics/Outdoor.cpp @ 2545:e06a3fe9ad6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
TravelUI init logic moved to GUIWindow_Travel TransitionUI init logic moved to GUIWindow_Transition
author a.parshin
date Mon, 11 May 2015 16:43:46 +0200
parents b6140dfeac27
children b8a56afc6ba1
line wrap: on
line diff
--- a/Engine/Graphics/Outdoor.cpp	Mon May 11 09:51:04 2015 +0200
+++ b/Engine/Graphics/Outdoor.cpp	Mon May 11 16:43:46 2015 +0200
@@ -1,42 +1,42 @@
 #define _CRTDBG_MAP_ALLOC
+#define _CRT_SECURE_NO_WARNINGS
 #include <stdlib.h>
 #include <crtdbg.h>
 
-#define _CRT_SECURE_NO_WARNINGS
-
 #include "Engine/Engine.h"
+#include "Engine/Party.h"
+#include "Engine/Objects/SpriteObject.h"
+#include "Engine/LOD.h"
+#include "Engine/OurMath.h"
+#include "Engine/Objects/ObjectList.h"
+#include "Engine/Objects/Actor.h"
+#include "Engine/Objects/Chest.h"
+#include "Engine/stru123.h"
+#include "Engine/Timer.h"
+#include "Engine/TurnEngine/TurnEngine.h"
+#include "Engine/Events.h"
+#include "Engine/ZlibWrapper.h"
+#include "Engine/MMT.h"
 
 #include "stru6.h"
 #include "Weather.h"
 #include "Sprites.h"
 #include "LightmapBuilder.h"
 #include "Outdoor.h"
-#include "Engine/Party.h"
-#include "Engine/Objects/SpriteObject.h"
-#include "Engine/LOD.h"
 #include "PaletteManager.h"
-#include "GUI/GUIProgressBar.h"
-#include "Media/Audio/AudioPlayer.h"
 #include "DecorationList.h"
-#include "Engine/OurMath.h"
-#include "Engine/Objects/ObjectList.h"
-#include "Engine/Objects/Actor.h"
-#include "Engine/Objects/Chest.h"
-#include "Engine/stru123.h"
-#include "Engine/Timer.h"
 #include "Viewport.h"
-#include "Engine/Events.h"
 #include "ParticleEngine.h"
-#include "Engine/TurnEngine/TurnEngine.h"
-
 #include "Lights.h"
+#include "Level/Decoration.h"
 
 #include "GUI/GUIWindow.h"
-#include "Level/Decoration.h"
-#include "Engine/ZlibWrapper.h"
-#include "Engine/MMT.h"
-
-MapStartPoint uLevel_StartingPointType; // weak
+#include "GUI/GUIProgressBar.h"
+#include "GUI/UI/UITransition.h"
+
+#include "Media/Audio/AudioPlayer.h"
+
+MapStartPoint uLevel_StartingPointType;
 
 OutdoorLocation *pOutdoor = new OutdoorLocation;
 ODMRenderParams *pODMRenderParams;
@@ -2878,7 +2878,7 @@
     else
     {
       pAudioPlayer->StopChannels(-1, -1);
-      TravelUI_Load();
+      pDialogueWindow = new GUIWindow_Travel();//TravelUI_Load();
     }
   }
   UpdateActors_ODM();