3 files changed, 11 insertions, 1 deletions

diff --git a/src/render/Occlusion.cpp b/src/render/Occlusion.cpp
index c2f220e9..1ea9da50 100644
--- a/src/render/Occlusion.cpp
+++ b/src/render/Occlusion.cpp
@@ -29,7 +29,9 @@ bool gOccluderCoorsValid[8];
 CVector gOccluderCoorsOnScreen[8];
 CVector gOccluderCoors[8];
 
+#ifndef MASTER
 bool bDisplayOccDebugStuff;
+#endif
 
 void
 COcclusion::Init(void)
@@ -39,7 +41,9 @@ COcclusion::Init(void)
 	NearbyList = -1;
 	ListWalkThroughFA = -1;
 	PreviousListWalkThroughFA = -1;
+#ifndef MASTER
 	bDisplayOccDebugStuff = false;
+#endif
 }
 
 void
@@ -436,6 +440,7 @@ bool COcclusion::IsPositionOccluded(CVector pos, float side) {
 	return false;
 }
 
+#ifndef MASTER
 #include "Lines.h"
 
 RwIm2DVertex vertexbufferT[2];
@@ -476,3 +481,4 @@ void COcclusion::Render() {
 
 	DefinedState();
 }
+#endif
\ No newline at end of file
diff --git a/src/render/Occlusion.h b/src/render/Occlusion.h
index 9a415f88..8a444525 100644
--- a/src/render/Occlusion.h
+++ b/src/render/Occlusion.h
@@ -49,10 +49,14 @@ public:
 	static bool OccluderHidesBehind(CActiveOccluder *occl1, CActiveOccluder *occl2);
 	static bool IsAABoxOccluded(CVector pos, float width, float length, float height);
 	static bool IsPositionOccluded(CVector pos, float side);
+#ifndef MASTER
 	static void Render();
+#endif
 };
 
 bool CalcScreenCoors(CVector const &in, CVector *out, float *outw, float *outh);
 bool CalcScreenCoors(CVector const &in, CVector *out);
 
+#ifndef MASTER
 extern bool bDisplayOccDebugStuff;
+#endif
\ No newline at end of file
diff --git a/src/render/PlayerSkin.cpp b/src/render/PlayerSkin.cpp
index b3e82cd9..261bbec0 100644
--- a/src/render/PlayerSkin.cpp
+++ b/src/render/PlayerSkin.cpp
@@ -99,7 +99,7 @@ CPlayerSkin::GetSkinTexture(const char *texName)
 	CTxdStore::PopCurrentTxd();
 	if (tex != nil) return tex;
 
-	if (strcmp(DEFAULT_SKIN_NAME, texName) == 0)
+	if (strcmp(DEFAULT_SKIN_NAME, texName) == 0 || texName[0] == '\0')
 		sprintf(gString, "models\\generic\\player.bmp");
 	else
 		sprintf(gString, "skins\\%s.bmp", texName);