Mercurial > mm7

comparison UI/UIHouses.cpp @ 1638:ccde94f02b75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
class IndoorCamera split into BLVRenderParams and ODMRenderParams
author Nomad
date Tue, 17 Sep 2013 15:40:09 +0200
parents ee4a65ac9d21
children b60ddd777d50
comparison
equal deleted inserted replaced
1637:2c71fa8913d2 1638:ccde94f02b75
13 #include "..\Mouse.h" 13 #include "..\Mouse.h"
14 #include "..\GUIWindow.h" 14 #include "..\GUIWindow.h"
15 #include "..\GUIFont.h" 15 #include "..\GUIFont.h"
16 #include "..\Overlays.h" 16 #include "..\Overlays.h"
17 #include "..\Outdoor.h" 17 #include "..\Outdoor.h"
18 #include "..\Outdoor_stuff.h"
18 #include "..\AudioPlayer.h" 19 #include "..\AudioPlayer.h"
19 #include "..\VideoPlayer.h" 20 #include "..\VideoPlayer.h"
20 #include "..\Monsters.h" 21 #include "..\Monsters.h"
21 #include "..\Viewport.h" 22 #include "..\Viewport.h"
22 #include "..\Keyboard.h" 23 #include "..\Keyboard.h"
23 #include "..\IndoorCamera.h"
24 #include "..\MapInfo.h" 24 #include "..\MapInfo.h"
25 #include "..\Log.h" 25 #include "..\Log.h"
26 #include "..\Game.h" 26 #include "..\Game.h"
27 27
28 #include "..\stru159.h" 28 #include "..\stru159.h"
2067 _5B65B0_npcdata_rep_or_other = pTravel->arrival_z; 2067 _5B65B0_npcdata_rep_or_other = pTravel->arrival_z;
2068 dword_5B65C0 = pTravel->arrival_x | pTravel->arrival_y | pTravel->arrival_z | pTravel->arrival_rot_y; 2068 dword_5B65C0 = pTravel->arrival_x | pTravel->arrival_y | pTravel->arrival_z | pTravel->arrival_rot_y;
2069 } 2069 }
2070 else 2070 else
2071 { 2071 {
2072 pIndoorCamera->sRotationY = 0; 2072 if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
2073 pODMRenderParams->rotation_y = 0;
2074 else if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
2075 pBLVRenderParams->sPartyRotY = 0;
2076
2073 pParty->uFlags |= 2u; 2077 pParty->uFlags |= 2u;
2074 pParty->vPosition.x = pTravel->arrival_x; 2078 pParty->vPosition.x = pTravel->arrival_x;
2075 pParty->vPosition.y = pTravel->arrival_y; 2079 pParty->vPosition.y = pTravel->arrival_y;
2076 pParty->vPosition.z = pTravel->arrival_z; 2080 pParty->vPosition.z = pTravel->arrival_z;
2077 pParty->uFallStartY = pParty->vPosition.z; 2081 pParty->uFallStartY = pParty->vPosition.z;