Lucy fixes:

-fix for hands exported from blender (you no longer have to reassign the motion references)
-fix for silent error / script freeze when getting player accuracy in scripts
-animation fixes (shotgun shell didn't sync with add cartridge and close anims)
-game no longer crashes on missing item section when loading a save (should be possible to uninstall most mods mid-game now)
-fix for mutants stuck running in place (many thanks to Arszi for finding it)
-fix for two handed detector/device animations (swaying is now applied to both arms instead of only the left one)
-it's now possible to play script particle effects in hud_mode with :play(true) / :play_at_pos(pos, true)
-the game will now display a crash message when crashing due to empty translation string

Author: themrdemonized

src/Layers/xrRender/SkeletonAnimated.cpp

@@ -813,7 +813,20 @@ void CKinematicsAnimated::Load(const char* N, IReader* data, u32 dwFlags)
 		string_path nm;
 		for (u32 k = 0; k < set_cnt; ++k)
 		{
-			_GetItem(items_nm, k, nm);
+			if (strstr(nm, "\\*.omf"))
+			{
+				FS_FileSet fset;
+				FS.file_list(fset, "$game_meshes$", FS_ListFiles, nm);
+				FS.file_list(fset, "$level$", FS_ListFiles, nm);
+
+				m_Motions.reserve(fset.size() - 1);
+
+				for (FS_FileSet::iterator it = fset.begin(); it != fset.end(); it++)
+					loadOMF((*it).name.c_str());
+
+				continue;
+			}
+
 			xr_strcat(nm, ".omf");
 			loadOMF(nm);
 		}

src/xrGame/Actor_Weapon.cpp

@@ -74,7 +74,7 @@ float CActor::GetWeaponAccuracy() const
 		}
 	}
 
-	if (W->m_lastCartridge.param_s.buckShot > 1)
+	if (W && W->m_lastCartridge.param_s.buckShot > 1)
 		dispersion *= GetWeaponParam(W, Get_PDM_BuckShot(), 1.0f);
 
 	return dispersion;

src/xrGame/WeaponAutomaticShotgun.cpp

@@ -179,17 +179,17 @@ void CWeaponAutomaticShotgun::PlayAnimOpenWeapon()
 void CWeaponAutomaticShotgun::PlayAnimAddOneCartridgeWeapon()
 {
 	VERIFY(GetState()==eReload);
-	PlayHUDMotion("anm_add_cartridge",TRUE, this, GetState(), 1.f, 0.f, false);
+	PlayHUDMotion("anm_add_cartridge",FALSE, this, GetState());
 }
 
 void CWeaponAutomaticShotgun::PlayAnimCloseWeapon()
 {
 	VERIFY(GetState()==eReload);
 
 	if (BeginReloadWasEmpty && HudAnimationExist("anm_close_empty"))
-		PlayHUDMotion("anm_close_empty", TRUE, this, GetState(), 1.f, 0.f, false);
+		PlayHUDMotion("anm_close_empty", FALSE, this, GetState());
 	else
-		PlayHUDMotion("anm_close",TRUE, this, GetState(), 1.f, 0.f, false);
+		PlayHUDMotion("anm_close", FALSE, this, GetState());
 }
 
 bool CWeaponAutomaticShotgun::HaveCartridgeInInventory(u8 cnt)

src/xrGame/WeaponShotgun.cpp

@@ -186,17 +186,17 @@ void CWeaponShotgun::PlayAnimOpenWeapon()
 void CWeaponShotgun::PlayAnimAddOneCartridgeWeapon()
 {
 	VERIFY(GetState()==eReload);
-	PlayHUDMotion("anm_add_cartridge",TRUE, this, GetState(), 1.f, 0.f, false);
+	PlayHUDMotion("anm_add_cartridge", FALSE, this, GetState());
 }
 
 void CWeaponShotgun::PlayAnimCloseWeapon()
 {
 	VERIFY(GetState()==eReload);
 
 	if (BeginReloadWasEmpty && HudAnimationExist("anm_close_empty"))
-		PlayHUDMotion("anm_close_empty", TRUE, this, GetState(), 1.f, 0.f, false);
+		PlayHUDMotion("anm_close_empty", FALSE, this, GetState());
 	else
-		PlayHUDMotion("anm_close", TRUE, this, GetState(), 1.f, 0.f, false);
+		PlayHUDMotion("anm_close", FALSE, this, GetState());
 }
 
 bool CWeaponShotgun::HaveCartridgeInInventory(u8 cnt)

src/xrGame/alife_object_registry.cpp

@@ -112,7 +112,13 @@ CSE_ALifeDynamicObject* CALifeObjectRegistry::get_object(IReader& file_stream)
 #endif
 	// create entity
 	CSE_Abstract* tpSE_Abstract = F_entity_Create(s_name);
