Mercurial > mm7

diff Outdoor.cpp @ 327:a7f15da53e82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 20 Feb 2013 11:27:06 +0600
parents d720a13e2273
children 24936a5ff8ca 58b71c1af7d8
line wrap: on
line diff
--- a/Outdoor.cpp	Wed Feb 20 11:26:54 2013 +0600
+++ b/Outdoor.cpp	Wed Feb 20 11:27:06 2013 +0600
@@ -57,10 +57,8 @@
 
   pIndoorCamera->sRotationX = pParty->sRotationX;
   pIndoorCamera->sRotationY = pParty->sRotationY;
-  pIndoorCamera->pos.x = pParty->vPosition.x
-                      - ((unsigned __int64)(stru_5C6E00->SinCos(pParty->sRotationY)
-                                          * (signed __int64)pParty->y_rotation_granularity) >> 16);
-  pIndoorCamera->pos.y = pParty->vPosition.y - pParty->y_rotation_granularity * ((stru_5C6E00->SinCos(pParty->sRotationY)) >> 16);
+  pIndoorCamera->pos.x = pParty->vPosition.x - ((stru_5C6E00->Cos(pParty->sRotationY) * (signed __int64)pParty->y_rotation_granularity) >> 16);
+  pIndoorCamera->pos.y = pParty->vPosition.y - pParty->y_rotation_granularity * (stru_5C6E00->Sin(pParty->sRotationY) >> 16);
   pIndoorCamera->pos.z = pParty->vPosition.z + pParty->sEyelevel;
   if (bRedraw || pRenderer->pRenderD3D)
   {
@@ -470,10 +468,10 @@
   {
     v3 = pParty->uCurrentMinute + 60 * (pParty->uCurrentHour - 5);
     v4 = (signed int)(v3 * stru_5C6E00->uIntegerPi) / 960;
-    v5 = stru_5C6E00->SinCos((signed int)(v3 * stru_5C6E00->uIntegerPi) / 960);
+    v5 = stru_5C6E00->Cos((signed int)(v3 * stru_5C6E00->uIntegerPi) / 960);
     v2->field_D1C = 0;
     v2->field_D18 = v5;
-    v6 = stru_5C6E00->SinCos(v4 - stru_5C6E00->uIntegerHalfPi);
+    v6 = stru_5C6E00->Sin(v4);
     v7 = v2->field_D18;
     v2->field_D20 = v6;
     v2->vSunlight.x = -v7;