Mercurial > mm7
diff mm7_data.h @ 1018:9ac94d00012e
Merge
author | Grumpy7 |
---|---|
date | Tue, 21 May 2013 02:24:31 +0200 |
parents | c45d51b3f4f4 9e823ad5eaa6 |
children | 67e33708d815 |
line wrap: on
line diff
--- a/mm7_data.h Sun May 19 20:41:19 2013 +0200 +++ b/mm7_data.h Tue May 21 02:24:31 2013 +0200 @@ -340,7 +340,6 @@ extern char aIcons[]; // idb extern char aPending[]; // idb extern char aCanTFindS[]; // idb -extern char pDayMoonPhase[28]; extern int paperdoll_Weapon[4][16][2]; extern char *spellbook_texture_filename_suffices[]; // weak extern __int16 word_4E1D3A[]; // weak @@ -443,7 +442,6 @@ extern int pMagicSkills[9]; extern unsigned int pHealthBarPos[4]; extern unsigned int pManaBarPos[4]; -extern char _4E2AD8_ui_colors[72]; extern char _4E2B21_buff_spell_tooltip_colors[80]; extern char monster_popup_y_offsets[]; // weak extern unsigned char hourglass_icon_idx; // weak @@ -1033,8 +1031,8 @@ extern int dword_50C9D8; // weak extern int dword_50C9DC; // weak extern struct NPCData *ptr_50C9E0; -extern int dword_50C9E8; // idb -extern int dword_50C9EC[]; // 50C9EC +//extern int dword_50C9E8; // idb +//extern int dword_50C9EC[]; // 50C9EC extern int dword_50CDC8; extern int dword_50CDCC; // weak extern int bProcessorIsNotIntel; // weak @@ -1522,7 +1520,7 @@ int __fastcall am_40D402(int, int); // weak int __cdecl am_40D444(); void ModalWindow(const char *pStr, int a4); -char __fastcall pPrimaryWindow_draws_text(int a1, const char *pText, int *pXY); +void pPrimaryWindow_draws_text(int a1, const char *pText, int *pXY); void __thiscall am_BeginScene(unsigned __int16 *pPcxPixels, int a2, int a3); // idb void __fastcall Blt_Chroma(struct ArcomageRect *pSrcXYZW, int *pTargetXY, int a3, int a4); void __fastcall Blt_Copy(struct ArcomageRect *pSrcXYZW, int *pTargetXY, int a3); @@ -1545,17 +1543,13 @@ void __fastcall sub_40F92A(int *pZBuffer, struct Texture *a2, int a3); // idb void __cdecl SetMoonPhaseNames(); signed int __fastcall sub_410D99_get_map_index(int a1); -struct GUIWindow *__cdecl sub_41140B(); -void __cdecl sub_411473(); void __fastcall LoadThumbnailLloydTexture(unsigned int uSlot, unsigned int uPlayer); -void sub_412AF9(); -char *GetDayPart(); void SetAttributeNames(); void uGameUIFontMain_initialize(); void uGameUIFontShadow_initialize(); void sub_41420D_press_esc(); void sub_41426F(); -char GameMenuUI_DrawKeyBindings(); +void GameMenuUI_DrawKeyBindings(); unsigned int __thiscall sub_414D24(int _this); void GameMenuUI_DrawVideoOptions(); void DrawGameOptions(); @@ -1572,7 +1566,7 @@ void sub_4178E1(); unsigned int __fastcall UI_GetHealthManaStringColor(signed int a1, signed int a2); signed int __thiscall GetConditionDrawColor(unsigned int uConditionIdx); // idb -char __fastcall sub_4179BC_draw_tooltip(const char *a1, const char *a2); // idb +void __fastcall sub_4179BC_draw_tooltip(const char *a1, const char *a2); // idb void FillAwardsData(); void sub_419220(); void sub_419379(); @@ -1581,7 +1575,7 @@ int __fastcall GUI_ReplaceHotkey(unsigned __int8 uOldHotkey, unsigned __int8 uNewHotkey, char bFirstCall); void __cdecl MainMenuUI_LoadFontsAndSomeStuff(); void __cdecl MainMenuUI_Create(); -char __fastcall sub_41D20D_buff_remaining_time_string(int ecx0, struct GUIWindow *edx0, __int64 a3, struct GUIFont *a2); +void __fastcall sub_41D20D_buff_remaining_time_string(int ecx0, struct GUIWindow *edx0, __int64 a3, struct GUIFont *a2); bool UI_OnKeyDown(unsigned int vkKey); void GameUI_DrawItemInfo(struct ItemGen* inspect_item); // idb void MonsterPopup_Draw(unsigned int uActorID, struct GUIWindow *edx0); @@ -1809,7 +1803,7 @@ void __thiscall sub_467E7F_EquipBody(unsigned int uEquipType); // idb void __fastcall sub_467F48(signed int a1); void __cdecl free_book_subwindow(); -char __cdecl CreateScrollWindow(); +void CreateScrollWindow(); void __cdecl OnPaperdollLeftClick(); int __thiscall UnprojectX(int x); int __thiscall UnprojectY(int _this); @@ -1984,7 +1978,7 @@ void __fastcall sub_4B3FE5(int a4); void NPCHireableDialogPrepare(); void _4B4224_UpdateNPCTopics(int _this); -char __fastcall DrawTextAtStatusBar(const char *Str, int a5); +void __fastcall DrawTextAtStatusBar(const char *Str, int a5); int __fastcall sub_4B46F8(int a1); signed int __fastcall sub_4BB756(signed int a1);