Mercurial > mm7

diff mm7_data.h @ 909:becbb0b11b7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 22 Apr 2013 09:25:22 +0600
parents f3ccfc765502
children 016e3577865c
line wrap: on
line diff
--- a/mm7_data.h	Mon Apr 22 09:25:05 2013 +0600
+++ b/mm7_data.h	Mon Apr 22 09:25:22 2013 +0600
@@ -2053,7 +2053,7 @@
 struct Player *__fastcall sub_4B1447_party_fine(int a1, int a2, int a3);
 void __thiscall sub_4B1523(int *_this);
 bool __cdecl sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win();
-void __cdecl sub_4B1A2D();
+void __cdecl ShowPopupShopItem();
 void __stdcall RestAndHeal(__int64 uNumMinutes); // idb
 void __cdecl sub_4B1D27();
 
@@ -2084,7 +2084,7 @@
 void UI_CreateEndConversationButton();
 void __fastcall OnSelectShopDialogueOption(signed int uMessageParam);
 signed int __cdecl sub_4BD8B5();
-bool __fastcall sub_4BDAAF(ItemGen *a1, int _2da_idx);
+bool __fastcall MerchandiseTest(ItemGen *item, int _2da_idx);
 void __cdecl UIShop_Buy_Identify_Repair();