1 files changed, 114 insertions, 560 deletions

diff --git a/src/animation/CutsceneMgr.cpp b/src/animation/CutsceneMgr.cpp
index eeec2728..bbbd9aa3 100644
--- a/src/animation/CutsceneMgr.cpp
+++ b/src/animation/CutsceneMgr.cpp
@@ -22,592 +22,86 @@
 #include "ColStore.h"
 #include "Radar.h"
 #include "Pools.h"
+#include "crossplatform.h"
 
 //--MIAMI: file done
 
-const struct {
-	const char *szTrackName;
-	int iTrackId;
-} musicNameIdAssoc[] = {
-	{ "ASS_1", STREAMED_SOUND_CUTSCENE_ASS_1 },
-	{ "ASS_2", STREAMED_SOUND_CUTSCENE_ASS_2 },
-	{ "BANK_1", STREAMED_SOUND_CUTSCENE_BANK_1 },
-	{ "BANK_2A", STREAMED_SOUND_CUTSCENE_BANK_2A },
-	{ "BANK_2B", STREAMED_SOUND_CUTSCENE_BANK_2B },
-	{ "BANK_3A", STREAMED_SOUND_CUTSCENE_BANK_3A },
-	{ "BANK_3B", STREAMED_SOUND_CUTSCENE_BANK_3B },
-	{ "BANK_4", STREAMED_SOUND_CUTSCENE_BANK_4 },
-	{ "BIKE_1", STREAMED_SOUND_CUTSCENE_BIKE_1 },
-	{ "BIKE_2", STREAMED_SOUND_CUTSCENE_BIKE_2 },
-	{ "BIKE_3", STREAMED_SOUND_CUTSCENE_BIKE_3 },
-	{ "BUD_1", STREAMED_SOUND_CUTSCENE_BUD_1 },
-	{ "BUD_2", STREAMED_SOUND_CUTSCENE_BUD_2 },
-	{ "BUD_3", STREAMED_SOUND_CUTSCENE_BUD_3 },
-	{ "CAP_1", STREAMED_SOUND_CUTSCENE_CAP_1 },
-	{ "CAR_1", STREAMED_SOUND_CUTSCENE_CAR_1 },
-	{ "CNT_1A", STREAMED_SOUND_CUTSCENE_CNT_1A },
-	{ "CNT_1B", STREAMED_SOUND_CUTSCENE_CNT_1B },
-	{ "CNT_2", STREAMED_SOUND_CUTSCENE_CNT_2 },
-	{ "COK_1", STREAMED_SOUND_CUTSCENE_COK_1 },
-	{ "COK_2A", STREAMED_SOUND_CUTSCENE_COK_2A },
-	{ "COK_2B", STREAMED_SOUND_CUTSCENE_COK_2B },
-	{ "COK_3", STREAMED_SOUND_CUTSCENE_COK_3 },
-	{ "COK_4A", STREAMED_SOUND_CUTSCENE_COK_4A },
-	{ "COK_4A2", STREAMED_SOUND_CUTSCENE_COK_4A2 },
-	{ "COK_4B", STREAMED_SOUND_CUTSCENE_COK_4B },
-	{ "COL_1", STREAMED_SOUND_CUTSCENE_COL_1 },
-	{ "COL_2", STREAMED_SOUND_CUTSCENE_COL_2 },
-	{ "COL_3A", STREAMED_SOUND_CUTSCENE_COL_3A },
-	{ "COL_4A", STREAMED_SOUND_CUTSCENE_COL_4A },
-	{ "COL_5A", STREAMED_SOUND_CUTSCENE_COL_5A },
-	{ "COL_5B", STREAMED_SOUND_CUTSCENE_COL_5B },
-	{ "CUB_1", STREAMED_SOUND_CUTSCENE_CUB_1 },
-	{ "CUB_2", STREAMED_SOUND_CUTSCENE_CUB_2 },
-	{ "CUB_3", STREAMED_SOUND_CUTSCENE_CUB_3 },
-	{ "CUB_4", STREAMED_SOUND_CUTSCENE_CUB_4 },
-	{ "DRUG_1", STREAMED_SOUND_CUTSCENE_DRUG_1 },
-	{ "FIN", STREAMED_SOUND_CUTSCENE_FIN },
-	{ "FIN_2", STREAMED_SOUND_CUTSCENE_FIN2 },
-	{ "FINALE", STREAMED_SOUND_CUTSCENE_FINALE },
-	{ "HAT_1", STREAMED_SOUND_CUTSCENE_HAT_1 },
-	{ "HAT_2", STREAMED_SOUND_CUTSCENE_HAT_2 },
-	{ "HAT_3", STREAMED_SOUND_CUTSCENE_HAT_3 },
-	{ "ICE_1", STREAMED_SOUND_CUTSCENE_ICE_1 },
-	{ "INT_A", STREAMED_SOUND_CUTSCENE_INT_A },
-	{ "INT_B", STREAMED_SOUND_CUTSCENE_INT_B },
-	{ "INT_D", STREAMED_SOUND_CUTSCENE_INT_D },
-	{ "INT_M", STREAMED_SOUND_CUTSCENE_INT_M },
-	{ "LAW_1A", STREAMED_SOUND_CUTSCENE_LAW_1A },
-	{ "LAW_1B", STREAMED_SOUND_CUTSCENE_LAW_1B },
-	{ "LAW_2A", STREAMED_SOUND_CUTSCENE_LAW_2A },
-	{ "LAW_2B", STREAMED_SOUND_CUTSCENE_LAW_2B },
-	{ "LAW_2C", STREAMED_SOUND_CUTSCENE_LAW_2C },
-	{ "LAW_3", STREAMED_SOUND_CUTSCENE_LAW_3 },
-	{ "LAW_4", STREAMED_SOUND_CUTSCENE_LAW_4 },
-	{ "PHIL_1", STREAMED_SOUND_CUTSCENE_PHIL_1 },
-	{ "PHIL_2", STREAMED_SOUND_CUTSCENE_PHIL_2 },
-	{ "PORN_1", STREAMED_SOUND_CUTSCENE_PORN_1 },
-	{ "PORN_2", STREAMED_SOUND_CUTSCENE_PORN_2 },
-	{ "PORN_3", STREAMED_SOUND_CUTSCENE_PORN_3 },
-	{ "PORN_4", STREAMED_SOUND_CUTSCENE_PORN_4 },
-	{ "RESC_1A", STREAMED_SOUND_CUTSCENE_RESC_1A },
-	{ "ROK_1", STREAMED_SOUND_CUTSCENE_ROK_1 },
-	{ "ROK_2", STREAMED_SOUND_CUTSCENE_ROK_2 },
-	{ "ROK_3A", STREAMED_SOUND_CUTSCENE_ROK_3A },
-	{ "STRIPA", STREAMED_SOUND_CUTSCENE_STRIPA },
-	{ "TAX_1", STREAMED_SOUND_CUTSCENE_TAX_1 },
-	{ "TEX_1", STREAMED_SOUND_CUTSCENE_TEX_1 },
-	{ "TEX_2", STREAMED_SOUND_CUTSCENE_TEX_2 },
-	{ "TEX_3", STREAMED_SOUND_CUTSCENE_TEX_3 },
-	{ "GSPOT", STREAMED_SOUND_CUTSCENE_GLIGHT },
-	{ "FIST", STREAMED_SOUND_CUTSCENE_FIST },
-	{ "EL_PH1", STREAMED_SOUND_CUTSCENE_ELBURRO1_PH1 },
-	{ "EL_PH2", STREAMED_SOUND_CUTSCENE_ELBURRO2_PH2 },
-	{ NULL, 0 }
-};
+static bool bModelsRemovedForCutscene;
+static int32 NumberOfSavedWeapons;
+static eWeaponType SavedWeaponIDs[TOTAL_WEAPON_SLOTS];
+static int32 SavedWeaponAmmo[TOTAL_WEAPON_SLOTS];
 
