3 files changed, 50 insertions, 6 deletions

diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index f568532a..35af1ebd 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -3,11 +3,14 @@
 #endif
 #include "common.h"
 
+#include "RwHelper.h"
 #include "Timecycle.h"
 #include "skeleton.h"
 #include "Debug.h"
-#ifndef FINAL
+#if !defined(FINAL) || defined(DEBUGMENU)
 #include "rtcharse.h"
+#endif
+#ifndef FINAL
 RtCharset *debugCharset;
 #endif
 
@@ -16,8 +19,9 @@ bool gPS2alphaTest = true;
 #else
 bool gPS2alphaTest = false;
 #endif
+bool gBackfaceCulling = true;
 
-#ifndef FINAL
+#if !defined(FINAL) || defined(DEBUGMENU)
 static bool charsetOpen;
 void OpenCharsetSafe()
 {
@@ -121,16 +125,34 @@ DefinedState(void)
 
 #ifdef LIBRW
 	rw::SetRenderState(rw::ALPHATESTFUNC, rw::ALPHAGREATEREQUAL);
-	rw::SetRenderState(rw::ALPHATESTREF, 3);
 
 	rw::SetRenderState(rw::GSALPHATEST, gPS2alphaTest);
 #else
 	// D3D stuff
 	RwD3D8SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATER);
-	RwD3D8SetRenderState(D3DRS_ALPHAREF, 2);
+#endif
+	SetAlphaRef(2);
+}
+
+void
+SetAlphaRef(int ref)
+{
+#ifdef LIBRW
+	rw::SetRenderState(rw::ALPHATESTREF, ref+1);
+#else
+	RwD3D8SetRenderState(D3DRS_ALPHAREF, ref);
 #endif
 }
 
+void
+SetCullMode(uint32 mode)
+{
+	if(gBackfaceCulling)
+		RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)mode);
+	else
+		RwRenderStateSet(rwRENDERSTATECULLMODE, (void*)rwCULLMODECULLNONE);
+}
+
 RwFrame*
 GetFirstFrameCallback(RwFrame *child, void *data)
 {
@@ -431,11 +453,13 @@ CameraSize(RwCamera * camera, RwRect * rect,
 			}
 		}
 
-		if (( origSize.w != rect->w ) && ( origSize.h != rect->h ))
+		if (( origSize.w != rect->w ) || ( origSize.h != rect->h ))
 		{
 			RwRaster           *raster;
 			RwRaster           *zRaster;
 
+			// BUG: game just changes camera raster's sizes, but this is a hack
+#ifdef FIX_BUGS
 			/*
 			 * Destroy rasters...
 			 */
@@ -444,12 +468,14 @@ CameraSize(RwCamera * camera, RwRect * rect,
 			if( raster )
 			{
 				RwRasterDestroy(raster);
+				camera->frameBuffer = nil;
 			}
 
 			zRaster = RwCameraGetZRaster(camera);
 			if( zRaster )
 			{
 				RwRasterDestroy(zRaster);
+				camera->zBuffer = nil;
 			}
 
 			/*
@@ -493,6 +519,13 @@ CameraSize(RwCamera * camera, RwRect * rect,
 				RwCameraSetRaster(camera, raster);
 				RwCameraSetZRaster(camera, zRaster);
 			}
+#else
+			raster = RwCameraGetRaster(camera);
+			zRaster = RwCameraGetZRaster(camera);
+
+			raster->width = zRaster->width = rect->w;
+			raster->height = zRaster->height = rect->h;
+#endif
 		}
 
 		/* Figure out the view window */
@@ -648,4 +681,4 @@ RestoreAlphaTest()
 	RwD3D8SetRenderState(D3DRS_ALPHAREF, saved_alpharef);
 #endif
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/rw/RwHelper.h b/src/rw/RwHelper.h
index eceaee07..130eb636 100644
--- a/src/rw/RwHelper.h
+++ b/src/rw/RwHelper.h
@@ -11,6 +11,8 @@ void DestroyDebugFont();
 void ObrsPrintfString(const char *str, short x, short y);
 void FlushObrsPrintfs();
 void DefinedState(void);
+void SetAlphaRef(int ref);
+void SetCullMode(uint32 mode);
 RwFrame *GetFirstChild(RwFrame *frame);
 RwObject *GetFirstObject(RwFrame *frame);
 RpAtomic *GetFirstAtomic(RpClump *clump);
diff --git a/src/rw/VisibilityPlugins.cpp b/src/rw/VisibilityPlugins.cpp
index b2e252a0..8878a26a 100644
--- a/src/rw/VisibilityPlugins.cpp
+++ b/src/rw/VisibilityPlugins.cpp
@@ -1,5 +1,6 @@
 #include "common.h"
 
+#include "RwHelper.h"
 #include "templates.h"
 #include "Entity.h"
 #include "ModelInfo.h"
@@ -158,6 +159,10 @@ CVisibilityPlugins::RenderFadingEntities(void)
 		if(mi->m_noZwrite)
 #endif
 			RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, FALSE);
+#ifdef EXTRA_MODEL_FLAGS
+		else if(mi->m_bIsTree)
+			SetAlphaRef(128);
+#endif
 
 		if(e->bDistanceFade){
 			DeActivateDirectional();
@@ -168,6 +173,10 @@ CVisibilityPlugins::RenderFadingEntities(void)
 		}else
 			CRenderer::RenderOneNonRoad(e);
 
+#ifdef EXTRA_MODEL_FLAGS
+		if(mi->m_bIsTree)
+			SetAlphaRef(2);
+#endif
 #ifdef FIX_BUGS
 		if(mi->GetModelType() == MITYPE_SIMPLE && mi->m_noZwrite)
 #else