Mercurial > mm7

changeset 782:c47efaf23642

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more tidy
author zipi
date Sun, 24 Mar 2013 01:45:09 +0000
parents d170f23f70d1
children b3e08a496778 da80bd2922df
files UIHouses.cpp mm7_1.cpp mm7_2.cpp mm7_4.cpp mm7_5.cpp
diffstat 5 files changed, 2 insertions(+), 394 deletions(-) [+]
line wrap: on
line diff
--- a/UIHouses.cpp	Sun Mar 24 01:27:34 2013 +0000
+++ b/UIHouses.cpp	Sun Mar 24 01:45:09 2013 +0000
@@ -1,5 +1,4 @@
 #include "UIHouses.h"
-
 #include "Party.h"
 #include "Player.h"
 #include "texts.h"
@@ -24,11 +23,9 @@
 #include "IndoorCamera.h"
 #include "MapInfo.h"
 #include "Log.h"
-
 #include "MM7.h"
 #include "mm7_data.h"
 
-
 int uHouse_ExitPic; // weak
 
 int dword_591080; // weak
@@ -36,7 +33,6 @@
 int in_current_building_type; // 00F8B198
 HOUSE_DIALOGUE_MENU dialog_menu_id; // 00F8B19C
 
-
 #pragma pack(push, 1)
 struct stru365_travel_info
 {
--- a/mm7_1.cpp	Sun Mar 24 01:27:34 2013 +0000
+++ b/mm7_1.cpp	Sun Mar 24 01:45:09 2013 +0000
@@ -8,7 +8,6 @@
 #include <assert.h>
 
 #include "MM7.h"
-
 #include "MapInfo.h"
 #include "Game.h"
 #include "GUIWindow.h"
@@ -52,24 +51,13 @@
 #include "texts.h"
 #include "stru351.h"
 #include "UIHouses.h"
-
 #include "mm7_data.h"
 
-
-
-
 int __stdcall aWinProc(HWND hWnd, UINT Msg, WPARAM wParam, unsigned int lParam);
 int __stdcall InsertMM7CDDialogFunc(HWND hDlg, int a2, __int16 a3, int a4);
 bool __fastcall FindMM7CD(HWND hWnd, char *pCDDrive);
 bool __fastcall Initialize(HINSTANCE hInst, char *pCmdLine);
 
-
-
-
-
-
-
-
 //----- (004453C0) mm6-----------------------------------------------------
 //----- (004A1760) mm6_chinese---------------------------------------------
 int fixpoint_mul(int a1, int a2)
@@ -113,8 +101,6 @@
 // 506988: using guessed type int dword_506988;
 // 50698C: using guessed type int dword_50698C;
 // 507CC0: using guessed type int dword_507CC0;
-
-
 // 50651C: using guessed type int dword_50651C;
 // 506520: using guessed type int dword_506520;
 // 506524: using guessed type int dword_506524;
@@ -123,14 +109,8 @@
 // 506548: using guessed type int dword_506548;
 // 723E80: using guessed type int dword_723E80_award_related[];
 // 723E84: using guessed type int dword_723E84[];
-
-
-
 // 5075E0: using guessed type int pVisibleWindowsIdxs[20];
 
-
-
-
 //----- (0041CD4F) --------------------------------------------------------
 bool __thiscall sub_41CD4F(unsigned int _this)
 {
@@ -480,12 +460,6 @@
   return a1->DrawText(a2, 32, uY, 0, pTmpBuf, 0, 0, 0);
 }
 
-
-
-
-
-
-
 //----- (0041F54A) --------------------------------------------------------
 void __cdecl LoadActualSkyFrame()
 {
@@ -544,9 +518,6 @@
   viewparams->bRedrawGameUI = 1;
 }
 
-
-
-
 //----- (0042038D) --------------------------------------------------------
 void __cdecl sub_42038D()
 {
@@ -574,7 +545,6 @@
   }
 }
 
-
 //----- (00420C05) --------------------------------------------------------
 void __fastcall party_finds_gold(unsigned int uNumGold, int _1_dont_share_with_followers___2_the_same_but_without_a_message__else_normal)
 {
@@ -731,8 +701,6 @@
   }
 }
 
-
-
 //----- (004219BE) --------------------------------------------------------
 GUIWindow *stru277::sub_4219BE()
 {
@@ -770,7 +738,6 @@
   return v2;
 }
 
