26 files changed, 207 insertions, 60 deletions

diff --git a/src/animation/AnimManager.cpp b/src/animation/AnimManager.cpp
index c31d7a5b..63dc172c 100644
--- a/src/animation/AnimManager.cpp
+++ b/src/animation/AnimManager.cpp
@@ -145,7 +145,7 @@ AnimAssocDesc aStdAnimDescs[] = {
 	{ ANIM_DRIVEBY_R, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
 	{ ANIM_CAR_LB, ASSOC_DELETEFADEDOUT | ASSOC_PARTIAL },
 	{ ANIM_DRIVE_BOAT, ASSOC_DELETEFADEDOUT },
-	{ ANIM_CAR_GETOUT_LHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
+	{ ANIM_CAR_GETOUT_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_GETOUT_LOW_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_CLOSE_RHS, ASSOC_FADEOUTWHENDONE | ASSOC_PARTIAL },
 	{ ANIM_CAR_HOOKERTALK, ASSOC_REPEAT | ASSOC_PARTIAL },
@@ -906,6 +906,7 @@ CAnimManager::LoadAnimFile(RwStream *stream, bool compress, char (*somename)[32]
 
 	int animIndex = animBlock->firstIndex;
 	for(j = 0; j < animBlock->numAnims; j++){
+		assert(animIndex < ARRAY_SIZE(ms_aAnimations));
 		CAnimBlendHierarchy *hier = &ms_aAnimations[animIndex++];
 
 		// animation name
diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index d29b52ab..a1d926f8 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -1913,7 +1913,7 @@ void CCarCtrl::PickNextNodeRandomly(CVehicle* pVehicle)
 		pCurLink->GetY() - ((pVehicle->AutoPilot.m_nCurrentLane + pCurLink->OneWayLaneOffset()) * LANE_WIDTH) * currentPathLinkForwardX,
 		0.0f);
 	CVector positionOnNextLinkIncludingLane(
-		pNextLink->GetX() + ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH),
+		pNextLink->GetX() + ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardY,
 		pNextLink->GetY() - ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardX,
 		0.0f);
 #endif
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
index 00d39066..40a8b09e 100644
--- a/src/core/AnimViewer.cpp
+++ b/src/core/AnimViewer.cpp
@@ -248,8 +248,9 @@ CAnimViewer::Update(void)
 	}
 	CPad::UpdatePads();
 	CPad* pad = CPad::GetPad(0);
-
+#ifdef DEBUGMENU
 	DebugMenuProcess();
+#endif
 
 	CStreaming::UpdateForAnimViewer();
 	CStreaming::RequestModel(modelId, 0);
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index f7749712..ae7df51f 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -29,7 +29,7 @@ bool PrintDebugCode = false;
 int16 DebugCamMode;
 
 #ifdef FREE_CAM
-bool CCamera::bFreeCam = false;
+bool CCamera::bFreeCam = true;
 int nPreviousMode = -1;
 #endif
 
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 22d4de99..3ea85659 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -604,8 +604,9 @@ void CGame::Process(void)
 	TheCamera.SetMotionBlurAlpha(0);
 	if (TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_SNIPER || TheCamera.m_BlurType == MBLUR_NORMAL)
 		TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE);
-
+#ifdef DEBUGMENU
 	DebugMenuProcess();
+#endif
 	CCutsceneMgr::Update();
 	if (!CCutsceneMgr::IsCutsceneProcessing() && !CTimer::GetIsCodePaused())
 		FrontEndMenuManager.Process();
diff --git a/src/core/Placeable.h b/src/core/Placeable.h
index 26a2291a..7e858283 100644
--- a/src/core/Placeable.h
+++ b/src/core/Placeable.h
@@ -16,7 +16,7 @@ public:
 		m_matrix.GetPosition().y = y;
 		m_matrix.GetPosition().z = z;
 	}
