diff mm7_data.h @ 270:d5c41d5e01e0

Слияние
author Ritor1
date Mon, 18 Feb 2013 16:02:32 +0600
parents b34b53ee874d 0b58962bf229
children 6e585f21a01e e5afd6848268
line wrap: on
line diff
--- a/mm7_data.h	Mon Feb 18 16:02:02 2013 +0600
+++ b/mm7_data.h	Mon Feb 18 16:02:32 2013 +0600
@@ -1648,7 +1648,7 @@
 extern int dword_80AA1C; // weak
 extern int dword_80AA20; // weak
 extern unsigned int uNumElementsIn80AA28;
-extern struct stru148 *ptr_80AA28[2000];
+extern struct stru148 *ptr_80AA28[];
 extern struct Edge *pNewEdges;
 extern struct Surf *pSurfs;
 extern struct Edge *pEdges;
@@ -1694,7 +1694,7 @@
 extern int dword_F8B1A8; // weak
 extern int dword_F8B1AC_something_todo_with_awards; // idb
 extern int dword_F8B1B0; // weak
-extern int dword_F8B1B4; // weak
+extern int gold_transaction_amount; // F8B1B4
 extern char *pShopOptions[4];
 extern _UNKNOWN unk_F8B1C8; // weak
 extern int dword_F8B1D8; // weak
@@ -1912,7 +1912,7 @@
 void __fastcall GameUI_OnPlayerPortraitLeftClick(unsigned int uPlayerID); // idb
 void __cdecl sub_421EA6_OnInventoryLeftClick();
 void __cdecl OnGameViewportClick();
-bool __cdecl sub_4226C2();
+bool PauseGameDrawing();
 void __fastcall SetUserInterface(int a1, bool bReplace);
 void __cdecl reset_some_strus_flt_2Cs();
 void __cdecl j_sub_423B4A();
@@ -2019,7 +2019,7 @@
 void __cdecl DrawBranchlessDialogueUI();
 void __fastcall sub_4451A8_press_any_key(int a1, int a2, int a4);
 void __cdecl sub_4452BB();
-const char *__fastcall sub_445308(int a1);
+const char *GetProfessionActionText(int a1);
 void __cdecl DrawDialogueUI();
 struct NPCData *__fastcall GetNPCData(unsigned int npcid);
 struct NPCData *__fastcall GetNewNPCData(signed int npcid, int a2);