-
 //----- (00421B2C) --------------------------------------------------------
 bool __cdecl sub_421B2C_PlaceInInventory_or_DropPickedItem()
 {
@@ -866,7 +833,6 @@
   return 1;
 }
 
-
 //----- (00421D00) --------------------------------------------------------
 void __fastcall GameUI_OnPlayerPortraitLeftClick(unsigned int uPlayerID)
 {
@@ -1635,8 +1601,6 @@
   uGameUIFontShadow = GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(v5, v4, v6);
 }
 
-
-
 //----- (00423AEE) --------------------------------------------------------
 void __cdecl reset_some_strus_flt_2Cs()
 {
@@ -2458,7 +2422,6 @@
   return result;*/
 }
 
-
 //----- (00424829) --------------------------------------------------------
 bool sub_424829(int a1, BspRenderer_stru2 *a2, BspRenderer_stru2 *a3, int a4)
 {
--- a/mm7_2.cpp	Sun Mar 24 01:27:34 2013 +0000
+++ b/mm7_2.cpp	Sun Mar 24 01:45:09 2013 +0000
@@ -53,12 +53,9 @@
 #include "Log.h"
 #include "UIHouses.h"
 #include "texts.h"
-
 #include "mm7_data.h"
 #include "MM7.h"
 
-
-
 //----- (004BB756) --------------------------------------------------------
 signed int __fastcall sub_4BB756(signed int a1)
 {
@@ -744,10 +741,6 @@
   pAudioPlayer->PlaySound((SoundID)14060, 0, 0, -1, 0, 0, 0, 0);
 }
 
-
-
-
-
 //----- (004BC8D5) --------------------------------------------------------
 void SpellBookGenerator()
 	{
@@ -810,7 +803,6 @@
   return;
 }
 
-
 //----- (004BCA33) --------------------------------------------------------
 void UI_CreateEndConversationButton()
 {
@@ -822,7 +814,6 @@
   pDialogueWindow->CreateButton(8, 8, 450, 320, 1, 0, 0x51u, 0, 0, "", 0);
 }
 
-
 //----- (004BD8B5) --------------------------------------------------------
 signed int __cdecl sub_4BD8B5()
 {
@@ -921,10 +912,6 @@
   return 0;
 }
 
-
-
-
-
 //----- (004BDB56) --------------------------------------------------------
 void __cdecl UIShop_Buy_Identify_Repair()
 {
@@ -1399,8 +1386,6 @@
   }
 }
 
-
-
 //----- (004BE386) --------------------------------------------------------
 void __fastcall log_error(const char *pMessage)
 {
@@ -1419,9 +1404,6 @@
   }
 }
 
-
-
-
 //----- (004BF91E) --------------------------------------------------------
 unsigned int __thiscall GameOverMenu(void *ecx0)
 {
@@ -1621,12 +1603,6 @@
   return result;
 }
 
-
-
-
-
-
-
 //----- (004D6FB0) --------------------------------------------------------
 int /*__usercall*/ sr_sub_4D6FB0/*<eax>*/(stru315 *a1/*<ebp>*/)
 {
@@ -2393,9 +2369,6 @@
   }
 }
 
-
-
-
 //----- (00451007) --------------------------------------------------------
 int stru350::sub_451007_scale_image_bicubic(unsigned short *pSrc, int srcWidth, int srcHeight, int srcPitch,
                                             unsigned short *pDst, int dstWidth, int dstHeight, int dstPitch,
@@ -3644,12 +3617,6 @@
   }
 }
 
-
-
-
-
-
-
 //----- (0044E1EC) --------------------------------------------------------
 int TextureFrameTable::FromFileTxt(const char *Args)
 {
@@ -3768,13 +3735,6 @@
   return 1;
 }
 
-
-
-
-
-
-
-
 //----- (0044F57C) --------------------------------------------------------
 void SpawnEncounter(MapInfo *pMapInfo, SpawnPointMM7 *spawn, int a3, int a4, int a5)
 {
@@ -4056,9 +4016,6 @@
     //while ( (signed int)v53 < v56 );
 }
 
-
-
-
 //----- (0044FA4C) --------------------------------------------------------
 signed int __fastcall sub_44FA4C_spawn_light_elemental(int a1, int a2, int a3)
 {
@@ -4181,7 +4138,6 @@
   return result;
 }
 
-
 //----- (0044FFD8) --------------------------------------------------------
 int MapInfo::SpawnRandomTreasure(SpawnPointMM7 *a2)
 {
@@ -4357,7 +4313,6 @@
   return a1a.Create(0, 0, 0, 0);
 }
 
