Mercurial > mm7

comparison GUI/UI/UIHouses.cpp @ 2541:a902abdfc7f2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
1. Renamed class Game to class Engine. 2. Separated game logic as state of FSM from game logic as engine. 3. Found out that many UI screen initializers were optimized away, intially they all returned newly created window as separate object like it is done in CharacterUI_Initialize.
author a.parshin
date Sun, 10 May 2015 01:29:11 +0200
parents 1bcadc6dd203
children b6140dfeac27
comparison
equal deleted inserted replaced
2540:abc6a9d079b9 2541:a902abdfc7f2
1 #define _CRTDBG_MAP_ALLOC 1 #define _CRTDBG_MAP_ALLOC
2 #include <stdlib.h> 2 #include <stdlib.h>
3 #include <crtdbg.h> 3 #include <crtdbg.h>
4 4
5 #define _CRT_SECURE_NO_WARNINGS 5 #define _CRT_SECURE_NO_WARNINGS
6
7 #include "Engine/Engine.h"
8
6 #include "UIGuilds.h" 9 #include "UIGuilds.h"
7 #include "UIPartyCreation.h" 10 #include "UIPartyCreation.h"
8 #include "UIShops.h" 11 #include "UIShops.h"
9 #include "..\../GUI/GUIButton.h" 12 #include "..\../GUI/GUIButton.h"
10 #include "..\../Engine/SaveLoad.h" 13 #include "..\../Engine/SaveLoad.h"
11 #include "..\../Engine/Graphics/Texture.h" 14 #include "..\../Engine/Graphics/Texture.h"
12 #include "..\../Engine/mm7_data.h"
13 #include "..\../Engine/ErrorHandling.h"
14 #include "UIHouses.h" 15 #include "UIHouses.h"
15 #include "..\../Engine/Party.h" 16 #include "..\../Engine/Party.h"
16 #include "..\../Engine/texts.h" 17 #include "..\../Engine/texts.h"
17 #include "..\../Engine/Events.h" 18 #include "..\../Engine/Events.h"
18 #include "..\../Arcomage/Arcomage.h" 19 #include "..\../Arcomage/Arcomage.h"
26 #include "..\../Media/MediaPlayer.h" 27 #include "..\../Media/MediaPlayer.h"
27 #include "..\../Engine/Objects/Monsters.h" 28 #include "..\../Engine/Objects/Monsters.h"
28 #include "..\../Engine/Graphics/Viewport.h" 29 #include "..\../Engine/Graphics/Viewport.h"
29 #include "..\../IO/Keyboard.h" 30 #include "..\../IO/Keyboard.h"
30 #include "..\../Engine/MapInfo.h" 31 #include "..\../Engine/MapInfo.h"
31 #include "..\../Engine/Log.h"
32 #include "..\../Engine/Game.h"
33 #include "..\../Engine/Spells/CastSpellInfo.h" 32 #include "..\../Engine/Spells/CastSpellInfo.h"
34 33
35 #include "../../Engine/Graphics/Level/Decoration.h" 34 #include "../../Engine/Graphics/Level/Decoration.h"
36 35
37 #include "..\../Engine/stru159.h" 36 #include "..\../Engine/stru159.h"
1562 _5B65B0_npcdata_rep_or_other = pTravel->arrival_z; 1561 _5B65B0_npcdata_rep_or_other = pTravel->arrival_z;
1563 dword_5B65C0 = pTravel->arrival_x | pTravel->arrival_y | pTravel->arrival_z | pTravel->arrival_rot_y; 1562 dword_5B65C0 = pTravel->arrival_x | pTravel->arrival_y | pTravel->arrival_z | pTravel->arrival_rot_y;
1564 } 1563 }
1565 else 1564 else
1566 { 1565 {
1567 pGame->pIndoorCameraD3D->sRotationY = 0; 1566 pEngine->pIndoorCameraD3D->sRotationY = 0;
1568 1567
1569 pParty->uFlags |= 2u; 1568 pParty->uFlags |= 2u;
1570 pParty->vPosition.x = pTravel->arrival_x; 1569 pParty->vPosition.x = pTravel->arrival_x;
1571 pParty->vPosition.y = pTravel->arrival_y; 1570 pParty->vPosition.y = pTravel->arrival_y;
1572 pParty->vPosition.z = pTravel->arrival_z; 1571 pParty->vPosition.z = pTravel->arrival_z;