Mercurial > mm7

comparison UI/UIHouses.cpp @ 1640:afc1c3514dd5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
author Nomad
date Tue, 17 Sep 2013 17:40:59 +0200
parents b60ddd777d50
children dbd6f940f26c 014eb02bd0e6
comparison
equal deleted inserted replaced
1639:b60ddd777d50 1640:afc1c3514dd5
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 if (uCurrentlyLoadedLevelType == LEVEL_Outdoor) 2072 pGame->pIndoorCameraD3D->sRotationY = 0;
2073 pODMRenderParams->rotation_y = 0;
2074 else if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
2075 pBLVRenderParams->sPartyRotY = 0;
2076 2073
2077 pParty->uFlags |= 2u; 2074 pParty->uFlags |= 2u;
2078 pParty->vPosition.x = pTravel->arrival_x; 2075 pParty->vPosition.x = pTravel->arrival_x;
2079 pParty->vPosition.y = pTravel->arrival_y; 2076 pParty->vPosition.y = pTravel->arrival_y;
2080 pParty->vPosition.z = pTravel->arrival_z; 2077 pParty->vPosition.z = pTravel->arrival_z;