diff GUIWindow.h @ 1048:d36681a9e4f8

Слияние
author Ritor1
date Thu, 23 May 2013 11:17:01 +0600
parents 39f42990698f
children 3e5d70cfe20e
line wrap: on
line diff
--- a/GUIWindow.h	Thu May 23 11:16:46 2013 +0600
+++ b/GUIWindow.h	Thu May 23 11:17:01 2013 +0600
@@ -307,6 +307,12 @@
 struct GUIButton;
 struct Texture;
 
+
+#define WINDOW_INPUT_NONE        0
+#define WINDOW_INPUT_IN_PROGRESS 1
+#define WINDOW_INPUT_CONFIRMED   2
+#define WINDOW_INPUT_CANCELLED   3
+
 /*  155 */
 #pragma pack(push, 1)
 struct GUIWindow
@@ -354,7 +360,7 @@
   int field_34;
   int pStartingPosActiveItem;
   int numVisibleWindows;
-  int field_40;
+  int receives_keyboard_input_2; //  0  no input   1 currently typing   2 enter pressed   3 escape pressed
   int receives_keyboard_input;
   char *Hint;
   GUIButton *pControlsHead;
@@ -464,7 +470,17 @@
 void draw_leather();
 
 
+// main menu ui
+void MainMenuUI_LoadFontsAndSomeStuff();
+void MainMenuUI_Create();
+MENU_STATE MainMenuUI_Credits_Loop();
 
+// save & load ui
+void SaveUI_Load();
+void SaveUI_Draw();
+
+void LoadUI_Draw();
+void LoadUI_Load(unsigned int uDialogueType); // idb
 
 // game ui
 void GameUI_DrawRightPanel();
@@ -479,17 +495,22 @@
 void GameUI_Footer_2();
 void GameUI_SetFooterString(const char *pStr);
 void GameUI_DrawMinimap(unsigned int uX, unsigned int uY, unsigned int uZ, unsigned int uW, unsigned int uZoom, unsigned int bRedrawOdmMinimap);
+auto GameUI_GetMinimapHintText() -> const char *;
 void GameUI_DrawPartySpells();
 void GameUI_DrawTorchlightAndWizardEye();
 void GameUI_DrawCharacterSelectionFrame();
 void GameUI_CharacterQuickRecord_Draw(GUIWindow *window, Player *player);
+void GameUI_DrawNPCPopup(void *_this);
 
-
+void GameUI_InitializeDialogue(Actor *actor, int bPlayerSaysHello);
+void GameUI_DrawBranchlessDialogue();
+void GameUI_DrawDialogue();
 
 
-
-
-
+// game menu ui
+void GameMenuUI_DrawKeyBindings();
+void GameMenuUI_DrawVideoOptions();
+void GameMenuUI_Options_Draw();
 
 
 
@@ -515,7 +536,7 @@
 
 
 
-//book ui
+// book ui
 void BookUI_Draw(WindowType book);
 void BookUI_Questbook_Draw();
 void BookUI_Autonotes_Draw();
@@ -528,7 +549,7 @@
 void InitializeBookFonts();
 void DrawSpellBookContent(Player *player);
 unsigned int __cdecl DrawLloydBeaconsScreen();
-void DrawTownPortalScreen();
+void BookUI_DrawTownPortalMap();
 void LoadSpellbook(unsigned int uID); // idb
 void DrawSpellDescriptionPopup(int spell_index);
 void sub_41140B();
@@ -536,8 +557,17 @@
 
 
 
+// rest ui
+void RestUI_Load();
+void RestUI_Draw();
 
 
+// transition & travel ui
+void TransitionUI_Load(uint anim_id, uint exit_pic_id, int x, int y, int z, int directiony, int directionx, int a8, const char *pLocationName);
+void TransitionUI_Draw();
+
+void TravelUI_Load();
+void TravelUI_Draw();
 
 
 
@@ -709,6 +739,11 @@
 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_gamemenu_video_gamma_title_color;
+extern unsigned int ui_gamemenu_keys_action_name_color;
+extern unsigned int ui_gamemenu_keys_key_selection_blink_color_1;
+extern unsigned int ui_gamemenu_keys_key_selection_blink_color_2;
+extern unsigned int ui_gamemenu_keys_key_default_color;
 extern unsigned int ui_book_quests_title_color;
 extern unsigned int ui_book_quests_text_color;
 extern unsigned int ui_book_autonotes_title_color;