--- a/mm7_3.cpp	Sun Mar 24 00:42:55 2013 +0000
+++ b/mm7_3.cpp	Sun Mar 24 01:27:34 2013 +0000
@@ -43,16 +43,8 @@
 #include "stru298.h"
 #include "texts.h"
 #include "Log.h"
-
 #include "mm7_data.h"
 
-
-
-
-
-
-
-
 //----- (0046E44E) --------------------------------------------------------
 int __thiscall _46E44E_collide_against_faces_and_portals(unsigned int b1)
 {
@@ -492,7 +484,6 @@
   return result;
 }
 
-
 //----- (0046ED1B) --------------------------------------------------------
 int _46ED1B_collide_against_floor(int x, int y, int z, unsigned int *pSectorID, unsigned int *pFaceID)
 {
@@ -760,7 +751,6 @@
   return result;
 }
 
-
 //----- (0047050A) --------------------------------------------------------
 int stru141::_47050A(int a2)
 {
@@ -1358,9 +1348,6 @@
   while ( (signed int)v75 < (signed int)uNumActors );
 }
 
-
-
-
 //----- (0047253E) --------------------------------------------------------
 void UpdateObjects()
 {
@@ -2166,7 +2153,6 @@
     EventProcessor(uFaceEvent, 0, 1);
 }
 
-
 //----- (00473893) --------------------------------------------------------
 void __cdecl ODM_ProcessPartyActions()
 {
@@ -3431,8 +3417,6 @@
   return 1;
 }
 
-
-
 //----- (00475665) --------------------------------------------------------
 signed int __thiscall sub_475665(BLVFace *_this, int a2, __int16 a3)
 {
@@ -3836,10 +3820,6 @@
   return 1;
 }
 
-
-
-
-
 //----- (004760D5) --------------------------------------------------------
 PartyAction ActionQueue::Next()
 {
@@ -3853,10 +3833,6 @@
 
   return result;
 }
-
-
-
-
 // 47730C: using guessed type int __stdcall const_1(int);
 
 //----- (0047752B) --------------------------------------------------------
@@ -3882,10 +3858,6 @@
   return v1 + v0->uReputation;
 }
 
-
-
-
-
 //----- (004775ED) --------------------------------------------------------
 int stru6_stru1_indoor_sw_billboard::_4775ED(float a2)
 {
@@ -4491,8 +4463,6 @@
   return v16;
 }
 
-
-
 //----- (004783FA) --------------------------------------------------------
 void __cdecl sub_4783FA_construct_global_73D150()
 {
@@ -4510,8 +4480,6 @@
   while ( v1 );
 }
 
-
-
 //----- (0047840D) --------------------------------------------------------
 char Render::DrawBuildingsD3D()
 {
@@ -5407,9 +5375,6 @@
   return false;
 }
 
-
-
-
 //----- (00479295) --------------------------------------------------------
 int stru148::_479295()
 {
@@ -5551,8 +5516,6 @@
   return result;
 }
 
