Mercurial > mm7

diff mm7_unsorted_subs.h @ 2252:cd80d91b780f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Wed, 26 Feb 2014 20:10:50 +0600
parents 3cc3a29f073b
children 4c9fef516e0a
line wrap: on
line diff
--- a/mm7_unsorted_subs.h	Wed Feb 26 20:10:43 2014 +0600
+++ b/mm7_unsorted_subs.h	Wed Feb 26 20:10:50 2014 +0600
@@ -175,7 +175,6 @@
 void UI_CreateEndConversationButton();
 void __fastcall OnSelectShopDialogueOption(signed int uMessageParam);
 int HouseDialogPressCloseBtn();
-bool MerchandiseTest(ItemGen *item, int _2da_idx);
 void UIShop_Buy_Identify_Repair();
 bool __fastcall IsBModelVisible(unsigned int uModelID, int *unused);
 void ODM_LoadAndInitialize(const char *pLevelFilename, struct ODMRenderParams *thisa);
@@ -219,7 +218,7 @@
 int GetSoundStrengthByDistanceFromParty(int x, int y, int z);
 void PlayLevelMusic();
 unsigned int __fastcall sub_4B0E07(unsigned int uFaceID); // idb
-void sub_4B1447_party_fine(int a1, int a2, int a3);
+void sub_4B1447_party_fine(int shopId, int stealingResult, int fineToAdd);
 void sub_4B1523_showSpellbookInfo(int spellItemId);
 void ShowPopupShopItem();
 void RestAndHeal(__int64 uNumMinutes); // idb