Mercurial > mm7

changeset 759:b2468462a360

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Sat, 23 Mar 2013 13:40:00 +0200
parents 9f7db515a8d7 (current diff) 0b3f4b854652 (diff)
children f24fb0d64a5c cf2fbac6edc9
files UIHouses.cpp
diffstat 3 files changed, 11 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Sat Mar 23 13:38:24 2013 +0200
+++ b/Player.cpp	Sat Mar 23 13:40:00 2013 +0200
@@ -8276,7 +8276,7 @@
     currPlayerId = 1;
   else if ( this == pPlayers[3] )
     currPlayerId = 2;
-  else if ( this == pPlayers[4] );
+  else if ( this == pPlayers[4] )
      currPlayerId  = 3;
   if ( var_type > VAR_AutoNotes )
   {
--- a/UIHouses.cpp	Sat Mar 23 13:38:24 2013 +0200
+++ b/UIHouses.cpp	Sat Mar 23 13:40:00 2013 +0200
@@ -1553,7 +1553,7 @@
         v106.x = 0;
         do
         {
-          if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v55].uItemID);//9 * (v55 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C)] )
+          if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v55].uItemID)//9 * (v55 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C)] )
             ++v106.x;
           ++v55;
         }
@@ -2056,7 +2056,7 @@
       v114 = 0;
       do
       {
-        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v114].uItemID);
+        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v114].uItemID)
         {
           v46 = ItemsInShopTexture[v114];
           v47 = 152 - v46->uTextureHeight;
@@ -2083,7 +2083,7 @@
       v114 = 0;
       do
       {
-        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v114+1].uItemID);
+        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v114+1].uItemID)
         {
           v50 = ItemsInShopTexture[v114 + 6];
           v51 = 308 - v50->uTextureHeight;
@@ -2116,7 +2116,7 @@
         v109 = 0;
         do
         {
-          if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v62].uItemID);
+          if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v62].uItemID)
             ++v109;
           ++v62;
         }
@@ -2702,7 +2702,7 @@
         v149 = 0;
         for(int i=0; i<8; ++i)
             {
-            if ( pParty->StandartItemsInShops[window_SpeakInHouse->par1C][i].uItemID);
+            if ( pParty->StandartItemsInShops[window_SpeakInHouse->par1C][i].uItemID)
             ++v149;
 
             }
@@ -4733,7 +4733,7 @@
     do
     {
      // if ( pParty->field_777C[9 * (v49 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C)] )
-	 if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v49].uItemID);
+	 if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v49].uItemID)
       {
         v50 = ItemsInShopTexture[v49];
         v51 = 152 - v50->uTextureHeight;
@@ -4766,7 +4766,7 @@
     do
     {
       //if ( pParty->field_777C[9 * (v122 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C) + 54] )
-	if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v122+1].uItemID);
+	if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v122+1].uItemID)
       {
         v54 = ItemsInShopTexture[v122 + 6];
         v55 = 306 - v54->uTextureHeight;
@@ -4862,12 +4862,12 @@
   if ( result )
   {
     v66 = 0;
-    v117 = 0;
+    v117 = 0;\
     if ( dialog_menu_id == HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
     {
       do
       {
-        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v66].uItemID); //9 * (v66 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C)] )
+        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v66].uItemID) //9 * (v66 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C)] )
           ++v117;
         ++v66;
       }
--- a/mm7_2.cpp	Sat Mar 23 13:38:24 2013 +0200
+++ b/mm7_2.cpp	Sat Mar 23 13:40:00 2013 +0200
@@ -1590,7 +1590,7 @@
 					do
 					{
 						// if ( pParty->field_777C[9 * (v48 + 12 * (int)v47)] )
-						if ( pParty->StandartItemsInShops[(int)v47][v48].uItemID);
+						if ( pParty->StandartItemsInShops[(int)v47][v48].uItemID)
 						{
 							v49 = rand();
 							v8 = window_SpeakInHouse;