Quake 4 related bug fixes.

neo/quake4/cm/CollisionModel_load.cpp

@@ -306,7 +306,7 @@ void idCollisionModelManagerLocal::LoadProcBSP( const char *name ) {
 	}
 
 // jmarshall: quake 4 proc format
-	if (!src->ReadToken(&token) || token.Icmp(va("%s", PROC_FILEVERSION))) {
+	if (!src->ReadToken(&token)) {
 		common->Printf("idRenderWorldLocal::InitFromMap: bad version '%s' instead of '%s'\n", token.c_str(), PROC_FILEVERSION);
 		delete src;
 		return;

neo/quake4/game/Game.h

@@ -176,6 +176,7 @@ public:
 	virtual void				MenuFrame( void ) = 0;
 
 	virtual byte*				MT_GetMaterialTypeArray(idStr image, int& width, int& height) = 0;
+	virtual void				MT_FreeMaterialTypeArray(byte* buffer) = 0;
 // RAVEN END
 
 	// Runs a repeater frame

neo/quake4/game/Game_local.cpp

@@ -13,6 +13,10 @@
 #include "Game_Log.h"
 // RAVEN END
 
+#include "../bse/BSE_Envelope.h"
+#include "../bse/BSE_Particle.h"
+#include "../bse/BSE.h"
+
 //#define UI_DEBUG	1
 
 #ifdef GAME_DLL
@@ -394,6 +398,11 @@ idGameLocal::Init
   initialize the game object, only happens once at startup, not each level load
 ============
 */
+static idDecl* AllocEffectDecl(void) {
+	idDecl* decl = new rvDeclEffect();
+	return decl;
+}
+
 // RAVEN BEGIN
 // jsinger: attempt to eliminate cross-DLL allocation issues
 extern idHashTable<rvViseme> *visemeTable100;
@@ -459,6 +468,9 @@ void idGameLocal::Init( void ) {
 	declManager->RegisterDeclFolder("materials/types", ".mtt", DECL_MATERIALTYPE);
 	declManager->RegisterDeclFolder("lipsync", ".lipsync", DECL_LIPSYNC);
 	declManager->RegisterDeclFolder("playbacks", ".playback", DECL_PLAYBACK);
+
+	declManager->RegisterDeclType("effect", DECL_EFFECT, AllocEffectDecl);
+	declManager->RegisterDeclFolder("effects", ".fx", DECL_EFFECT);
 // jmarshall end
 
 // jsinger: added to support serialization/deserialization of binary decls
@@ -8417,7 +8429,16 @@ idGameLocal::MT_GetMaterialTypeArray
 ============
 */
 byte* idGameLocal::MT_GetMaterialTypeArray(idStr image, int& width, int& height) {
-	return MT_GetMaterialTypeArray(image, width, height);
+	return ::MT_GetMaterialTypeArray(image, width, height);
+}
+
+/*
+===========
+idGameLocal::MT_FreeMaterialTypeArray
+============
+*/
+void idGameLocal::MT_FreeMaterialTypeArray(byte* buffer) {
+	free(buffer);
 }
 
 /*

neo/quake4/game/Game_local.h

@@ -577,6 +577,7 @@ public:
 // RAVEN END
 
 	virtual byte*			MT_GetMaterialTypeArray(idStr image, int& width, int& height);
+	virtual void				MT_FreeMaterialTypeArray(byte* buffer);
 
 	virtual int			    GetTimeGroupTime(int timeGroup);
 	virtual void			SelectTimeGroup(int timeGroup);

neo/quake4/idLib/LexerFactory.cpp

@@ -25,7 +25,7 @@ int LexerFactory::GetReadBinary()
 { 
 	if(cvarSystem->GetCVarBool("com_binaryRead")) 
 	{
-		return LEXFL_READBINARY; 
+		return 0; 
 	}
 	else 
 	{
@@ -42,10 +42,10 @@ int LexerFactory::GetWriteBinary()
 	case 0:
 		break;
 	case 1:
-		ret = LEXFL_WRITEBINARY;
+		ret = 0;
 		break;
 	case 2:
-		ret = LEXFL_WRITEBINARY | LEXFL_BYTESWAP;
+		ret = 0;
 		break;
 	}