--- a/mm7_2.cpp	Sun Mar 24 00:33:27 2013 +0200
+++ b/mm7_2.cpp	Sun Mar 24 21:14:28 2013 +0200
@@ -6595,9 +6595,8 @@
 
 
 //----- (0046086A) --------------------------------------------------------
-bool Autosave()
-{
-  int flag; // esi@3
+void Autosave()
+{
   FILE *v3; // eax@7
   LOD::FileHeader this_; // [sp+Ch] [bp-16Ch]@3
   LOD::Directory pDir; // [sp+10Ch] [bp-6Ch]@4
@@ -6607,7 +6606,6 @@
 
   if ( pVideoPlayer->AnyMovieLoaded() )
     pVideoPlayer->Unload();
-  flag = 0;
   pSave = pAllocator->AllocNamedChunk(0, 0xF4240, 0);
   pNew_LOD->CloseWriteFile();
   remove("data\\new.lod");
@@ -6648,13 +6646,11 @@
     pParty->sRotationX = 0;
     pParty->vPrevPosition.z = 1816;
     pParty->vPosition.y = 1816;
-    flag = 1;
     pParty->sPrevRotationY = 512;
     pParty->sRotationY = 512;
     SaveGame(1, (__int16 *)1);
   }
   pAllocator->FreeChunk(pSave);
-  return flag;
 }
 
 
@@ -6844,7 +6840,7 @@
   pIndoorCamera->sRotationY = 0;
   pIndoorCamera->sRotationX = 0;
   viewparams->bRedrawGameUI = 1;
-  uLevel_StartingPointType = 0;
+  uLevel_StartingPointType = MapStartPoint_Party;
   pSprites_LOD->_461397();
   pPaletteManager->LockTestAll();
   if ( pParty->pPickedItem.uItemID != 0 )
@@ -9181,8 +9177,8 @@
           if ( pAudioPlayer->hAILRedbook )
             AIL_redbook_stop(pAudioPlayer->hAILRedbook);
           pParty->Reset();
-          for (uint k = 0; k < 50; ++k)
-            pOtherOverlayList->pOverlays[k].Reset();
+          pOtherOverlayList->Reset();
+
           strcpy(pCurrentMapName, pStartingMapName);
           pParty->CreateDefaultParty(0);
           PlayerCreationUI_Initialize();
@@ -11553,7 +11549,7 @@
 }
 
 //----- (0046BDC0) --------------------------------------------------------
-void __cdecl sub_46BDC0_UpdateUserInput_and_MapSpecificStuff()
+void __cdecl UpdateUserInput_and_MapSpecificStuff()
 {
   if ( dword_6BE364_game_settings_1 & 0x80 )
   {
@@ -11566,7 +11562,7 @@
     else if (uCurrentlyLoadedLevelType == LEVEL_Outdoor)
         ODM_UpdateUserInputAndOther();
 
-    _438F8F_area_of_effect__damage_evaluate();
+    area_of_effect__damage_evaluate();
   }
 }
 
@@ -11579,14 +11575,14 @@
   BLV_ProcessPartyActions();
   UpdateActors_BLV();
   BLV_UpdateDoors();
-  _46CC4B_check_event_triggers();
+  check_event_triggers();
 }
 
 //----- (0046BE0A) --------------------------------------------------------
 void __cdecl ODM_UpdateUserInputAndOther()
 {
   bool v0; // eax@5
-  int pOut; // [sp+8h] [bp-20h]@5
+  char pOut[32]; // [sp+8h] [bp-20h]@5
 
   UpdateObjects();
   ODM_ProcessPartyActions();
@@ -11596,7 +11592,7 @@
     || pParty->vPosition.y > 22528 )
   {
     strcpy(pOutdoor->pLevelFilename, pCurrentMapName);
-    v0 = pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, (char *)&pOut, 32);
+    v0 = pOutdoor->GetTravelDestination(pParty->vPosition.x, pParty->vPosition.y, pOut, 32);
     if ( !bUnderwater && (pParty->uFlags & (PARTY_FLAGS_1_STANDING_ON_WATER | PARTY_FLAGS_1_FALLING | 0x04) || pParty->uFlags & 0x0200 || pParty->bFlying) || !v0 )
     {
       if ( pParty->vPosition.x < -22528 )
@@ -11615,7 +11611,7 @@
     }
   }
   UpdateActors_ODM();
-  _46CC4B_check_event_triggers();
+  check_event_triggers();
 }