-	void SetPosition(const CVector& pos) { m_matrix.GetPosition() = pos; }
+	void SetPosition(const CVector &pos) { m_matrix.GetPosition() = pos; }
 	CVector &GetRight(void) { return m_matrix.GetRight(); }
 	CVector &GetForward(void) { return m_matrix.GetForward(); }
 	CVector &GetUp(void) { return m_matrix.GetUp(); }
diff --git a/src/core/World.cpp b/src/core/World.cpp
index 29505481..3e07721a 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -382,7 +382,11 @@ CWorld::ProcessVerticalLine(const CVector &point1, float z2, CColPoint &point, C
 {
 	AdvanceCurrentScanCode();
 	CVector point2(point1.x, point1.y, z2);
-	return ProcessVerticalLineSector(*GetSector(GetSectorIndexX(point1.x), GetSectorIndexY(point1.y)),
+	int secX = GetSectorIndexX(point1.x);
+	int secY = GetSectorIndexY(point1.y);
+	secX = clamp(secX, 0, NUMSECTORS_X-1);
+	secY = clamp(secY, 0, NUMSECTORS_Y-1);
+	return ProcessVerticalLineSector(*GetSector(secX, secY),
 	                                 CColLine(point1, point2), point, entity, checkBuildings, checkVehicles,
 	                                 checkPeds, checkObjects, checkDummies, ignoreSeeThrough, poly);
 }
diff --git a/src/core/config.h b/src/core/config.h
index 2ded57bf..dd4628d5 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -186,6 +186,7 @@ enum Config {
 #	define NO_MOVIES	// disable intro videos
 #	define NO_CDCHECK
 #	define CHATTYSPLASH	// print what the game is loading
+#	define DEBUGMENU
 //#	define TIMEBARS		// print debug timers
 #endif
 
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 9e0fda15..6bf8228d 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -91,7 +91,9 @@ void GameInit(void);
 void SystemInit(void);
 void TheGame(void);
 
+#ifdef DEBUGMENU
 void DebugMenuPopulate(void);
+#endif
 
 
 void
@@ -328,11 +330,10 @@ Initialise3D(void *param)
 {
 	if (RsRwInitialise(param))
 	{
-		//
+#ifdef DEBUGMENU
 		DebugMenuInit();
 		DebugMenuPopulate();
-		//
-
+#endif // !DEBUGMENU
 		return CGame::InitialiseRenderWare();
 	}
 
@@ -343,8 +344,9 @@ static void
 Terminate3D(void)
 {
 	CGame::ShutdownRenderWare();
-
+#ifdef DEBUGMENU
 	DebugMenuShutdown();
+#endif // !DEBUGMENU
 	
 	RsRwTerminate();
 
@@ -878,7 +880,9 @@ Render2dStuff(void)
 	CPad::PrintErrorMessage();
 	CFont::DrawFonts();
 
+#ifdef DEBUGMENU
 	DebugMenuRender();
+#endif
 }
 
 void
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index c221d64b..a2c0a9a3 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -61,6 +61,7 @@ mysrand(unsigned int seed)
 	myrand_seed = seed;
 }
 
+#ifdef DEBUGMENU
 void WeaponCheat();
 void HealthCheat();
 void TankCheat();
@@ -386,6 +387,7 @@ DebugMenuPopulate(void)
 		CTweakVars::AddDBG("Debug");
 	}
 }
+#endif
 
 const int   re3_buffsize = 1024;
 static char re3_buff[re3_buffsize];
diff --git a/src/extras/debugmenu.cpp b/src/extras/debugmenu.cpp
index bb0ed55e..a31426bb 100644
--- a/src/extras/debugmenu.cpp
+++ b/src/extras/debugmenu.cpp
@@ -1,4 +1,5 @@
 #include "common.h"
+#ifdef DEBUGMENU
 #include "RwHelper.h"
 #include "Pad.h"
 #include "ControllerConfig.h"
@@ -1313,3 +1314,4 @@ DebugMenuEntrySetAddress(MenuEntry *e, void *addr)
 			((MenuEntry_Float32*)e)->variable = (float*)addr;
 	}
 }
