Mercurial > might-and-magic-trilogy

diff mm7_4.cpp @ 109:62772029b56d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 06 Nov 2012 10:07:35 +0600
parents ccc0cf95706a 3b5267621a5b
children 918dca162239
line wrap: on
line diff
--- a/mm7_4.cpp	Tue Nov 06 10:06:45 2012 +0600
+++ b/mm7_4.cpp	Tue Nov 06 10:07:35 2012 +0600
@@ -3357,7 +3357,7 @@
 
   v1 = uHoursToSleep;
   if ( uHoursToSleep > 240 )
-    UpdateActors();
+    InitializeActors();
   v2 = (double)(7680 * v1) * 0.033333335;
   pParty->uTimePlayed += (signed __int64)v2;
   v3 = &pPlayers[1];
@@ -5387,6 +5387,7 @@
   int uX; // [sp+160h] [bp-10h]@18
   unsigned int v133; // [sp+164h] [bp-Ch]@25
   int v134; // [sp+168h] [bp-8h]@14
+  char *Str; // [sp+16Ch] [bp-4h]@18
   Player *pPlayer;
   const char *pSkillName;
 
@@ -5474,6 +5475,8 @@
   v119 = 6 * v6 + 169;
   do
   {
+    Str = pPlayer->pName;
+
     pGUIWindow_CurrentMenu->DrawText(
       pFontCreate,
       v134 + 73,