Mercurial > mm7

comparison mm7_4.cpp @ 908:e2c1cb9b46f6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Mon, 22 Apr 2013 09:25:05 +0600
parents 10fa7dad1391
children becbb0b11b7d
comparison
equal deleted inserted replaced
900:4dc2252e0b03 908:e2c1cb9b46f6
6321 return; 6321 return;
6322 v6 = 9 * (v5 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C); 6322 v6 = 9 * (v5 + 12 * (unsigned int)window_SpeakInHouse->ptr_1C);
6323 v7 = (ItemGen *)((char *)&pParty->pPickedItem + 4 * v6 + 4); 6323 v7 = (ItemGen *)((char *)&pParty->pPickedItem + 4 * v6 + 4);
6324 if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD) 6324 if ( dialog_menu_id != HOUSE_DIALOGUE_SHOP_BUY_STANDARD)
6325 // v7 = (ItemGen *)&pParty->field_C59C[v6 + 715]; 6325 // v7 = (ItemGen *)&pParty->field_C59C[v6 + 715];
6326 v7 =&pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v5]; 6326 v7 =&pParty->SpecialItemsInShops[(unsigned int)window_SpeakInHouse->ptr_1C][v5 - 1];
6327 goto LABEL_15; 6327 goto LABEL_15;
6328 } 6328 }
6329 if ( in_current_building_type <= BildingType_16 && dialog_menu_id == HOUSE_DIALOGUE_GUILD_BUY_BOOKS ) 6329 if ( in_current_building_type <= BildingType_16 && dialog_menu_id == HOUSE_DIALOGUE_GUILD_BUY_BOOKS )
6330 { 6330 {
6331 v1 = pMouse->GetCursorPos(&a2); 6331 v1 = pMouse->GetCursorPos(&a2);