Mercurial > mm7

diff mm7_data.h @ 1732:e8d477b48596

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Grumpy7
date Thu, 26 Sep 2013 08:09:05 +0200
parents f44b6e02e81c
children 1776d4f033a7
line wrap: on
line diff
--- a/mm7_data.h	Thu Sep 26 08:07:50 2013 +0200
+++ b/mm7_data.h	Thu Sep 26 08:09:05 2013 +0200
@@ -1073,7 +1073,7 @@
 void SetAttributeNames();
 void uGameUIFontMain_initialize();
 void uGameUIFontShadow_initialize();
-void OnInventoryItemRightClick();
+void Inventory_ItemPopupAndAlchemy();
 void sub_416D62_ShowPopupWindow_MonsterRecord_ItemInfo_etcsub_416D62(struct Vec2_int_ *_this);
 void UI_OnMouseLeftClick(int *pXY); // idb
 unsigned int UI_GetHealthManaAndOtherQualitiesStringColor(signed int current_pos, signed int base_pos);
@@ -1150,7 +1150,7 @@
 void OnMapLeave();
 void OnMapLoad();
 void Level_LoadEvtAndStr(const char *pLevelName);
-const char *sub_444564();
+const char *GetMapBookHintText();//sub_444564
 char *GetEventHintString(unsigned int uEventID); // idb
 int GetTravelTime();
 void __fastcall sub_4451A8_press_any_key(int a1, int a2, int a4);