-
 //----- (00450521) --------------------------------------------------------
 signed int __fastcall sub_450521_ProllyDropItemAt(int ecx0, signed int a2, int a3, int a4, int a5, unsigned __int16 a6)
 {
@@ -4403,9 +4358,6 @@
   return a1.Create(0, 0, 0, 0);
 }
 
-
-
-
 //----- (0045063B) --------------------------------------------------------
 int __fastcall sub_45063B(MapInfo *a1, int a2)
 {
@@ -4559,8 +4511,6 @@
   return result;
 }
 
-
-
 //----- (00450929) --------------------------------------------------------
 int LevelDecoration::GetGlobalEvent()
 {
@@ -4764,7 +4714,6 @@
 }
 // 5C6DF8: using guessed type int dword_5C6DF8;
 
-
 //----- (00450DA3) --------------------------------------------------------
 int __cdecl GetAlertStatus()
 {
@@ -4777,8 +4726,6 @@
   return result;
 }
 
-
-
 //----- (00450DDE) --------------------------------------------------------
 stru350 *stru350::_450DDE()
 {
@@ -4786,7 +4733,6 @@
   return this;
 }
 
-
 //----- (00450DF1) --------------------------------------------------------
 bool stru350::_450DF1(const stru355 *p1, const stru355 *p2)
 {
@@ -4987,9 +4933,6 @@
   return true;
 }
 
-
-
-
 //----- (00450F55) --------------------------------------------------------
 unsigned int stru350::_450F55(int a2)
 {
@@ -5014,7 +4957,6 @@
   return v2 | ((a2 & field_0.field_10) << field_48) | ((a2 & field_0.field_14) << field_50) | ((a2 & field_0.field_18) << field_58);
 }
 
-
 //----- (00452442) --------------------------------------------------------
 unsigned int __fastcall sub_452442(unsigned __int16 a1, unsigned __int16 a2, int a3, int a4)
 {
@@ -5048,8 +4990,6 @@
                                                                     + (__PAIR__(v10, (unsigned __int16)a4 >> 2) & 0x1C00));
 }
 
-
-
 //----- (0045281E) --------------------------------------------------------
 //    Calculates atan2(y/x)
 // return value: angle in integer format (multiplier of Pi/1024)  
@@ -5160,9 +5100,6 @@
   return 0;
 }
 
-
-
-
 //----- (00452969) --------------------------------------------------------
 stru193_math::stru193_math()
 {
@@ -5324,11 +5261,6 @@
   return result;
 }
 
-
-
-
-
-
 //----- (00453F62) --------------------------------------------------------
 void MapStats::Initialize()
 {
@@ -5657,11 +5589,6 @@
 }
 // 453F62: using guessed type char Str[32];
 
-
-
-
-
-
 //----- (004547A3) --------------------------------------------------------
 MAP_TYPE MapStats::GetMapInfo(const char *Str2)
 {
@@ -5729,11 +5656,6 @@
   }
 }
 
-
-
-
-
-
 //----- (00458244) --------------------------------------------------------
 unsigned int __fastcall SkillToMastery(unsigned __int16 a1)
 {
@@ -5759,7 +5681,6 @@
   return result;
 }
 
-
 //----- (0045828B) --------------------------------------------------------
 unsigned int __fastcall GetSpellColor(signed int a1)
 {
@@ -5876,7 +5797,6 @@
   return GenerateColorAsCloseAsPossibleToR8G8B8InTargetFormat(v2, v1, v4);
 }
 
-
 //----- (004583B0) --------------------------------------------------------
 LevelDecoration::LevelDecoration()
 {
@@ -5891,14 +5811,6 @@
   this->uCog = 0;
 }
 
-
-
-
-
-
-
-
-
 //----- (00458600) --------------------------------------------------------
 void DecorationList::ToFile()
 {
@@ -6129,10 +6041,6 @@
   return 1;
 }
 
-
-
-
-
 //----- (00459064) --------------------------------------------------------
 void ObjectList::InitializeSprites()
 {
@@ -6347,7 +6255,6 @@
   return 1;
 }
 
-
 //----- (0045E03A) --------------------------------------------------------
 unsigned __int16 *__fastcall MakeScreenshot(signed int width, signed int height)
 {
@@ -6530,10 +6437,6 @@
   free(v2);
 }
 
