eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

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

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@6226 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Eukara 2022-04-10 17:43:33 +00:00
parent 7a8472ed6b
commit 6c5bd42d93
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/common/config_wastes.h
View file

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

5
engine/common/plugin.c
View file

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

2
plugins/Makefile
View file

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

3
plugins/plugin.h
View file

@ -385,10 +385,11 @@ typedef struct
F(char*, AdrToString, (char *s, int len, netadr_t *a)); 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(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)); 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(huffman_t*,Huff_CompressionCRC, (int crc));
F(void, Huff_EncryptPacket, (sizebuf_t *msg, int offset)); F(void, Huff_EncryptPacket, (sizebuf_t *msg, int offset));
F(void, Huff_DecryptPacket, (sizebuf_t *msg, int offset)); F(void, Huff_DecryptPacket, (sizebuf_t *msg, int offset));
#endif
#define plugmsgfuncs_name "Messaging" #define plugmsgfuncs_name "Messaging"
} plugmsgfuncs_t; } plugmsgfuncs_t;
#endif #endif