Mercurial > mm7

diff Party.cpp @ 1288:7adc8b9b6a25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 10 Jun 2013 09:30:21 +0600
parents 8c02e6f74b29
children 86a83e12d795
line wrap: on
line diff
--- a/Party.cpp	Mon Jun 10 09:30:12 2013 +0600
+++ b/Party.cpp	Mon Jun 10 09:30:21 2013 +0600
@@ -196,7 +196,7 @@
 	  byte_AE3368[v4] = 1;
   }
   if ( (unsigned __int8)(byte_AE3369 & byte_AE336A & byte_AE336B) & byte_AE3368[0] )
-    memset(byte_AE3368, 0, 4u);
+    memset(byte_AE3368.data(), 0, 4u);
   v2 = v12;
   if ( v12 )
     return v2 + 1;
@@ -849,7 +849,7 @@
     v4 = 0;
     if ( (signed int)uNumActors > 0 )
     {
-      v0 = pActors;//[0].pMonsterInfo.uMovementType;
+      v0 = pActors.data();//[0].pMonsterInfo.uMovementType;
       do
       {
         if ( v0->Actor::CanAct() && v0->pMonsterInfo.uHostilityType != MonsterInfo::Hostility_Long && v0->pMonsterInfo.uMovementType != 5 )