Merge pull request #146 from revolucas/dev

CDestroyablePhysicsObject: Fix incorrect type passed to GameObject::e…
OpenXRay · Sep 12, 2016 · c5cbc9e · c5cbc9e
2 parents e9bc987 + 266f6bb
commit c5cbc9e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp
@@ -177,13 +177,16 @@ void CRender::LoadBuffers	(CStreamReader *base_fs)
 		u32 count				= fs->r_u32();
 		DCL.resize				(count);
 		VB.resize				(count);
+
+		u32	buffer_size = (MAXD3DDECLLENGTH+1)*sizeof(D3DVERTEXELEMENT9);
+		D3DVERTEXELEMENT9 *dcl = (D3DVERTEXELEMENT9*)_alloca(buffer_size);
+
 		for (u32 i=0; i<count; i++)
 		{
 			// decl
 
 //			D3DVERTEXELEMENT9	*dcl = (D3DVERTEXELEMENT9*) fs->pointer();
-			u32					buffer_size = (MAXD3DDECLLENGTH+1)*sizeof(D3DVERTEXELEMENT9);
-			D3DVERTEXELEMENT9	*dcl = (D3DVERTEXELEMENT9*)_alloca(buffer_size);
+
 			fs->r				(dcl,buffer_size);
 			fs->advance			(-(int)buffer_size);
 

diff --git a/src/xrGame/DestroyablePhysicsObject.cpp b/src/xrGame/DestroyablePhysicsObject.cpp
@@ -99,7 +99,7 @@ void CDestroyablePhysicsObject::Destroy()
 {
 	VERIFY(!physics_world()->Processing());
 	const CGameObject *who_object = smart_cast<const CGameObject*>(FatalHit().initiator());
-	callback(GameObject::eDeath)(lua_game_object(),who_object  ? who_object : 0);
+	callback(GameObject::eDeath)(lua_game_object(),who_object ? who_object->lua_game_object() : 0);
 	CPHDestroyable::Destroy(ID(),"physic_destroyable_object");
 	if(m_destroy_sound._handle())
 	{