diff mm7_4.cpp @ 784:b3e08a496778

Merge
author Nomad
date Sun, 24 Mar 2013 21:15:01 +0200
parents b27dd658ea77 c47efaf23642
children f004c7ceb7bd
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Mar 24 21:14:28 2013 +0200
+++ b/mm7_4.cpp	Sun Mar 24 21:15:01 2013 +0200
@@ -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 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;
 }
-