Fix compiling with HUFFMAN and HAVE_MEDIA_DECODER disabled, bump ODE version to latest stable.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6226 fc73d0e0-1445-4013-8a0c-d673dee63da5

engine/common/config_wastes.h

@@ -12,9 +12,9 @@
 #define BRANDING_ICON "wastes.ico"
 
 /* FS rebranding */
-#define GAME_SHORTNAME		"wastes"
+#define GAME_SHORTNAME		"TW"
 #define GAME_FULLNAME		FULLENGINENAME
-#define GAME_BASEGAMES		"logos","wastes"
+#define GAME_BASEGAMES		"platform","wastes"
 #define GAME_PROTOCOL		"The-Wastes"
 #define GAME_DEFAULTPORT	23000
 

engine/common/plugin.c

@@ -1957,10 +1957,11 @@ static void *QDECL PlugBI_GetEngineInterface(const char *interfacename, size_t s
 			NET_AdrToString,
 			NET_StringToAdr2,
 			NET_SendPacket,
-
+#ifdef HUFFNETWORK
 			Huff_CompressionCRC,
 			Huff_EncryptPacket,
 			Huff_DecryptPacket,
+#endif
 		};
 		if (structsize == sizeof(funcs))
 			return &funcs;
@@ -2049,6 +2050,7 @@ static void *QDECL PlugBI_GetEngineInterface(const char *interfacename, size_t s
 
 			{
 				R_ShaderGetCinematic,
+#ifdef HAVE_MEDIA_DECODER
 				Plug_Media_SetState,
 				Plug_Media_GetState,
 				Media_Send_Reset,
@@ -2058,6 +2060,7 @@ static void *QDECL PlugBI_GetEngineInterface(const char *interfacename, size_t s
 				Media_Send_Resize,
 				Media_Send_GetSize,
 				Media_Send_KeyEvent,
+#endif
 			},
 		};
 		if (structsize == sizeof(funcs))

plugins/Makefile

@@ -248,7 +248,7 @@ ODE_ARCH=$(FTE_TARGET)
 ifeq ($(ODE_ARCH),)
   ODE_ARCH=unknown
 endif
-ODE_VER=0.14
+ODE_VER=0.16.2
 ODE_URL=https://bitbucket.org/odedevs/ode/downloads/ode-$(ODE_VER).tar.gz
 ODE_BASE=$(OUT_DIR)/../ode-$(ODE_VER)_$(ODE_ARCH)/
 ODE_LIB=$(ODE_BASE)ode-$(ODE_VER)/ode/src/.libs/libode.a

plugins/plugin.h

@@ -385,10 +385,11 @@ typedef struct
 	F(char*,	AdrToString,		(char *s, int len, netadr_t *a));
 	F(size_t,	StringToAdr,		(const char *s, int defaultport, netadr_t *a, size_t addrcount, const char **pathstart));
 	F(neterr_t,	SendPacket,			(struct ftenet_connections_s *col, int length, const void *data, netadr_t *to));
-
+#ifdef HUFFNETWORK
 	F(huffman_t*,Huff_CompressionCRC,	(int crc));
 	F(void,		Huff_EncryptPacket,		(sizebuf_t *msg, int offset));
 	F(void,		Huff_DecryptPacket,		(sizebuf_t *msg, int offset));
+#endif
 #define plugmsgfuncs_name "Messaging"
 } plugmsgfuncs_t;
 #endif