-
-
-
-
 //----- (00460706) --------------------------------------------------------
 void TryLoadLevelFromLOD()
 {
@@ -6590,10 +6493,6 @@
   return false;
 }
 
-
-
-
-
 //----- (0046086A) --------------------------------------------------------
 bool Autosave()
 {
@@ -6657,7 +6556,6 @@
   return flag;
 }
 
-
 //----- (004610AA) --------------------------------------------------------
 void __fastcall PrepareToLoadODM(unsigned int bLoading, OutdoorCamera *a2)
 {
@@ -6851,8 +6749,6 @@
     pMouse->SetCursorBitmapFromItemID(pParty->pPickedItem.uItemID);
 }
 
-
-
 //----- (004613C4) --------------------------------------------------------
 int __cdecl sub_4613C4()
 {
@@ -6887,18 +6783,6 @@
 }
 // 6836C8: using guessed type int 6836C8_num_decorations_6807E8;
 
-
-
-
-
-
-
-
-
-
-
-
-
 //----- (004621DA) --------------------------------------------------------
 int __fastcall int_get_vector_length(signed int a1, signed int a2, signed int a3)
 {
@@ -6929,11 +6813,6 @@
   return (11 * a2 >> 5) + a1 + (v4 >> 2);
 }
 
-
-
-
-
-
 OPENFILENAMEA ofn;
 //----- (0046271C) --------------------------------------------------------
 void __cdecl crt_init_globals_46271C()
@@ -7794,8 +7673,6 @@
     pWindowList[pVisibleWindowsIdxs[v0--] - 1].Release();
 }
 
-
-
 //----- (004646F0) --------------------------------------------------------
 void PrepareWorld(unsigned int this_)
 {
@@ -7862,8 +7739,6 @@
   day_fogrange_2 = 5000;
 }
 
-
-
 //----- (00464866) --------------------------------------------------------
 void __fastcall DoPrepareWorld(unsigned int bLoading, int a2)
 {
@@ -7929,7 +7804,6 @@
   _flushall();
 }
 
-
 //----- (004649EF) --------------------------------------------------------
 int __fastcall ReadWindowsRegistryInt(const char *pKey, int uDefValue)
 {
@@ -8295,9 +8169,6 @@
   }
 }
 
-
-
-
 //----- (004651F4) --------------------------------------------------------
 bool MM7_Initialize()
 {
@@ -8833,9 +8704,6 @@
   return true;
 }
 
-
-
-
 //----- (00465D0B) --------------------------------------------------------
 void __cdecl SecondaryInitialization()
 {
@@ -8939,11 +8807,6 @@
   dword_576E28 = 9;
 }
 
-
-
-
-
-
 void IntegrityTest()
 {
   assert(sizeof(RenderVertexSoft) == 0x30);
@@ -9287,10 +9150,6 @@
   return 1;
 }
 
-
-
-
-
 //----- (004637E0) --------------------------------------------------------
 char __cdecl sub_4637E0_is_there_popup_onscreen()
 {
@@ -9298,8 +9157,6 @@
 }
 // 507BF0: using guessed type int dword_507BF0_is_there_popup_onscreen;
 
-
-
 //----- (00465F5A) --------------------------------------------------------
 void __cdecl CreateAsyncMouse()
 {
@@ -9512,7 +9369,6 @@
     pOutdoorCamera->_485F64();
 }
 
-
 //----- (00466B8C) --------------------------------------------------------
 int __cdecl AbortWithError()
 {
@@ -9586,10 +9442,6 @@
   return uCurrentMenuID;
 }
 
-
-
-
-
 /*
     v17 = 0;
     if ( v4 > -2005532222 )
@@ -10092,16 +9944,12 @@
         }
       }*/
 
-
-
 //----- (00467D5D) --------------------------------------------------------
 int __thiscall sub_467D5D(int _this)
 {
   return *(int *)(_this + 7204);
 }
 
-
-
 //----- (00467E7F) --------------------------------------------------------
 void __thiscall sub_467E7F_EquipBody(unsigned int uEquipType)
 {
@@ -10223,9 +10071,6 @@
            0);
 }
 
-
-
-
 //----- (00468F8A) --------------------------------------------------------
 void __cdecl OnPaperdollLeftClick()
 {
@@ -10756,9 +10601,6 @@
   }
 }
 
-
-
-
 //----- (0046A0A1) --------------------------------------------------------
 int __thiscall UnprojectX(int x)
 {
@@ -11541,7 +11383,6 @@
   return v19;
 }
 
