# HG changeset patch
# User zipi
# Date 1363291461 0
# Node ID 8c6c41037c39a88773ba1d3b158e802c86f39503
# Parent  a5750c94b0222169ff9797cc90a0fb58553b5f6d
profession NPC dialogue fixed
WearsItem fix

diff -r a5750c94b022 -r 8c6c41037c39 NPC.cpp
--- 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;
diff -r a5750c94b022 -r 8c6c41037c39 Player.cpp
--- 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;
 }