Mercurial > mm7

diff GUIWindow.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 8251e59fd7c1
line wrap: on
line diff
--- a/GUIWindow.cpp	Tue Sep 17 15:40:36 2013 +0200
+++ b/GUIWindow.cpp	Tue Sep 17 17:40:59 2013 +0200
@@ -26,7 +26,7 @@
 #include "Awards.h"
 #include "Chest.h"
 #include "Outdoor.h"
-#include "Outdoor_stuff.h"
+#include "Game.h"
 
 
 #include "mm7_data.h"
@@ -297,16 +297,8 @@
 		dword_5C35D4 = 0;
 		if ( bFlipOnExit )
 		{
-			/*pIndoorCamera->sRotationY = (stru_5C6E00->uIntegerDoublePi - 1) & (stru_5C6E00->uIntegerPi
-																			+ pIndoorCamera->sRotationY);
-			pParty->sRotationY = pIndoorCamera->sRotationY;*/
-
           pParty->sRotationY = (stru_5C6E00->uIntegerDoublePi - 1) & (stru_5C6E00->uIntegerPi + pParty->sRotationY);
-          if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
-            pBLVRenderParams->sPartyRotY = pParty->sRotationY;
-          else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
-            pODMRenderParams->rotation_y = pParty->sRotationY;
-          else Error("(%u)", uCurrentlyLoadedLevelType);
+          pGame->pIndoorCameraD3D->sRotationY = pParty->sRotationY;
 		}
 		pParty->uFlags |= 2u;
 		break;