ubergames
/
rpgxef
mirror of https://github.com/UberGames/rpgxEF.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compile errors and modified Makefile 

- fixed compile errors while compiling the engine
- fixed a warning while compiling the engine
- modified Makefile to compile client, server and shared libs by default
This commit is contained in:
Walter Julius Hennecke 2012-08-04 17:16:01 +02:00
parent c8ca3f2f37
commit 0748cb7b59
4 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -30,13 +30,13 @@ ifndef BUILD_STANDALONE
BUILD_STANDALONE =
endif
ifndef BUILD_CLIENT
BUILD_CLIENT = 0
BUILD_CLIENT = 1
endif
ifndef BUILD_CLIENT_SMP
BUILD_CLIENT_SMP =
endif
ifndef BUILD_SERVER
BUILD_SERVER = 0
BUILD_SERVER = 1
endif
ifndef BUILD_GAME_SO
BUILD_GAME_SO = 1

2
code/client/cl_main.c
View File

@ -3810,6 +3810,8 @@ void CL_ServerInfoPacket( netadr_t from, msg_t *msg ) {
char *gamename;
qboolean gameMismatch;
Q_UNUSED(type);
// eliteforce doesn't send a \n after infoResponse..
infoString = strchr((char *) msg->data, '"');
if(!infoString)

1
code/game/g_public.h
View File

@ -11,6 +11,7 @@
// special server behaviors
#define SVF_NOCLIENT 0x00000001 // don't send entity to clients, even if it has effects
#define SVF_SHIELD_BBOX 0x00000002 // signals that SV_LinkEntity needs to use special client-side bbox encoding
#define SVF_CLIENTMASK 0x00000004
#define SVF_BOT 0x00000008
#define SVF_ELIMINATED 0x00000010 // Just so we know he's been eliminated without adding the EF_ELIMINATED flag which has all sorts of side effects
#define SVF_BROADCAST 0x00000020 // send to all connected clients

20
code/qcommon/q_shared.h
View File

@ -90,6 +90,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//#pragma intrinsic( memset, memcpy )
#endif
#define Q_UNUSED(x) (void)x;
//Ignore __attribute__ on non-gcc platforms
#ifndef __GNUC__
#ifndef __attribute__
@ -129,7 +131,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
**********************************************************************/
// meh somehow preprocessor G_LUA won't work for me
#define G_LUA 1
#define CG_LUA 1
#ifdef Q3_VM
#error "Q3_VM is defined - QVMs are no longer supported by RPG-X2"
#include "../game/bg_lib.h"
@ -1398,4 +1405,17 @@ typedef enum _flag_status {
#define LERP( a, b, w ) ( ( a ) * ( 1.0f - ( w ) ) + ( b ) * ( w ) )
#define LUMA( red, green, blue ) ( 0.2126f * ( red ) + 0.7152f * ( green ) + 0.0722f * ( blue ) )
//Strictly not directly related to string Id tables, but is only used (so far) in the animation parsing string table.
#define ENUM2STRING(arg) #arg,arg
typedef struct stringID_table_s
{
char *name;
int id;
} stringID_table_t;
int GetIDForString ( stringID_table_t *table, const char *string );
const char *GetStringForID( stringID_table_t *table, int id );
#endif // __Q_SHARED_H