diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2020-04-10 10:41:48 +0200 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2020-04-10 10:41:48 +0200 |
| commit | b76172e2ddde4ca77f0827f017705e12bb759b91 (patch) | |
| tree | 52111d5c4cb32eb44a4c9befd04c2693fe0b5d0d /src/render/PlayerSkin.cpp | |
| parent | Fixing mixed IsCutsceneProcessing and IsRunning (diff) | |
| download | re3-b76172e2ddde4ca77f0827f017705e12bb759b91.tar re3-b76172e2ddde4ca77f0827f017705e12bb759b91.tar.gz re3-b76172e2ddde4ca77f0827f017705e12bb759b91.tar.bz2 re3-b76172e2ddde4ca77f0827f017705e12bb759b91.tar.lz re3-b76172e2ddde4ca77f0827f017705e12bb759b91.tar.xz re3-b76172e2ddde4ca77f0827f017705e12bb759b91.tar.zst re3-b76172e2ddde4ca77f0827f017705e12bb759b91.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/render/PlayerSkin.cpp (renamed from src/core/PlayerSkin.cpp) | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/PlayerSkin.cpp b/src/render/PlayerSkin.cpp index 62bcd07d..2cba45fe 100644 --- a/src/core/PlayerSkin.cpp +++ b/src/render/PlayerSkin.cpp @@ -15,6 +15,9 @@ #include "Timer.h" #include "Lights.h" +RpClump *gpPlayerClump; +float gOldFov; + int CPlayerSkin::m_txdSlot; void @@ -92,7 +95,7 @@ CPlayerSkin::GetSkinTexture(const char *texName) CTxdStore::SetCurrentTxd(m_txdSlot); tex = RwTextureRead(texName, NULL); CTxdStore::PopCurrentTxd(); - if (tex) return tex; + if (tex != nil) return tex; if (strcmp(DEFAULT_SKIN_NAME, texName) == 0) sprintf(gString, "models\\generic\\player.bmp"); @@ -139,7 +142,7 @@ CPlayerSkin::RenderFrontendSkinEdit(void) { static float rotation = 0.0f; RwRGBAReal AmbientColor = { 0.65f, 0.65f, 0.65f, 1.0f }; - RwV3d pos = { 1.35f, 0.35f, 7.725f }; + const RwV3d pos = { 1.35f, 0.35f, 7.725f }; const RwV3d axis1 = { 1.0f, 0.0f, 0.0f }; const RwV3d axis2 = { 0.0f, 0.0f, 1.0f }; static uint32 LastFlash = 0; |