+#endif
\ No newline at end of file
diff --git a/src/extras/debugmenu.h b/src/extras/debugmenu.h
index ae595c1f..eb56c8f9 100644
--- a/src/extras/debugmenu.h
+++ b/src/extras/debugmenu.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#ifdef DEBUGMENU
+
 typedef void (*TriggerFunc)(void);
 
 struct Menu;
@@ -85,3 +87,4 @@ inline DebugMenuEntry *DebugMenuAddVarBool8(const char *path, const char *name,
 {
 	return DebugMenuAddVarBool8(path, name, (int8_t*)ptr, triggerFunc);
 }
+#endif
\ No newline at end of file
diff --git a/src/modelinfo/ClumpModelInfo.cpp b/src/modelinfo/ClumpModelInfo.cpp
index 44faf3c5..2a4927a2 100644
--- a/src/modelinfo/ClumpModelInfo.cpp
+++ b/src/modelinfo/ClumpModelInfo.cpp
@@ -5,6 +5,7 @@
 #include "NodeName.h"
 #include "VisibilityPlugins.h"
 #include "ModelInfo.h"
+#include "AnimManager.h"
 
 void
 CClumpModelInfo::DeleteRwObject(void)
@@ -13,17 +14,17 @@ CClumpModelInfo::DeleteRwObject(void)
 		RpClumpDestroy(m_clump);
 		m_clump = nil;
 		RemoveTexDictionaryRef();
+		if(GetAnimFileIndex() != -1)
+			CAnimManager::RemoveAnimBlockRef(GetAnimFileIndex());
 	}
 }
 
-#ifdef PED_SKIN
 static RpAtomic*
 SetHierarchyForSkinAtomic(RpAtomic *atomic, void *data)
 {
 	RpSkinAtomicSetHAnimHierarchy(atomic, (RpHAnimHierarchy*)data);
 	return nil;
 }
-#endif
 
 RwObject*
 CClumpModelInfo::CreateInstance(void)
@@ -31,24 +32,17 @@ CClumpModelInfo::CreateInstance(void)
 	if(m_clump == nil)
 		return nil;
 	RpClump *clone = RpClumpClone(m_clump);
-#ifdef PED_SKIN
 	if(IsClumpSkinned(clone)){
 		RpHAnimHierarchy *hier;
 		RpHAnimAnimation *anim;
 
 		hier = GetAnimHierarchyFromClump(clone);
 		assert(hier);
-		// This seems dangerous as only the first atomic will get a hierarchy
-		// can we guarantee this if hands and head are also in the clump?
 		RpClumpForAllAtomics(clone, SetHierarchyForSkinAtomic, hier);
 		anim = HAnimAnimationCreateForHierarchy(hier);
 		RpHAnimHierarchySetCurrentAnim(hier, anim);
-//		RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
-		// the rest is xbox only:
-		// RpSkinGetNumBones(RpSkinGeometryGetSkin(RpAtomicGetGeometry(IsClumpSkinned(clone))));
-		RpHAnimHierarchyUpdateMatrices(hier);
+		RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
 	}
-#endif
 	return (RwObject*)clone;
 }
 
@@ -76,31 +70,19 @@ CClumpModelInfo::SetClump(RpClump *clump)
 	m_clump = clump;
 	CVisibilityPlugins::SetClumpModelInfo(m_clump, this);
 	AddTexDictionaryRef();
-	RpClumpForAllAtomics(clump, SetAtomicRendererCB, nil);
+	if(GetAnimFileIndex() != -1)
+		CAnimManager::AddAnimBlockRef(GetAnimFileIndex());
 
