Mercurial > mm7
diff GUIWindow.h @ 1018:9ac94d00012e
Merge
author | Grumpy7 |
---|---|
date | Tue, 21 May 2013 02:24:31 +0200 |
parents | c45d51b3f4f4 9e823ad5eaa6 |
children | 3413ad40cc88 |
line wrap: on
line diff
--- a/GUIWindow.h Sun May 19 20:41:19 2013 +0200 +++ b/GUIWindow.h Tue May 21 02:24:31 2013 +0200 @@ -301,7 +301,7 @@ WINDOW_AutonotesBook = 0xC9, WINDOW_MapsBook = 0xCA, WINDOW_CalendarBook = 0xCB, - WINDOW_HistoryBook = 0xE0, + WINDOW_JournalBook = 0xE0, }; struct GUIButton; @@ -321,7 +321,7 @@ UIMessageType msg, unsigned int msg_param, unsigned __int8 uHotkey, const char *pName, Texture *pTextures, ...); void DrawFlashingInputCursor(signed int a3, int a4, struct GUIFont *a2); int DrawTextInRect(GUIFont *a2, unsigned int uX, unsigned int uY, unsigned int uColor, const char *Str1, int Source, int a8); - char DrawText(GUIFont *a2, signed int uX, int uY, unsigned int uFontColor, const char *Str, int a7, int a8, unsigned int uFontShadowColor); + void DrawText(GUIFont *a2, signed int uX, int uY, unsigned int uFontColor, const char *Str, int a7, int a8, unsigned int uFontShadowColor); void DrawTitleText(GUIFont *a2, signed int uHorizontalMargin, unsigned int uVerticalMargin, unsigned __int16 uDefaultColor, const char *pInString, unsigned int uLineSpacing); void DrawCurrentTime(__int64 a2); void HouseDialogManager(); @@ -331,8 +331,7 @@ GUIButton *GetControl(unsigned int uID); void Release(); void _41D08F_set_keyboard_control_group(int a2, int a3, int a4, int a5); - void DrawQuickCharRecord(); - char _41D73D_draw_buff_tooltip(); + void _41D73D_draw_buff_tooltip(); static GUIWindow *Create(unsigned int uX, unsigned int uY, unsigned int uWidth, unsigned int uHeight, enum WindowType eType, int a4, int a5); @@ -443,7 +442,7 @@ extern struct GUIMessageQueue *pMessageQueue_50CBD0; // idb - +extern struct GUIMessageQueue *pMessageQueue_50C9E8; // idb @@ -483,6 +482,7 @@ void GameUI_DrawPartySpells(); void GameUI_DrawTorchlightAndWizardEye(); void GameUI_DrawCharacterSelectionFrame(); +void GameUI_CharacterQuickRecord_Draw(GUIWindow *window, Player *player); @@ -497,9 +497,9 @@ // character ui struct GUIWindow *CharacterUI_Initialize(unsigned int _this); const char *CharacterUI_GetSkillDescText(unsigned int uPlayerID, PLAYER_SKILL_TYPE uPlayerSkillType); -char CharacterUI_SkillsTab_ShowHint(); +void CharacterUI_SkillsTab_ShowHint(); void CharacterUI_StatsTab_ShowHint(); -char CharacterUI_StatsTab_Draw(Player *player); +void CharacterUI_StatsTab_Draw(Player *player); void CharacterUI_SkillsTab_CreateButtons(); void CharacterUI_SkillsTab_Draw(Player *player); void CharacterUI_AwardsTab_Draw(Player *player); @@ -521,17 +521,18 @@ void BookUI_Autonotes_Draw(); void BookUI_Map_Draw(); void BookUI_Calendar_Draw(); +void BookUI_Journal_Draw(); void OnCloseSpellBook(); void InitializeBookTextures(); void InitializeBookFonts(); -void DrawSpellBookContent(); -void DrawBook_History(); +void DrawSpellBookContent(Player *player); unsigned int __cdecl DrawLloydBeaconsScreen(); void DrawTownPortalScreen(); void LoadSpellbook(unsigned int uID); // idb void DrawSpellDescriptionPopup(int spell_index); - +void sub_41140B(); +void sub_411473(); @@ -561,7 +562,7 @@ #pragma pack(push, 1) struct GUIButton { - char DrawLabel(const char *edx0, struct GUIFont *pFont, int a5, int *a9); +void DrawLabel(const char *label_text, struct GUIFont *pFont, int a5, int uFontShadowColor); void Release(); @@ -691,6 +692,7 @@ extern int uTextureID_GameUI_CharSelectionFrame; // 50C98C +extern unsigned int ui_mainmenu_copyright_color; extern unsigned int ui_character_default_text_color; extern unsigned int ui_character_skill_highlight_color; extern unsigned int ui_character_header_text_color; @@ -706,9 +708,20 @@ extern unsigned int ui_game_minimap_decoration_color_1; extern unsigned int ui_game_minimap_projectile_color; extern unsigned int ui_game_minimap_treasure_color; +extern unsigned int ui_game_character_record_playerbuff_colors[24]; extern unsigned int ui_book_quests_title_color; extern unsigned int ui_book_quests_text_color; extern unsigned int ui_book_autonotes_title_color; extern unsigned int ui_book_autonotes_text_color; extern unsigned int ui_book_map_title_color; -extern unsigned int ui_book_map_coordinates_color; \ No newline at end of file +extern unsigned int ui_book_map_coordinates_color; +extern unsigned int ui_book_calendar_title_color; +extern unsigned int ui_book_calendar_time_color; +extern unsigned int ui_book_calendar_day_color; +extern unsigned int ui_book_calendar_month_color; +extern unsigned int ui_book_calendar_year_color; +extern unsigned int ui_book_calendar_moon_color; +extern unsigned int ui_book_calendar_location_color; +extern unsigned int ui_book_journal_title_color; +extern unsigned int ui_book_journal_text_color; +extern unsigned int ui_book_journal_text_shadow; \ No newline at end of file