-
-
 unsigned short *LoadTgaTexture(const wchar_t *filename, int *out_width = nullptr, int *out_height = nullptr)
 {
   #pragma pack(push, 1)
@@ -5632,8 +5595,10 @@
               *skybox_yn, *skybox_yp,
               *skybox_zn, *skybox_zp;
 int            skybox_width, skybox_height;
+
 IDirect3DTexture2   *skybox_texture;
 IDirectDrawSurface4 *skybox_surface;
+
 bool Skybox_Initialize(const wchar_t *skybox_name)
 {
   wchar_t xn_filename[1024], xp_filename[1024],
@@ -5714,15 +5679,16 @@
   return true;
 }
 
-
 struct vector
 {
   float x, y, z;
 };
+
 struct matrix
 {
   float m[4][4];
 };
+
 void VectorNormalize(vector *v)
 {
   float invmag = 1.0f / sqrtf(v->x * v->x + v->y * v->y + v->z * v->z);
@@ -5730,6 +5696,7 @@
   v->y *= invmag;
   v->z *= invmag;
 }
+
 void MatrixRotationAxis(matrix *pout, CONST vector *pv, float angle)
 {
   memset(pout, 0, sizeof(matrix));
@@ -5752,6 +5719,7 @@
    pout->m[1][2] = (1.0f - cos(angle)) * v.z * v.y + sin(angle) * v.x;
     pout->m[2][2] = (1.0f - cos(angle)) * v.z * v.z + cos(angle);
 }
+
 void VectorTransform(const matrix *m, const vector *v, vector *out)
 {
   out->x = m->m[0][0] * v->x + m->m[1][0] * v->y + m->m[2][0] * v->z + m->m[3][0];
@@ -5759,7 +5727,6 @@
   out->z = m->m[0][2] * v->x + m->m[1][2] * v->y + m->m[2][2] * v->z + m->m[3][2];
 }
 
-
 bool DrawSkyD3D_Skybox()
 {
   static bool initialized = false,
@@ -6745,8 +6712,6 @@
   MM7Initialization();
 }
 
-
-
 //----- (0047A825) --------------------------------------------------------
 bool LevelDecoration::_47A825()
 {
@@ -6785,8 +6750,6 @@
   return v1;
 }
 
-
-
 //----- (0047BC6F) --------------------------------------------------------
 unsigned __int16 *__fastcall GetBillboardPalette(RenderBillboard *a1, int a2, signed int a3, int a4)
 {
@@ -6889,13 +6852,6 @@
 // 6BE040: using guessed type int day_fogrange_1;
 // 6BE044: using guessed type int day_fogrange_2;
 
-
-
-
-
-
-
-
 //----- (0047BEB1) --------------------------------------------------------
 int __fastcall sr_sub_47BEB1(signed int a1, stru148 *a2, int terrain_gamma, int a4, int *a5, int *a6, int a7, int a8)
 {
@@ -7207,10 +7163,8 @@
   }
   return result;
 }
-
 // 4D864C: using guessed type char byte_4D864C;
 
-
 //----- (0047C370) --------------------------------------------------------
 unsigned int __cdecl GetLevelFogColor()
 {
@@ -7311,7 +7265,6 @@
   return (-1 - v7) << 24;
 }
 
-
 //----- (0047C4FC) --------------------------------------------------------
 signed int __fastcall GetActorTintColor(int max_dimm, int min_dimm, float distance, int a4, RenderBillboard *a5)
 {
@@ -7452,9 +7405,6 @@
 }
 // 6BE3C4: using guessed type char bUnderwater;
 
-
-
-
 //----- (0047F44B) --------------------------------------------------------
 unsigned int __stdcall WorldPosToGridCellX(signed int sWorldPosX)
 {
@@ -7531,9 +7481,6 @@
   //while ( (signed int)v4 < (signed int)arary_77E5C8 );
 }
 
-
-
-
 //----- (004811A3) --------------------------------------------------------
 void stru148::_4811A3()
 {
@@ -7548,8 +7495,6 @@
   pRenderer->DrawTerrainPolygon(uNumVertices, this, pBitmaps_LOD->pHardwareTextures[uTileBitmapID], 1, 1);
 }
 
-
-
 //----- (00481DB2) --------------------------------------------------------
 char __fastcall sr_sub_481DB2(RenderVertexSoft *a1, signed int a2, stru148 *a3)
 {
@@ -7588,8 +7533,6 @@
 // 50B570: using guessed type int dword_50B570[];
 // 50B638: using guessed type int dword_50B638[];
 
-
-
 //----- (00481E55) --------------------------------------------------------
 void OutdoorCamera::Project(unsigned int uNumVertices)
 {
@@ -7720,8 +7663,6 @@
     return false;
 }
 
-
-
 //----- (004823F4) --------------------------------------------------------
 bool IsTerrainSlopeTooHigh(int pos_x, int pos_z)
 {
@@ -7814,7 +7755,6 @@
   return y3 - v10 > 512;*/
 }
 
-
 //----- (0048257A) --------------------------------------------------------
 int __fastcall GetTerrainHeightsAroundParty2(int a1, int a2, int *a3, int a4)
 {
@@ -7886,7 +7826,6 @@
   return result;
 }
 
-
 //----- (0048276F) --------------------------------------------------------
 void stru148::_48276F_sr()
 {
@@ -8070,7 +8009,6 @@
   return 1;
 }
 
-
 //----- (00482A94) --------------------------------------------------------
 int sr_sub_482A94(Span *_this)
 {
@@ -8703,7 +8641,6 @@
   return 0;
 }
 
-
 //----- (004839BD) --------------------------------------------------------
 signed int __fastcall sr_sub_4839BD(Span *ecx0, unsigned __int16 *pTargetSurface)
 {
@@ -9018,8 +8955,6 @@
 // 6BE0E8: using guessed type int mipmapping_building_mm2;
 // 6BE0EC: using guessed type int mipmapping_building_mm3;
 
-
-
 //----- (0048408A) --------------------------------------------------------
 signed int sr_sub_48408A_prolly_odm_water_no_waves(Span *_this)
 {
@@ -9199,8 +9134,6 @@
   return 1;
 }
 
-
-
 //----- (00484442) --------------------------------------------------------
 signed int sr_sub_484442(Span *_this)
 {
@@ -9365,7 +9298,6 @@
   return 1;
 }
 
-
 //----- (004847EB) --------------------------------------------------------
 int sr_sub_4847EB(Span *_this)
 {
@@ -9740,8 +9672,6 @@
 // 80AA1C: using guessed type int dword_80AA1C;
 // 80AA20: using guessed type int dword_80AA20;
 
-
-
 //----- (00485407) --------------------------------------------------------
 signed int __fastcall sr_sub_485407_prolly_odm_water_wavy(Span *a1)
 {
@@ -9947,7 +9877,6 @@
   return 1;
 }
 
-
 //----- (0048585C) --------------------------------------------------------
 signed int __fastcall sr_sub_48585C_mb_DrawSpan(Span *a1, unsigned __int16 *pRenderTarget, int a4)
 {
@@ -10499,8 +10428,6 @@
     v->y = 0;
 }
 
-
-
 //----- (00485F64) --------------------------------------------------------
 void OutdoorCamera::_485F64()
 {
@@ -10535,7 +10462,6 @@
   camera_rotation_x_int_cosine = stru_5C6E00->Cos(pIndoorCamera->sRotationX);
 }
 
-
 //----- (0048607B) --------------------------------------------------------
 void stru148::_48607B(stru149 *a2)
 {
@@ -10836,7 +10762,6 @@
   return result;
 }
 
-
 //----- (00486A28) --------------------------------------------------------
 void OutdoorCamera::AllocSoftwareDrawBuffers()
 {
@@ -11085,8 +11010,6 @@
   return v7;
 }
 
-
-
 //----- (0043F953) --------------------------------------------------------
 void PrepareBspRenderList_BLV()
 {
@@ -11301,7 +11224,6 @@
         }
 }
 
-
 //----- (0044028F) --------------------------------------------------------
 void PrepareItemsRenderList_BLV()
 {
@@ -11465,8 +11387,6 @@
   }
 }
 
-
-
 //----- (00440639) --------------------------------------------------------
 void AddBspNodeToRenderList(unsigned int node_id)
 {
@@ -11615,8 +11535,6 @@
 }
 // 4E28F8: using guessed type int pCurrentScreen;
 
-
-
 //----- (00441A4E) --------------------------------------------------------
 __int16 __fastcall sub_441A4E(int a1)
 {
@@ -11692,11 +11610,6 @@
   return result;
 }
 
-
-
-
-
-
 //----- (00443801) --------------------------------------------------------
 void Initialize2DA()
 {
@@ -11925,7 +11838,6 @@
 
 }
 
-
 //----- (00443E31) --------------------------------------------------------
 void LoadLevel_InitializeLevelStr()
     {
@@ -11973,7 +11885,6 @@
   }
 }
 
-
 //----- (00443F95) --------------------------------------------------------
 void __cdecl OnMapLeave()
 {
@@ -11993,10 +11904,9 @@
   }
 }
 
