From 32005e8e253ff084469ca19e405de2b2a35c4c90 Mon Sep 17 00:00:00 2001 From: revolucas Date: Fri, 9 Sep 2016 07:45:51 -0400 Subject: [PATCH 1/2] CDestroyablePhysicsObject: Fix incorrect type passed to GameObject::eDeath callback --- src/xrGame/DestroyablePhysicsObject.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xrGame/DestroyablePhysicsObject.cpp b/src/xrGame/DestroyablePhysicsObject.cpp index 8cc1b87a0d7..8e1afad519a 100644 --- 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(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()) { From 266f6bbd2bf876d4406f392a073f6c352c71d5cb Mon Sep 17 00:00:00 2001 From: revolucas Date: Fri, 9 Sep 2016 21:30:49 -0400 Subject: [PATCH 2/2] xrRenderPC_RC1\FStaticRender_Loader.cpp: Moved vertex buffer_size declaration outside of loop --- src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp b/src/Layers/xrRenderPC_R1/FStaticRender_Loader.cpp index 0544f9f06cd..c3a011babfd 100644 --- 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; ipointer(); - u32 buffer_size = (MAXD3DDECLLENGTH+1)*sizeof(D3DVERTEXELEMENT9); - D3DVERTEXELEMENT9 *dcl = (D3DVERTEXELEMENT9*)_alloca(buffer_size); + fs->r (dcl,buffer_size); fs->advance (-(int)buffer_size);