diff GUIWindow.h @ 992:3a3ab572eff5

Merge
author Nomad
date Mon, 13 May 2013 17:07:52 +0200
parents c5d8ea1e6ccb 087a9af8e0ec
children 3431f6abc786 1c13fbaad0c5
line wrap: on
line diff
--- a/GUIWindow.h	Mon May 13 17:01:20 2013 +0200
+++ b/GUIWindow.h	Mon May 13 17:07:52 2013 +0200
@@ -14,9 +14,9 @@
 
   UIMSG_MouseLeftClickInGame = 10,
 
-  UIMSG_C = 12,
+  UIMSG_CHEST_ClickItem = 12,
 
-  UIMSG_E = 14,
+  UIMSG_MouseLeftClickInScreen = 14,
   UIMSG_F = 15,
 
   UIMSG_11 = 17,
@@ -70,7 +70,7 @@
   UIMSG_ClickInstallRemoveQuickSpellBtn = 88,
 
   UIMSG_OnTravelByFoot = 90,
-  UIMSG_5B = 91,
+  UIMSG_CHANGE_LOCATION_ClickCencelBtn = 91,
   UIMSG_ShowStatus_DateTime = 92,
   UIMSG_ShowStatus_ManaHP = 93,
   UIMSG_ShowStatus_Player = 94,
@@ -115,9 +115,9 @@
   UIMSG_SelectNPCDialogueOption = 136,
 
   UIMSG_CastSpell_GreatShot = 140,
-  UIMSG_CastSpell_8D = 141,
+  UIMSG_CastSpell_SPIRIT_Fate = 141,
   UIMSG_CastSpellFromBook = 142,
-  UIMSG_8F = 143,
+  UIMSG_CastSpell_8F = 143,
   UIMSG_PlayerCreation_VoicePrev = 144,
   UIMSG_PlayerCreation_VoiceNext = 145,
   UIMSG_92 = 146,
@@ -268,6 +268,7 @@
   WINDOW_SpellBook = 0x12,
   WINDOW_GreetingNPC = 19,
   WINDOW_Chest = 0x14,
+  WINDOW_22 = 0x16,
   WINDOW_SaveLoadButtons = 23,
   WINDOW_MainMenu_Load = 0x18,
   WINDOW_HouseInterior = 0x19,
@@ -386,7 +387,7 @@
   SCREEN_LOADGAME = 0xC,
   SCREEN_HOUSE = 0xD,
   SCREEN_E = 0xE,
-  SCREEN_F = 0xF,
+  SCREEN_CHEST_INVENTORY = 0xF,
   SCREEN_VIDEO = 0x10,
   SCREEN_CHANGE_LOCATION = 0x11,
   SCREEN_INPUT_BLV = 0x12,