-
 //----- (00443FDC) --------------------------------------------------------
 void OnMapLoad()
-	{
+{
 	stru176 *v3; // esi@7
 	__int16 v4; // cx@9
 	__int16 v5; // di@9
@@ -12027,23 +11937,23 @@
 	__int16 v33; // [sp+4Eh] [bp-2h]@9
 
 	for (uint i = 0; i < uLevelEVT_NumEvents; ++i)
-		{
+	{
 		auto pEvent = pLevelEVT_Index[i];
 
 		auto _evt = (_evt_raw *)(pLevelEVT + pEvent.uEventOffsetInEVT);
 
 		if (_evt->_e_type == EVENT_PlaySound)
-			{
+		{
 			pSoundList->LoadSound(EVT_DWORD(_evt->v5), 0);
-			}
+		}
 		else if (_evt->_e_type == EVENT_OnMapReload)
-			{
+		{
 			start_event_seq_number = pEvent.event_sequence_num;
 			EventProcessor(pEvent.uEventID, 0, 0);
 			start_event_seq_number = 0;
-			}
+		}
 		else if (_evt->_e_type == EVENT_OnTimer || _evt->_e_type == EVENT_OnLongTimer)
-			{
+		{
 			v3 = &array_5B5928_timers[dword_5B65C8_timers_count];
 			v20 = pOutdoor->uLastVisitDay;
 			if (uCurrentlyLoadedLevelType == LEVEL_Indoor)
@@ -12066,7 +11976,7 @@
 			v3->field_C = ((unsigned short)_evt->v12 << 8) + _evt->v11;
 			v3->field_E = ((unsigned short)_evt->v12 << 8) + _evt->v11;
 			if (v3->timer_evt_type  == EVENT_OnLongTimer && !(short)v6 )
-				{
+			{
 				if ( v20 )
 					v18 = pParty->uTimePlayed - v20;
 				else
@@ -12074,25 +11984,25 @@
 				v26 = (signed int)(signed __int64)((double)(signed __int64)v18 * 0.234375) / 60 / 60 / 24;
 
 				if ( v26 / 7 / 4 / 12 )
-					{
+				{
 					if ( v3->field_10 )
-						{
+					{
 						++dword_5B65C8_timers_count;
 						v3->field_0_time = 0;
 						continue;
-						}
 					}
+				}
 				if (v26 / 7 / 4 != 0 && v3->field_12 != 0 ||
 					v26 / 7 != 0 && v3->field_14 != 0 ||
 					v26 != 0 || !v20)
-					{
+				{
 					++dword_5B65C8_timers_count;
 					v3->field_0_time = 0;
 					continue;
-					}
 				}
+			}
 			else
-				{
+			{
 				v8 = (signed __int64)((double)(signed __int64)pParty->uTimePlayed * 0.234375);
 				v9 = v8;
 				v10 = (signed int)v8 / 60;
@@ -12118,30 +12028,30 @@
 				weeks = v15;
 				months = v16 % 12;
 				if ( v3->field_10 )
-					{
+				{
 					++years;
-					}
+				}
 				else
-					{
+				{
 					if ( v3->field_12 )
+					{
+						++months;
+					}
+					else
+					{
+						if ( v3->field_14 )
 						{
-						++months;
+							++weeks;
 						}
-					else
+						else
 						{
-						if ( v3->field_14 )
-							{
-							++weeks;
-							}
-						else
-							{
 							++days;
 							minutes = v3->field_18;
 							hours = v3->field_16;
 							seconds = v3->field_1A;
-							}
 						}
 					}
+				}
 				v3->field_0_time = (signed __int64)((double)((seconds
 					+ 60 * minutes
 					+ 3600 * hours
@@ -12151,10 +12061,10 @@
 					* 0.033333335);
 
 				++dword_5B65C8_timers_count;
-				}
 			}
 		}
 	}
+}
 
 //----- (00444360) --------------------------------------------------------
 void __thiscall Level_LoadEvtAndStr(const char *pLevelName)
@@ -12361,9 +12271,6 @@
   return result;
 }
 
-
-
-
 //----- (00444A51) --------------------------------------------------------
 void TransitionUI_Draw()
 {
@@ -12418,7 +12325,6 @@
   _unused_5B5924_is_travel_ui_drawn = true;
 }
 
-
 //----- (00444C8F) --------------------------------------------------------
 GUIWindow *__cdecl UI_CreateTravelDialogue()
 {
@@ -12539,7 +12445,6 @@
   }
 }
 
-
 //----- (00444FBE) --------------------------------------------------------
 void __cdecl DrawBranchlessDialogueUI()
 {
@@ -12644,7 +12549,6 @@
   pEventTimer->Resume();
 }
 
-
 //----- (00445308) --------------------------------------------------------
 const char *GetProfessionActionText(int a1)
 {
@@ -13018,235 +12922,6 @@
   pRenderer->DrawTextureIndexed(471, 445, (Texture *)(uExitCancelTextureId != -1 ? &pIcons_LOD->pTextures[uExitCancelTextureId] : 0));
 }
 
-//----- (004459F9) --------------------------------------------------------
-NPCData *__fastcall GetNPCData(signed int npcid)
-{
-  unsigned int v1; // esi@1
-  NPCData *result; // eax@5
-  int v3; // esi@9
-  int v4; // ecx@9
-  //int v5; // edx@9
-  //NPCData *v6; // eax@9
-  char *v7; // ebx@14
-  NPCData *v8; // edi@14
-  char v9; // al@22
-  char v10;
-  //std::string v10; // [sp-18h] [bp-2Ch]@4
-  int v11;
-  //const char *v11; // [sp-8h] [bp-1Ch]@4
-  int v12; // [sp-4h] [bp-18h]@4
-  int v13; 
-  char *v14;
-  //std::string *v13; // [sp+Ch] [bp-8h]@4
-  int a3; // [sp+13h] [bp-1h]@4
-  int i;
-
-  /*v1 = npcid;
-  if ( (npcid & 0x80000000u) == 0 )
-  {
-    if ( (signed int)npcid < 5000 )
-    {
-      if ( (signed int)npcid >= 501 )
-      {
-    MessageBoxW(nullptr, L"NPC id exceeds MAX_DATA!", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Events.cpp:1984", 0);
-      }
-      return &pNPCStats->pNewNPCData[v1];
-    }
-    return &pNPCStats->array_13EF4[npcid - 5000];
-  }
-  if ( (signed int)npcid >= 5000 )
-    return &pNPCStats->array_13EF4[npcid - 5000];
-  if ( (sDialogue_SpeakingActorNPC_ID & 0x80000000u) == 0 )
-  {
-    result = 0;
-  }
-  else
-  {
-    v3 = abs((int)sDialogue_SpeakingActorNPC_ID) - 1;
-    v4 = 0;
-    v5 = 0;
-    v6 = pParty->pHirelings;
-    do
-    {
-      if ( v6->pName )
-        pTmpBuf[v4++] = v5;
-      ++v6;
-      ++v5;
-    }
-    while ( (signed int)v6 < (signed int)&pParty->pPickedItem );
-    v13 = 0;
-    if ( (signed int)pNPCStats->uNumNewNPCs > 0 )
-    {
-      v7 = &pTmpBuf[v4];
-      v8 = pNPCStats->pNewNPCData;
-      do
-      {
-        if ( v8->uFlags & 0x80
-          && (!pParty->pHirelings[0].pName || strcmp(v8->pName, pParty->pHirelings[0].pName))
-          && (!pParty->pHirelings[1].pName || strcmp(v8->pName, pParty->pHirelings[1].pName)) )
-          *v7++ = (char)v13 + 2;
-        v13 = (std::string *)((char *)v13 + 1);
-        ++v8;
-      }
-      while ( (signed int)v13 < (signed int)pNPCStats->uNumNewNPCs );
-    }
-    v9 = pTmpBuf[v3];
-    if ( (unsigned __int8)v9 >= 2u )
-      result = &pNPCStats->pNPCData[(unsigned __int8)v9 + 499];
-    else
-      result = &pParty->pHirelings[(unsigned __int8)v9];
-  }
-  return result;*/
-  v1 = npcid;
-  if ( npcid >= 0 )
-  {
-    if ( npcid < 5000 )
-    {
-      if ( npcid >= 501 )
-      {
-        MessageBoxW(nullptr, L"NPC id exceeds MAX_DATA!", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Events.cpp:1984", 0);
-      }
-      return &pNPCStats->pNewNPCData[v1];// - 1];
-    }
-    return &pNPCStats->pAdditionalNPC[npcid - 5000];
-  }
-
-
-  if ( npcid >= 5000 )
-    return &pNPCStats->pAdditionalNPC[npcid - 5000];
-  if (sDialogue_SpeakingActorNPC_ID >= 0)
-  {
-    result = 0;
-  }
-  else
-  {
-    v3 = abs(sDialogue_SpeakingActorNPC_ID) - 1;
-    v4 = 0;
-
-    for (i = 0; i < 2; ++i)
-    {
-      if (pParty->pHirelings[i].pName)
-        pTmpBuf[v4++] = i;
-    }
-
-    if (pNPCStats->uNumNewNPCs > 0)
-    {
-      for (i = 0; i < pNPCStats->uNumNewNPCs; ++i)
-      {
-        if (pNPCStats->pNewNPCData[i].Hired())
-        {
-          if (!pParty->pHirelings[0].pName || strcmp((char *)pNPCStats->pNewNPCData[i].pName, (char *)pParty->pHirelings[0].pName))
-          {
-            if (!pParty->pHirelings[1].pName || strcmp((char *)pNPCStats->pNewNPCData[i].pName, (char *)pParty->pHirelings[1].pName))
-              pTmpBuf[v4++] = i + 2;
-          }
-        }
-      }
-    }
-
-    v9 = pTmpBuf[v3];
-    if ( v9 >= 2 )
-     result = &pNPCStats->pNPCData[499 + v9];
-    else
-      result = &pParty->pHirelings[v9];
-  }
-}
-
-//----- (00445B2C) --------------------------------------------------------
-NPCData *__fastcall GetNewNPCData(signed int npcid, int a2)
-{
-  signed int v2; // esi@1
-  int v3; // edi@1
-  NPCData *result; // eax@5
-  int v5; // esi@9
-  int v6; // ecx@9
-  int v7; // edx@9
-  NPCData *v8; // eax@9
-  NPCData *v9; // edi@14
-  int v10; // ecx@20
-  char v11; // al@23
-  std::string v12; // [sp-18h] [bp-34h]@4
-  const char *v13; // [sp-8h] [bp-24h]@4
-  int v14; // [sp-4h] [bp-20h]@4
-  std::string *v15; // [sp+Ch] [bp-10h]@1
-  char *v16; // [sp+10h] [bp-Ch]@14
-  int v17; // [sp+14h] [bp-8h]@13
-  int a3; // [sp+1Bh] [bp-1h]@4
-
-  v2 = npcid;
-  v3 = a2;
-  v15 = (std::string *)a2;
-  if ( npcid >= 0 )
-  {
-    if ( npcid < 5000 )
-    {
-      if ( npcid >= 501 )
-      {
-    MessageBoxW(nullptr, L"NPC id exceeds MAX_DATA!", L"E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Events.cpp:2040", 0);
-      }
-      *(int *)v3 = v2;
-      return &pNPCStats->pNewNPCData[v2];
-    }
-LABEL_7:
-    *(int *)a2 = npcid - 5000;
-    return &pNPCStats->pAdditionalNPC[npcid - 5000];
-  }
-  if ( npcid >= 5000 )
-    goto LABEL_7;
-  if ( sDialogue_SpeakingActorNPC_ID >= 0 )
-  {
-    *(int *)a2 = 0;
-    result = 0;
-  }
-  else
-  {
-    v5 = abs((int)sDialogue_SpeakingActorNPC_ID) - 1;
-    v6 = 0;
-    v7 = 0;
-    v8 = pParty->pHirelings;
-    do
-    {
-      if ( v8->pName )
-        pTmpBuf[v6++] = v7;
-      ++v8;
-      ++v7;
-    }
-    while ( (signed int)v8 < (signed int)&pParty->pPickedItem );
-    v17 = 0;
-    if ( (signed int)pNPCStats->uNumNewNPCs > 0 )
-    {
-      v9 = pNPCStats->pNewNPCData;
-      v16 = &pTmpBuf[v6];
-      do
-      {
-        if ( v9->Hired()
-          && (!pParty->pHirelings[0].pName || strcmp(v9->pName, pParty->pHirelings[0].pName))
-          && (!pParty->pHirelings[1].pName || strcmp(v9->pName, pParty->pHirelings[1].pName)) )
-        {
-          v10 = (int)v16++;
-          *(char *)v10 = v17 + 2;
-        }
-        ++v17;
-        ++v9;
-      }
-      while ( v17 < (signed int)pNPCStats->uNumNewNPCs );
-      v3 = (int)v15;
-    }
-    v11 = pTmpBuf[v5];
-    if ( (unsigned __int8)v11 >= 2u )
-    {
-      *(int *)v3 = (unsigned __int8)v11 - 2;
-      result = &pNPCStats->pNPCData[(unsigned __int8)pTmpBuf[v5] + 499];
-    }
-    else
-    {
-      *(int *)v3 = (unsigned __int8)v11;
-      result = &pParty->pHirelings[(unsigned __int8)pTmpBuf[v5]];
-    }
-  }
-  return result;
-}
-
 //----- (00445C8B) --------------------------------------------------------
 int __fastcall sub_445C8B(signed int a1)
 {
@@ -13298,7 +12973,6 @@
   return ((unsigned __int8)pTmpBuf[v3] < 2u) + 1;
 }
 
-
 //----- (0044603D) --------------------------------------------------------
 void __cdecl sub_44603D()
 {
@@ -13309,7 +12983,6 @@
   pEventTimer->Resume();
 }
 
-
 //----- (004465DF) --------------------------------------------------------
 int sub_4465DF_check_season(int a1)
 {
@@ -13508,8 +13181,6 @@
   return result;
 }
 
-
-
 //----- (0044861E) --------------------------------------------------------
 void __fastcall sub_44861E_set_texture(unsigned int uFaceCog, const char *pFilename)
 {
@@ -13635,9 +13306,6 @@
   }
 }
 
-
-
-
 //----- (0044882F) --------------------------------------------------------
 void __fastcall SetDecorationSprite(unsigned int uCog, int a2, const char *pFileName)
 {
@@ -13676,7 +13344,6 @@
   }
 }
 
-
 //----- (004488B6) --------------------------------------------------------
 unsigned __int16 DecorationList::GetDecorIdByName(const char *pName)
 {
@@ -13706,7 +13373,6 @@
   return result;
 }
 
-
 //----- (0044892E) --------------------------------------------------------
 void __fastcall sub_44892E_set_faces_bit(int sCogNumber, int bit, int on)
 {
@@ -13785,30 +13451,6 @@
   }
 }
 
-
-
-
-//----- (00448A40) --------------------------------------------------------
-void Actor::ToggleFlag(signed int uActorID, unsigned int uFlag, int bToggle)
-{
-  if ( uActorID >= 0 && uActorID <= (signed int)(uNumActors - 1) )
-  {
-    if ( bToggle )
-    {
-      pActors[uActorID].uAttributes |= uFlag;
-    }
-    else
-    {
-      if ( uFlag == 0x10000 )
-      {
-        if (pActors[uActorID].uAIState == Disabled )
-          pActors[uActorID].uAIState = Standing;
-      }
-      pActors[uActorID].uAttributes &= ~uFlag;
-    }
-  }
-}
-
 //----- (00448A98) --------------------------------------------------------
 void __fastcall ToggleActorGroupFlag(unsigned int uGroupID, unsigned int uFlag, unsigned int bToggle)
 {
@@ -13877,7 +13519,6 @@
   }
 }
 
-
 //----- (00448B45) --------------------------------------------------------
 void __thiscall GameUI_StatusBar_UpdateTimedString(unsigned int bForceHide)
 {
@@ -13993,7 +13634,6 @@
   v->vWorldViewProjY = (double)pViewport->uScreenCenterY - v2 * v->vWorldViewPosition.z;
 }
 
-
 //----- (00448CF4) --------------------------------------------------------
 void __fastcall sub_448CF4_spawn_monsters(__int16 typeindex, __int16 level, int count, int x, int y, int z, int group, unsigned int uUniqueName)
 {
@@ -14040,7 +13680,6 @@
   }
 }
 
-
 //----- (00448DF8) --------------------------------------------------------
 void __fastcall sub_448DF8_cast_spell(int spellnum, int rank, int level, int fromx, int fromy, int fromz, int tox, int toy, int toz)
 {
@@ -14846,7 +14485,6 @@
     pArray[v3 / 8] &= ~set_bit;
 }
 
-
 //----- (0044A56A) --------------------------------------------------------
 void __cdecl Party__CountHirelings()
 {
@@ -14864,7 +14502,6 @@
   }
 }
 
-
 //----- (0044C175) --------------------------------------------------------
 void __fastcall ShowStatusBarString(const char *pString, unsigned int uNumSeconds)
 {
@@ -14887,7 +14524,6 @@
     ShowStatusBarString(pGlobalTXT_LocalizationStrings[521], 2u);// Nothing here
 }
 
-
 //----- (0044C28B) --------------------------------------------------------
 signed int __cdecl const_2()
 {
@@ -14917,7 +14553,6 @@
   return result;
 }
 
-
 //----- (0044C2F4) --------------------------------------------------------
 int LevelDecoration::IsInteractive()
 {
@@ -14974,11 +14609,6 @@
   v1->z = LODWORD(v14);
 }
 
-
-
-
-
-
 //----- (00401000) --------------------------------------------------------
 void __stdcall mm7__vector_constructor(void *a1, int objSize, int numObjs, int (__thiscall *constructor)(int))
 {
@@ -14999,7 +14629,6 @@
   }
 }
 
