Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
2544:c674d547cc7c 2545:e06a3fe9ad6e
1 #define _CRTDBG_MAP_ALLOC 1 #define _CRTDBG_MAP_ALLOC
2 #define _CRT_SECURE_NO_WARNINGS
2 #include <stdlib.h> 3 #include <stdlib.h>
3 #include <crtdbg.h> 4 #include <crtdbg.h>
4 5
5 #define _CRT_SECURE_NO_WARNINGS
6
7 #include "Engine/Engine.h" 6 #include "Engine/Engine.h"
8
9 #include "stru6.h"
10 #include "Weather.h"
11 #include "Sprites.h"
12 #include "LightmapBuilder.h"
13 #include "Outdoor.h"
14 #include "Engine/Party.h" 7 #include "Engine/Party.h"
15 #include "Engine/Objects/SpriteObject.h" 8 #include "Engine/Objects/SpriteObject.h"
16 #include "Engine/LOD.h" 9 #include "Engine/LOD.h"
17 #include "PaletteManager.h"
18 #include "GUI/GUIProgressBar.h"
19 #include "Media/Audio/AudioPlayer.h"
20 #include "DecorationList.h"
21 #include "Engine/OurMath.h" 10 #include "Engine/OurMath.h"
22 #include "Engine/Objects/ObjectList.h" 11 #include "Engine/Objects/ObjectList.h"
23 #include "Engine/Objects/Actor.h" 12 #include "Engine/Objects/Actor.h"
24 #include "Engine/Objects/Chest.h" 13 #include "Engine/Objects/Chest.h"
25 #include "Engine/stru123.h" 14 #include "Engine/stru123.h"
26 #include "Engine/Timer.h" 15 #include "Engine/Timer.h"
27 #include "Viewport.h" 16 #include "Engine/TurnEngine/TurnEngine.h"
28 #include "Engine/Events.h" 17 #include "Engine/Events.h"
29 #include "ParticleEngine.h"
30 #include "Engine/TurnEngine/TurnEngine.h"
31
32 #include "Lights.h"
33
34 #include "GUI/GUIWindow.h"
35 #include "Level/Decoration.h"
36 #include "Engine/ZlibWrapper.h" 18 #include "Engine/ZlibWrapper.h"
37 #include "Engine/MMT.h" 19 #include "Engine/MMT.h"
38 20
39 MapStartPoint uLevel_StartingPointType; // weak 21 #include "stru6.h"
22 #include "Weather.h"
23 #include "Sprites.h"
24 #include "LightmapBuilder.h"
25 #include "Outdoor.h"
26 #include "PaletteManager.h"
27 #include "DecorationList.h"
28 #include "Viewport.h"
29 #include "ParticleEngine.h"
30 #include "Lights.h"
31 #include "Level/Decoration.h"
32
33 #include "GUI/GUIWindow.h"
34 #include "GUI/GUIProgressBar.h"
35 #include "GUI/UI/UITransition.h"
36
37 #include "Media/Audio/AudioPlayer.h"
38
39 MapStartPoint uLevel_StartingPointType;
40 40
41 OutdoorLocation *pOutdoor = new OutdoorLocation; 41 OutdoorLocation *pOutdoor = new OutdoorLocation;
42 ODMRenderParams *pODMRenderParams; 42 ODMRenderParams *pODMRenderParams;
43 43
44 44
2876 pParty->vPosition.y = 22528; 2876 pParty->vPosition.y = 22528;
2877 } 2877 }
2878 else 2878 else
2879 { 2879 {
2880 pAudioPlayer->StopChannels(-1, -1); 2880 pAudioPlayer->StopChannels(-1, -1);
2881 TravelUI_Load(); 2881 pDialogueWindow = new GUIWindow_Travel();//TravelUI_Load();
2882 } 2882 }
2883 } 2883 }
2884 UpdateActors_ODM(); 2884 UpdateActors_ODM();
2885 check_event_triggers(); 2885 check_event_triggers();
2886 } 2886 }