Mercurial > mm7

changeset 2159:67a83bc1a7de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uDefaultPartyHeight = 192
author Ritor1
date Mon, 13 Jan 2014 14:31:25 +0600
parents 10f03a70ab6d
children c68723f7b522
files Party.cpp Player.cpp
diffstat 2 files changed, 40 insertions(+), 43 deletions(-) [+]
line wrap: on
line diff
--- a/Party.cpp	Fri Jan 10 17:56:19 2014 +0600
+++ b/Party.cpp	Mon Jan 13 14:31:25 2014 +0600
@@ -56,54 +56,51 @@
 //----- (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;
+  uCurrentYear = 0;
+  uCurrentMonth = 0;
+  uCurrentMonthWeek = 0;
+  uDaysPlayed = 0;
+  uCurrentHour = 0;
+  uCurrentMinute = 0;
+  uCurrentTimeSecond = 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_radius = 37;
-    y_rotation_granularity = 25;
-    y_rotation_speed = 90;
-
-    uWalkSpeed = 384;
-    walk_sound_timer = 0;
+  field_6FC = 0;
+  days_played_without_rest = 0;
+  vPosition.x = 0;
+  vPosition.y = 0;
+  vPosition.z = 0;
+  uFallStartY = 0;
+  sRotationY = 0;
+  sRotationX = 0;
+  uFallSpeed = 0;
+  field_28 = 0;
+  uDefaultPartyHeight = 192;
+  field_14_radius = 37;
+  y_rotation_granularity = 25;
+  y_rotation_speed = 90;
 
-    field_24 = 5;
-    field_6FC = 0;
-    field_708 = 15;
-    field_0 = 25;
+  uWalkSpeed = 384;
+  walk_sound_timer = 0;
+
+  field_24 = 5;
+  field_6FC = 0;
+  field_708 = 15;
+  field_0 = 25;
 
-    uNumDeaths = 0;
-    uNumPrisonTerms = 0;
-    uNumBountiesCollected = 0;
-    monster_for_hunting_killed.fill(0);
-    monster_id_for_hunting.fill(0);
-    memset(_quest_bits, 0, sizeof(_quest_bits));
-    pArcomageWins.fill(0);
-    uNumArenaPageWins = 0;
-    uNumArenaSquireWins = 0;
-    uNumArenaKnightWins = 0;
-    uNumArenaLordWins = 0;
-
+  uNumDeaths = 0;
+  uNumPrisonTerms = 0;
+  uNumBountiesCollected = 0;
+  monster_for_hunting_killed.fill(0);
+  monster_id_for_hunting.fill(0);
+  memset(_quest_bits, 0, sizeof(_quest_bits));
+  pArcomageWins.fill(0);
+  uNumArenaPageWins = 0;
+  uNumArenaSquireWins = 0;
+  uNumArenaKnightWins = 0;
+  uNumArenaLordWins = 0;
 }
 
 //inlined
--- a/Player.cpp	Fri Jan 10 17:56:19 2014 +0600
+++ b/Player.cpp	Mon Jan 13 14:31:25 2014 +0600
@@ -3177,7 +3177,7 @@
             {
               if ( attr > CHARACTER_ATTRIBUTE_RESIST_BODY && v5 < currEquippedItem->m_enchantmentStrength )//for skills bonuses
                 v5 = currEquippedItem->m_enchantmentStrength;
-              else // for resisits and attributes bonuses
+              else // for resists and attributes bonuses
                 v5 += currEquippedItem->m_enchantmentStrength;
             }
           }