-
 //----- (0046BDA8) --------------------------------------------------------
 unsigned int __cdecl GetGravityStrength()
 {
@@ -11570,8 +11411,6 @@
   }
 }
 
-
-
 //----- (0046BDF1) --------------------------------------------------------
 void __cdecl BLV_UpdateUserInputAndOther()
 {
@@ -11618,9 +11457,6 @@
   _46CC4B_check_event_triggers();
 }
 
-
-
-
 //----- (0046BEF1) --------------------------------------------------------
 void SpriteObject::_46BEF1_apply_spells()
 {
@@ -11662,7 +11498,6 @@
   }
 }
 
-
 //----- (0046BFFA) --------------------------------------------------------
 bool __fastcall _46BFFA_check_object_intercept(unsigned int uLayingItemID, signed int a2)
 {
@@ -12695,4 +12530,3 @@
   pAudioPlayer->PlaySound((SoundID)v125, v126, v127, v128, v129, v130, v131, v133);
   return 0;
 }
-
--- a/mm7_4.cpp	Sun Mar 24 01:27:34 2013 +0000
+++ b/mm7_4.cpp	Sun Mar 24 01:45:09 2013 +0000
@@ -3,7 +3,6 @@
 #include <assert.h>
 
 #include "MM7.h"
-
 #include "MapInfo.h"
 #include "Game.h"
 #include "GUIWindow.h"
@@ -54,23 +53,8 @@
 #include "texts.h"
 #include "Log.h"
 #include "UIHouses.h"
-
 #include "mm7_data.h"
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 //----- (0046CC4B) --------------------------------------------------------
 void __cdecl _46CC4B_check_event_triggers()
 {
@@ -842,7 +826,6 @@
   return dword_720F20[v22];
 }
 
-
 //not sure if right- or left-handed coordinate space assumed, so this could be normal of inverse normal
 // for a right-handed system, that would be an inverse normal
 //----- (0046DCC8) --------------------------------------------------------
@@ -916,7 +899,6 @@
   }
 }
 
-
 //----- (0046DEF2) --------------------------------------------------------
 unsigned int __fastcall sub_46DEF2(signed int a2, unsigned int uLayingItemID)
 {
@@ -1452,8 +1434,6 @@
 }
 // 4EC3EC: using guessed type Edge defaultEdge;
 
-
-
 //----- (00487355) --------------------------------------------------------
 bool OutdoorCamera::_487355()
 {
@@ -1476,8 +1456,6 @@
   return result;
 }
 
-
-
 //----- (00487DA9) --------------------------------------------------------
 void __cdecl sub_487DA9()
 {
@@ -1519,10 +1497,6 @@
 }
 // 4EC3EC: using guessed type Edge defaultEdge;
 
-
-
-
-
 //----- (0048958E) --------------------------------------------------------
 stru12_MemoryBlock::stru12_MemoryBlock(int a2)
 {
@@ -1795,10 +1769,6 @@
   this->field_8C = 0;
 }
 
-
-
-
-
 //----- (0048A959) --------------------------------------------------------
 unsigned int ReplaceHSV(unsigned int uColor, float h_replace, float s_replace, float v_replace)
 {
@@ -1822,7 +1792,6 @@
          ((uint)floorf(b * 255.0f + 0.5f) & 0xFF);
 }
 
-
 //----- (0048B561) --------------------------------------------------------
 int _48B561_mess_with_scaling_along_z(/*int a1, */float a2)
 {
@@ -1836,11 +1805,6 @@
   return v5 | (v4 << 16);
 }
 
-
-
-
-
-
 //----- (00491E3A) --------------------------------------------------------
 void __cdecl sub_491E3A()
 {
@@ -1942,9 +1906,6 @@
 }
 // 4ED498: using guessed type char byte_4ED498;
 
-
-
-
 //----- (0049387A) --------------------------------------------------------
 int CycleCharacter(unsigned int _this)
 {
@@ -2380,8 +2341,6 @@
   return result;
 }
 
-
-
 //----- (00493F79) --------------------------------------------------------
 void sub_493F79(stru351_summoned_item *_this, __int64 a2)
 {
@@ -2405,10 +2364,6 @@
   _this->field_18_expire_year = v6 / 0xC + game_starting_year;
 }
 
-
-
-
-
 //----- (00494035) --------------------------------------------------------
 void __cdecl _494035_timed_effects__water_walking_damage__etc()
 {
@@ -2908,8 +2863,6 @@
 }
 // 4EE088: using guessed type __int16 word_4EE088_sound_ids[];
 
