Removed MDO for now

Author: sago007

Makefile

@@ -598,7 +598,7 @@ ifeq ($(PLATFORM),mingw32)
     TOOLS_BINEXT=.exe
   endif
 
-  LIBS= -lws2_32 -lwinmm 
+  LIBS= -lws2_32 -lwinmm
   CLIENT_LDFLAGS += -mwindows
   CLIENT_LIBS = -lgdi32 -lole32
   RENDERER_LIBS = -lgdi32 -lole32 -lopengl32
@@ -1719,7 +1719,6 @@ Q3ROAOBJ = \
   $(B)/renderer_oa/tr_mesh.o \
   $(B)/renderer_oa/tr_model.o \
   $(B)/renderer_oa/tr_model_iqm.o \
-  $(B)/renderer_oa/tr_model_mdo.o \
   $(B)/renderer_oa/tr_noise.o \
   $(B)/renderer_oa/tr_scene.o \
   $(B)/renderer_oa/tr_shade.o \
@@ -1794,7 +1793,6 @@ Q3RSOFTOBJ = \
   $(B)/renderer_oa/tr_mesh.o \
   $(B)/renderer_oa/tr_model.o \
   $(B)/renderer_oa/tr_model_iqm.o \
-  $(B)/renderer_oa/tr_model_mdo.o \
   $(B)/renderer_oa/tr_noise.o \
   $(B)/renderer_oa/tr_scene.o \
   $(B)/renderer_oa/tr_shade.o \

code/renderer_oa/tr_local.h

@@ -31,7 +31,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "../renderercommon/tr_public.h"
 #include "../renderercommon/tr_common.h"
 #include "../renderercommon/iqm.h"
-#include "tr_mdo.h"
 #include "../renderercommon/qgl.h"
 
 #define GL_INDEX_TYPE		GL_UNSIGNED_INT
@@ -567,7 +566,6 @@ typedef enum {
 	SF_POLY,
 	SF_MD3,
 	SF_MDR,
-	SF_MDO,
 	SF_IQM,
 	SF_FLARE,
 	SF_ENTITY,				// beams, rails, lightning, etc that can be determined by entity
@@ -980,7 +978,7 @@ typedef struct model_s {
 	int			dataSize;	// just for listing purposes
 	bmodel_t	*bmodel;		// only if type == MOD_BRUSH
 	md3Header_t	*md3[MD3_MAX_LODS];	// only if type == MOD_MESH
-	void	*modelData;			// only if type == (MOD_MDR | MOD_IQM | MOD_MDO)
+	void	*modelData;			// only if type == (MOD_MDR | MOD_IQM)
 
 	int			 numLods;
 } model_t;

code/renderer_oa/tr_main.c

@@ -1249,9 +1249,6 @@ void R_AddEntitySurfaces (void) {
 				case MOD_MDR:
 					R_MDRAddAnimSurfaces( ent );
 					break;
-				case MOD_MDO:
-					R_AddMDOSurfaces( ent );
-					break;
 				case MOD_IQM:
 					R_AddIQMSurfaces( ent );
 					break;

code/renderer_oa/tr_mdo.h

@@ -27,7 +27,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 static qboolean R_LoadMD3(model_t *mod, int lod, void *buffer, const char *name );
 static qboolean R_LoadMDR(model_t *mod, void *buffer, int filesize, const char *name );
-qboolean R_LoadMDO( model_t *mod, void *buffer, int filesize, const char *mod_name );
 extern int ismaptexture; // leilei - for listing map textures
 /*
 ====================
@@ -183,47 +182,6 @@ qhandle_t R_RegisterIQM(const char *name, model_t *mod)
 }
 
 
-/*
-====================
-R_RegisterMDO
-====================
-*/
-qhandle_t R_RegisterMDO(const char *name, model_t *mod)
-{
-	union {
-		unsigned *u;
-		void *v;
-	} buf;
-	qboolean loaded = qfalse;
-#if 0
-	int filesize = 
-#endif
-	ri.FS_ReadFile(name, (void **) &buf.v);
-	if(!buf.u)
-	{
-		mod->type = MOD_BAD;
-		return 0;
-	}
-#if 0
-	int ident = LittleLong(*(unsigned *)buf.u);
-	if(ident == MDO_IDENT)
-		loaded = R_LoadMDO(mod, buf.u, filesize, name);
-#endif
-
-	ri.FS_FreeFile (buf.v);
-	
-	if(!loaded)
-	{
-		ri.Printf(PRINT_WARNING,"R_RegisterMDO: couldn't load mdo file %s\n", name);
-		mod->type = MOD_BAD;
-		return 0;
-	}
-	
-	return mod->index;
-}
-
-
-
 
 typedef struct
 {
@@ -236,7 +194,6 @@ typedef struct
 static modelExtToLoaderMap_t modelLoaders[ ] =
 {
 	{ "iqm", R_RegisterIQM },
-	{ "mdo", R_RegisterMDO },
 	{ "mdr", R_RegisterMDR },
 	{ "md3", R_RegisterMD3 }
 };