diff -Nru tremulous/src/cgame/cg_public.h tremulous.temp/src/cgame/cg_public.h --- tremulous/src/cgame/cg_public.h 2007-02-28 18:28:08.000000000 +0100 +++ tremulous.temp/src/cgame/cg_public.h 2007-02-28 18:31:09.000000000 +0100 @@ -138,6 +138,11 @@ CG_KEY_GETCATCHER, CG_KEY_SETCATCHER, CG_KEY_GETKEY, + CG_PARSE_ADD_GLOBAL_DEFINE, + CG_PARSE_LOAD_SOURCE, + CG_PARSE_FREE_SOURCE, + CG_PARSE_READ_TOKEN, + CG_PARSE_SOURCE_FILE_AND_LINE, CG_S_STOPBACKGROUNDTRACK, CG_REAL_TIME, CG_SNAPVECTOR, @@ -172,12 +177,6 @@ CG_KEY_GETBINDINGBUF, CG_KEY_SETBINDING, - CG_PARSE_ADD_GLOBAL_DEFINE, - CG_PARSE_LOAD_SOURCE, - CG_PARSE_FREE_SOURCE, - CG_PARSE_READ_TOKEN, - CG_PARSE_SOURCE_FILE_AND_LINE, - CG_MEMSET = 200, CG_MEMCPY, CG_STRNCPY, diff -Nru tremulous/src/cgame/cg_syscalls.asm tremulous.temp/src/cgame/cg_syscalls.asm --- tremulous/src/cgame/cg_syscalls.asm 2007-02-28 18:28:08.000000000 +0100 +++ tremulous.temp/src/cgame/cg_syscalls.asm 2007-02-28 18:31:09.000000000 +0100 @@ -64,43 +64,42 @@ equ trap_Key_GetCatcher -62 equ trap_Key_SetCatcher -63 equ trap_Key_GetKey -64 -equ trap_S_StopBackgroundTrack -65 -equ trap_RealTime -66 -equ trap_SnapVector -67 -equ trap_RemoveCommand -68 -equ trap_R_LightForPoint -69 -equ trap_CIN_PlayCinematic -70 -equ trap_CIN_StopCinematic -71 -equ trap_CIN_RunCinematic -72 -equ trap_CIN_DrawCinematic -73 -equ trap_CIN_SetExtents -74 -equ trap_R_RemapShader -75 -equ trap_S_AddRealLoopingSound -76 -equ trap_S_StopLoopingSound -77 -equ trap_CM_TempCapsuleModel -78 -equ trap_CM_CapsuleTrace -79 -equ trap_CM_TransformedCapsuleTrace -80 -equ trap_R_AddAdditiveLightToScene -81 -equ trap_GetEntityToken -82 -equ trap_R_AddPolysToScene -83 -equ trap_R_inPVS -84 -equ trap_FS_Seek -85 -equ trap_FS_GetFileList -86 -equ trap_LiteralArgs -87 -equ trap_CM_BiSphereTrace -88 -equ trap_CM_TransformedBiSphereTrace -89 -equ trap_GetDemoState -90 -equ trap_GetDemoPos -91 -equ trap_GetDemoName -92 -equ trap_Key_KeynumToStringBuf -93 -equ trap_Key_GetBindingBuf -94 -equ trap_Key_SetBinding -95 - -equ trap_Parse_AddGlobalDefine -96 -equ trap_Parse_LoadSource -97 -equ trap_Parse_FreeSource -98 -equ trap_Parse_ReadToken -99 -equ trap_Parse_SourceFileAndLine -100 +equ trap_Parse_AddGlobalDefine -65 +equ trap_Parse_LoadSource -66 +equ trap_Parse_FreeSource -67 +equ trap_Parse_ReadToken -68 +equ trap_Parse_SourceFileAndLine -69 +equ trap_S_StopBackgroundTrack -70 +equ trap_RealTime -71 +equ trap_SnapVector -72 +equ trap_RemoveCommand -73 +equ trap_R_LightForPoint -74 +equ trap_CIN_PlayCinematic -75 +equ trap_CIN_StopCinematic -76 +equ trap_CIN_RunCinematic -77 +equ trap_CIN_DrawCinematic -78 +equ trap_CIN_SetExtents -79 +equ trap_R_RemapShader -80 +equ trap_S_AddRealLoopingSound -81 +equ trap_S_StopLoopingSound -82 +equ trap_CM_TempCapsuleModel -83 +equ trap_CM_CapsuleTrace -84 +equ trap_CM_TransformedCapsuleTrace -85 +equ trap_R_AddAdditiveLightToScene -86 +equ trap_GetEntityToken -87 +equ trap_R_AddPolysToScene -88 +equ trap_R_inPVS -89 +equ trap_FS_Seek -90 +equ trap_FS_GetFileList -91 +equ trap_LiteralArgs -92 +equ trap_CM_BiSphereTrace -93 +equ trap_CM_TransformedBiSphereTrace -94 +equ trap_GetDemoState -95 +equ trap_GetDemoPos -96 +equ trap_GetDemoName -97 +equ trap_Key_KeynumToStringBuf -98 +equ trap_Key_GetBindingBuf -99 +equ trap_Key_SetBinding -100 equ memset -201 equ memcpy -202 @@ -114,3 +113,4 @@ equ testPrintInt -210 equ testPrintFloat -211 + diff -Nru tremulous/src/game/bg_public.h tremulous.temp/src/game/bg_public.h --- tremulous/src/game/bg_public.h 2007-02-28 18:28:08.000000000 +0100 +++ tremulous.temp/src/game/bg_public.h 2007-02-28 18:31:09.000000000 +0100 @@ -454,13 +454,13 @@ BIT_NUM_TEAMS } buildableTeam_t; -#define B_HEALTH_BITS 12 +#define B_HEALTH_BITS 5 #define B_HEALTH_MASK ((1<persistant[PERS_PLAYEREVENTS]) diff -Nru tremulous/src/game/g_public.h tremulous.temp/src/game/g_public.h --- tremulous/src/game/g_public.h 2007-02-28 18:28:08.000000000 +0100 +++ tremulous.temp/src/game/g_public.h 2007-02-28 18:31:09.000000000 +0100 @@ -199,7 +199,7 @@ G_ENTITY_CONTACT, // ( const vec3_t mins, const vec3_t maxs, const gentity_t *ent ); // perform an exact check against inline brush models of non-square shape - G_GET_USERCMD, // ( int clientNum, usercmd_t *cmd ) + G_GET_USERCMD=36, // ( int clientNum, usercmd_t *cmd ) G_GET_ENTITY_TOKEN, // qboolean ( char *buffer, int bufferSize ) // Retrieves the next string token from the entity spawn text, returning @@ -207,7 +207,7 @@ // This should only be done at GAME_INIT time. G_FS_GETFILELIST, - G_REAL_TIME, + G_REAL_TIME=41, G_SNAPVECTOR, G_TRACECAPSULE, // ( trace_t *results, const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int passEntityNum, int contentmask ); @@ -216,13 +216,13 @@ // 1.32 G_FS_SEEK, + G_SEND_GAMESTAT, + G_PARSE_ADD_GLOBAL_DEFINE, G_PARSE_LOAD_SOURCE, G_PARSE_FREE_SOURCE, G_PARSE_READ_TOKEN, - G_PARSE_SOURCE_FILE_AND_LINE, - - G_SEND_GAMESTAT + G_PARSE_SOURCE_FILE_AND_LINE } gameImport_t; @@ -260,3 +260,4 @@ // and parameters. Return qfalse if the game doesn't recognize it as a command. } gameExport_t; + diff -Nru tremulous/src/game/g_syscalls.asm tremulous.temp/src/game/g_syscalls.asm --- tremulous/src/game/g_syscalls.asm 2007-02-28 18:28:08.000000000 +0100 +++ tremulous.temp/src/game/g_syscalls.asm 2007-02-28 18:31:09.000000000 +0100 @@ -34,22 +34,19 @@ equ trap_UnlinkEntity -32 equ trap_EntitiesInBox -33 equ trap_EntityContact -34 -equ trap_GetUsercmd -35 -equ trap_GetEntityToken -36 -equ trap_FS_GetFileList -37 -equ trap_RealTime -38 -equ trap_SnapVector -39 -equ trap_TraceCapsule -40 -equ trap_EntityContactCapsule -41 -equ trap_FS_Seek -42 - -equ trap_Parse_AddGlobalDefine -43 -equ trap_Parse_LoadSource -44 -equ trap_Parse_FreeSource -45 -equ trap_Parse_ReadToken -46 -equ trap_Parse_SourceFileAndLine -47 - -equ trap_SendGameStat -48 +equ trap_BotAllocateClient -35 +equ trap_BotFreeClient -36 +equ trap_GetUsercmd -37 +equ trap_GetEntityToken -38 +equ trap_FS_GetFileList -39 +equ trap_DebugPolygonCreate -40 +equ trap_DebugPolygonDelete -41 +equ trap_RealTime -42 +equ trap_SnapVector -43 +equ trap_TraceCapsule -44 +equ trap_EntityContactCapsule -45 +equ trap_FS_Seek -46 +equ trap_SendGameStat -47 equ memset -101 diff -Nru tremulous/src/qcommon/msg.c tremulous.temp/src/qcommon/msg.c --- tremulous/src/qcommon/msg.c 2007-02-28 18:28:08.000000000 +0100 +++ tremulous.temp/src/qcommon/msg.c 2007-02-28 18:31:09.000000000 +0100 @@ -827,7 +827,7 @@ { NETF(modelindex), 8 }, { NETF(otherEntityNum2), GENTITYNUM_BITS }, { NETF(loopSound), 8 }, -{ NETF(generic1), 16 }, +{ NETF(generic1), 8 }, { NETF(origin2[2]), 0 }, { NETF(origin2[0]), 0 }, { NETF(origin2[1]), 0 }, @@ -1143,7 +1143,7 @@ { PSF(damageYaw), 8 }, { PSF(damagePitch), 8 }, { PSF(damageCount), 8 }, -{ PSF(generic1), 16 }, +{ PSF(generic1), 8 }, { PSF(pm_type), 8 }, { PSF(delta_angles[0]), 16 }, { PSF(delta_angles[2]), 16 }, diff -Nru tremulous/src/qcommon/q_shared.h tremulous.temp/src/qcommon/q_shared.h --- tremulous/src/qcommon/q_shared.h 2007-02-28 18:28:08.000000000 +0100 +++ tremulous.temp/src/qcommon/q_shared.h 2007-02-28 18:31:09.000000000 +0100 @@ -1271,9 +1271,9 @@ // server browser sources // TTimo: AS_MPLAYER is no longer used -#define AS_GLOBAL 0 +#define AS_GLOBAL 2 #define AS_MPLAYER 1 -#define AS_LOCAL 2 +#define AS_LOCAL 0 #define AS_FAVORITES 3 diff -Nru tremulous/src/qcommon/qcommon.h tremulous.temp/src/qcommon/qcommon.h --- tremulous/src/qcommon/qcommon.h 2007-02-28 18:28:08.000000000 +0100 +++ tremulous.temp/src/qcommon/qcommon.h 2007-02-28 18:31:09.000000000 +0100 @@ -224,7 +224,7 @@ ============================================================== */ -#define PROTOCOL_VERSION 70 +#define PROTOCOL_VERSION 69 // maintain a list of compatible protocols for demo playing // NOTE: that stuff only works with two digits protocols diff -Nru tremulous/src/ui/ui_main.c tremulous.temp/src/ui/ui_main.c --- tremulous/src/ui/ui_main.c 2007-02-28 18:28:09.000000000 +0100 +++ tremulous.temp/src/ui/ui_main.c 2007-02-28 18:31:09.000000000 +0100 @@ -56,9 +56,9 @@ static const char *netSources[] = { - "Internet", - "Mplayer", "LAN", + "Mplayer", + "Internet", "Favorites" }; static const int numNetSources = sizeof(netSources) / sizeof(const char*); diff -Nru tremulous/src/ui/ui_public.h tremulous.temp/src/ui/ui_public.h --- tremulous/src/ui/ui_public.h 2007-02-28 18:28:09.000000000 +0100 +++ tremulous.temp/src/ui/ui_public.h 2007-02-28 18:31:09.000000000 +0100 @@ -91,6 +91,11 @@ UI_MEMORY_REMAINING, UI_R_REGISTERFONT, UI_R_MODELBOUNDS, + UI_PARSE_ADD_GLOBAL_DEFINE, + UI_PARSE_LOAD_SOURCE, + UI_PARSE_FREE_SOURCE, + UI_PARSE_READ_TOKEN, + UI_PARSE_SOURCE_FILE_AND_LINE, UI_S_STOPBACKGROUNDTRACK, UI_S_STARTBACKGROUNDTRACK, UI_REAL_TIME, @@ -118,12 +123,6 @@ UI_FS_SEEK, UI_SET_PBCLSTATUS, - UI_PARSE_ADD_GLOBAL_DEFINE, - UI_PARSE_LOAD_SOURCE, - UI_PARSE_FREE_SOURCE, - UI_PARSE_READ_TOKEN, - UI_PARSE_SOURCE_FILE_AND_LINE, - UI_MEMSET = 100, UI_MEMCPY, UI_STRNCPY, diff -Nru tremulous/src/ui/ui_syscalls.asm tremulous.temp/src/ui/ui_syscalls.asm --- tremulous/src/ui/ui_syscalls.asm 2007-02-28 18:28:09.000000000 +0100 +++ tremulous.temp/src/ui/ui_syscalls.asm 2007-02-28 18:31:09.000000000 +0100 @@ -55,37 +55,37 @@ equ trap_MemoryRemaining -53 equ trap_R_RegisterFont -54 equ trap_R_ModelBounds -55 -equ trap_S_StopBackgroundTrack -56 -equ trap_S_StartBackgroundTrack -57 -equ trap_RealTime -58 -equ trap_LAN_GetServerCount -59 -equ trap_LAN_GetServerAddressString -60 -equ trap_LAN_GetServerInfo -61 -equ trap_LAN_MarkServerVisible -62 -equ trap_LAN_UpdateVisiblePings -63 -equ trap_LAN_ResetPings -64 -equ trap_LAN_LoadCachedServers -65 -equ trap_LAN_SaveCachedServers -66 -equ trap_LAN_AddServer -67 -equ trap_LAN_RemoveServer -68 -equ trap_CIN_PlayCinematic -69 -equ trap_CIN_StopCinematic -70 -equ trap_CIN_RunCinematic -71 -equ trap_CIN_DrawCinematic -72 -equ trap_CIN_SetExtents -73 -equ trap_R_RemapShader -74 -equ trap_LAN_ServerStatus -75 -equ trap_LAN_GetServerPing -76 -equ trap_LAN_ServerIsVisible -77 -equ trap_LAN_CompareServers -78 -equ trap_FS_Seek -79 -equ trap_SetPbClStatus -80 +equ trap_Parse_AddGlobalDefine -56 +equ trap_Parse_LoadSource -57 +equ trap_Parse_FreeSource -58 +equ trap_Parse_ReadToken -59 +equ trap_Parse_SourceFileAndLine -60 +equ trap_S_StopBackgroundTrack -61 +equ trap_S_StartBackgroundTrack -62 +equ trap_RealTime -63 +equ trap_LAN_GetServerCount -64 +equ trap_LAN_GetServerAddressString -65 +equ trap_LAN_GetServerInfo -66 +equ trap_LAN_MarkServerVisible -67 +equ trap_LAN_UpdateVisiblePings -68 +equ trap_LAN_ResetPings -69 +equ trap_LAN_LoadCachedServers -70 +equ trap_LAN_SaveCachedServers -71 +equ trap_LAN_AddServer -72 +equ trap_LAN_RemoveServer -73 +equ trap_CIN_PlayCinematic -74 +equ trap_CIN_StopCinematic -75 +equ trap_CIN_RunCinematic -76 +equ trap_CIN_DrawCinematic -77 +equ trap_CIN_SetExtents -78 +equ trap_R_RemapShader -79 +equ trap_LAN_ServerStatus -80 +equ trap_LAN_GetServerPing -81 +equ trap_LAN_ServerIsVisible -82 +equ trap_LAN_CompareServers -83 +equ trap_FS_Seek -84 +equ trap_SetPbClStatus -85 -equ trap_Parse_AddGlobalDefine -81 -equ trap_Parse_LoadSource -82 -equ trap_Parse_FreeSource -83 -equ trap_Parse_ReadToken -84 -equ trap_Parse_SourceFileAndLine -85 equ memset -101 @@ -98,3 +98,4 @@ equ floor -108 equ ceil -109 +