Mercurial > mm7

changeset 667:8c6c41037c39

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
profession NPC dialogue fixed WearsItem fix
author zipi
date Thu, 14 Mar 2013 20:04:21 +0000
parents a5750c94b022
children 28109e4eee44
files NPC.cpp Player.cpp
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/NPC.cpp	Wed Mar 13 17:08:21 2013 +0600
+++ b/NPC.cpp	Thu Mar 14 20:04:21 2013 +0000
@@ -456,8 +456,8 @@
 			decode_step=0;
 			do 
 				{
-                while (*test_string == '\t')  // some steps are separated by multiple \t's
-                  ++test_string;
+                //while (*test_string == '\t')  // some steps are separated by multiple \t's
+                  //++test_string;
                 
 				c = *(unsigned char*)test_string;
 				temp_str_len = 0;
@@ -492,7 +492,7 @@
 					}
 				else
 					{ 
-					if (decode_step)
+					if (!decode_step)
 						break_loop = true;
 					}
 				++decode_step;
--- a/Player.cpp	Wed Mar 13 17:08:21 2013 +0600
+++ b/Player.cpp	Thu Mar 14 20:04:21 2013 +0000
@@ -3391,7 +3391,7 @@
     return 1;
   }
   if ( HasItemEquipped((ITEM_EQUIP_TYPE)a2)
-    && *(int *)&this->pInventoryItems[*(&v4->pEquipment.uOffHand + v3)-1] == a1 )
+    && *(int *)&this->pInventoryItems[*(&this->pEquipment.uOffHand + v3)-1] == a1 )
     return 1;
   return 0;
 }