Mercurial > mm7

changeset 1451:6b1c8c41c83f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
m
author Ritor1
date Tue, 06 Aug 2013 09:26:06 +0600
parents 4d13549db029
children 9add223260ce
files UI/Books/UISpellBook.cpp UI/UIBooks.cpp UI/UICharacter.cpp mm7_data.h
diffstat 4 files changed, 16 insertions(+), 51 deletions(-) [+]
line wrap: on
line diff
--- a/UI/Books/UISpellBook.cpp	Fri Aug 02 17:30:23 2013 +0600
+++ b/UI/Books/UISpellBook.cpp	Tue Aug 06 09:26:06 2013 +0600
@@ -46,26 +46,22 @@
   }
 }
 
-
-
 //----- (00411597) --------------------------------------------------------
 void OnCloseBook()
-    {
-    pAllocator->FreeChunk(pSpellFont);
-    pSpellFont = nullptr;
-    pAllocator->FreeChunk(pBookFont);
-    pBookFont = nullptr;
-    pAllocator->FreeChunk(pBook2Font);
-    pBook2Font = nullptr;
-    pAllocator->FreeChunk(pAutonoteFont);
-    pAutonoteFont = nullptr;
-    pTexture_mapbordr->Release();
-    pAudioPlayer->PlaySound(SOUND_CloseBook, 0, 0, -1, 0, 0, 0, 0);
-    pIcons_LOD->RemoveTexturesPackFromTextureList();
-    dword_506364 = 0;
-    }
-
-
+{
+  pAllocator->FreeChunk(pSpellFont);
+  pSpellFont = nullptr;
+  pAllocator->FreeChunk(pBookFont);
+  pBookFont = nullptr;
+  pAllocator->FreeChunk(pBook2Font);
+  pBook2Font = nullptr;
+  pAllocator->FreeChunk(pAutonoteFont);
+  pAutonoteFont = nullptr;
+  pTexture_mapbordr->Release();
+  pAudioPlayer->PlaySound(SOUND_CloseBook, 0, 0, -1, 0, 0, 0, 0);
+  pIcons_LOD->RemoveTexturesPackFromTextureList();
+  dword_506364 = 0;
+}
 
 //----- (00412AF9) --------------------------------------------------------
 static void BookUI_Spellbook_DrawCurrentSchoolBackground()
@@ -74,7 +70,7 @@
 
   v0 = 0;
   if ( uActiveCharacter )
-	  v0 = pParty->pPlayers[uActiveCharacter - 1].lastOpenedSpellbookPage;//*((char *)&pParty->pPartyBuffs[5].uExpireTime + 6972 * uActiveCharacter + 2);
+    v0 = pParty->pPlayers[uActiveCharacter - 1].lastOpenedSpellbookPage;//*((char *)&pParty->pPartyBuffs[5].uExpireTime + 6972 * uActiveCharacter + 2);
   pRenderer->DrawTextureIndexed(8, 8, pSpellBookPagesTextr[v0]);
   pRenderer->DrawTextureIndexed(476, 450, pSBQuickSpellBtnTextr);
   pRenderer->DrawTextureIndexed(561, 450, pSpellBookCloseBtnTextr);
--- a/UI/UIBooks.cpp	Fri Aug 02 17:30:23 2013 +0600
+++ b/UI/UIBooks.cpp	Tue Aug 06 09:26:06 2013 +0600
@@ -39,12 +39,6 @@
   }
 }
 
-
-
-
-
-
-
 //----- (0041192C) --------------------------------------------------------
 void InitializeBookTextures()
 {
@@ -81,8 +75,6 @@
   }
 }
 
-
-
 //----- (00411AAA) --------------------------------------------------------
 void InitializeBookFonts()
 {
@@ -100,9 +92,6 @@
   pSpellFont = LoadFont("spell.fnt", "FONTPAL", NULL);
 }
 
-
-
-
 //----- (0041140B) --------------------------------------------------------
 void OnCloseSpellBookPage()
 {
@@ -144,11 +133,3 @@
   pAudioPlayer->PlaySound(SOUND_CloseBook, 0, 0, -1, 0, 0, 0, 0);
   pIcons_LOD->RemoveTexturesPackFromTextureList();
 }
-
-
-
-
-
-
-
-
--- a/UI/UICharacter.cpp	Fri Aug 02 17:30:23 2013 +0600
+++ b/UI/UICharacter.cpp	Tue Aug 06 09:26:06 2013 +0600
@@ -186,11 +186,6 @@
   ui_house_player_cant_interact_color = TargetColor(255, 255, 155);
 }
 
-
-
-
-
-
 std::array<unsigned int, 16> papredoll_dbrds;
 unsigned int papredoll_drhs[4];
 unsigned int papredoll_dlhus[4];
@@ -385,8 +380,6 @@
     PLAYER_SKILL_MIND,     PLAYER_SKILL_BODY,        PLAYER_SKILL_LIGHT,      PLAYER_SKILL_DARK};
 
 
-
-
 //----- (00421626) --------------------------------------------------------
 GUIWindow *CharacterUI_Initialize(unsigned int _this)
 {
@@ -473,11 +466,6 @@
   return v2;
 }
 
-
-
-
-
-
 static int CharacterUI_SkillsTab_Draw__DrawSkillTable(Player *player, int x, int y, const int *skill_list, int skill_list_size, int right_margin, const char *skill_group_name)
 {
   int y_offset = y;
--- a/mm7_data.h	Fri Aug 02 17:30:23 2013 +0600
+++ b/mm7_data.h	Tue Aug 06 09:26:06 2013 +0600
@@ -1135,7 +1135,7 @@
 void __fastcall party_finds_gold(unsigned int uNumGold, int _1_dont_share_with_followers___2_the_same_but_without_a_message__else_normal); // idb
 void OnChestLeftClick();
 void __cdecl GameUI_WritePointedObjectStatusString();
-struct GUIWindow *__thiscall sub_4219BE(void *a4);
+//struct GUIWindow *__thiscall sub_4219BE(void *a4);
 bool __cdecl sub_421B2C_PlaceInInventory_or_DropPickedItem();
 void __fastcall GameUI_OnPlayerPortraitLeftClick(unsigned int uPlayerID); // idb
 void OnInventoryLeftClick();