-
-
 //----- (00494AED) --------------------------------------------------------
 unsigned int PlayerFrameTable::GetFrameIdByExpression(CHARACTER_EXPRESSION_ID expression)
 {
@@ -3385,8 +3338,6 @@
   return result;
 }
 
-
-
 //----- (00495366) --------------------------------------------------------
 char *__fastcall sub_495366(unsigned __int8 a1, unsigned __int8 a2)
 {
@@ -3895,9 +3846,6 @@
   return pTmpBuf2;
 }
 
-
-
-
 //----- (0049B04D) --------------------------------------------------------
 void stru154::GetFacePlaneAndClassify(ODMFace *a2, BSPVertexBuffer *a3)
 {
@@ -4029,10 +3977,6 @@
   *pOutDist = (double)(v5->pFacePlane.dist & 0xFFFF) / 65535.0f + (double)(v5->pFacePlane.dist >> 16);
 }
 
-
-
-
-
 //----- (0049D700) --------------------------------------------------------
 unsigned int __fastcall GetMaxMipLevels(unsigned int uDim)
 {
@@ -4051,15 +3995,6 @@
   return v3 == 0 ? v2 : 0;
 }
 
-
-
-
-
-
-
-
-
-
 //----- (004A19D8) --------------------------------------------------------
 unsigned int BlendColors(unsigned int a1, unsigned int a2)
 {
@@ -4102,8 +4037,6 @@
   return LOBYTE(v13) | ((LOBYTE(v11) | (((v6 << 8) | v9) << 8)) << 8);*/
 }
 
-
-
 //----- (004A46E6) --------------------------------------------------------
 int __fastcall sr_4A46E6_draw_particle_segment(unsigned int x, signed int y, signed int _z, int a4, unsigned int lightColor)
 {
@@ -4243,7 +4176,6 @@
   return z;
 }
 
-
 //----- (004A57E9) --------------------------------------------------------
 void __cdecl Present_ColorKey()
 {
@@ -4472,8 +4404,6 @@
   }
 }
 
-
-
 //----- (004A7063) --------------------------------------------------------
 int __thiscall sub_4A7063(unsigned int uDiffuse, float a2)
 {
@@ -4521,13 +4451,6 @@
   return v10 | ((v9 | ((v7 | (v4 << 8)) << 8)) << 8);
 }
 
-
-
-
-
-
-
-
 //----- (004AD504) --------------------------------------------------------
 int __fastcall sub_4AD504(signed int sFaceID)
 {
@@ -5506,9 +5429,6 @@
 }
 // 4AE491: using guessed type int __fastcall sub_4AE491(int, int);
 
-
-
-
 //----- (004AE5F1) --------------------------------------------------------
 void __fastcall sub_4AE5F1(unsigned int uFaceID)
 {
@@ -6162,11 +6082,6 @@
   return result;
 }
 
-
-
-
-
-
 //----- (004B1447) --------------------------------------------------------
 Player *__fastcall sub_4B1447_party_fine(int a1, int a2, int a3)
 {
@@ -6309,7 +6224,6 @@
   a1.DrawTitleText(pFontComic, 0xCu, a1.uFrameHeight - LOBYTE(pFontComic->uFontHeight) - 16, 0, pTmpBuf, 3);
 }
 
-
 //----- (004B1784) --------------------------------------------------------
 bool __cdecl sub_4B1784_check_if_player_concious__draw_warning_else_mess_with_dlg_win()
 {
@@ -6344,7 +6258,6 @@
 }
 // F8B1E0: using guessed type int dword_F8B1E0;
 
-
 //view  item details  in shop?
 //----- (004B1A2D) --------------------------------------------------------
 void __cdecl sub_4B1A2D()
@@ -6548,8 +6461,6 @@
   }
 }
 
-
-
 //----- (004B1ECE) --------------------------------------------------------
 void __cdecl sub_4B1ECE()
 {
@@ -6645,7 +6556,6 @@
 	  v9->uHolderPlayer = v5;
   }
 }
-
 // 4F08EC: using guessed type int dword_4F08EC[];
 // 722B3C: using guessed type int dword_722B3C;
 // 722B44: using guessed type int dword_722B44;
@@ -6930,7 +6840,6 @@
   pVideoPlayer->_4BF5B2();//HouseVideo
 }
 