-	R_ASSERT2(tpSE_Abstract, "Can't create entity.");
+	if (!tpSE_Abstract)
+	{
+		Msg("! Can't create entity '%s'", s_name);
+		tNetPacket.B.count = file_stream.r_u16();
+		file_stream.advance(tNetPacket.B.count);
+		return nullptr;
+	}
 	CSE_ALifeDynamicObject* tpALifeDynamicObject = smart_cast<CSE_ALifeDynamicObject*>(tpSE_Abstract);
 	R_ASSERT2(tpALifeDynamicObject, "Non-ALife object in the saved game!");
 	tpALifeDynamicObject->Spawn_Read(tNetPacket);
@@ -135,15 +141,14 @@ void CALifeObjectRegistry::load(IReader& file_stream)
 	m_objects.clear();
 
 	u32 count = file_stream.r_u32();
-	CSE_ALifeDynamicObject** objects = (CSE_ALifeDynamicObject**)_alloca(count * sizeof(CSE_ALifeDynamicObject*));
-
-	CSE_ALifeDynamicObject** I = objects;
-	CSE_ALifeDynamicObject** E = objects + count;
-	for (; I != E; ++I)
+	for (u32 I = 0; I < count; ++I)
 	{
-		*I = get_object(file_stream);
-		add(*I);
+		CSE_ALifeDynamicObject* tpSE_Abstract = get_object(file_stream);
+		if (!tpSE_Abstract)
+			continue;
+
+		add(tpSE_Abstract);
 	}
 
-	Msg("* %d objects are successfully loaded", count);
+	Msg("* %d objects are successfully loaded", m_objects.size());
 }

src/xrGame/movement_manager.cpp

@@ -360,7 +360,9 @@ void CMovementManager::on_restrictions_change()
 
 bool CMovementManager::can_use_distributed_computations(u32 option) const
 {
-	return (!m_build_at_once && g_mt_config.test(option) && !object().getDestroy());
+	//return (!m_build_at_once && g_mt_config.test(option) && !object().getDestroy());
+	return false; // Fix for bug which makes mutants running in one place. Something happens with the thread, and the mutants will wait for a thread which will never finish running.
+	// Many thanks to Arszi for finding this <3
 }
 
 void CMovementManager::on_frame(CPHMovementControl* movement_control, Fvector& dest_position)

src/xrGame/player_hud.cpp

@@ -896,8 +896,11 @@ void player_hud::update(const Fmatrix& cam_trans)
 		if (wep && wep->IsZoomed())
 			trans_2.mulB_43(wep->m_shoot_shake_mat);
 	}
-	else
+	
+	if (m_attached_items[0] && !m_attached_items[1])
 		trans_2 = trans;
+	else if (m_attached_items[1] && !m_attached_items[0])
+		trans = trans_2;
 
 	// override hand offset for single hand animation
 	if (script_anim_part == 2 || (script_anim_part && !m_attached_items[0] && !m_attached_items[1]))

src/xrGame/script_particles.cpp

@@ -113,19 +113,19 @@ CScriptParticles::~CScriptParticles()
 	}
 }
 
-void CScriptParticles::Play()
+void CScriptParticles::Play(bool bHudMode)
 {
 	VERIFY(m_particles);
-	m_particles->Play(false);
+	m_particles->Play(bHudMode);
 }
 
-void CScriptParticles::PlayAtPos(const Fvector& position)
+void CScriptParticles::PlayAtPos(const Fvector& position, bool bHudMode)
 {
 	VERIFY(m_particles);
 	//m_particles->play_at_pos	(position);
 	m_transform.translate_over(position);
 	m_particles->UpdateParent(m_transform, zero_vel);
-	m_particles->Play(false);
+	m_particles->Play(bHudMode);
 	m_particles->UpdateParent(m_transform, zero_vel);
 }
 

src/xrGame/script_particles.h

@@ -42,8 +42,8 @@ class CScriptParticles
 	CScriptParticles(LPCSTR caParticlesName);
 	virtual ~CScriptParticles();
 
-	void Play();
-	void PlayAtPos(const Fvector& pos);
+	void Play(bool bHudMode = false);
+	void PlayAtPos(const Fvector& pos, bool bHudMode = false);
 	void Stop();
 	void StopDeffered();
 

src/xrGame/string_table.cpp

@@ -100,7 +100,7 @@ void CStringTable::Load(LPCSTR xml_file_full)
 		if (m_bWriteErrorsToLog && string_text)
 			Msg("[string table] '%s' no translation in '%s'", string_name, pData->m_sLanguage.c_str());
 
-		VERIFY3(string_text, "string table entry does not have a text", string_name);
+		R_ASSERT3(string_text, "string table entry does not have a text", string_name);
 
 		STRING_VALUE str_val = ParseLine(string_text, string_name, true);