diff Party.cpp @ 788:f004c7ceb7bd

Слияние
author Ritor1
date Mon, 25 Mar 2013 02:21:14 +0600
parents b27dd658ea77
children 0f56abdcce94
line wrap: on
line diff
--- a/Party.cpp	Mon Mar 25 02:20:57 2013 +0600
+++ b/Party.cpp	Mon Mar 25 02:21:14 2013 +0600
@@ -28,6 +28,50 @@
 
 
 
+// inlined
+//----- (mm6c::004858D0) --------------------------------------------------
+void Party::Zero()
+{
+  
+  uFlags2 = 0;
+  uNumGoldInBank = 0;
+
+    uCurrentYear = 0;
+    uCurrentMonth = 0;
+    uCurrentMonthWeek = 0;
+    uDaysPlayed = 0;
+    uCurrentHour = 0;
+    uCurrentMinute = 0;
+    uCurrentTimeSecond = 0;
+
+    field_6FC = 0;
+    days_played_without_rest = 0;
+
+    vPosition.y = 0;
+    vPosition.z = 0;
+    vPosition.x = 0;
+    uFallStartY = 0;
+    sRotationY = 0;
+    sRotationX = 0;
+    uFallSpeed = 0;
+    field_28 = 0;
+    uDefaultPartyHeight = 120;
+    field_14 = 37;
+    y_rotation_granularity = 25;
+    uWalkSpeed = 384;
+    y_rotation_speed = 90;
+    field_24 = 5;
+    field_6FC = 0;
+    field_708 = 15;
+    field_0 = 25;
+}
+
+//inlined
+//----- (mm6c::0045BE90) --------------------------------------------------
+void ActionQueue::Reset()
+{
+  uNumActions = 0;
+}
 
 //----- (004760C1) --------------------------------------------------------
 void ActionQueue::Add(PartyAction action)
@@ -530,14 +574,15 @@
   //signed int v13; // edi@18
   SpellBuff *v14; // ebx@21
   signed int v15; // edi@21
+  
+  Zero();
 
   field_708 = 15;
   sEyelevel = 160;
-  uFlags2 = 0;
   uNumGold = 200;
-  uNumGoldInBank = 0;
   uNumFoodRations = 7;
 
+  
   alignment = PartyAlignment_Neutral;
   SetUserInterface(alignment, true);