-
 //----- (004B254D) --------------------------------------------------------
 char *__thiscall _4B254D_SkillMasteryTeacher(int _this)
 {
@@ -7259,8 +7168,6 @@
   return pTmpBuf2;
 }
 
-
-
 //----- (004B29F2) --------------------------------------------------------
 const char * ContractSelectText( int pEventCode )
 	{
@@ -7293,7 +7200,6 @@
   }
 }
 
-
 //----- (004B2A74) --------------------------------------------------------
 void SimpleHouseAndBoatsDialog()
 {
@@ -7620,18 +7526,12 @@
   }
 }
 
-
-
-
-
 //----- (004B36CC) --------------------------------------------------------
 void CreateButtonInColumn( int column_pos, unsigned int control_id )
-	{
+{
      pDialogueWindow->CreateButton( 480, 30 * column_pos + 146, 140, 30,  1,  0, 0x195u,  control_id,  0,   "",   0);
 }
 
-
-
 //----- (004B3A72) --------------------------------------------------------
 void sub_4B3A72( int a1 )
 	{
@@ -7968,7 +7868,6 @@
   dialog_menu_id = HOUSE_DIALOGUE_OTHER;
 }
 
-
 //----- (004B4224) --------------------------------------------------------
 void _4B4224_UpdateNPCTopics( int _this )
 	{
@@ -8090,8 +7989,6 @@
  
 }
 
-
-
 //----- (004B46A5) --------------------------------------------------------
 char __fastcall DrawTextAtStatusBar(const char *sText, int font_color)
 {
@@ -8113,7 +8010,6 @@
   return 1000 * v1;
 }
 
-
 //----- (004BC49B) --------------------------------------------------------
 void OnSelectNPCDialogueOption(DIALOGUE_TYPE newDialogueType)
 {
@@ -8339,8 +8235,6 @@
 	dword_7241C8 = 0;
 }
 
-
-
 //----- (004BDAAF) --------------------------------------------------------
 bool __fastcall sub_4BDAAF(ItemGen *a1, int _2da_idx)
 {
@@ -8445,9 +8339,6 @@
 */
 }
 
-
-
-
 //----- (004B6478) --------------------------------------------------------
 void sub_4B6478()
     {
@@ -8656,10 +8547,6 @@
   return;
 }
 
-
-
-
-
 //----- (00405CFF) --------------------------------------------------------
 void stru262_TurnBased::End(bool bPlaySound)
 {
@@ -8908,9 +8795,6 @@
   }
 }
 
-
-
-
 //----- (0043FDED) --------------------------------------------------------
 void PrepareActorRenderList_BLV()
 {
@@ -9125,9 +9009,6 @@
   }
 }
 
-
-
-
 //----- (00444732) --------------------------------------------------------
 char *GetEventHintString(unsigned int uEventID)
 {
@@ -9183,9 +9064,6 @@
   return result;
 }
 
-
-
-
 //----- (00444839) --------------------------------------------------------
 unsigned int __fastcall sub_444839_move_map(unsigned int a1, int a2, int x, int y, int z, int directiony, int directionx, int a8, const char *pLocationName)
 {
@@ -9289,4 +9167,3 @@
     uCurrentHouse_Animation = v23;
   return result;
 }
-
--- a/mm7_5.cpp	Sun Mar 24 01:27:34 2013 +0000
+++ b/mm7_5.cpp	Sun Mar 24 01:45:09 2013 +0000
@@ -1,7 +1,6 @@
 #include <assert.h>
 
 #include "mm7.h"
-
 #include "MapInfo.h"
 #include "Game.h"
 #include "GUIWindow.h"
@@ -45,24 +44,8 @@
 #include "texts.h"
 #include "Log.h"
 #include "UIHouses.h"
-
 #include "mm7_data.h"
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 //----- (004304E7) --------------------------------------------------------
 void __cdecl GameUI_MsgProc()
 {
@@ -3480,7 +3463,6 @@
   pStru277->_427E01_cast_spell();
 }
 
-
 //----- (004356FF) --------------------------------------------------------
 void __cdecl back_to_game()
 {
@@ -3493,6 +3475,7 @@
     pEventTimer->Resume();
   viewparams->bRedrawGameUI = 1;
 }
+
 //----- (00435748) --------------------------------------------------------
 void __cdecl GUI_MainMenuMessageProc()
 {
@@ -4014,15 +3997,6 @@
   v1->z = v2 * v1->z;
 }
 
