q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2025-01-18 15:42:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

ioquake3 resync to revision 2116 from 2115.

Browse source
This commit is contained in:
zturtleman 2011-08-10 21:49:38 +00:00
parent 4c3ad4d379
commit 964be685e3
34 changed files with 326 additions and 250 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/Makefile
View file

@ -54,7 +54,7 @@ ifndef BUILD_DEFINES
endif
# ioquake3 svn version that this is based on
IOQ3_REVISION = 2115
IOQ3_REVISION = 2116
#############################################################################
#

2
engine/code/botlib/be_ai_move.c
View file

@ -3187,7 +3187,7 @@ void BotMoveToGoal(bot_moveresult_t *result, int movestate, bot_goal_t *goal, in
else if ((reach.traveltype & TRAVELTYPE_MASK) == TRAVEL_ELEVATOR ||
(reach.traveltype & TRAVELTYPE_MASK) == TRAVEL_FUNCBOB)
{
if ((result->flags & MOVERESULT_ONTOPOF_FUNCBOB) ||
if ((result->flags & MOVERESULT_ONTOPOF_ELEVATOR) ||
(result->flags & MOVERESULT_ONTOPOF_FUNCBOB))
{
ms->reachability_time = AAS_Time() + 5;

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

@ -2754,9 +2754,9 @@ static void CG_DrawTeamVote(void) {
char *s;
int sec, cs_offset;
if ( cgs.clientinfo->team == TEAM_RED )
if ( cgs.clientinfo[cg.clientNum].team == TEAM_RED )
cs_offset = 0;
else if ( cgs.clientinfo->team == TEAM_BLUE )
else if ( cgs.clientinfo[cg.clientNum].team == TEAM_BLUE )
cs_offset = 1;
else
return;

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

@ -525,6 +525,51 @@ static void CG_ItemPickup( int itemNum ) {
}
/*
================
CG_WaterLevel
Returns waterlevel for entity origin
================
*/
int CG_WaterLevel(centity_t *cent) {
vec3_t point;
int contents, sample1, sample2, anim, waterlevel;
// get waterlevel, accounting for ducking
waterlevel = 0;
VectorCopy(cent->lerpOrigin, point);
point[2] += MINS_Z + 1;
anim = cent->currentState.legsAnim & ~ANIM_TOGGLEBIT;
if (anim == LEGS_WALKCR || anim == LEGS_IDLECR) {
point[2] += CROUCH_VIEWHEIGHT;
} else {
point[2] += DEFAULT_VIEWHEIGHT;
}
contents = CG_PointContents(point, -1);
if (contents & MASK_WATER) {
sample2 = point[2] - MINS_Z;
sample1 = sample2 / 2;
waterlevel = 1;
point[2] = cent->lerpOrigin[2] + MINS_Z + sample1;
contents = CG_PointContents(point, -1);
if (contents & MASK_WATER) {
waterlevel = 2;
point[2] = cent->lerpOrigin[2] + MINS_Z + sample2;
contents = CG_PointContents(point, -1);
if (contents & MASK_WATER) {
waterlevel = 3;
}
}
}
return waterlevel;
}
/*
================
@ -555,8 +600,16 @@ void CG_PainEvent( centity_t *cent, int health ) {
} else {
snd = "*pain100_1.wav";
}
trap_S_StartSound( NULL, cent->currentState.number, CHAN_VOICE,
CG_CustomSound( cent->currentState.number, snd ) );
// play a gurp sound instead of a normal pain sound
if (CG_WaterLevel(cent) >= 1) {
if (rand()&1) {
trap_S_StartSound(NULL, cent->currentState.number, CHAN_VOICE, CG_CustomSound(cent->currentState.number, "sound/player/gurp1.wav"));
} else {
trap_S_StartSound(NULL, cent->currentState.number, CHAN_VOICE, CG_CustomSound(cent->currentState.number, "sound/player/gurp2.wav"));
}
} else {
trap_S_StartSound(NULL, cent->currentState.number, CHAN_VOICE, CG_CustomSound(cent->currentState.number, snd));
}
*/
if ( health < 25 ) {
snd = cgs.media.damage25[(int)(random() * 2)];
@ -1274,11 +1327,22 @@ void CG_EntityEvent( centity_t *cent, vec3_t position ) {
case EV_DEATH2:
case EV_DEATH3:
DEBUGNAME("EV_DEATHx");
// Q3Rally Code Start
// trap_S_StartSound( NULL, es->number, CHAN_VOICE,
// CG_CustomSound( es->number, va("*death%i.wav", event - EV_DEATH1 + 1) ) );
trap_S_StartSound( NULL, es->number, CHAN_VOICE, cgs.media.death[(int)(random()*2)] );
/*
if (CG_WaterLevel(cent) >= 1) {
trap_S_StartSound(NULL, es->number, CHAN_VOICE, CG_CustomSound(es->number, "*drown.wav"));
} else {
trap_S_StartSound(NULL, es->number, CHAN_VOICE, CG_CustomSound(es->number, va("*death%i.wav", event - EV_DEATH1 + 1)));
}
*/
if (CG_WaterLevel(cent) >= 1) {
trap_S_StartSound(NULL, es->number, CHAN_VOICE, cgs.media.drown);
} else {
trap_S_StartSound( NULL, es->number, CHAN_VOICE, cgs.media.death[(int)(random()*2)] );
}
// Q3Rally Code END
break;

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

@ -1120,6 +1120,7 @@ static void CG_RegisterGraphics( void ) {
}
if ( cgs.gametype == GT_OBELISK || cg_buildScript.integer ) {
cgs.media.rocketExplosionShader = trap_R_RegisterShader("rocketExplosion");
cgs.media.overloadBaseModel = trap_R_RegisterModel( "models/powerups/overload_base.md3" );
cgs.media.overloadTargetModel = trap_R_RegisterModel( "models/powerups/overload_target.md3" );
cgs.media.overloadLightsModel = trap_R_RegisterModel( "models/powerups/overload_lights.md3" );
@ -1475,7 +1476,7 @@ char *CG_GetMenuBuffer(const char *filename) {
return NULL;
}
if ( len >= MAX_MENUFILE ) {
trap_Print( va( S_COLOR_RED "menu file too large: %s is %i, max allowed is %i", filename, len, MAX_MENUFILE ) );
trap_Print( va( S_COLOR_RED "menu file too large: %s is %i, max allowed is %i\n", filename, len, MAX_MENUFILE ) );
trap_FS_FCloseFile( f );
return NULL;
}
@ -1732,7 +1733,7 @@ void CG_LoadMenus(const char *menuFile) {
}
if ( len >= MAX_MENUDEFFILE ) {
trap_Error( va( S_COLOR_RED "menu file too large: %s is %i, max allowed is %i", menuFile, len, MAX_MENUDEFFILE ) );
trap_Error( va( S_COLOR_RED "menu file too large: %s is %i, max allowed is %i\n", menuFile, len, MAX_MENUDEFFILE ) );
trap_FS_FCloseFile( f );
return;
}

9
engine/code/cgame/cg_players.c
View file

@ -343,7 +343,7 @@ static qboolean CG_ParseAnimationFile( const char *filename, clientInfo_t *ci )
}
if ( i != MAX_ANIMATIONS ) {
CG_Printf( "Error parsing animation file: %s", filename );
CG_Printf( "Error parsing animation file: %s\n", filename );
return qfalse;
}
@ -1450,7 +1450,7 @@ void CG_NewClientInfo( int clientNum ) {
// if we are low on memory, leave them with this model
if ( forceDefer ) {
CG_Printf( "Memory is low. Using deferred model.\n" );
CG_Printf( "Memory is low. Using deferred model.\n" );
newInfo.deferred = qfalse;
}
} else {
@ -1483,7 +1483,7 @@ void CG_LoadDeferredPlayers( void ) {
if ( ci->infoValid && ci->deferred ) {
// if we are low on memory, leave it deferred
if ( trap_MemoryRemaining() < 4000000 ) {
CG_Printf( "Memory is low. Using deferred model.\n" );
CG_Printf( "Memory is low. Using deferred model.\n" );
ci->deferred = qfalse;
continue;
}
@ -1820,7 +1820,8 @@ static void CG_PlayerAngles( centity_t *cent, vec3_t legs[3], vec3_t torso[3], v
// allow yaw to drift a bit
if ( ( cent->currentState.legsAnim & ~ANIM_TOGGLEBIT ) != LEGS_IDLE
|| ( cent->currentState.torsoAnim & ~ANIM_TOGGLEBIT ) != TORSO_STAND ) {
|| ((cent->currentState.torsoAnim & ~ANIM_TOGGLEBIT) != TORSO_STAND
&& (cent->currentState.torsoAnim & ~ANIM_TOGGLEBIT) != TORSO_STAND2)) {
// if not standing still, always point all in the same direction
cent->pe.torso.yawing = qtrue; // always center
cent->pe.torso.pitching = qtrue; // always center

7
engine/code/cgame/cg_playerstate.c
View file

@ -424,7 +424,7 @@ void CG_CheckLocalSounds( playerState_t *ps, playerState_t *ops ) {
}
// check for flag pickup
if ( cgs.gametype >= GT_TEAM ) {
if ( cgs.gametype > GT_TEAM ) {
if ((ps->powerups[PW_REDFLAG] != ops->powerups[PW_REDFLAG] && ps->powerups[PW_REDFLAG]) ||
(ps->powerups[PW_BLUEFLAG] != ops->powerups[PW_BLUEFLAG] && ps->powerups[PW_BLUEFLAG]) ||
(ps->powerups[PW_NEUTRALFLAG] != ops->powerups[PW_NEUTRALFLAG] && ps->powerups[PW_NEUTRALFLAG]) )
@ -474,6 +474,11 @@ void CG_CheckLocalSounds( playerState_t *ps, playerState_t *ops ) {
// fraglimit warnings
if ( cgs.fraglimit > 0 && cgs.gametype < GT_CTF) {
highScore = cgs.scores1;
if (cgs.gametype == GT_TEAM && cgs.scores2 > highScore) {
highScore = cgs.scores2;
}
if ( !( cg.fraglimitWarnings & 4 ) && highScore == (cgs.fraglimit - 1) ) {
cg.fraglimitWarnings |= 1 | 2 | 4;
CG_AddBufferedSound(cgs.media.oneFragSound);

4
engine/code/cgame/cg_predict.c
View file

@ -478,10 +478,8 @@ static void CG_TouchItem( centity_t *cent ) {
return;
}
}
if( cgs.gametype == GT_CTF || cgs.gametype == GT_HARVESTER ) {
#else
if( cgs.gametype == GT_CTF ) {
#endif
if( cgs.gametype == GT_CTF ) {
if (cg.predictedPlayerState.persistant[PERS_TEAM] == TEAM_RED &&
item->giTag == PW_REDFLAG)
return;

4
engine/code/cgame/cg_servercmds.c
View file

@ -624,7 +624,7 @@ int CG_ParseVoiceChats( const char *filename, voiceChatList_t *voiceChatList, in
return qfalse;
}
if ( len >= MAX_VOICEFILESIZE ) {
trap_Print( va( S_COLOR_RED "voice chat file too large: %s is %i, max allowed is %i", filename, len, MAX_VOICEFILESIZE ) );
trap_Print( va( S_COLOR_RED "voice chat file too large: %s is %i, max allowed is %i\n", filename, len, MAX_VOICEFILESIZE ) );
trap_FS_FCloseFile( f );
return qfalse;
}
@ -737,7 +737,7 @@ int CG_HeadModelVoiceChats( char *filename ) {
return -1;
}
if ( len >= MAX_VOICEFILESIZE ) {
trap_Print( va( S_COLOR_RED "voice chat file too large: %s is %i, max allowed is %i", filename, len, MAX_VOICEFILESIZE ) );
trap_Print( va( S_COLOR_RED "voice chat file too large: %s is %i, max allowed is %i\n", filename, len, MAX_VOICEFILESIZE ) );
trap_FS_FCloseFile( f );
return -1;
}

4
engine/code/client/cl_main.c
View file

@ -2598,7 +2598,7 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
if (clc.state != CA_CONNECTING)
{
Com_DPrintf("Unwanted challenge response received. Ignored.\n");
Com_DPrintf("Unwanted challenge response received. Ignored.\n");
return;
}
@ -2677,7 +2677,7 @@ void CL_ConnectionlessPacket( netadr_t from, msg_t *msg ) {
// server connection
if ( !Q_stricmp(c, "connectResponse") ) {
if ( clc.state >= CA_CONNECTED ) {
Com_Printf ("Dup connect received. Ignored.\n");
Com_Printf ("Dup connect received. Ignored.\n");
return;
}
if ( clc.state != CA_CHALLENGING ) {

1
engine/code/game/ai_chat.c
View file

@ -385,6 +385,7 @@ int BotValidChatPosition(bot_state_t *bs) {
if (BotIsDead(bs)) return qtrue;
//never start chatting with a powerup
if (bs->inventory[INVENTORY_QUAD] ||
bs->inventory[INVENTORY_ENVIRONMENTSUIT] ||
bs->inventory[INVENTORY_HASTE] ||
bs->inventory[INVENTORY_INVISIBILITY] ||
bs->inventory[INVENTORY_REGEN] ||

21
engine/code/game/ai_dmnet.c
View file

@ -192,8 +192,12 @@ int BotNearbyGoal(bot_state_t *bs, int tfl, bot_goal_t *ltg, float range) {
//check if the bot should go for air
if (BotGoForAir(bs, tfl, ltg, range)) return qtrue;
//if the bot is carrying the enemy flag
if (BotCTFCarryingFlag(bs)) {
// if the bot is carrying a flag or cubes
if (BotCTFCarryingFlag(bs)
#ifdef MISSIONPACK
|| Bot1FCTFCarryingFlag(bs) || BotHarvesterCarryingCubes(bs)
#endif
) {
//if the bot is just a few secs away from the base
if (trap_AAS_AreaTravelTimeToGoalArea(bs->areanum, bs->origin,
bs->teamgoal.areanum, TFL_DEFAULT) < 300) {
@ -1421,7 +1425,11 @@ int BotSelectActivateWeapon(bot_state_t *bs) {
return WEAPONINDEX_CHAINGUN;
else if (bs->inventory[INVENTORY_NAILGUN] > 0 && bs->inventory[INVENTORY_NAILS] > 0)
return WEAPONINDEX_NAILGUN;
else if (bs->inventory[INVENTORY_PROXLAUNCHER] > 0 && bs->inventory[INVENTORY_MINES] > 0)
return WEAPONINDEX_PROXLAUNCHER;
#endif
else if (bs->inventory[INVENTORY_GRENADELAUNCHER] > 0 && bs->inventory[INVENTORY_GRENADES] > 0)
return WEAPONINDEX_GRENADE_LAUNCHER;
else if (bs->inventory[INVENTORY_RAILGUN] > 0 && bs->inventory[INVENTORY_SLUGS] > 0)
return WEAPONINDEX_RAILGUN;
else if (bs->inventory[INVENTORY_ROCKETLAUNCHER] > 0 && bs->inventory[INVENTORY_ROCKETS] > 0)
@ -2145,11 +2153,12 @@ void AIEnter_Battle_Fight(bot_state_t *bs) {
BotRecordNodeSwitch(bs, "battle fight", "");
trap_BotResetLastAvoidReach(bs->ms);
bs->ainode = AINode_Battle_Fight;
bs->flags &= ~BFL_FIGHTSUICIDAL;
}
/*
==================
AIEnter_Battle_Fight
AIEnter_Battle_SuicidalFight
==================
*/
void AIEnter_Battle_SuicidalFight(bot_state_t *bs) {
@ -2278,6 +2287,12 @@ int AINode_Battle_Fight(bot_state_t *bs) {
// if (!BotEntityVisible(bs->entitynum, bs->eye, bs->viewangles, 360, bs->enemy)) {
if (!BotEntityVisible(bs->entitynum, bs->eye, bs->cur_ps.viewangles, 360, bs->enemy)) {
// END
#ifdef MISSIONPACK
if (bs->enemy == redobelisk.entitynum || bs->enemy == blueobelisk.entitynum) {
AIEnter_Battle_Chase(bs, "battle fight: obelisk out of sight");
return qfalse;
}
#endif
if (BotWantsToChase(bs)) {
AIEnter_Battle_Chase(bs);
return qfalse;

73
engine/code/game/ai_dmq3.c
View file

@ -145,16 +145,17 @@ BotTeam
==================
*/
int BotTeam(bot_state_t *bs) {
char info[1024];
if (bs->client < 0 || bs->client >= MAX_CLIENTS) {
//BotAI_Print(PRT_ERROR, "BotCTFTeam: client out of range\n");
return qfalse;
}
trap_GetConfigstring(CS_PLAYERS+bs->client, info, sizeof(info));
//
if (atoi(Info_ValueForKey(info, "t")) == TEAM_RED) return TEAM_RED;
else if (atoi(Info_ValueForKey(info, "t")) == TEAM_BLUE) return TEAM_BLUE;
if (level.clients[bs->client].sess.sessionTeam == TEAM_RED) {
return TEAM_RED;
} else if (level.clients[bs->client].sess.sessionTeam == TEAM_BLUE) {
return TEAM_BLUE;
}
return TEAM_FREE;
}
@ -1692,8 +1693,8 @@ void BotCheckItemPickup(bot_state_t *bs, int *oldinventory) {
//trap_BotEnterChat(bs->cs, leader, CHAT_TELL);
}
}
bs->teamtaskpreference |= TEAMTP_ATTACKER;
}
bs->teamtaskpreference |= TEAMTP_ATTACKER;
}
bs->teamtaskpreference &= ~TEAMTP_DEFENDER;
}
@ -2304,7 +2305,7 @@ int BotWantsToRetreat(bot_state_t *bs) {
else if (gametype == GT_OBELISK) {
//the bots should be dedicated to attacking the enemy obelisk
if (bs->ltgtype == LTG_ATTACKENEMYBASE) {
if (bs->enemy != redobelisk.entitynum ||
if (bs->enemy != redobelisk.entitynum &&
bs->enemy != blueobelisk.entitynum) {
return qtrue;
}
@ -2323,8 +2324,12 @@ int BotWantsToRetreat(bot_state_t *bs) {
if (bs->enemy >= 0) {
//if the enemy is carrying a flag
BotEntityInfo(bs->enemy, &entinfo);
if (EntityCarriesFlag(&entinfo))
return qfalse;
// if the enemy is carrying a flag
if (EntityCarriesFlag(&entinfo)) return qfalse;
#ifdef MISSIONPACK
// if the enemy is carrying cubes
if (EntityCarriesCubes(&entinfo)) return qfalse;
#endif
}
//if the bot is getting the flag
if (bs->ltgtype == LTG_GETFLAG)
@ -2365,7 +2370,7 @@ int BotWantsToChase(bot_state_t *bs) {
else if (gametype == GT_OBELISK) {
//the bots should be dedicated to attacking the enemy obelisk
if (bs->ltgtype == LTG_ATTACKENEMYBASE) {
if (bs->enemy != redobelisk.entitynum ||
if (bs->enemy != redobelisk.entitynum &&
bs->enemy != blueobelisk.entitynum) {
return qfalse;
}
@ -2373,8 +2378,11 @@ int BotWantsToChase(bot_state_t *bs) {
}
else if (gametype == GT_HARVESTER) {
//never chase if carrying cubes
if (BotHarvesterCarryingCubes(bs))
return qfalse;
if (BotHarvesterCarryingCubes(bs)) return qfalse;
BotEntityInfo(bs->enemy, &entinfo);
// always chase if the enemy is carrying cubes
if (EntityCarriesCubes(&entinfo)) return qtrue;
}
#endif
//if the bot is getting the flag
@ -2803,22 +2811,19 @@ BotSameTeam
==================
*/
int BotSameTeam(bot_state_t *bs, int entnum) {
char info1[1024], info2[1024];
if (bs->client < 0 || bs->client >= MAX_CLIENTS) {
//BotAI_Print(PRT_ERROR, "BotSameTeam: client out of range\n");
return qfalse;
}
if (entnum < 0 || entnum >= MAX_CLIENTS) {
//BotAI_Print(PRT_ERROR, "BotSameTeam: client out of range\n");
return qfalse;
}
if ( gametype >= GT_TEAM ) {
trap_GetConfigstring(CS_PLAYERS+bs->client, info1, sizeof(info1));
trap_GetConfigstring(CS_PLAYERS+entnum, info2, sizeof(info2));
//
if (atoi(Info_ValueForKey(info1, "t")) == atoi(Info_ValueForKey(info2, "t"))) return qtrue;
if (gametype >= GT_TEAM) {
if (level.clients[bs->client].sess.sessionTeam == level.clients[entnum].sess.sessionTeam) return qtrue;
}
return qfalse;
}
@ -3709,7 +3714,7 @@ void BotCheckAttack(bot_state_t *bs) {
VectorMA(start, -12, forward, start);
BotAI_Trace(&trace, start, mins, maxs, end, bs->entitynum, MASK_SHOT);
//if the entity is a client
if (trace.ent > 0 && trace.ent <= MAX_CLIENTS) {
if (trace.ent >= 0 && trace.ent < MAX_CLIENTS) {
if (trace.ent != attackentity) {
//if a teammate is hit
if (BotSameTeam(bs, trace.ent))
@ -5207,7 +5212,7 @@ void BotSetupAlternativeRouteGoals(void) {
#ifdef MISSIONPACK
if (gametype == GT_CTF) {
if (trap_BotGetLevelItemGoal(-1, "Neutral Flag", &ctf_neutralflag) < 0)
BotAI_Print(PRT_WARNING, "no alt routes without Neutral Flag\n");
BotAI_Print(PRT_WARNING, "No alt routes without Neutral Flag\n");
if (ctf_neutralflag.areanum) {
//
red_numaltroutegoals = trap_AAS_AlternativeRouteGoals(
@ -5225,7 +5230,8 @@ void BotSetupAlternativeRouteGoals(void) {
}
}
else if (gametype == GT_1FCTF) {
//
if (trap_BotGetLevelItemGoal(-1, "Neutral Obelisk", &neutralobelisk) < 0)
BotAI_Print(PRT_WARNING, "One Flag CTF without Neutral Obelisk\n");
red_numaltroutegoals = trap_AAS_AlternativeRouteGoals(
ctf_neutralflag.origin, ctf_neutralflag.areanum,
ctf_redflag.origin, ctf_redflag.areanum, TFL_DEFAULT,
@ -5241,7 +5247,7 @@ void BotSetupAlternativeRouteGoals(void) {
}
else if (gametype == GT_OBELISK) {
if (trap_BotGetLevelItemGoal(-1, "Neutral Obelisk", &neutralobelisk) < 0)
BotAI_Print(PRT_WARNING, "Harvester without neutral obelisk\n");
BotAI_Print(PRT_WARNING, "No alt routes without Neutral Obelisk\n");
//
red_numaltroutegoals = trap_AAS_AlternativeRouteGoals(
neutralobelisk.origin, neutralobelisk.areanum,
@ -5257,7 +5263,8 @@ void BotSetupAlternativeRouteGoals(void) {
ALTROUTEGOAL_VIEWPORTALS);
}
else if (gametype == GT_HARVESTER) {
//
if (trap_BotGetLevelItemGoal(-1, "Neutral Obelisk", &neutralobelisk) < 0)
BotAI_Print(PRT_WARNING, "Harvester without Neutral Obelisk\n");
red_numaltroutegoals = trap_AAS_AlternativeRouteGoals(
neutralobelisk.origin, neutralobelisk.areanum,
redobelisk.origin, redobelisk.areanum, TFL_DEFAULT,
@ -5491,27 +5498,27 @@ void BotSetupDeathmatchAI(void) {
if (trap_BotGetLevelItemGoal(-1, "Neutral Flag", &ctf_neutralflag) < 0)
BotAI_Print(PRT_WARNING, "One Flag CTF without Neutral Flag\n");
if (trap_BotGetLevelItemGoal(-1, "Red Flag", &ctf_redflag) < 0)
BotAI_Print(PRT_WARNING, "CTF without Red Flag\n");
BotAI_Print(PRT_WARNING, "One Flag CTF without Red Flag\n");
if (trap_BotGetLevelItemGoal(-1, "Blue Flag", &ctf_blueflag) < 0)
BotAI_Print(PRT_WARNING, "CTF without Blue Flag\n");
BotAI_Print(PRT_WARNING, "One Flag CTF without Blue Flag\n");
}
else if (gametype == GT_OBELISK) {
if (trap_BotGetLevelItemGoal(-1, "Red Obelisk", &redobelisk) < 0)
BotAI_Print(PRT_WARNING, "Obelisk without red obelisk\n");
BotAI_Print(PRT_WARNING, "Overload without Red Obelisk\n");
BotSetEntityNumForGoal(&redobelisk, "team_redobelisk");
if (trap_BotGetLevelItemGoal(-1, "Blue Obelisk", &blueobelisk) < 0)
BotAI_Print(PRT_WARNING, "Obelisk without blue obelisk\n");
BotAI_Print(PRT_WARNING, "Overload without Blue Obelisk\n");
BotSetEntityNumForGoal(&blueobelisk, "team_blueobelisk");
}
else if (gametype == GT_HARVESTER) {
if (trap_BotGetLevelItemGoal(-1, "Red Obelisk", &redobelisk) < 0)
BotAI_Print(PRT_WARNING, "Harvester without red obelisk\n");
BotAI_Print(PRT_WARNING, "Harvester without Red Obelisk\n");
BotSetEntityNumForGoal(&redobelisk, "team_redobelisk");
if (trap_BotGetLevelItemGoal(-1, "Blue Obelisk", &blueobelisk) < 0)
BotAI_Print(PRT_WARNING, "Harvester without blue obelisk\n");
BotAI_Print(PRT_WARNING, "Harvester without Blue Obelisk\n");
BotSetEntityNumForGoal(&blueobelisk, "team_blueobelisk");
if (trap_BotGetLevelItemGoal(-1, "Neutral Obelisk", &neutralobelisk) < 0)
BotAI_Print(PRT_WARNING, "Harvester without neutral obelisk\n");
BotAI_Print(PRT_WARNING, "Harvester without Neutral Obelisk\n");
BotSetEntityNumForGoal(&neutralobelisk, "team_neutralobelisk");
}
#endif

57
engine/code/game/ai_main.c
View file

@ -832,11 +832,13 @@ void BotInputToUserCommand(bot_input_t *bi, usercmd_t *ucmd, int delta_angles[3]
vec3_t angles, forward, right;
short temp;
int j;
// STONELANCE
// float f, r, u, m;
float f, r, m;
// END
//clear the whole structure
memset(ucmd, 0, sizeof(usercmd_t));
//
//Com_Printf("dir = %f %f %f speed = %f\n", bi->dir[0], bi->dir[1], bi->dir[2], bi->speed);
//the duration for the user command in milli seconds
ucmd->serverTime = time;
//
@ -891,28 +893,51 @@ void BotInputToUserCommand(bot_input_t *bi, usercmd_t *ucmd, int delta_angles[3]
//bot input speed is in the range [0, 400]
bi->speed = bi->speed * 127 / 400;
//set the view independent movement
ucmd->forwardmove = DotProduct(forward, bi->dir) * bi->speed;
ucmd->rightmove = DotProduct(right, bi->dir) * bi->speed;
f = DotProduct(forward, bi->dir);
r = DotProduct(right, bi->dir);
// STONELANCE
// ucmd->upmove = abs(forward[2]) * bi->dir[2] * bi->speed;
// u = abs(forward[2]) * bi->dir[2];
// END
m = fabs(f);
if (fabs(r) > m) {
m = fabs(r);
}
// STONELANCE
/*
if (fabs(u) > m) {
m = fabs(u);
}
*/
// END
//normal keyboard movement
if (bi->actionflags & ACTION_MOVEFORWARD) ucmd->forwardmove += 127;
if (bi->actionflags & ACTION_MOVEBACK) ucmd->forwardmove -= 127;
if (bi->actionflags & ACTION_MOVELEFT) ucmd->rightmove -= 127;
if (bi->actionflags & ACTION_MOVERIGHT) ucmd->rightmove += 127;
if (m > 0) {
f *= bi->speed / m;
r *= bi->speed / m;
// STONELANCE
// u *= bi->speed / m;
// END
}
ucmd->forwardmove = f;
ucmd->rightmove = r;
// STONELANCE
// ucmd->upmove = u;
// END
if (bi->actionflags & ACTION_MOVEFORWARD) ucmd->forwardmove = 127;
if (bi->actionflags & ACTION_MOVEBACK) ucmd->forwardmove = -127;
if (bi->actionflags & ACTION_MOVELEFT) ucmd->rightmove = -127;
if (bi->actionflags & ACTION_MOVERIGHT) ucmd->rightmove = 127;
// STONELANCE
/*
//jump/moveup
if (bi->actionflags & ACTION_JUMP) ucmd->upmove += 127;
//crouch/movedown
if (bi->actionflags & ACTION_CROUCH) ucmd->upmove -= 127;
if (bi->actionflags & ACTION_JUMP) ucmd->upmove = 127;
//crouch/movedown
if (bi->actionflags & ACTION_CROUCH) ucmd->upmove = -127;
*/
// END
//
//Com_Printf("forward = %d right = %d up = %d\n", ucmd.forwardmove, ucmd.rightmove, ucmd.upmove);
//Com_Printf("ucmd->serverTime = %d\n", ucmd->serverTime);
}
/*

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

@ -461,11 +461,11 @@ void BotCTFOrders_FlagNotAtBase(bot_state_t *bs) {
case 1: break;
case 2:
{
//both will go for the enemy flag
// keep one near the base for when the flag is returned
ClientName(teammates[0], name, sizeof(name));
BotAI_BotInitialChat(bs, "cmd_defendbase", name, NULL);
BotSayTeamOrder(bs, teammates[0]);
BotSayVoiceTeamOrder(bs, teammates[0], VOICECHAT_GETFLAG);
BotSayVoiceTeamOrder(bs, teammates[0], VOICECHAT_DEFEND);
//
ClientName(teammates[1], name, sizeof(name));
BotAI_BotInitialChat(bs, "cmd_getflag", name, NULL);
@ -497,7 +497,7 @@ void BotCTFOrders_FlagNotAtBase(bot_state_t *bs) {
//keep some people near the base for when the flag is returned
defenders = (int) (float) numteammates * 0.3 + 0.5;
if (defenders > 3) defenders = 3;
attackers = (int) (float) numteammates * 0.7 + 0.5;
attackers = (int) (float) numteammates * 0.6 + 0.5;
if (attackers > 6) attackers = 6;
for (i = 0; i < defenders; i++) {
//
@ -540,7 +540,7 @@ void BotCTFOrders_FlagNotAtBase(bot_state_t *bs) {
{
//everyone go for the flag
ClientName(teammates[0], name, sizeof(name));
BotAI_BotInitialChat(bs, "cmd_defendbase", name, NULL);
BotAI_BotInitialChat(bs, "cmd_getflag", name, NULL);
BotSayTeamOrder(bs, teammates[0]);
BotSayVoiceTeamOrder(bs, teammates[0], VOICECHAT_GETFLAG);
//
@ -1352,7 +1352,7 @@ void Bot1FCTFOrders_EnemyHasFlag(bot_state_t *bs) {
if (defenders > 8) defenders = 8;
//10% will try to return the flag
attackers = (int) (float) numteammates * 0.1 + 0.5;
if (attackers > 2) attackers = 2;
if (attackers > 1) attackers = 1;
for (i = 0; i < defenders; i++) {
//
ClientName(teammates[i], name, sizeof(name));
@ -1413,7 +1413,7 @@ void Bot1FCTFOrders_EnemyHasFlag(bot_state_t *bs) {
{
//70% defend the base
defenders = (int) (float) numteammates * 0.7 + 0.5;
if (defenders > 8) defenders = 8;
if (defenders > 7) defenders = 7;
//20% try to return the flag
attackers = (int) (float) numteammates * 0.2 + 0.5;
if (attackers > 2) attackers = 2;
@ -1576,7 +1576,7 @@ void Bot1FCTFOrders_EnemyDroppedFlag(bot_state_t *bs) {
ClientName(teammates[numteammates - i - 1], name, sizeof(name));
BotAI_BotInitialChat(bs, "cmd_getflag", name, NULL);
BotSayTeamOrder(bs, teammates[numteammates - i - 1]);
BotSayVoiceTeamOrder(bs, teammates[numteammates - i - 1], VOICECHAT_DEFEND);
BotSayVoiceTeamOrder(bs, teammates[numteammates - i - 1], VOICECHAT_GETFLAG);
}
//
break;

4
engine/code/game/bg_pmove.c
View file

@ -466,7 +466,7 @@ static qboolean PM_CheckWaterJump( void ) {
spot[2] += 16;
cont = pm->pointcontents (spot, pm->ps->clientNum );
if ( cont ) {
if ( cont & (CONTENTS_SOLID|CONTENTS_PLAYERCLIP|CONTENTS_BODY) ) {
return qfalse;
}
@ -2466,7 +2466,7 @@ void PmoveSingle (pmove_t *pmove) {
}
// set the firing flag for continuous beam weapons
if ( !(pm->ps->pm_flags & PMF_RESPAWNED) && pm->ps->pm_type != PM_INTERMISSION
if ( !(pm->ps->pm_flags & PMF_RESPAWNED) && pm->ps->pm_type != PM_INTERMISSION && (!pm->ps->pm_type == PM_NOCLIP)
&& ( pm->cmd.buttons & BUTTON_ATTACK ) && pm->ps->ammo[ pm->ps->weapon ] ) {
pm->ps->eFlags |= EF_FIRING;
} else {

16
engine/code/game/g_active.c
View file

@ -227,18 +227,6 @@ void P_WorldEffects( gentity_t *ent ) {
if (ent->damage > 15)
ent->damage = 15;
// play a gurp sound instead of a normal pain sound
if (ent->health <= ent->damage) {
// STONELANCE
// G_Sound(ent, CHAN_VOICE, G_SoundIndex("*drown.wav"));
G_Sound(ent, CHAN_VOICE, G_SoundIndex("sound/rally/car/drown.wav"));
// END
} else if (rand()&1) {
G_Sound(ent, CHAN_VOICE, G_SoundIndex("sound/player/gurp1.wav"));
} else {
G_Sound(ent, CHAN_VOICE, G_SoundIndex("sound/player/gurp2.wav"));
}
// don't play a normal pain sound
ent->pain_debounce_time = level.time + 200;
@ -1582,7 +1570,7 @@ void ClientThink_real( gentity_t *ent ) {
// STONELANCE
if (g_gametype.integer != GT_DERBY || !ent->client->finishRaceTime)
// END
respawn( ent );
ClientRespawn( ent );
return;
}
@ -1591,7 +1579,7 @@ void ClientThink_real( gentity_t *ent ) {
// STONELANCE
if (g_gametype.integer != GT_DERBY || !ent->client->finishRaceTime)
// END
respawn( ent );
ClientRespawn( ent );
}
}
return;

6
engine/code/game/g_bot.c
View file

@ -134,7 +134,7 @@ static void G_LoadArenasFromFile( char *filename ) {
return;
}
if ( len >= MAX_ARENAS_TEXT ) {
trap_Printf( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i", filename, len, MAX_ARENAS_TEXT ) );
trap_Printf( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i\n", filename, len, MAX_ARENAS_TEXT ) );
trap_FS_FCloseFile( f );
return;
}
@ -667,7 +667,7 @@ static void G_AddBot( const char *name, float skill, const char *team, int delay
// have the server allocate a client slot
clientNum = trap_BotAllocateClient();
if ( clientNum == -1 ) {
G_Printf( S_COLOR_RED "Unable to add bot. All player slots are in use.\n" );
G_Printf( S_COLOR_RED "Unable to add bot. All player slots are in use.\n" );
G_Printf( S_COLOR_RED "Start server with more 'open' slots (or check setting of sv_maxclients cvar).\n" );
return;
}
@ -880,7 +880,7 @@ static void G_LoadBotsFromFile( char *filename ) {
return;
}
if ( len >= MAX_BOTS_TEXT ) {
trap_Printf( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i", filename, len, MAX_BOTS_TEXT ) );
trap_Printf( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i\n", filename, len, MAX_BOTS_TEXT ) );
trap_FS_FCloseFile( f );
return;
}

107
engine/code/game/g_client.c
View file

@ -458,8 +458,6 @@ void CopyToBodyQue( gentity_t *ent ) {
body = level.bodyQue[ level.bodyQueIndex ];
level.bodyQueIndex = (level.bodyQueIndex + 1) % BODY_QUEUE_SIZE;
trap_UnlinkEntity (body);
body->s = ent->s;
body->s.eFlags = EF_DEAD; // clear EF_TALK, etc
#ifdef MISSIONPACK
@ -600,18 +598,13 @@ void SetClientViewAngle( gentity_t *ent, vec3_t angle ) {
/*
================
respawn
ClientRespawn
================
*/
void respawn( gentity_t *ent ) {
gentity_t *tent;
void ClientRespawn( gentity_t *ent ) {
CopyToBodyQue (ent);
ClientSpawn(ent);
// add a teleportation effect
tent = G_TempEntity( ent->client->ps.origin, EV_PLAYER_TELEPORT_IN );
tent->s.clientNum = ent->s.clientNum;
}
/*
@ -1256,7 +1249,6 @@ and on transition between teams, but doesn't happen on respawns
void ClientBegin( int clientNum ) {
gentity_t *ent;
gclient_t *client;
gentity_t *tent;
int flags;
ent = g_entities + clientNum;
@ -1319,19 +1311,15 @@ void ClientBegin( int clientNum ) {
ent->raceObserver = qfalse;
// END
if ( client->sess.sessionTeam != TEAM_SPECTATOR ) {
// send event
tent = G_TempEntity( ent->client->ps.origin, EV_PLAYER_TELEPORT_IN );
tent->s.clientNum = ent->s.clientNum;
// STONELANCE
/*
if ( client->sess.sessionTeam != TEAM_SPECTATOR ) {
if ( g_gametype.integer != GT_TOURNAMENT ) {
trap_SendServerCommand( -1, va("print \"%s" S_COLOR_WHITE " entered the game\n\"", client->pers.netname) );
}
}
*/
// END
}
G_LogPrintf( "ClientBegin: %i\n", clientNum );
// count current clients and rank for scoreboard
@ -1356,6 +1344,7 @@ void ClientSpawn(gentity_t *ent) {
clientSession_t savedSess;
int persistant[MAX_PERSISTANT];
gentity_t *spawnPoint;
gentity_t *tent;
int flags;
int savedPing;
// char *savedAreaBits;
@ -1665,30 +1654,6 @@ void ClientSpawn(gentity_t *ent) {
}
// END
if ( ent->client->sess.sessionTeam == TEAM_SPECTATOR ) {
} else {
G_KillBox( ent );
trap_LinkEntity (ent);
// force the base weapon up
// STONELANCE
if (!isRallyRace()/* TEMP DERBY && g_gametype.integer != GT_DERBY*/){
client->ps.weapon = WP_MACHINEGUN;
}
else if (!isRallyNonDMRace()/*TEMP DERBY && g_gametype.integer != GT_DERBY*/){
client->ps.weapon = WP_GAUNTLET;
}
else {
client->ps.weapon = WP_NONE;
}
// client->ps.weapon = WP_MACHINEGUN;
// END
client->ps.weaponstate = WEAPON_READY;
}
// don't allow full run speed for a bit
client->ps.pm_flags |= PMF_TIME_KNOCKBACK;
client->ps.pm_time = 100;
@ -1705,36 +1670,52 @@ void ClientSpawn(gentity_t *ent) {
*/
// END
if ( level.intermissiontime ) {
MoveClientToIntermission( ent );
} else {
// fire the targets of the spawn point
G_UseTargets( spawnPoint, ent );
// select the highest weapon number available, after any
// spawn given items have fired
client->ps.weapon = 1;
for ( i = WP_NUM_WEAPONS - 1 ; i > 0 ; i-- ) {
if ( client->ps.stats[STAT_WEAPONS] & ( 1 << i ) ) {
client->ps.weapon = i;
break;
if (!level.intermissiontime) {
if (ent->client->sess.sessionTeam != TEAM_SPECTATOR) {
G_KillBox(ent);
// force the base weapon up
// STONELANCE
if (!isRallyRace()/* TEMP DERBY && g_gametype.integer != GT_DERBY*/){
client->ps.weapon = WP_MACHINEGUN;
}
else if (!isRallyNonDMRace()/*TEMP DERBY && g_gametype.integer != GT_DERBY*/){
client->ps.weapon = WP_GAUNTLET;
}
else {
client->ps.weapon = WP_NONE;
}
}
}
// client->ps.weapon = WP_MACHINEGUN;
// END
client->ps.weaponstate = WEAPON_READY;
// fire the targets of the spawn point
G_UseTargets(spawnPoint, ent);
// select the highest weapon number available, after any spawn given items have fired
client->ps.weapon = 1;
for (i = WP_NUM_WEAPONS - 1 ; i > 0 ; i--) {
if (client->ps.stats[STAT_WEAPONS] & (1 << i)) {
client->ps.weapon = i;
break;
}
}
// positively link the client, even if the command times are weird
VectorCopy(ent->client->ps.origin, ent->r.currentOrigin);
tent = G_TempEntity(ent->client->ps.origin, EV_PLAYER_TELEPORT_IN);
tent->s.clientNum = ent->s.clientNum;
trap_LinkEntity (ent);
}
} else {
// move players to intermission
MoveClientToIntermission(ent);
}
// run a client frame to drop exactly to the floor,
// initialize animations and other things
client->ps.commandTime = level.time - 100;
ent->client->pers.cmd.serverTime = level.time;
ClientThink( ent-g_entities );
// positively link the client, even if the command times are weird
if ( ent->client->sess.sessionTeam != TEAM_SPECTATOR ) {
BG_PlayerStateToEntityState( &client->ps, &ent->s, qtrue );
VectorCopy( ent->client->ps.origin, ent->r.currentOrigin );
trap_LinkEntity( ent );
}
// run the presend to set anything else
ClientEndFrame( ent );

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

@ -1399,7 +1399,7 @@ Cmd_Where_f
==================
*/
void Cmd_Where_f( gentity_t *ent ) {
trap_SendServerCommand( ent-g_entities, va("print \"%s\n\"", vtos( ent->s.origin ) ) );
trap_SendServerCommand( ent-g_entities, va("print \"%s\n\"", vtos(ent->r.currentOrigin) ) );
}
static const char *gameNames[] = {

19
engine/code/game/g_combat.c
View file

@ -626,22 +626,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
}
}
// if client is in a nodrop area, don't drop anything (but return CTF flags!)
contents = trap_PointContents( self->r.currentOrigin, -1 );
if ( !( contents & CONTENTS_NODROP )) {
TossClientItems( self );
}
else {
if ( self->client->ps.powerups[PW_NEUTRALFLAG] ) { // only happens in One Flag CTF
Team_ReturnFlag( TEAM_FREE );
}
else if ( self->client->ps.powerups[PW_REDFLAG] ) { // only happens in standard CTF
Team_ReturnFlag( TEAM_RED );
}
else if ( self->client->ps.powerups[PW_BLUEFLAG] ) { // only happens in standard CTF
Team_ReturnFlag( TEAM_BLUE );
}
}
TossClientItems( self );
#ifdef MISSIONPACK
TossClientPersistantPowerups( self );
if( g_gametype.integer == GT_HARVESTER ) {
@ -702,6 +687,8 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
memset( self->client->ps.powerups, 0, sizeof(self->client->ps.powerups) );
// never gib in a nodrop
contents = trap_PointContents( self->r.currentOrigin, -1 );
if ( (self->health <= GIB_HEALTH && !(contents & CONTENTS_NODROP) && g_blood.integer) || meansOfDeath == MOD_SUICIDE) {
// gib death
GibEntity( self, killer );

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

@ -791,11 +791,11 @@ void G_CheckTeamItems( void ) {
// check for the two flags
item = BG_FindItem( "Red Flag" );
if ( !item || !itemRegistered[ item - bg_itemlist ] ) {
G_Printf( S_COLOR_YELLOW "WARNING: No team_CTF_redflag in map" );
G_Printf( S_COLOR_YELLOW "WARNING: No team_CTF_redflag in map\n" );
}
item = BG_FindItem( "Blue Flag" );
if ( !item || !itemRegistered[ item - bg_itemlist ] ) {
G_Printf( S_COLOR_YELLOW "WARNING: No team_CTF_blueflag in map" );
G_Printf( S_COLOR_YELLOW "WARNING: No team_CTF_blueflag in map\n" );
}
}
@ -806,15 +806,15 @@ void G_CheckTeamItems( void ) {
// check for all three flags
item = BG_FindItem( "Red Flag" );
if ( !item || !itemRegistered[ item - bg_itemlist ] ) {
G_Printf( S_COLOR_YELLOW "WARNING: No team_CTF_redflag in map" );
G_Printf( S_COLOR_YELLOW "WARNING: No team_CTF_redflag in map\n" );
}
item = BG_FindItem( "Blue Flag" );
if ( !item || !itemRegistered[ item - bg_itemlist ] ) {
G_Printf( S_COLOR_YELLOW "WARNING: No team_CTF_blueflag in map" );
G_Printf( S_COLOR_YELLOW "WARNING: No team_CTF_blueflag in map\n" );
}
item = BG_FindItem( "Neutral Flag" );
if ( !item || !itemRegistered[ item - bg_itemlist ] ) {
G_Printf( S_COLOR_YELLOW "WARNING: No team_CTF_neutralflag in map" );
G_Printf( S_COLOR_YELLOW "WARNING: No team_CTF_neutralflag in map\n" );
}
}
@ -825,13 +825,13 @@ void G_CheckTeamItems( void ) {
ent = NULL;
ent = G_Find( ent, FOFS(classname), "team_redobelisk" );
if( !ent ) {
G_Printf( S_COLOR_YELLOW "WARNING: No team_redobelisk in map" );
G_Printf( S_COLOR_YELLOW "WARNING: No team_redobelisk in map\n" );
}
ent = NULL;
ent = G_Find( ent, FOFS(classname), "team_blueobelisk" );
if( !ent ) {
G_Printf( S_COLOR_YELLOW "WARNING: No team_blueobelisk in map" );
G_Printf( S_COLOR_YELLOW "WARNING: No team_blueobelisk in map\n" );
}
}
@ -842,19 +842,19 @@ void G_CheckTeamItems( void ) {
ent = NULL;
ent = G_Find( ent, FOFS(classname), "team_redobelisk" );
if( !ent ) {
G_Printf( S_COLOR_YELLOW "WARNING: No team_redobelisk in map" );
G_Printf( S_COLOR_YELLOW "WARNING: No team_redobelisk in map\n" );
}
ent = NULL;
ent = G_Find( ent, FOFS(classname), "team_blueobelisk" );
if( !ent ) {
G_Printf( S_COLOR_YELLOW "WARNING: No team_blueobelisk in map" );
G_Printf( S_COLOR_YELLOW "WARNING: No team_blueobelisk in map\n" );
}
ent = NULL;
ent = G_Find( ent, FOFS(classname), "team_neutralobelisk" );
if( !ent ) {
G_Printf( S_COLOR_YELLOW "WARNING: No team_neutralobelisk in map" );
G_Printf( S_COLOR_YELLOW "WARNING: No team_neutralobelisk in map\n" );
}
}
#endif

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

@ -717,7 +717,7 @@ team_t PickTeam( int ignoreClientNum );
void SetClientViewAngle( gentity_t *ent, vec3_t angle );
gentity_t *SelectSpawnPoint (vec3_t avoidPoint, vec3_t origin, vec3_t angles, qboolean isbot);
void CopyToBodyQue( gentity_t *ent );
void respawn (gentity_t *ent);
void ClientRespawn(gentity_t *ent);
void BeginIntermission (void);
void InitClientPersistant (gclient_t *client);
void InitClientResp (gclient_t *client);

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

@ -612,8 +612,6 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) {
if( g_gametype.integer == GT_SINGLE_PLAYER || trap_Cvar_VariableIntegerValue( "com_buildScript" ) ) {
G_ModelIndex( SP_PODIUM_MODEL );
G_SoundIndex( "sound/player/gurp1.wav" );
G_SoundIndex( "sound/player/gurp2.wav" );
}
if ( trap_Cvar_VariableIntegerValue( "bot_enable" ) ) {
@ -1145,7 +1143,7 @@ void MoveClientToIntermission( gentity_t *ent ) {
StopFollowing( ent );
}
FindIntermissionPoint();
// move to the spot
VectorCopy( level.intermission_origin, ent->s.origin );
VectorCopy( level.intermission_origin, ent->client->ps.origin );
@ -1225,8 +1223,17 @@ void BeginIntermission( void ) {
// END
level.intermissiontime = level.time;
FindIntermissionPoint();
// move all clients to the intermission point
for (i=0 ; i< level.maxclients ; i++) {
client = g_entities + i;
if (!client->inuse)
continue;
// respawn if dead
if (client->health <= 0) {
ClientRespawn(client);
}
MoveClientToIntermission( client );
}
#ifdef MISSIONPACK
if (g_singlePlayer.integer) {
trap_Cvar_Set("ui_singlePlayerActive", "0");
@ -1239,19 +1246,6 @@ void BeginIntermission( void ) {
SpawnModelsOnVictoryPads();
}
#endif
// move all clients to the intermission point
for (i=0 ; i< level.maxclients ; i++) {
client = g_entities + i;
if (!client->inuse)
continue;
// respawn if dead
if (client->health <= 0) {
respawn(client);
}
MoveClientToIntermission( client );
}
// send the current scoring to all clients
SendScoreboardMessageToAllClients();

25
engine/code/game/g_misc.c
View file

@ -79,7 +79,9 @@ TELEPORTERS
void TeleportPlayer( gentity_t *player, vec3_t origin, vec3_t angles ) {
gentity_t *tent;
qboolean noAngles;
noAngles = (angles[0] > 999999.0);
// use temp events at source and destination to prevent the effect
// from getting dropped by a second player event
if ( player->client->sess.sessionTeam != TEAM_SPECTATOR ) {
@ -95,23 +97,24 @@ void TeleportPlayer( gentity_t *player, vec3_t origin, vec3_t angles ) {
VectorCopy ( origin, player->client->ps.origin );
player->client->ps.origin[2] += 1;
// spit the player out
AngleVectors( angles, player->client->ps.velocity, NULL, NULL );
VectorScale( player->client->ps.velocity, 400, player->client->ps.velocity );
player->client->ps.pm_time = 160; // hold time
player->client->ps.pm_flags |= PMF_TIME_KNOCKBACK;
if (!noAngles) {
// spit the player out
AngleVectors( angles, player->client->ps.velocity, NULL, NULL );
VectorScale( player->client->ps.velocity, 400, player->client->ps.velocity );
player->client->ps.pm_time = 160; // hold time
player->client->ps.pm_flags |= PMF_TIME_KNOCKBACK;
// set angles
SetClientViewAngle(player, angles);
}
// toggle the teleport bit so the client knows to not lerp
player->client->ps.eFlags ^= EF_TELEPORT_BIT;
// set angles
SetClientViewAngle( player, angles );
// STONELANCE - reset car
// PM_InitializeVehicle( &player->client->car, origin, angles, player->client->ps.velocity, car_frontweight_dist.value );
VectorCopy( origin, player->client->ps.origin );
VectorCopy( angles, player->client->ps.viewangles );
if (!noAngles) {
VectorCopy( angles, player->client->ps.viewangles );
}
player->client->car.initializeOnNextMove = qtrue;
// END

34
engine/code/game/g_mover.c
View file

@ -1080,26 +1080,26 @@ Touch_DoorTriggerSpectator
================
*/
static void Touch_DoorTriggerSpectator( gentity_t *ent, gentity_t *other, trace_t *trace ) {
int i, axis;
vec3_t origin, dir, angles;
int axis;
float doorMin, doorMax;
vec3_t origin;
axis = ent->count;
VectorClear(dir);
if (fabs(other->s.origin[axis] - ent->r.absmax[axis]) <
fabs(other->s.origin[axis] - ent->r.absmin[axis])) {
origin[axis] = ent->r.absmin[axis] - 10;
dir[axis] = -1;
// the constants below relate to constants in Think_SpawnNewDoorTrigger()
doorMin = ent->r.absmin[axis] + 100;
doorMax = ent->r.absmax[axis] - 100;
VectorCopy(other->client->ps.origin, origin);
if (origin[axis] < doorMin || origin[axis] > doorMax) return;
if (fabs(origin[axis] - doorMax) < fabs(origin[axis] - doorMin)) {
origin[axis] = doorMin - 10;
} else {
origin[axis] = doorMax + 10;
}
else {
origin[axis] = ent->r.absmax[axis] + 10;
dir[axis] = 1;
}
for (i = 0; i < 3; i++) {
if (i == axis) continue;
origin[i] = (ent->r.absmin[i] + ent->r.absmax[i]) * 0.5;
}
vectoangles(dir, angles);
TeleportPlayer(other, origin, angles );
TeleportPlayer(other, origin, tv(10000000.0, 0, 0));
}
/*

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

@ -797,7 +797,8 @@ int Team_TouchOurFlag( gentity_t *ent, gentity_t *other, int team ) {
player->client->ps.eFlags &= ~(EF_AWARD_IMPRESSIVE | EF_AWARD_EXCELLENT | EF_AWARD_GAUNTLET | EF_AWARD_ASSIST | EF_AWARD_DEFEND | EF_AWARD_CAP );
player->client->ps.eFlags |= EF_AWARD_ASSIST;
player->client->rewardTime = level.time + REWARD_SPRITE_TIME;
} else if (player->client->pers.teamState.lastfraggedcarrier +
}
if (player->client->pers.teamState.lastfraggedcarrier +
CTF_FRAG_CARRIER_ASSIST_TIMEOUT > level.time) {
AddScore(player, ent->r.currentOrigin, CTF_FRAG_CARRIER_ASSIST_BONUS);
other->client->pers.teamState.assists++;

11
engine/code/game/g_weapon.c
View file

@ -90,13 +90,18 @@ qboolean CheckGauntletAttack( gentity_t *ent ) {
return qfalse;
}
if ( ent->client->noclip ) {
return qfalse;
}
if (g_entities[ tr.entityNum ].flags & FL_EXTRA_BBOX)
traceEnt = &g_entities[ g_entities[ tr.entityNum ].r.ownerNum ];
else
traceEnt = &g_entities[ tr.entityNum ];
if ( traceEnt->client->noclip ) {
return qfalse;
}
// send blood impact
if ( traceEnt->takedamage && traceEnt->client ) {
tent = G_TempEntity( tr.endpos, EV_MISSILE_HIT );
@ -199,9 +204,9 @@ void SnapVectorTowards( vec3_t v, vec3_t to ) {
for ( i = 0 ; i < 3 ; i++ ) {
if ( to[i] <= v[i] ) {
v[i] = (int)v[i];
v[i] = floor(v[i]);
} else {
v[i] = (int)v[i] + 1;
v[i] = ceil(v[i]);
}
}
}

4
engine/code/q3_ui/ui_gameinfo.c
View file

@ -155,7 +155,7 @@ static void UI_LoadArenasFromFile( char *filename ) {
return;
}
if ( len >= MAX_ARENAS_TEXT ) {
trap_Print( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i", filename, len, MAX_ARENAS_TEXT ) );
trap_Print( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i\n", filename, len, MAX_ARENAS_TEXT ) );
trap_FS_FCloseFile( f );
return;
}
@ -348,7 +348,7 @@ static void UI_LoadBotsFromFile( char *filename ) {
return;
}
if ( len >= MAX_BOTS_TEXT ) {
trap_Print( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i", filename, len, MAX_BOTS_TEXT ) );
trap_Print( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i\n", filename, len, MAX_BOTS_TEXT ) );
trap_FS_FCloseFile( f );
return;
}

2
engine/code/q3_ui/ui_players.c
View file

@ -1718,7 +1718,7 @@ static qboolean UI_ParseAnimationFile( playerInfo_t *pi, const char *filename )
}
if ( i != MAX_ANIMATIONS ) {
Com_Printf( "Error parsing animation file: %s", filename );
Com_Printf( "Error parsing animation file: %s\n", filename );
return qfalse;
}
*/

2
engine/code/q3_ui/ui_startserver.c
View file

@ -1348,7 +1348,7 @@ static void ServerOptions_MenuInit( qboolean multiplayer ) {
y = 80;
s_serveroptions.botSkill.generic.type = MTYPE_SPINCONTROL;
s_serveroptions.botSkill.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT;
s_serveroptions.botSkill.generic.name = "Bot Skill: ";
s_serveroptions.botSkill.generic.name = "Bot Skill:";
s_serveroptions.botSkill.generic.x = 32 + (strlen(s_serveroptions.botSkill.generic.name) + 2 ) * SMALLCHAR_WIDTH;
s_serveroptions.botSkill.generic.y = y;
s_serveroptions.botSkill.itemnames = botSkill_list;

4
engine/code/ui/ui_gameinfo.c
View file

@ -115,7 +115,7 @@ static void UI_LoadArenasFromFile( char *filename ) {
return;
}
if ( len >= MAX_ARENAS_TEXT ) {
trap_Print( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i", filename, len, MAX_ARENAS_TEXT ) );
trap_Print( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i\n", filename, len, MAX_ARENAS_TEXT ) );
trap_FS_FCloseFile( f );
return;
}
@ -226,7 +226,7 @@ static void UI_LoadBotsFromFile( char *filename ) {
return;
}
if ( len >= MAX_BOTS_TEXT ) {
trap_Print( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i", filename, len, MAX_BOTS_TEXT ) );
trap_Print( va( S_COLOR_RED "file too large: %s is %i, max allowed is %i\n", filename, len, MAX_BOTS_TEXT ) );
trap_FS_FCloseFile( f );
return;
}

2
engine/code/ui/ui_main.c
View file

@ -655,7 +655,7 @@ char *GetMenuBuffer(const char *filename) {
return defaultMenu;
}
if ( len >= MAX_MENUFILE ) {
trap_Print( va( S_COLOR_RED "menu file too large: %s is %i, max allowed is %i", filename, len, MAX_MENUFILE ) );
trap_Print( va( S_COLOR_RED "menu file too large: %s is %i, max allowed is %i\n", filename, len, MAX_MENUFILE ) );
trap_FS_FCloseFile( f );
return defaultMenu;
}

2
engine/code/ui/ui_players.c
View file

@ -1132,7 +1132,7 @@ static qboolean UI_ParseAnimationFile( const char *filename, animation_t *animat
}
if ( i != MAX_ANIMATIONS ) {
Com_Printf( "Error parsing animation file: %s", filename );
Com_Printf( "Error parsing animation file: %s\n", filename );
return qfalse;
}