diff Indoor.cpp @ 1848:3b39b70e8e93

Merge
author Nomad
date Sun, 13 Oct 2013 21:13:08 +0200
parents 4359a15360e3
children 436553b0603c
line wrap: on
line diff
--- a/Indoor.cpp	Sun Oct 13 21:12:57 2013 +0200
+++ b/Indoor.cpp	Sun Oct 13 21:13:08 2013 +0200
@@ -5182,13 +5182,13 @@
 
     this->angle_from_north = fixpoint_mul(v19, v28) + fixpoint_mul(a4, v9);
     this->angle_from_west = fixpoint_mul(a3, v8) - fixpoint_mul(a2, v29);
-    this->field_14 = fixpoint_mul(a4, v28) - fixpoint_mul(v19, v9);
+    this->viewing_angle_from_west_east = fixpoint_mul(a4, v28) - fixpoint_mul(v19, v9);
   }
   else
   {
     this->angle_from_north = fixpoint_mul(a2, v8) + fixpoint_mul(a3, v29);
     this->angle_from_west = fixpoint_mul(a3, v8) - fixpoint_mul(a2, v29);
-    this->field_14 = a4;
+    this->viewing_angle_from_west_east = a4;
   }
 
   if (pGame->pIndoorCameraD3D->sRotationX)
@@ -5197,25 +5197,25 @@
 
     this->angle_from_east = fixpoint_mul(v21, v28) + fixpoint_mul(a7, v9);
     this->angle_from_south = fixpoint_mul(a6, v8) - fixpoint_mul(a5, v29);
-    this->viewing_angle = fixpoint_mul(a7, v28) - fixpoint_mul(v21, v9);
+    this->viewing_angle_from_north_south = fixpoint_mul(a7, v28) - fixpoint_mul(v21, v9);
   }
   else
   {
     this->angle_from_east = fixpoint_mul(a5, v8) + fixpoint_mul(a6, v29);
     this->angle_from_south = fixpoint_mul(a6, v8) - fixpoint_mul(a5, v29);
-    this->viewing_angle = a7;
+    this->viewing_angle_from_north_south = a7;
   }
 
   this->angle_from_east = -this->angle_from_east;
   this->angle_from_south = -this->angle_from_south;
-  this->viewing_angle = -this->viewing_angle;
+  this->viewing_angle_from_north_south = -this->viewing_angle_from_north_south;
 
   this->field_24 = fixpoint_dot(this->angle_from_north,  this->field_0_party_dir_x,
                                 this->angle_from_west, this->field_4_party_dir_y,
-                                this->field_14, this->field_8_party_dir_z);
+                                this->viewing_angle_from_west_east, this->field_8_party_dir_z);
   this->field_28 = fixpoint_dot(this->angle_from_east, this->field_0_party_dir_x,
                                 this->angle_from_south, this->field_4_party_dir_y,
-                                this->viewing_angle, this->field_8_party_dir_z);
+                                this->viewing_angle_from_north_south, this->field_8_party_dir_z);
 }
 //----- (00407A1C) --------------------------------------------------------
 bool __fastcall sub_407A1C(int x, int z, int y, Vec3_int_ v)