-
 //----- (004014E6) --------------------------------------------------------
 void MakeActorAIList_ODM()
 {
@@ -16098,9 +15727,6 @@
   }
 }
 
-
-
-
 //----- (0040261D) --------------------------------------------------------
 int stru298::Add(__int16 uID, __int16 a3, __int16 x, __int16 y, __int16 z, char a7, char a8)
 {
@@ -16121,10 +15747,6 @@
   return result;
 }
 
-
-
-
-
 //----- (00402CAE) --------------------------------------------------------
 int stru193_math::Cos(int angle)
 {
@@ -16143,19 +15765,6 @@
     return pCosTable[v2];
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 //----- (00404544) --------------------------------------------------------
 signed int stru262_TurnBased::_404544()
 {
@@ -16305,30 +15914,6 @@
   }
 }
 
-
-//----- (00404828) --------------------------------------------------------
-SpriteObject::SpriteObject()
-{
-  field_22_glow_radius_multiplier = 1;
-  uSoundID = 0;
-  uFacing = 0;
-  vVelocity.z = 0;
-  vVelocity.y = 0;
-  vVelocity.x = 0;
-  uType = 0;
-  uObjectDescID = 0;
-  field_61 = 0;
-  field_60_distance_related_prolly_lod = 0;
-  field_20 = 0;
-  uSpriteFrameID = 0;
-  field_50 = 0;
-  field_4C = 0;
-  field_48 = 0;
-  field_54 = 0;
-}
-
-
-
 //----- (004059DB) --------------------------------------------------------
 signed int stru262_TurnBased::Start()
 {
@@ -16545,4 +16130,3 @@
   }
   return v1->_404544();
 }
-