-	// TODO: also set for player?
-	if(strncmp(GetName(), "playerh", 8) == 0)
-		RpClumpForAllAtomics(clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
-
-#ifdef PED_SKIN
 	if(IsClumpSkinned(clump)){
 		int i;
 		RpHAnimHierarchy *hier;
 		RpAtomic *skinAtomic;
 		RpSkin *skin;
 
-		// mobile:
-//		hier = nil;
-//		RwFrameForAllChildren(RpClumpGetFrame(clump), GetHierarchyFromChildNodesCB, &hier);
-//		assert(hier);
-//		RpClumpForAllAtomics(clump, SetHierarchyForSkinAtomic, hier);
-//		skinAtomic = GetFirstAtomic(clump);
-
-		// xbox:
 		hier = GetAnimHierarchyFromClump(clump);
 		assert(hier);
-		RpSkinAtomicSetHAnimHierarchy(IsClumpSkinned(clump), hier);
-		skinAtomic = IsClumpSkinned(clump);
+		RpClumpForAllAtomics(clump, SetHierarchyForSkinAtomic, hier);
+		skinAtomic = GetFirstAtomic(clump);
 
 		assert(skinAtomic);
 		skin = RpSkinGeometryGetSkin(RpAtomicGetGeometry(skinAtomic));
@@ -113,9 +95,29 @@ CClumpModelInfo::SetClump(RpClump *clump)
 			weights->w2 /= sum;
 			weights->w3 /= sum;
 		}
-//		RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
+		RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
+	}
+}
+
+void
+CClumpModelInfo::SetAnimFile(const char *file)
+{
+	if(strcasecmp(file, "null") == 0)
+		return;
+
+	m_animFileName = new char[strlen(file)+1];
+	strcpy(m_animFileName, file);
+}
+
+void
+CClumpModelInfo::ConvertAnimFileIndex(void)
+{
+	if(m_animFileIndex != -1){
+		// we have a string pointer in that union
+		int32 index = CAnimManager::GetAnimationBlockIndex(m_animFileName);
+		delete[] m_animFileName;
+		m_animFileIndex = index;
 	}
-#endif
 }
 
 void
