From db92864fe2ac5fa6fda47d0db634bf466d060356 Mon Sep 17 00:00:00 2001
From: Sergeanur <s.anureev@yandex.ua>
Date: Sun, 29 Mar 2020 08:51:30 +0300
Subject: Fire and PlayerSkin fix

---
 src/core/Fire.cpp       |  8 +++---
 src/core/PlayerSkin.cpp | 72 ++++++++++++++++++++++++-------------------------
 2 files changed, 41 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/src/core/Fire.cpp b/src/core/Fire.cpp
index c98c808d..cfa849e9 100644
--- a/src/core/Fire.cpp
+++ b/src/core/Fire.cpp
@@ -113,7 +113,7 @@ CFire::ProcessFire(void)
 			CVector(0.0f, 0.0f, CGeneral::GetRandomNumberInRange(0.0125f, 0.1f) * m_fStrength),
 				0, m_fStrength, 0, 0, 0, 0);
 
-		rand(); rand(); rand(); /* unsure why these three rands are called */
+		CGeneral::GetRandomNumber(); CGeneral::GetRandomNumber(); CGeneral::GetRandomNumber(); /* unsure why these three rands are called */
 
 		CParticle::AddParticle(PARTICLE_CARFLAME_SMOKE, firePos,
 			CVector(0.0f, 0.0f, 0.0f), 0, 0.0f, 0, 0, 0, 0);
@@ -129,8 +129,10 @@ CFire::ProcessFire(void)
 
 		if (!m_pEntity) {
 			CShadows::StoreStaticShadow((uint32)this, SHADOWTYPE_ADDITIVE, gpShadowExplosionTex, &lightpos,
-				7.0f, 0.0f, 0.0f, -7.0f, 0, nRandNumber / 2, nRandNumber / 2,
-				0, 10.0f, 1.0f, 40.0f, 0, 0.0f);
+				7.0f, 0.0f, 0.0f, -7.0f,
+				255,                                        // this is 0 on PC which results in no shadow
+				nRandNumber / 2, nRandNumber / 2, 0,
+				10.0f, 1.0f, 40.0f, 0, 0.0f);
 		}
 		fGreen = nRandNumber / 128;
 		fRed = nRandNumber / 128;
diff --git a/src/core/PlayerSkin.cpp b/src/core/PlayerSkin.cpp
index 4d2c31df..4f730b90 100644
--- a/src/core/PlayerSkin.cpp
+++ b/src/core/PlayerSkin.cpp
@@ -1,22 +1,22 @@
-#include "common.h"
-#include "patcher.h"
-#include "main.h"
-#include "PlayerSkin.h"
-#include "TxdStore.h"
-#include "rtbmp.h"
-#include "ClumpModelInfo.h"
-#include "VisibilityPlugins.h"
-#include "World.h"
-#include "PlayerInfo.h"
-#include "CdStream.h"
-#include "FileMgr.h"
-#include "Directory.h"
-#include "RwHelper.h"
-#include "Timer.h"
-#include "Lights.h"
-
-int CPlayerSkin::m_txdSlot;
-
+#include "common.h"
+#include "patcher.h"
+#include "main.h"
+#include "PlayerSkin.h"
+#include "TxdStore.h"
+#include "rtbmp.h"
+#include "ClumpModelInfo.h"
+#include "VisibilityPlugins.h"
+#include "World.h"
+#include "PlayerInfo.h"
+#include "CdStream.h"
+#include "FileMgr.h"
+#include "Directory.h"
+#include "RwHelper.h"
+#include "Timer.h"
+#include "Lights.h"
+
+int CPlayerSkin::m_txdSlot;
+
 void
 FindPlayerDff(uint32 &offset, uint32 &size)
 {
@@ -32,8 +32,8 @@ FindPlayerDff(uint32 &offset, uint32 &size)
 
 	offset = info.offset;
 	size = info.size;
-}
-
+}
+
 void
 LoadPlayerDff(void)
 {
@@ -65,22 +65,22 @@ LoadPlayerDff(void)
 
 	if (streamWasAdded)
 		CdStreamRemoveImages();
-}
-
+}
+
 void
 CPlayerSkin::Initialise(void)
 {
 	m_txdSlot = CTxdStore::AddTxdSlot("skin");
 	CTxdStore::Create(m_txdSlot);
 	CTxdStore::AddRef(m_txdSlot);
-}
-
+}
+
 void
 CPlayerSkin::Shutdown(void)
 {
 	CTxdStore::RemoveTxdSlot(m_txdSlot);
-}
-
+}
+
 RwTexture *
 CPlayerSkin::GetSkinTexture(const char *texName)
 {
@@ -112,8 +112,8 @@ CPlayerSkin::GetSkinTexture(const char *texName)
 		RwImageDestroy(image);
 	}
 	return tex;
-}
-
+}
+
 void
 CPlayerSkin::BeginFrontendSkinEdit(void)
 {
@@ -163,11 +163,11 @@ CPlayerSkin::RenderFrontendSkinEdit(void)
 	RpClumpRender(gpPlayerClump);
 }
 
-STARTPATCHES
-InjectHook(0x59B9B0, &CPlayerSkin::Initialise, PATCH_JUMP);
-InjectHook(0x59B9E0, &CPlayerSkin::Shutdown, PATCH_JUMP);
-InjectHook(0x59B9F0, &CPlayerSkin::GetSkinTexture, PATCH_JUMP);
-InjectHook(0x59BC70, &CPlayerSkin::BeginFrontendSkinEdit, PATCH_JUMP);
-InjectHook(0x59BCB0, &CPlayerSkin::EndFrontendSkinEdit, PATCH_JUMP);
-InjectHook(0x59BCE0, &CPlayerSkin::RenderFrontendSkinEdit, PATCH_JUMP);
+STARTPATCHES
+InjectHook(0x59B9B0, &CPlayerSkin::Initialise, PATCH_JUMP);
+InjectHook(0x59B9E0, &CPlayerSkin::Shutdown, PATCH_JUMP);
+InjectHook(0x59B9F0, &CPlayerSkin::GetSkinTexture, PATCH_JUMP);
+InjectHook(0x59BC70, &CPlayerSkin::BeginFrontendSkinEdit, PATCH_JUMP);
+InjectHook(0x59BCB0, &CPlayerSkin::EndFrontendSkinEdit, PATCH_JUMP);
+InjectHook(0x59BCE0, &CPlayerSkin::RenderFrontendSkinEdit, PATCH_JUMP);
 ENDPATCHES
\ No newline at end of file
-- 
cgit v1.2.3