q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-21 11:31:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

removed the odd domination gametype. will add a better one.

Browse source
This commit is contained in:
q3rally 2011-03-07 20:33:43 +00:00
parent a6c8d82748
commit c24b342ea9
17 changed files with 54 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/code/cgame/cg_draw.c
View file

@ -3262,8 +3262,6 @@ static void CG_Draw2D(stereoFrame_t stereoFrame)
CG_DrawLagometer();
if (cg_sigilLocator.integer == 1)
CG_DrawSigilLocations();
#ifdef MISSIONPACK
if (!cg_paused.integer) {

2
engine/code/cgame/cg_event.c
View file

@ -838,7 +838,7 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
// powerups and team items will have a separate global sound, this one
// will be played at prediction time
if ( item->giType == IT_POWERUP || item->giType == IT_TEAM || item->giType == IT_SIGIL ) {
if ( item->giType == IT_POWERUP || item->giType == IT_TEAM ) {
trap_S_StartSound (NULL, es->number, CHAN_AUTO, cgs.media.n_healthSound );
} else if (item->giType == IT_PERSISTANT_POWERUP) {
#ifdef MISSIONPACK

4
engine/code/cgame/cg_local.h
View file

@ -829,9 +829,6 @@ typedef struct {
qhandle_t redFlagShader[3];
qhandle_t blueFlagShader[3];
qhandle_t flagShader[4];
// Q3Rally Code Start
qhandle_t sigilShader;
// Q3Rally Code END
qhandle_t flagPoleModel;
qhandle_t flagFlapModel;
@ -1425,7 +1422,6 @@ extern vmCvar_t cg_oldRail;
extern vmCvar_t cg_oldRocket;
extern vmCvar_t cg_oldPlasma;
extern vmCvar_t cg_trueLightning;
extern vmCvar_t cg_sigilLocator;
#ifdef MISSIONPACK
extern vmCvar_t cg_redTeamName;
extern vmCvar_t cg_blueTeamName;

5
engine/code/cgame/cg_main.c
View file

@ -218,7 +218,6 @@ vmCvar_t cg_oldRail;
vmCvar_t cg_oldRocket;
vmCvar_t cg_oldPlasma;
vmCvar_t cg_trueLightning;
vmCvar_t cg_sigilLocator;
#ifdef MISSIONPACK
vmCvar_t cg_redTeamName;
@ -428,7 +427,6 @@ static cvarTable_t cvarTable[] = {
{ &cg_oldRocket, "cg_oldRocket", "1", CVAR_ARCHIVE},
{ &cg_oldPlasma, "cg_oldPlasma", "1", CVAR_ARCHIVE},
{ &cg_trueLightning, "cg_trueLightning", "0.0", CVAR_ARCHIVE},
{ &cg_sigilLocator, "cg_sigilLocator", "1", CVAR_ARCHIVE}
// { &cg_pmove_fixed, "cg_pmove_fixed", "0", CVAR_USERINFO | CVAR_ARCHIVE }
};
@ -1109,9 +1107,6 @@ static void CG_RegisterGraphics( void ) {
cgs.media.blueFlagShader[0] = trap_R_RegisterShaderNoMip( "icons/iconf_blu1" );
cgs.media.blueFlagShader[1] = trap_R_RegisterShaderNoMip( "icons/iconf_blu2" );
cgs.media.blueFlagShader[2] = trap_R_RegisterShaderNoMip( "icons/iconf_blu3" );
// Q3Rally Code Start
cgs.media.sigilShader = trap_R_RegisterShaderNoMip( "icons/iconf_neutral1" );
// Q3Rally Code END
#ifdef MISSIONPACK
cgs.media.flagPoleModel = trap_R_RegisterModel( "models/flag2/flagpole.md3" );
cgs.media.flagFlapModel = trap_R_RegisterModel( "models/flag2/flagflap3.md3" );

3
engine/code/game/bg_misc.c
View file

@ -1170,8 +1170,7 @@ gitem_t *BG_FindItemForPowerup( powerup_t pw ) {
for ( i = 0 ; i < bg_numItems ; i++ ) {
if ( (bg_itemlist[i].giType == IT_POWERUP ||
bg_itemlist[i].giType == IT_TEAM ||
bg_itemlist[i].giType == IT_PERSISTANT_POWERUP ||
bg_itemlist[i].giType == IT_SIGIL ) &&
bg_itemlist[i].giType == IT_PERSISTANT_POWERUP ) &&
bg_itemlist[i].giTag == pw ) {
return &bg_itemlist[i];
}

8
engine/code/game/bg_public.h
View file

@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// second version that must match between game and cgame
// STONELANCE
#define GAME_VERSION "Q3Rally v0.1 Pre-Alpha build r37"
#define GAME_VERSION "Q3Rally v0.1 Pre-Alpha build 13"
// END
#define DEFAULT_GRAVITY 800
@ -108,7 +108,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//#define CS_MODELS 32
#define CS_MODELS 30
#define CS_SIGILSTATUS 31
// Q3Rally Code END
#define CS_SOUNDS (CS_MODELS+MAX_MODELS)
// STONELANCE
@ -427,10 +426,6 @@ typedef enum {
PW_DOUBLER,
PW_AMMOREGEN,
PW_INVULNERABILITY,
PW_SIGILWHITE,
PW_SIGILRED,
PW_SIGILBLUE,
PW_NUM_POWERUPS
@ -818,7 +813,6 @@ typedef enum {
IT_TEAM,
// Q3Rally Code Start
IT_RFWEAPON,
IT_SIGIL
// Q3Rally Code END
} itemType_t;

7
engine/code/game/g_items.c
View file

@ -508,11 +508,6 @@ void Touch_Item (gentity_t *ent, gentity_t *other, trace_t *trace) {
case IT_TEAM:
respawn = Pickup_Team(ent, other);
break;
// Q3Rally Code Start
case IT_SIGIL:
respawn = Sigil_Touch(ent, other);
break;
// Q3Rally Code END
case IT_HOLDABLE:
respawn = Pickup_Holdable(ent, other);
break;
@ -532,7 +527,7 @@ void Touch_Item (gentity_t *ent, gentity_t *other, trace_t *trace) {
}
// powerup pickups are global broadcasts
if ( ent->item->giType == IT_POWERUP || ent->item->giType == IT_TEAM || ent->item->giType == IT_SIGIL ) {
if ( ent->item->giType == IT_POWERUP || ent->item->giType == IT_TEAM ) {
// if we want the global sound to play
if (!ent->speed) {
gentity_t *te;

1
engine/code/game/g_local.h
View file

@ -971,7 +971,6 @@ extern vmCvar_t g_enableDust;
extern vmCvar_t g_enableBreath;
extern vmCvar_t g_singlePlayer;
extern vmCvar_t g_proxMineTimeout;
extern vmCvar_t g_dominationSpawnStyle;
extern vmCvar_t g_humanplayers;
// STONELANCE
extern vmCvar_t g_forceEngineStart;

2
engine/code/game/g_main.c
View file

@ -99,7 +99,6 @@ vmCvar_t g_enableBreath;
vmCvar_t g_proxMineTimeout;
#endif
// STONELANCE
vmCvar_t g_dominationSpawnStyle;
vmCvar_t g_forceEngineStart;
vmCvar_t g_finishRaceDelay;
vmCvar_t g_trackReversed;
@ -219,7 +218,6 @@ static cvarTable_t gameCvarTable[] = {
{ &g_enableBreath, "g_enableBreath", "0", CVAR_SERVERINFO, 0, qtrue, qfalse },
{ &g_proxMineTimeout, "g_proxMineTimeout", "20000", 0, 0, qfalse },
#endif
{ &g_dominationSpawnStyle, "g_dominationSpawnStyle", "0", CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_NORESTART, 0, qtrue },
{ &g_smoothClients, "g_smoothClients", "1", 0, 0, qfalse},
// STONELANCE
// { &pmove_fixed, "pmove_fixed", "0", CVAR_SYSTEMINFO, 0, qfalse},

14
engine/code/game/g_spawn.c
View file

@ -768,19 +768,7 @@ void SP_worldspawn( void ) {
}
/*
============================
G_ValidateSigils
============================
*/
void G_ValidateSigils()
{
gentity_t *it_ent;
it_ent = G_Spawn();
it_ent->think = ValidateSigilsInMap;
it_ent->nextthink = level.time + 500;
}
/*
==============

14
engine/code/game/g_team.c
View file

@ -24,15 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "g_local.h"
// Q3Rally Code Start
typedef struct domination_sigil_s
{
gentity_t *entity;
sigilStatus_t status;
} domination_sigil_t;
// Q3Rally Code END
typedef struct teamgame_s {
float last_flag_capture;
@ -52,10 +43,7 @@ teamgame_t teamgame;
gentity_t *neutralObelisk;
void Team_SetFlagStatus( int team, flagStatus_t status );
// Q3Rally Code Start
void Team_SetSigilStatus( int sigilNum, sigilStatus_t status );
void Init_Sigils( void );
// Q3Rally Code END
void Team_InitGame( void ) {
memset(&teamgame, 0, sizeof teamgame);

5
engine/code/game/g_team.h
View file

@ -88,7 +88,4 @@ void CheckTeamStatus(void);
int Pickup_Team( gentity_t *ent, gentity_t *other );
// Q3Rally Code Start
int Sigil_Touch( gentity_t *ent, gentity_t *other );
void ValidateSigilsInMap( gentity_t *ent );
// Q3Rally Code END

1
engine/code/q3_ui/ui_rally_servers.c
View file

@ -124,7 +124,6 @@ MULTIPLAYER MENU (SERVER BROWSER)
#define GAMES_TEAM_RACING_DM 6
#define GAMES_TEAMPLAY 7
#define GAMES_CTF 8
#define GAMES_DOMINATION 9
// END
static const char *master_items[] = {

13
engine/code/q3_ui/ui_rally_startserver.c
View file

@ -1244,8 +1244,6 @@ typedef struct {
menufield_s flaglimit;
menuradiobutton_s friendlyfire;
menufield_s hostname;
menulist_s dominationSpawnStyle;
menuradiobutton_s sigillocator;
// STONLANCE
menulist_s trackLength;
menulist_s reversed;
@ -1335,13 +1333,6 @@ static const char *botSkill_list[] = {
0
};
// for dominationSpawnStyle
static const char *dtfspawn_list[] = {
"DM Spawns",
"CTF Team Spawns",
0
};
/*
=================
BotAlreadySelected
@ -1375,8 +1366,6 @@ ServerOptions_Start
static void ServerOptions_Start( void ) {
int timelimit;
int fraglimit;
int dominationSpawnStyle;
int sigillocator;
int maxclients;
int dedicated;
int friendlyfire;
@ -1398,8 +1387,6 @@ static void ServerOptions_Start( void ) {
pure = s_serveroptions.pure.curvalue;
// STONELANCE
skill = s_serveroptions.botSkill.curvalue + 1;
dominationSpawnStyle = s_serveroptions.dominationSpawnStyle.curvalue; // dtf
sigillocator = s_serveroptions.sigillocator.curvalue; // dtf
trackLength = s_serveroptions.trackLength.curvalue;
reversed = s_serveroptions.reversed.curvalue;
// END

1
engine/code/q3_ui/ui_servers2.c
View file

@ -114,7 +114,6 @@ MULTIPLAYER MENU (SERVER BROWSER)
#define GAMES_TEAM_RACING_DM 6
#define GAMES_TEAMPLAY 7
#define GAMES_CTF 8
#define GAMES_DOMINATION 9
// END
static const char *master_items[] = {

13
engine/code/qcommon/q_shared.h
View file

@ -44,7 +44,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#endif
#ifdef _MSC_VER
#define PRODUCT_VERSION "0.1 build r37"
#define PRODUCT_VERSION "0.1 build 13"
#endif
#define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
@ -1658,17 +1658,6 @@ typedef enum _flag_status {
FLAG_DROPPED
} flagStatus_t;
// Q3Rally Code Start
#define MAX_SIGILS 3
typedef enum _sigil_status {
SIGIL_ISWHITE = 0,
SIGIL_ISRED,
SIGIL_ISBLUE
} sigilStatus_t;
// Q3Rally Code END
#define MAX_GLOBAL_SERVERS 4096
#define MAX_OTHER_SERVERS 128

69
q3rallycode.ppr
View file

@ -870,48 +870,53 @@ q3rallycode
14=engine\code\cgame\cg_rally_hud2.c
15=engine\code\game\g_client.c
16=engine\code\game\g_rally_tools.c
17=engine\code\cgame\cg_event.c
18=engine\code\game\g_team.h
19=engine\code\qcommon\q_shared.h
20=engine\code\sys\sys_main.c
21=engine\code\game\g_local.h
22=engine\code\game\g_main.c
[Selected Project Files]
Main=
Selected=engine\code\q3_ui\ui_rally_startserver.c
[engine\code\cgame\cg_draw.c]
TopLine=3133
Caret=1,3153
TopLine=3252
Caret=1,3266
[engine\code\cgame\cg_local.h]
TopLine=1264
Caret=20,1277
TopLine=1414
Caret=35,1424
[engine\code\cgame\cg_main.c]
TopLine=1088
Caret=30,1102
TopLine=1099
Caret=82,1109
[engine\code\cgame\cg_servercmds.c]
TopLine=396
Caret=1,407
[engine\code\game\bg_misc.c]
TopLine=880
Caret=1,892
TopLine=1160
Caret=53,1173
[engine\code\game\g_items.c]
TopLine=797
Caret=1,806
TopLine=516
Caret=71,530
[engine\code\game\g_spawn.c]
TopLine=345
Caret=1,356
TopLine=759
Caret=1,771
[engine\code\game\g_team.c]
TopLine=899
Caret=1,939
TopLine=33
Caret=1,46
[engine\code\cgame\cg_info.c]
TopLine=254
Caret=1,266
[engine\code\game\bg_public.h]
TopLine=140
Caret=60,153
TopLine=20
Caret=65,34
[engine\code\q3_ui\ui_rally_servers.c]
TopLine=683
Caret=17,695
TopLine=113
Caret=50,126
[engine\code\q3_ui\ui_rally_startserver.c]
TopLine=2538
Caret=3,2550
TopLine=1322
Caret=3,1334
[engine\code\q3_ui\ui_servers2.c]
TopLine=604
Caret=3,616
TopLine=103
Caret=23,116
[engine\code\cgame\cg_newdraw.c]
TopLine=1211
Caret=33,1218
@ -924,3 +929,21 @@ Caret=43,1378
[engine\code\game\g_rally_tools.c]
TopLine=333
Caret=314,346
[engine\code\cgame\cg_event.c]
TopLine=827
Caret=63,841
[engine\code\game\g_team.h]
TopLine=78
Caret=1,91
[engine\code\qcommon\q_shared.h]
TopLine=33
Caret=40,47
[engine\code\sys\sys_main.c]
TopLine=604
Caret=1,618
[engine\code\game\g_local.h]
TopLine=960
Caret=35,973
[engine\code\game\g_main.c]
TopLine=208
Caret=7,220