From: black <black@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sun, 2 Mar 2008 22:31:03 +0000 (+0000)
Subject: Remove FS_FIX_PATHS again and disable model rendering in the menu until someone can... 
X-Git-Tag: xonotic-v0.1.0preview~2339
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8bcbd476c86b2c26e77b76b57039f840904a89a5;p=xonotic%2Fdarkplaces.git

Remove FS_FIX_PATHS again and disable model rendering in the menu until someone can do it correctly (both were hacks).

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8186 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/fs.c b/fs.c
index 4b06a4e7..de596b4b 100644
--- a/fs.c
+++ b/fs.c
@@ -1808,17 +1808,6 @@ Open a file. The syntax is the same as fopen
 */
 qfile_t* FS_Open (const char* filepath, const char* mode, qboolean quiet, qboolean nonblocking)
 {
-#ifdef FS_FIX_PATHS
-	char fixedFileName[MAX_QPATH];
-	char *d;
-	strlcpy( fixedFileName, filepath, MAX_QPATH );
-	// try to fix common mistakes (\ instead of /)
-	for( d = fixedFileName ; *d ; d++ )
-		if( *d == '\\' )
-			*d = '/';
-	filepath = fixedFileName;
-#endif
-
 	if (FS_CheckNastyPath(filepath, false))
 	{
 		Con_Printf("FS_Open(\"%s\", \"%s\", %s): nasty filename rejected\n", filepath, mode, quiet ? "true" : "false");
diff --git a/mvm_cmds.c b/mvm_cmds.c
index 36e0b417..391076f5 100644
--- a/mvm_cmds.c
+++ b/mvm_cmds.c
@@ -876,9 +876,16 @@ VM_altstr_ins,						//  #86
 VM_findflags,						//  #87
 VM_findchainflags,				//  #88
 VM_cvar_defstring,				//  #89
+// deactivate support for model rendering in the menu until someone has time to do it right [3/2/2008 Andreas]
+#if 0
 VM_CL_setmodel,					// #90 void(entity e, string m) setmodel (QUAKE)
 VM_CL_precache_model,			// #91 void(string s) precache_model (QUAKE)
 VM_CL_setorigin,				// #92 void(entity e, vector o) setorigin (QUAKE)
+#else
+NULL,
+NULL,
+NULL,
+#endif
 NULL,									//  #93
 NULL,									//  #94
 NULL,									//  #95
@@ -1086,6 +1093,8 @@ NULL,									// #296
 NULL,									// #297
 NULL,									// #298
 NULL,									// #299
+// deactivate support for model rendering in the menu until someone has time to do it right [3/2/2008 Andreas]
+#if 0
 // CSQC range #300-#399
 VM_CL_R_ClearScene,				// #300 void() clearscene (DP_QC_RENDER_SCENE)
 VM_CL_R_AddEntities,			// #301 void(float mask) addentities (DP_QC_RENDER_SCENE)
@@ -1101,6 +1110,22 @@ NULL/*VM_CL_R_LoadWorldModel*/,				// #309 void(string modelname) R_LoadWorldMod
 VM_CL_setattachment,				// #310 void(entity e, entity tagentity, string tagname) setattachment (DP_GFX_QUAKE3MODELTAGS) (DP_QC_RENDER_SCENE)
 VM_CL_gettagindex,				// #311 float(entity ent, string tagname) gettagindex (DP_QC_GETTAGINFO) (DP_QC_RENDER_SCENE)
 VM_CL_gettaginfo,					// #312 vector(entity ent, float tagindex) gettaginfo (DP_QC_GETTAGINFO) (DP_QC_RENDER_SCENE)
+#else
+// CSQC range #300-#399
+NULL,		
+NULL,		
+NULL,		
+NULL,		
+NULL,		
+NULL,		
+NULL,		
+NULL,	
+NULL,	
+NULL,
+NULL,	
+NULL,	
+NULL,	
+#endif
 NULL,									// #313
 NULL,									// #314
 NULL,									// #315