Mercurial > mm7

changeset 668:28109e4eee44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
standard weapon shop fix
author zipi
date Thu, 14 Mar 2013 20:20:55 +0000
parents 8c6c41037c39
children fb87a8249794 92c1e1250e7c
files UIHouses.cpp mm7_2.cpp
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/UIHouses.cpp	Thu Mar 14 20:04:21 2013 +0000
+++ b/UIHouses.cpp	Thu Mar 14 20:20:55 2013 +0000
@@ -1514,7 +1514,7 @@
       do
       {
         //  if ( pParty->field_777C[9 * (int)&v48[3 * (unsigned int)window_SpeakInHouse->ptr_1C]] )
-        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(int)v48].uItemID);
+        if ( pParty->StandartItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][(int)v48].uItemID)
         {
           v49 = word_F8B158[(signed int)v48];
           v50 = ItemsInShopTexture[(signed int)v48];
--- a/mm7_2.cpp	Thu Mar 14 20:04:21 2013 +0000
+++ b/mm7_2.cpp	Thu Mar 14 20:20:55 2013 +0000
@@ -1757,8 +1757,8 @@
    // v31 = 9 * (v29 - 1 + 12 * (int)v30);
     if ( dialog_menu_id == 2 )
     {
-      v32 = (ItemGen *)&pParty->StandartItemsInShops[(int)v30][v29];
-      _this = (ItemGen *)&pParty->StandartItemsInShops[(int)v30][v29];
+      v32 = (ItemGen *)&pParty->StandartItemsInShops[(int)v30][v29-1];
+      _this = (ItemGen *)&pParty->StandartItemsInShops[(int)v30][v29-1];
     }
     else
     {