-
-
-
-
-
-
-
-
-
 //----- (004385B5) --------------------------------------------------------
 void stru11::CheckCPU()
 {
@@ -4415,8 +4389,6 @@
   memcpy((char *)&v17->cpuid_80000002_registers2[0] + 1, v18, 0x30u);*/
 }
 
-
-
 //----- (00438BDF) --------------------------------------------------------
 bool MonsterStats::BelongsToSupertype(unsigned int uMonsterInfoID, enum MONSTER_SUPERTYPE eSupertype)
 {
@@ -4500,7 +4472,6 @@
   return result;
 }
 
-
 //----- (00438F8F) --------------------------------------------------------
 void __cdecl _438F8F_area_of_effect__damage_evaluate()
 {
@@ -5201,7 +5172,6 @@
 }
 // 4D864C: using guessed type char byte_4D864C;
 
-
 //----- (00439FCB) --------------------------------------------------------
 void __fastcall DamagePlayerFromMonster(unsigned int uObjID, int a2, Vec3_int_ *pPos, unsigned int a4)
 {
@@ -5708,7 +5678,6 @@
   }
 }
 
-
 //----- (0043A97E) --------------------------------------------------------
 void __fastcall sub_43A97E(unsigned int uLayingItemID, signed int a2)
 {
@@ -5799,9 +5768,6 @@
   *z *= 65536 / (v5 | 1);
 }
 
-
-
-
 //----- (0043AE12) --------------------------------------------------------
 double __fastcall sub_43AE12(signed int a1)
 {
@@ -6051,8 +6017,6 @@
   }
 }
 
-
-
 //----- (0043C91D) --------------------------------------------------------
 int __fastcall _43C91D_FormItemTextureFilename(char *a1, signed int a2, int a3, int a4)
 {
@@ -6256,8 +6220,6 @@
   return result;
 }
 
-
-
 //----- (0043ED6F) --------------------------------------------------------
 bool _43ED6F_check_party_races(bool a1)
 {
@@ -6529,7 +6491,6 @@
   return result;
 }
 
-
 //----- (0043F333) --------------------------------------------------------
 void BspRenderer::MakeVisibleSectorList()
 {
@@ -6557,7 +6518,6 @@
   }
 }
 
-
 //----- (0043F515) --------------------------------------------------------
 void FindBillboardsLightLevels_BLV()
 {
@@ -9346,7 +9306,6 @@
   return !v114 || !v113;
 }
 
-
 //----- (00408768) --------------------------------------------------------
 void InitializeActors()
 {
@@ -9435,7 +9394,6 @@
   return result;
 }
 
-
 //----- (00408A27) --------------------------------------------------------
 unsigned int __thiscall SearchAliveActors(unsigned int *pTotalActors)
 {
@@ -9577,7 +9535,6 @@
   return v5;
 }
 
-
 //----- (00409BE8) --------------------------------------------------------
 void __cdecl sub_409BE8()
 {
@@ -9622,12 +9579,6 @@
 // 505888: using guessed type int amuint_505888;
 // 50588C: using guessed type int amuint_50588C;
 
-
-
-
-
-
-
 //----- (0040D75D) --------------------------------------------------------
 char __fastcall pPrimaryWindow_draws_text(int a1, const char *pText, int *pXY)
 {
@@ -9647,8 +9598,6 @@
            0);
 }
 
-
-
 //----- (0040DB27) --------------------------------------------------------
 void __fastcall DrawRect(Vec4_int_ *pXYZW, unsigned __int16 uColor, char bSolidFill)
 {
@@ -9675,9 +9624,6 @@
   pRenderer->EndScene();
 }
 
-
-
-
 //----- (0040DDB1) --------------------------------------------------------
 int __fastcall rand_interval(int a, int b)
 {
@@ -9722,7 +9668,6 @@
   pRenderer->Present();
 }
 
-
 //----- (0040DFA7) --------------------------------------------------------
 int __stdcall retzero_sub_40DFA7(int a1)
 {
@@ -9935,12 +9880,6 @@
   return result;
 }
 
-
-
-
-
-
-
 //----- (0040F82D) --------------------------------------------------------
 void __fastcall ZBuffer_Fill(int *pZBuffer, int uTextureId, int iZValue)
 {
@@ -10037,7 +9976,6 @@
   }
 }
 
-
 //----- (0040F92A) --------------------------------------------------------
 void __fastcall sub_40F92A(int *pZBuffer, Texture *a2, int a3)
 {