diff Indoor.cpp @ 1842:175bf8da83d9

Merge
author Grumpy7
date Sun, 13 Oct 2013 06:32:06 +0200
parents 303a56458f7b
children 4359a15360e3
line wrap: on
line diff
--- a/Indoor.cpp	Fri Oct 11 10:12:29 2013 +0200
+++ b/Indoor.cpp	Sun Oct 13 06:32:06 2013 +0200
@@ -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->field_20 = fixpoint_mul(a7, v28) - fixpoint_mul(v21, v9);
+    this->viewing_angle = 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->field_20 = a7;
+    this->viewing_angle = a7;
   }
 
   this->angle_from_east = -this->angle_from_east;
   this->angle_from_south = -this->angle_from_south;
-  this->field_20 = -this->field_20;
+  this->viewing_angle = -this->viewing_angle;
 
   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->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->field_20, this->field_8_party_dir_z);
+                                this->viewing_angle, this->field_8_party_dir_z);
 }
 //----- (00407A1C) --------------------------------------------------------
 bool __fastcall sub_407A1C(int x, int z, int y, Vec3_int_ v)