@@ -139,27 +141,26 @@ CClumpModelInfo::FindFrameFromIdCB(RwFrame *frame, void *data)
 {
 	RwObjectIdAssociation *assoc = (RwObjectIdAssociation*)data;
 
-	if(CVisibilityPlugins::GetFrameHierarchyId(frame) != assoc->id){
-		RwFrameForAllChildren(frame, FindFrameFromIdCB, assoc);
-		return assoc->frame ? nil : frame;
-	}else{
+	if(CVisibilityPlugins::GetFrameHierarchyId(frame) == assoc->id){
 		assoc->frame = frame;
 		return nil;
 	}
+	RwFrameForAllChildren(frame, FindFrameFromIdCB, assoc);
+	return assoc->frame ? nil : frame;
 }
 
+//--MIAMI: unused
 RwFrame*
 CClumpModelInfo::FindFrameFromNameCB(RwFrame *frame, void *data)
 {
 	RwObjectNameAssociation *assoc = (RwObjectNameAssociation*)data;
 
-	if(CGeneral::faststricmp(GetFrameNodeName(frame), assoc->name)){
-		RwFrameForAllChildren(frame, FindFrameFromNameCB, assoc);
-		return assoc->frame ? nil : frame;
-	}else{
+	if(!CGeneral::faststricmp(GetFrameNodeName(frame), assoc->name)){
 		assoc->frame = frame;
 		return nil;
 	}
+	RwFrameForAllChildren(frame, FindFrameFromNameCB, assoc);
+	return assoc->frame ? nil : frame;
 }
 
 RwFrame*
@@ -167,14 +168,13 @@ CClumpModelInfo::FindFrameFromNameWithoutIdCB(RwFrame *frame, void *data)
 {
 	RwObjectNameAssociation *assoc = (RwObjectNameAssociation*)data;
 
-	if(CVisibilityPlugins::GetFrameHierarchyId(frame) ||
-		CGeneral::faststricmp(GetFrameNodeName(frame), assoc->name)){
-		RwFrameForAllChildren(frame, FindFrameFromNameWithoutIdCB, assoc);
-		return assoc->frame ? nil : frame;
-	}else{
+	if(CVisibilityPlugins::GetFrameHierarchyId(frame) == 0 &&
+	   !CGeneral::faststricmp(GetFrameNodeName(frame), assoc->name)){
 		assoc->frame = frame;
 		return nil;
 	}
+	RwFrameForAllChildren(frame, FindFrameFromNameWithoutIdCB, assoc);
+	return assoc->frame ? nil : frame;
 }
 
 RwFrame*
diff --git a/src/modelinfo/ClumpModelInfo.h b/src/modelinfo/ClumpModelInfo.h
index bf756e67..0113d340 100644
--- a/src/modelinfo/ClumpModelInfo.h
+++ b/src/modelinfo/ClumpModelInfo.h
@@ -30,9 +30,13 @@ class CClumpModelInfo : public CBaseModelInfo
 {
 public:
 	RpClump *m_clump;
+	union {
+		int32 m_animFileIndex;
+		char *m_animFileName;
+	};
 
-	CClumpModelInfo(void) : CBaseModelInfo(MITYPE_CLUMP) {}
-	CClumpModelInfo(ModelInfoType id) : CBaseModelInfo(id) {}
+	CClumpModelInfo(void) : CBaseModelInfo(MITYPE_CLUMP) { m_animFileIndex = -1; }
+	CClumpModelInfo(ModelInfoType id) : CBaseModelInfo(id) { m_animFileIndex = -1; }
 	~CClumpModelInfo() {}
 	void DeleteRwObject(void);
 	RwObject *CreateInstance(void);
@@ -40,6 +44,9 @@ public:
 	RwObject *GetRwObject(void) { return (RwObject*)m_clump; }
 
 	virtual void SetClump(RpClump *);
+	virtual void SetAnimFile(const char *file);
+	virtual void ConvertAnimFileIndex(void);
+	virtual int GetAnimFileIndex(void) { return m_animFileIndex; }
 
 	static RpAtomic *SetAtomicRendererCB(RpAtomic *atomic, void *data);
 	void SetFrameIds(RwObjectNameIdAssocation *assocs);
diff --git a/src/modelinfo/ModelInfo.cpp b/src/modelinfo/ModelInfo.cpp
index 29466777..3dc048c9 100644
--- a/src/modelinfo/ModelInfo.cpp
+++ b/src/modelinfo/ModelInfo.cpp
@@ -9,6 +9,7 @@ CBaseModelInfo *CModelInfo::ms_modelInfoPtrs[MODELINFOSIZE];
 
 CStore<CSimpleModelInfo, SIMPLEMODELSIZE> CModelInfo::ms_simpleModelStore;
 CStore<CTimeModelInfo, TIMEMODELSIZE> CModelInfo::ms_timeModelStore;
+CStore<CWeaponModelInfo, WEAPONMODELSIZE> CModelInfo::ms_weaponModelStore;
 CStore<CClumpModelInfo, CLUMPMODELSIZE> CModelInfo::ms_clumpModelStore;
 CStore<CPedModelInfo, PEDMODELSIZE> CModelInfo::ms_pedModelStore;
 CStore<CVehicleModelInfo, VEHICLEMODELSIZE> CModelInfo::ms_vehicleModelStore;
@@ -25,6 +26,7 @@ CModelInfo::Initialise(void)
 	ms_2dEffectStore.clear();
 	ms_simpleModelStore.clear();
 	ms_timeModelStore.clear();
+	ms_weaponModelStore.clear();
 	ms_clumpModelStore.clear();
 	ms_pedModelStore.clear();
 	ms_vehicleModelStore.clear();
@@ -86,6 +88,8 @@ CModelInfo::ShutDown(void)
 		ms_simpleModelStore.store[i].Shutdown();
 	for(i = 0; i < ms_timeModelStore.allocPtr; i++)
 		ms_timeModelStore.store[i].Shutdown();
+	for(i = 0; i < ms_weaponModelStore.allocPtr; i++)
+		ms_weaponModelStore.store[i].Shutdown();
 	for(i = 0; i < ms_clumpModelStore.allocPtr; i++)
 		ms_clumpModelStore.store[i].Shutdown();
 	for(i = 0; i < ms_vehicleModelStore.allocPtr; i++)
@@ -98,6 +102,7 @@ CModelInfo::ShutDown(void)
 	ms_2dEffectStore.clear();
 	ms_simpleModelStore.clear();
 	ms_timeModelStore.clear();
+	ms_weaponModelStore.clear();
 	ms_pedModelStore.clear();
 	ms_clumpModelStore.clear();
 	ms_vehicleModelStore.clear();
@@ -123,6 +128,16 @@ CModelInfo::AddTimeModel(int id)
 	return modelinfo;
 }
 
+CWeaponModelInfo*
+CModelInfo::AddWeaponModel(int id)
+{
+	CWeaponModelInfo *modelinfo;
+	modelinfo = CModelInfo::ms_weaponModelStore.alloc();
+	CModelInfo::ms_modelInfoPtrs[id] = modelinfo;
+	modelinfo->Init();
+	return modelinfo;
+}
+
 CClumpModelInfo*
 CModelInfo::AddClumpModel(int id)
 {
diff --git a/src/modelinfo/ModelInfo.h b/src/modelinfo/ModelInfo.h
index fd545e3d..a24ba797 100644
--- a/src/modelinfo/ModelInfo.h
+++ b/src/modelinfo/ModelInfo.h
@@ -4,6 +4,7 @@
 #include "BaseModelInfo.h"
 #include "SimpleModelInfo.h"
 #include "TimeModelInfo.h"
+#include "WeaponModelInfo.h"
 #include "ClumpModelInfo.h"
 #include "PedModelInfo.h"
 #include "VehicleModelInfo.h"
@@ -14,6 +15,7 @@ class CModelInfo
 	static CBaseModelInfo *ms_modelInfoPtrs[MODELINFOSIZE];
 	static CStore<CSimpleModelInfo, SIMPLEMODELSIZE> ms_simpleModelStore;
 	static CStore<CTimeModelInfo, TIMEMODELSIZE> ms_timeModelStore;
+	static CStore<CWeaponModelInfo, WEAPONMODELSIZE> ms_weaponModelStore;
 	static CStore<CClumpModelInfo, CLUMPMODELSIZE> ms_clumpModelStore;
 	static CStore<CPedModelInfo, PEDMODELSIZE> ms_pedModelStore;
 	static CStore<CVehicleModelInfo, VEHICLEMODELSIZE> ms_vehicleModelStore;
@@ -25,6 +27,7 @@ public:
 
 	static CSimpleModelInfo *AddSimpleModel(int id);
 	static CTimeModelInfo *AddTimeModel(int id);
+	static CWeaponModelInfo *AddWeaponModel(int id);
 	static CClumpModelInfo *AddClumpModel(int id);
 	static CPedModelInfo *AddPedModel(int id);
 	static CVehicleModelInfo *AddVehicleModel(int id);
diff --git a/src/modelinfo/WeaponModelInfo.cpp b/src/modelinfo/WeaponModelInfo.cpp
new file mode 100644
index 00000000..2a79fada
--- /dev/null
+++ b/src/modelinfo/WeaponModelInfo.cpp
@@ -0,0 +1,55 @@
+#include "common.h"
+
+#include "ModelInfo.h"
+#include "AnimManager.h"
+#include "VisibilityPlugins.h"
+
+//--MIAMI: file done
+
+void
+CWeaponModelInfo::SetAnimFile(const char *file)
+{
+	if(strcasecmp(file, "null") == 0)
+		return;
+
+	m_animFileName = new char[strlen(file)+1];
+	strcpy(m_animFileName, file);
+}
+
+void
+CWeaponModelInfo::ConvertAnimFileIndex(void)
+{
+	if(m_animFileIndex != -1){
+		// we have a string pointer in that union
+		int32 index = CAnimManager::GetAnimationBlockIndex(m_animFileName);
+		delete[] m_animFileName;
+		m_animFileIndex = index;
+	}
+}
+
+void
+CWeaponModelInfo::Init(void)
+{
+	CSimpleModelInfo::Init();
+	SetWeaponInfo(0);
+}
+
+void
+CWeaponModelInfo::SetWeaponInfo(int32 weaponId)
+{
+	m_atomics[2] = (RpAtomic*)weaponId;
+}
+
+int32
+CWeaponModelInfo::GetWeaponInfo(void)
+{
+	return (int32)(uintptr)m_atomics[2];
+}
+
+void
+CWeaponModelInfo::SetAtomic(int n, RpAtomic *atomic)
+{
+	CSimpleModelInfo::SetAtomic(n, atomic);
+	CVisibilityPlugins::SetAtomicRenderCallback(atomic, CVisibilityPlugins::RenderWeaponCB);
+}
+
diff --git a/src/modelinfo/WeaponModelInfo.h b/src/modelinfo/WeaponModelInfo.h
new file mode 100644
index 00000000..17e717db
--- /dev/null
+++ b/src/modelinfo/WeaponModelInfo.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "SimpleModelInfo.h"
+
+class CWeaponModelInfo : public CSimpleModelInfo
+{
+	union {
+		int32 m_animFileIndex;
+		char *m_animFileName;
+	};
+public:
+	CWeaponModelInfo(void) : CSimpleModelInfo(MITYPE_WEAPON) { m_animFileIndex = -1; }
+
+	virtual void SetAnimFile(const char *file);
+	virtual void ConvertAnimFileIndex(void);
+	virtual int GetAnimFileIndex(void) { return m_animFileIndex; }
+
+	void Init(void);
+	void SetWeaponInfo(int32 weaponId);
+	int32 GetWeaponInfo(void);
+	void SetAtomic(int n, RpAtomic *atomic);
+};
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index fd4f9f58..f538f0a4 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -3856,7 +3856,7 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 					if (IsPedHeadAbovePos(-0.3f)) {
 						dieAnim = NUM_ANIMS;
 					} else {
-						if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FLAG800))
+					    if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
 							dieAnim = ANIM_FLOOR_HIT_F;
 						else
 							dieAnim = ANIM_FLOOR_HIT;
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index c855c860..5995432b 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -222,10 +222,12 @@ int32 Randomizer;
 int32 nParticleCreationInterval = 1;
 float fParticleScaleLimit       = 0.5f;
 
+#ifdef DEBUGMENU
 SETTWEAKPATH("Particle");
 TWEAKINT32(nParticleCreationInterval, 0, 5, 1);
 TWEAKFLOAT(fParticleScaleLimit, 0.0f, 1.0f, 0.1f);
 TWEAKFUNC(CParticle::ReloadConfig);
+#endif
 
 void CParticle::ReloadConfig()
 {
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index cc8c7034..cefc1d9f 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -20,8 +20,10 @@
 #include "SpecialFX.h"
 #include "Shadows.h"
 
+#ifdef DEBUGMENU
 SETTWEAKPATH("Shadows");
 TWEAKBOOL(gbPrintShite);
+#endif
 
 RwImVertexIndex ShadowIndexList[24];
 
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index ed618dd8..cb1d4ab5 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -13,6 +13,7 @@ RtCharset *debugCharset;
 
 bool gPS2alphaTest = 1;
 
+#ifndef FINAL
 static bool charsetOpen;
 void OpenCharsetSafe()
 {
@@ -20,6 +21,7 @@ void OpenCharsetSafe()
 		RtCharsetOpen();
 	charsetOpen = true;
 }
+#endif
 
 void CreateDebugFont()
 {
diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp
index 14f68e52..93a478e5 100644
--- a/src/rw/VisibilityPlugins.cpp
+++ b/src/rw/VisibilityPlugins.cpp
@@ -218,6 +218,25 @@ CVisibilityPlugins::RenderAlphaAtomic(RpAtomic *atomic, int alpha)
 	return atomic;
 }
 
+//--MIAMI: done
+RpAtomic*
+CVisibilityPlugins::RenderWeaponCB(RpAtomic *atomic)
+{
+	RwMatrix *m;
+	RwV3d view;
+	float maxdist, distsq;
+	CSimpleModelInfo *mi;
+
+	mi = GetAtomicModelInfo(atomic);
+	m = RwFrameGetLTM(RpAtomicGetFrame(atomic));
+	RwV3dSub(&view, RwMatrixGetPos(m), ms_pCameraPosn);
+	maxdist = mi->GetLodDistance(0);
+	distsq = RwV3dDotProduct(&view, &view);
+	if(distsq < maxdist*maxdist)
+		AtomicDefaultRenderCallBack(atomic);
+	return atomic;
+}
+
 RpAtomic*
 CVisibilityPlugins::RenderFadingAtomic(RpAtomic *atomic, float camdist)
 {
diff --git a/src/rw/VisibilityPlugins.h b/src/rw/VisibilityPlugins.h
index b367d7ee..e2fc4d19 100644
--- a/src/rw/VisibilityPlugins.h
+++ b/src/rw/VisibilityPlugins.h
@@ -46,6 +46,7 @@ public:
 	static RpAtomic *RenderWheelAtomicCB(RpAtomic *atomic);
 	static RpAtomic *RenderObjNormalAtomic(RpAtomic *atomic);
 	static RpAtomic *RenderAlphaAtomic(RpAtomic *atomic, int alpha);
+	static RpAtomic *RenderWeaponCB(RpAtomic *atomic);
 	static RpAtomic *RenderFadingAtomic(RpAtomic *atm, float dist);
 
 	static RpAtomic *RenderVehicleHiDetailCB(RpAtomic *atomic);
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp
index 261a8426..00ee73ea 100644
--- a/src/vehicles/Boat.cpp
+++ b/src/vehicles/Boat.cpp
@@ -401,10 +401,10 @@ CBoat::ProcessControl(void)
 		}
 
 		// Slow down or push down boat as it approaches the world limits
-		m_vecMoveSpeed.x = Min(m_vecMoveSpeed.x, -(GetPosition().x - 1500.0f)*0.01f);	// east
-		m_vecMoveSpeed.x = Max(m_vecMoveSpeed.x, -(GetPosition().x - -2300.0f)*0.01f);	// west
-		m_vecMoveSpeed.y = Min(m_vecMoveSpeed.y, -(GetPosition().y - 1900.0f)*0.01f);	// north
-		m_vecMoveSpeed.y = Max(m_vecMoveSpeed.y, -(GetPosition().y - -1900.0f)*0.01f);	// south
+		m_vecMoveSpeed.x = Min(m_vecMoveSpeed.x, -(GetPosition().x - (WORLD_MAX_X-50.0f))*0.01f);	// east
+		m_vecMoveSpeed.x = Max(m_vecMoveSpeed.x, -(GetPosition().x - (WORLD_MIN_X+50.0f))*0.01f);	// west
+		m_vecMoveSpeed.y = Min(m_vecMoveSpeed.y, -(GetPosition().y - (WORLD_MAX_Y-50.0f))*0.01f);	// north
+		m_vecMoveSpeed.y = Max(m_vecMoveSpeed.y, -(GetPosition().y - (WORLD_MIN_Y+50.0f))*0.01f);	// south
 
 		if(!onLand && bBoatInWater)
 			ApplyWaterResistance();
diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp
index 71189d84..39069364 100644
--- a/src/vehicles/Plane.cpp
+++ b/src/vehicles/Plane.cpp
@@ -806,7 +806,7 @@ CPlane::LoadPath(char const *filename, int32 &numNodes, float &totalLength, bool
 
 	for(i = 0; i < numNodes; i++){
 		*gString = '\0';
-		for(lp = 0; work_buff[bp] != '\n'; bp++, lp++)
+		for(lp = 0; work_buff[bp] != '\n' && work_buff[bp] != '\0'; bp++, lp++)
 			gString[lp] = work_buff[bp];
 		bp++;
 		// BUG: game doesn't terminate string