-int
-FindCutsceneAudioTrackId(const char *szCutsceneName)
-{
-	for (int i = 0; musicNameIdAssoc[i].szTrackName; i++) {
-		if (!CGeneral::faststricmp(musicNameIdAssoc[i].szTrackName, szCutsceneName))
-			return musicNameIdAssoc[i].iTrackId;
-	}
-	return -1;
-}
-
-bool CCutsceneMgr::ms_running;
-bool CCutsceneMgr::ms_cutsceneProcessing;
+char CCutsceneMgr::ms_cAppendAnimName[NUMCUTSCENEOBJECTS][NAMELENGTH];
+char CCutsceneMgr::ms_cAppendObjectName[NUMCUTSCENEOBJECTS][NAMELENGTH];
+int CCutsceneMgr::ms_numAppendObjectNames;
 CDirectory *CCutsceneMgr::ms_pCutsceneDir;
-CCutsceneObject *CCutsceneMgr::ms_pCutsceneObjects[NUMCUTSCENEOBJECTS];
-int32 CCutsceneMgr::ms_numCutsceneObjs;
 bool CCutsceneMgr::ms_loaded;
-bool CCutsceneMgr::ms_animLoaded;
-bool CCutsceneMgr::ms_useLodMultiplier;
-char CCutsceneMgr::ms_cutsceneName[CUTSCENENAMESIZE];
-CAnimBlendAssocGroup CCutsceneMgr::ms_cutsceneAssociations;
-CVector CCutsceneMgr::ms_cutsceneOffset;
-float CCutsceneMgr::ms_cutsceneTimer;
+bool CCutsceneMgr::ms_hasFileInfo;
 bool CCutsceneMgr::ms_wasCutsceneSkipped;
+bool CCutsceneMgr::ms_useLodMultiplier;
+bool CCutsceneMgr::ms_cutsceneProcessing;
+bool CCutsceneMgr::ms_running;
+bool CCutsceneMgr::ms_animLoaded;
 uint32 CCutsceneMgr::ms_cutsceneLoadStatus;
-bool CCutsceneMgr::ms_useCutsceneShadows = true;
-
-bool bCamLoaded;
-bool bIsEverythingRemovedFromTheWorldForTheBiggestFuckoffCutsceneEver; // pls don't shrink the name :P
-int32 NumberOfSavedWeapons;
-eWeaponType SavedWeaponIDs[TOTAL_WEAPON_SLOTS];
-int32 SavedWeaponAmmo[TOTAL_WEAPON_SLOTS];
-char uncompressedAnims[8][32];
-uint32 numUncompressedAnims;
-
-
-RpAtomic *
-CalculateBoundingSphereRadiusCB(RpAtomic *atomic, void *data)
-{
-	float radius = RpAtomicGetBoundingSphere(atomic)->radius;
-	RwV3d center = RpAtomicGetBoundingSphere(atomic)->center;
-
-	for (RwFrame *frame = RpAtomicGetFrame(atomic); RwFrameGetParent(frame); frame = RwFrameGetParent(frame))
-		RwV3dTransformPoints(&center, &center, 1, RwFrameGetMatrix(frame));
-
-	float size = RwV3dLength(&center) + radius;
-	if (size > *(float *)data)
-		*(float *)data = size;
-	return atomic;
-}
 
 void
-CCutsceneMgr::Initialise(void)
+CCutsceneMgr::Initialise(void *dir)
 {
-	ms_numCutsceneObjs = 0;
-	ms_loaded = false;
-	ms_wasCutsceneSkipped = false;
+	ms_cutsceneLoadStatus = CUTSCENE_NOT_LOADED;
 	ms_running = false;
-	ms_useLodMultiplier = false;
 	ms_animLoaded = false;
 	ms_cutsceneProcessing = false;
-
-	ms_pCutsceneDir = new CDirectory(CUTSCENEDIRSIZE);
-	ms_pCutsceneDir->ReadDirFile("ANIM\\CUTS.DIR");
-
-	numUncompressedAnims = 0;
-	uncompressedAnims[0][0] = '\0';
-}
-
-void
-CCutsceneMgr::Shutdown(void)
-{
-	delete ms_pCutsceneDir;
-}
-
-void
-CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName)
-{
-	int file;
-	uint32 size;
-	uint32 offset;
-	CPlayerPed *pPlayerPed;
-
-	ms_cutsceneProcessing = true;
+	ms_useLodMultiplier = false;
 	ms_wasCutsceneSkipped = false;
-	CTimer::Suspend();
-	if (!bIsEverythingRemovedFromTheWorldForTheBiggestFuckoffCutsceneEver)
-		CStreaming::RemoveCurrentZonesModels();
-
-	ms_pCutsceneDir->numEntries = 0;
-	ms_pCutsceneDir->ReadDirFile("ANIM\\CUTS.DIR");
-
-	CStreaming::RemoveUnusedModelsInLoadedList();
-	CGame::DrasticTidyUpMemory(true);
-
-	strcpy(ms_cutsceneName, szCutsceneName);
-
-	RwStream *stream;
-	stream = RwStreamOpen(rwSTREAMFILENAME, rwSTREAMREAD, "ANIM\\CUTS.IMG");
-	assert(stream);
-
-	// Load animations
-	sprintf(gString, "%s.IFP", szCutsceneName);
-	if (ms_pCutsceneDir->FindItem(gString, offset, size)) {
-		CStreaming::MakeSpaceFor(size << 11);
-		CStreaming::ImGonnaUseStreamingMemory();
-		RwStreamSkip(stream,  offset << 11);
-		CAnimManager::LoadAnimFile(stream, true, uncompressedAnims);
-		ms_cutsceneAssociations.CreateAssociations(szCutsceneName);
-		CStreaming::IHaveUsedStreamingMemory();
-		ms_animLoaded = true;
-	} else {
-		ms_animLoaded = false;
-	}
-	RwStreamClose(stream, nil);
-
-	// Load camera data
-	file = CFileMgr::OpenFile("ANIM\\CUTS.IMG", "rb");
-	sprintf(gString, "%s.DAT", szCutsceneName);
-	if (ms_pCutsceneDir->FindItem(gString, offset, size)) {
-		CStreaming::ImGonnaUseStreamingMemory();
-		CFileMgr::Seek(file, offset << 11, SEEK_SET);
-		TheCamera.LoadPathSplines(file);
-		CStreaming::IHaveUsedStreamingMemory();
-		bCamLoaded = true;
-	} else {
-		bCamLoaded = false;
-	}
-
-	CFileMgr::CloseFile(file);
-
-	if (CGeneral::faststricmp(ms_cutsceneName, "finale")) {
-		DMAudio.ChangeMusicMode(MUSICMODE_CUTSCENE);
-		int trackId = FindCutsceneAudioTrackId(szCutsceneName);
-		if (trackId != -1) {
-			printf("Start preload audio %s\n", szCutsceneName);
-			DMAudio.PreloadCutSceneMusic(trackId);
-			printf("End preload audio %s\n", szCutsceneName);
-		}
+	ms_hasFileInfo = false;
+	//ms_numCutsceneObjs = 0;
+	//ms_loaded = false;
+	if (gMakeResources) {
+		ms_pCutsceneDir = new CDirectory(CUTSCENEDIRSIZE);
+		ms_pCutsceneDir->ReadDirFile("ANIM\\CUTS.DIR");
 	}
+	else
+		ms_pCutsceneDir = (CDirectory*)dir;
 
-	ms_cutsceneTimer = 0.0f;
-	ms_loaded = true;
-	ms_cutsceneOffset = CVector(0.0f, 0.0f, 0.0f);
-
-	pPlayerPed = FindPlayerPed();
-	pPlayerPed->m_pWanted->ClearQdCrimes();
-	pPlayerPed->bIsVisible = false;
-	pPlayerPed->m_fCurrentStamina = pPlayerPed->m_fMaxStamina;
-	CPad::GetPad(0)->SetDisablePlayerControls(PLAYERCONTROL_CUTSCENE);
-	CWorld::Players[CWorld::PlayerInFocus].MakePlayerSafe(true);
-
-	CTimer::Resume();
-}
-
-void
-CCutsceneMgr::FinishCutscene()
-{
-	ms_wasCutsceneSkipped = true;
-	if (bCamLoaded) {
-		CCutsceneMgr::ms_cutsceneTimer = TheCamera.GetCutSceneFinishTime() * 0.001f;
-		TheCamera.FinishCutscene();
-	}
-
-	FindPlayerPed()->bIsVisible = true;
-	CWorld::Players[CWorld::PlayerInFocus].MakePlayerSafe(false);
+	//numUncompressedAnims = 0;
+	//uncompressedAnims[0][0] = '\0';
 }
 
-void
-CCutsceneMgr::SetupCutsceneToStart(void)
+void CCutsceneMgr::Write(base::cRelocatableChunkWriter& writer)
 {
-	if (bCamLoaded) {
-		TheCamera.SetCamCutSceneOffSet(ms_cutsceneOffset);
-		TheCamera.TakeControlWithSpline(JUMP_CUT);
-		TheCamera.SetWideScreenOn();
-	}
-
-	ms_cutsceneOffset.z++;
-
-	for (int i = ms_numCutsceneObjs - 1; i >= 0; i--) {
-		assert(RwObjectGetType(ms_pCutsceneObjects[i]->m_rwObject) == rpCLUMP);
-		if (CAnimBlendAssociation *pAnimBlendAssoc = RpAnimBlendClumpGetFirstAssociation((RpClump*)ms_pCutsceneObjects[i]->m_rwObject)) {
-			assert(pAnimBlendAssoc->hierarchy->sequences[0].HasTranslation());
-			if (ms_pCutsceneObjects[i]->m_pAttachTo != nil) {
-				pAnimBlendAssoc->flags &= (~ASSOC_HAS_TRANSLATION);
-			} else {
-				if (pAnimBlendAssoc->hierarchy->IsCompressed()){
-					KeyFrameTransCompressed *keyFrames = ((KeyFrameTransCompressed*)pAnimBlendAssoc->hierarchy->sequences[0].GetKeyFrameCompressed(0));
-					CVector trans;
-					keyFrames->GetTranslation(&trans);
-					ms_pCutsceneObjects[i]->SetPosition(ms_cutsceneOffset + trans);
-				}else{
-					KeyFrameTrans *keyFrames = ((KeyFrameTrans*)pAnimBlendAssoc->hierarchy->sequences[0].GetKeyFrame(0));
-					ms_pCutsceneObjects[i]->SetPosition(ms_cutsceneOffset + keyFrames->translation);
-				}
-			}
-			pAnimBlendAssoc->SetRun();
-		} else {
-			ms_pCutsceneObjects[i]->SetPosition(ms_cutsceneOffset);
-		}
-		CWorld::Add(ms_pCutsceneObjects[i]);
-		if (RwObjectGetType(ms_pCutsceneObjects[i]->m_rwObject) == rpCLUMP) {
-			ms_pCutsceneObjects[i]->UpdateRpHAnim();
-		}
-	}
-
-	CTimer::Update();
-	CTimer::Update();
-	ms_running = true;
-	ms_cutsceneTimer = 0.0f;
+	writer.AllocateRaw(ms_pCutsceneDir, sizeof(*ms_pCutsceneDir), 4, false, true);
+	writer.AllocateRaw(ms_pCutsceneDir->entries, sizeof(CDirectory::DirectoryInfo) * ms_pCutsceneDir->numEntries, 4, false, true);
+	writer.AddPatch(ms_pCutsceneDir);
 }
 
 void
-CCutsceneMgr::SetCutsceneAnim(const char *animName, CObject *pObject)
+CCutsceneMgr::Shutdown(void)
 {
-	CAnimBlendAssociation *pNewAnim;
-	CAnimBlendClumpData *pAnimBlendClumpData;
-
-	assert(RwObjectGetType(pObject->m_rwObject) == rpCLUMP);
-	debug("Give cutscene anim %s\n", animName);
-	RpAnimBlendClumpRemoveAllAssociations((RpClump*)pObject->m_rwObject);
-
-	pNewAnim = ms_cutsceneAssociations.GetAnimation(animName);
-	if (!pNewAnim) {
-		debug("\n\nHaven't I told you I can't find the fucking animation %s\n\n\n", animName);
-		return;
-	}
-
-	if (pNewAnim->hierarchy->IsCompressed())
-		pNewAnim->hierarchy->keepCompressed = true;
-
-	CStreaming::ImGonnaUseStreamingMemory();
-	pNewAnim = ms_cutsceneAssociations.CopyAnimation(animName);
-	CStreaming::IHaveUsedStreamingMemory();
-
-	pNewAnim->SetCurrentTime(0.0f);
-	pNewAnim->flags |= ASSOC_HAS_TRANSLATION;
-	pNewAnim->flags &= ~ASSOC_RUNNING;
-
-	pAnimBlendClumpData = *RPANIMBLENDCLUMPDATA(pObject->m_rwObject);
-	pAnimBlendClumpData->link.Prepend(&pNewAnim->link);
-
-	if (pNewAnim->hierarchy->keepCompressed)
-		pAnimBlendClumpData->frames->flag |= AnimBlendFrameData::COMPRESSED;
+	delete ms_pCutsceneDir;
 }
 
 void
-CCutsceneMgr::SetCutsceneAnimToLoop(const char* animName)
-{
-	ms_cutsceneAssociations.GetAnimation(animName)->flags |= ASSOC_REPEAT;
-}
-
-CCutsceneHead *
-CCutsceneMgr::AddCutsceneHead(CObject *pObject, int modelId)
-{
-	return nil;
-}
-
-void UpdateCutsceneObjectBoundingBox(RpClump* clump, int modelId)
-{
-	if (modelId >= MI_CUTOBJ01 && modelId <= MI_CUTOBJ05) {
-		CColModel* pColModel = &CTempColModels::ms_colModelCutObj[modelId - MI_CUTOBJ01];
-		float radius = 0.0f;
-		RpClumpForAllAtomics(clump, CalculateBoundingSphereRadiusCB, &radius);
-		pColModel->boundingSphere.radius = radius;
-		pColModel->boundingBox.min = CVector(-radius, -radius, -radius);
-		pColModel->boundingBox.max = CVector(radius, radius, radius);
-	}
-}
-
-CCutsceneObject *
-CCutsceneMgr::CreateCutsceneObject(int modelId)
+CCutsceneMgr::LoadCutsceneData(const char *szCutsceneName)
 {
-	CBaseModelInfo *pModelInfo;
-	CColModel *pColModel;
-	CCutsceneObject *pCutsceneObject;
-
-	CStreaming::ImGonnaUseStreamingMemory();
-	debug("Created cutscene object %s\n", CModelInfo::GetModelInfo(modelId)->GetModelName());
-	if (modelId >= MI_CUTOBJ01 && modelId <= MI_CUTOBJ05) {
-		pModelInfo = CModelInfo::GetModelInfo(modelId);
-		pColModel = &CTempColModels::ms_colModelCutObj[modelId - MI_CUTOBJ01];
-		pModelInfo->SetColModel(pColModel);
-		UpdateCutsceneObjectBoundingBox((RpClump*)pModelInfo->GetRwObject(), modelId);
-	} else if (modelId >= MI_SPECIAL01 && modelId <= MI_SPECIAL21) {
-		pModelInfo = CModelInfo::GetModelInfo(modelId);
-		if (pModelInfo->GetColModel() == &CTempColModels::ms_colModelPed1) {
-			CColModel *colModel = new CColModel();
-			colModel->boundingSphere.radius = 2.0f;
-			colModel->boundingSphere.center = CVector(0.0f, 0.0f, 0.0f);
-			pModelInfo->SetColModel(colModel, true);
-		}
-		pColModel = pModelInfo->GetColModel();
-		float radius = 2.0f;
-		pColModel->boundingSphere.radius = radius;
-		pColModel->boundingBox.min = CVector(-radius, -radius, -radius);
-		pColModel->boundingBox.max = CVector(radius, radius, radius);
-	}
-
-	pCutsceneObject = new CCutsceneObject();
-	pCutsceneObject->SetModelIndex(modelId);
-	if (ms_useCutsceneShadows)
-		pCutsceneObject->CreateShadow();
-	ms_pCutsceneObjects[ms_numCutsceneObjs++] = pCutsceneObject;
-	CStreaming::IHaveUsedStreamingMemory();
-	return pCutsceneObject;
+	LoadCutsceneData_overlay(szCutsceneName);
 }
 
 void
 CCutsceneMgr::DeleteCutsceneData(void)
 {
-	if (!ms_loaded) return;
-	CTimer::Suspend();
-
-	ms_cutsceneProcessing = false;
-	ms_useLodMultiplier = false;
-	ms_useCutsceneShadows = true;
-
-	for (--ms_numCutsceneObjs; ms_numCutsceneObjs >= 0; ms_numCutsceneObjs--) {
-		CWorld::Remove(ms_pCutsceneObjects[ms_numCutsceneObjs]);
-		ms_pCutsceneObjects[ms_numCutsceneObjs]->DeleteRwObject();
-		delete ms_pCutsceneObjects[ms_numCutsceneObjs];
-		ms_pCutsceneObjects[ms_numCutsceneObjs] = nil;
-	}
-	ms_numCutsceneObjs = 0;
-
-	for (int i = MI_SPECIAL01; i < MI_SPECIAL21; i++) {
-		CBaseModelInfo *minfo = CModelInfo::GetModelInfo(i);
-		CColModel *colModel = minfo->GetColModel();
-		if (colModel != &CTempColModels::ms_colModelPed1) {
-			delete colModel;
-			minfo->SetColModel(&CTempColModels::ms_colModelPed1);
-		}
-	}
-
-	if (ms_animLoaded)
-		CAnimManager::RemoveLastAnimFile();
-
-	ms_animLoaded = false;
-	numUncompressedAnims = 0;
-	uncompressedAnims[0][0] = '\0';
-
-	if (bCamLoaded) {
-		TheCamera.RestoreWithJumpCut();
-		TheCamera.SetWideScreenOff();
-		TheCamera.DeleteCutSceneCamDataMemory();
-	}
-	ms_running = false;
-	ms_loaded = false;
-
-	FindPlayerPed()->bIsVisible = true;
-	CPad::GetPad(0)->SetEnablePlayerControls(PLAYERCONTROL_CUTSCENE);
-	CWorld::Players[CWorld::PlayerInFocus].MakePlayerSafe(false);
-
-	if (CGeneral::faststricmp(ms_cutsceneName, "finale")) {
-		DMAudio.StopCutSceneMusic();
-		DMAudio.ChangeMusicMode(MUSICMODE_GAME);
-	}
-
-	CStreaming::ms_disableStreaming = false;
-	CWorld::bProcessCutsceneOnly = false;
-
-	if(bCamLoaded)
-		CGame::DrasticTidyUpMemory(TheCamera.GetScreenFadeStatus() == FADE_2);
-	
-	CPad::GetPad(0)->Clear(false);
-	if (bIsEverythingRemovedFromTheWorldForTheBiggestFuckoffCutsceneEver) {
-		CStreaming::LoadInitialPeds();
-		CStreaming::LoadInitialWeapons();
-		CStreaming::LoadInitialVehicles();
-		bIsEverythingRemovedFromTheWorldForTheBiggestFuckoffCutsceneEver = false;
-		
-		CPlayerPed *pPlayerPed = FindPlayerPed();
-		for (int i = 0; i < NumberOfSavedWeapons; i++) {
-			int32 weaponModelId = CWeaponInfo::GetWeaponInfo(SavedWeaponIDs[i])->m_nModelId;
-			uint8 flags = CStreaming::ms_aInfoForModel[weaponModelId].m_flags;
-			CStreaming::RequestModel(weaponModelId, STREAMFLAGS_DONT_REMOVE);
-			CStreaming::LoadAllRequestedModels(false);
-			if (CWeaponInfo::GetWeaponInfo(SavedWeaponIDs[i])->m_nModel2Id != -1) {
-				CStreaming::RequestModel(CWeaponInfo::GetWeaponInfo(SavedWeaponIDs[i])->m_nModel2Id, 0);
-				CStreaming::LoadAllRequestedModels(false);
-			}
-			if (!(flags & STREAMFLAGS_DONT_REMOVE))
-				CStreaming::SetModelIsDeletable(weaponModelId);
-			pPlayerPed->GiveWeapon(SavedWeaponIDs[i], SavedWeaponAmmo[i], true);
-		}
-		NumberOfSavedWeapons = 0;
-	}
-
-	CTimer::Resume();
-}
-
-void
-CCutsceneMgr::Update(void)
-{
-	enum {
-		CUTSCENE_LOADING_0 = 0,
-		CUTSCENE_LOADING_AUDIO,
-		CUTSCENE_LOADING_2,
-		CUTSCENE_LOADING_3,
-		CUTSCENE_LOADING_4
-	};
-
-	switch (ms_cutsceneLoadStatus) {
-	case CUTSCENE_LOADING_AUDIO:
-		SetupCutsceneToStart();
-		if (CGeneral::faststricmp(ms_cutsceneName, "finale"))
-			DMAudio.PlayPreloadedCutSceneMusic();
-		ms_cutsceneLoadStatus++;
-		break;
-	case CUTSCENE_LOADING_2:
-	case CUTSCENE_LOADING_3:
-		ms_cutsceneLoadStatus++;
-		break;
-	case CUTSCENE_LOADING_4:
-		ms_cutsceneLoadStatus = CUTSCENE_LOADING_0;
-		break;
-	default:
-		break;
-	}
-
-	if (!ms_running) return;
-
-	ms_cutsceneTimer += CTimer::GetTimeStepNonClippedInSeconds();
-
-	for (int i = 0; i < ms_numCutsceneObjs; i++) {
-		int modelId = ms_pCutsceneObjects[i]->GetModelIndex();
-		if (modelId >= MI_CUTOBJ01 && modelId <= MI_CUTOBJ05)
-			UpdateCutsceneObjectBoundingBox(ms_pCutsceneObjects[i]->GetClump(), modelId);
-
-		if (ms_pCutsceneObjects[i]->m_pAttachTo != nil && modelId >= MI_SPECIAL01 && modelId <= MI_SPECIAL21)
-			UpdateCutsceneObjectBoundingBox(ms_pCutsceneObjects[i]->GetClump(), modelId);
-	}
-
-	if (bCamLoaded)
-		if (CGeneral::faststricmp(ms_cutsceneName, "finale") && TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_FLYBY && ms_cutsceneLoadStatus == CUTSCENE_LOADING_0) {
-			if (CPad::GetPad(0)->GetCrossJustDown()
-				|| (CGame::playingIntro && CPad::GetPad(0)->GetStartJustDown())
-				|| CPad::GetPad(0)->GetLeftMouseJustDown()
-				|| CPad::GetPad(0)->GetEnterJustDown()
-				|| CPad::GetPad(0)->GetCharJustDown(' '))
-					FinishCutscene();
-		}
-}
-
-bool CCutsceneMgr::HasCutsceneFinished(void) { return !bCamLoaded || TheCamera.GetPositionAlongSpline() == 1.0f; }
-
-void
-CCutsceneMgr::LoadAnimationUncompressed(char const* name)
-{
-	strcpy(uncompressedAnims[numUncompressedAnims], name);
-	
-	// Because that's how CAnimManager knows the end of array
-	++numUncompressedAnims;
-	assert(numUncompressedAnims < ARRAY_SIZE(uncompressedAnims));
-	uncompressedAnims[numUncompressedAnims][0] = '\0';
-}
-
-void
-CCutsceneMgr::AttachObjectToParent(CObject *pObject, CEntity *pAttachTo)
-{
-	((CCutsceneObject*)pObject)->m_pAttachmentObject = nil;
-	((CCutsceneObject*)pObject)->m_pAttachTo = RpClumpGetFrame(pAttachTo->GetClump());
-
-	debug("Attach %s to %s\n", CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(), CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
-}
-
-void
-CCutsceneMgr::AttachObjectToFrame(CObject *pObject, CEntity *pAttachTo, const char *frame)
-{
-	((CCutsceneObject*)pObject)->m_pAttachmentObject = nil;
-	((CCutsceneObject*)pObject)->m_pAttachTo = RpAnimBlendClumpFindFrame(pAttachTo->GetClump(), frame)->frame;
-	debug("Attach %s to component %s of %s\n",
-		CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(),
-		frame,
-		CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
-	if (RwObjectGetType(pObject->m_rwObject) == rpCLUMP) {
-		RpClump *clump = (RpClump*)pObject->m_rwObject;
-		if (IsClumpSkinned(clump))
-			RpAtomicGetBoundingSphere(GetFirstAtomic(clump))->radius *= 1.1f;
-	}
+	DeleteCutsceneData_overlay();
+	if (bModelsRemovedForCutscene)
+		LoadEverythingBecauseCutsceneDeletedAllOfIt();
 }
 
 void
-CCutsceneMgr::AttachObjectToBone(CObject *pObject, CObject *pAttachTo, int bone)
+CCutsceneMgr::RemoveEverythingBecauseCutsceneDoesntFitInMemory()
 {
-	RpHAnimHierarchy *hanim = GetAnimHierarchyFromSkinClump(pAttachTo->GetClump());
-	RwInt32 id = RpHAnimIDGetIndex(hanim, bone);
-	RwMatrix *matrixArray = RpHAnimHierarchyGetMatrixArray(hanim);
-	((CCutsceneObject*)pObject)->m_pAttachmentObject = pAttachTo;
-	((CCutsceneObject*)pObject)->m_pAttachTo = &matrixArray[id];
-	debug("Attach %s to %s\n",
-		CModelInfo::GetModelInfo(pObject->GetModelIndex())->GetModelName(),
-		CModelInfo::GetModelInfo(pAttachTo->GetModelIndex())->GetModelName());
-}
-
-void
-CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver()
-{
-	CStreaming::ms_disableStreaming = true;
+	//CStreaming::ms_disableStreaming = true;
+	CWorld::ClearExcitingStuffFromArea(FindPlayerCoors(), 120.0f, true);
 	CColStore::RemoveAllCollision();
 	CWorld::bProcessCutsceneOnly = true;
-	ms_cutsceneProcessing = true;
+	/*ms_cutsceneProcessing = true;
 
 	for (int i = CPools::GetPedPool()->GetSize() - 1; i >= 0; i--) {
 		CPed *pPed = CPools::GetPedPool()->GetSlot(i);
@@ -628,25 +122,21 @@ CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver()
 			}
 		}
 	}
-
-	bIsEverythingRemovedFromTheWorldForTheBiggestFuckoffCutsceneEver = true;
+	CWorld::bProcessCutsceneOnly = true;
+	//bIsEverythingRemovedFromTheWorldForTheBiggestFuckoffCutsceneEver = true;*/
 	CStreaming::RemoveCurrentZonesModels();
+	while (CStreaming::RemoveLoadedVehicle());
+	CRadar::RemoveRadarSections();
 	CStreaming::SetModelIsDeletable(MI_MALE01);
 	CStreaming::SetModelTxdIsDeletable(MI_MALE01);
-	CStreaming::SetModelIsDeletable(MI_TAXI_D);
-	CStreaming::SetModelTxdIsDeletable(MI_TAXI_D);
+	CStreaming::SetModelIsDeletable(MI_COLT45);
+	CStreaming::SetModelTxdIsDeletable(MI_COLT45);
 	CStreaming::SetModelIsDeletable(MI_NIGHTSTICK);
 	CStreaming::SetModelTxdIsDeletable(MI_NIGHTSTICK);
 	CStreaming::SetModelIsDeletable(MI_MISSILE);
 	CStreaming::SetModelTxdIsDeletable(MI_MISSILE);
-	CStreaming::SetModelIsDeletable(MI_POLICE);
-	CStreaming::SetModelTxdIsDeletable(MI_POLICE);
-
-	while (CStreaming::RemoveLoadedVehicle()) ;
-
-	CRadar::RemoveRadarSections();
 
-	for (int i = CPools::GetDummyPool()->GetSize() - 1; i >= 0; i--) {
+	/*for (int i = CPools::GetDummyPool()->GetSize() - 1; i >= 0; i--) {
 		CDummy* pDummy = CPools::GetDummyPool()->GetSlot(i);
 		if (pDummy)
 			pDummy->DeleteRwObject();
@@ -666,7 +156,7 @@ CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver()
 			if (!pBuilding->bImBeingRendered)
 				pBuilding->DeleteRwObject();
 		}
-	}
+	}*/
 
 	CPlayerPed *pPlayerPed = FindPlayerPed();
 	pPlayerPed->RemoveWeaponAnims(0, -1000.0f);
@@ -681,5 +171,69 @@ CCutsceneMgr::RemoveEverythingFromTheWorldForTheBiggestFuckoffCutsceneEver()
 	}
 
 	pPlayerPed->ClearWeapons();
-	CGame::DrasticTidyUpMemory(true);
+	bModelsRemovedForCutscene = true;
+	//CGame::DrasticTidyUpMemory(true);
+}
+
+void
+CCutsceneMgr::LoadEverythingBecauseCutsceneDeletedAllOfIt()
+{
+	bModelsRemovedForCutscene = false;
+	CStreaming::LoadInitialPeds();
+	CStreaming::LoadInitialWeapons();
+	//CStreaming::LoadInitialVehicles();
+		
+	CPlayerPed *pPlayerPed = FindPlayerPed();
+	for (int i = 0; i < NumberOfSavedWeapons; i++) {
+		int32 weaponModelId = CWeaponInfo::GetWeaponInfo(SavedWeaponIDs[i])->m_nModelId;
+		uint8 flags = CStreaming::ms_aInfoForModel[weaponModelId].m_flags;
+		CStreaming::RequestModel(weaponModelId, STREAMFLAGS_DONT_REMOVE);
+		CStreaming::LoadAllRequestedModels(false);
+		if (CWeaponInfo::GetWeaponInfo(SavedWeaponIDs[i])->m_nModel2Id != -1) {
+			CStreaming::RequestModel(CWeaponInfo::GetWeaponInfo(SavedWeaponIDs[i])->m_nModel2Id, 0);
+			CStreaming::LoadAllRequestedModels(false);
+		}
+		if (!(flags & STREAMFLAGS_DONT_REMOVE))
+			CStreaming::SetModelIsDeletable(weaponModelId);
+		pPlayerPed->GiveWeapon(SavedWeaponIDs[i], SavedWeaponAmmo[i], true);
+	}
+	NumberOfSavedWeapons = 0;
+}
+
+void
+CCutsceneMgr::Update(void)
+{
+	if (ms_cutsceneLoadStatus != CUTSCENE_NOT_LOADED)
+		Update_overlay();
+}
+
+void
+CCutsceneMgr::LoadAnimationUncompressed(char const* name)
+{
+	strcpy(ms_aUncompressedCutsceneAnims[ms_numUncompressedCutsceneAnims], name);
+	
+	// Because that's how CAnimManager knows the end of array
+	++ms_numUncompressedCutsceneAnims;
+	assert(ms_numUncompressedCutsceneAnims < ARRAY_SIZE(ms_aUncompressedCutsceneAnims));
+	ms_aUncompressedCutsceneAnims[ms_numUncompressedCutsceneAnims][0] = '\0';
+}
+
+
+bool
+CCutsceneMgr::IsCutsceneSkipButtonBeingPressed()
+{
+	return (CPad::GetPad(0)->GetCrossJustDown()
+		|| CPad::GetPad(0)->GetLeftMouseJustDown()
+		|| CPad::GetPad(0)->GetEnterJustDown()
+		|| CPad::GetPad(0)->GetCharJustDown(' '));
+}
+
+void
+CCutsceneMgr::AppendToNextCutscene(const char *object, const char *anim)
+{
+	strcpy(ms_cAppendObjectName[ms_numAppendObjectNames], object);
+	strlwr(ms_cAppendObjectName[ms_numAppendObjectNames]);
+	strcpy(ms_cAppendAnimName[ms_numAppendObjectNames], anim);
+	strlwr(ms_cAppendAnimName[ms_numAppendObjectNames]);
+	ms_numAppendObjectNames++;
 }
\ No newline at end of file