rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for autojoin and a very minir for for Obits

This commit is contained in:
Richard Allen 2002-05-11 15:00:04 +00:00
parent b864ac356a
commit d4ea8e455e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reaction/game/g_combat.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.71 2002/05/11 15:00:04 jbravo
// Fix for autojoin and a very minir for for Obits
//
// Revision 1.70 2002/05/10 08:10:18 jbravo
// Fixed a bug in the Obit system and a give (weapons or all) bug
//
@ -939,6 +942,7 @@ void PrintDeathMessage (gentity_t *target, gentity_t *attacker, int location, in
default:
Q_strncpyz (message, " was sniped by", sizeof(message));
}
break;
case MOD_AKIMBO:
switch (location) {
case LOC_HDAM:

9
reaction/game/g_session.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.15 2002/05/11 15:00:04 jbravo
// Fix for autojoin and a very minir for for Obits
//
// Revision 1.14 2002/05/05 15:51:16 slicer
// Captain and subs get saved on map_restarts ( moved to "sess" )
//
@ -174,7 +177,11 @@ void G_InitSessionData( gclient_t *client, char *userinfo ) {
// initial team determination
if ( g_gametype.integer >= GT_TEAM ) {
if ( g_teamAutoJoin.integer ) {
sess->sessionTeam = PickTeam( -1 );
if (g_gametype.integer == GT_TEAMPLAY) {
sess->savedTeam = PickTeam( -1 );
client->ps.persistant[PERS_SAVEDTEAM] = sess->savedTeam;
} else
sess->sessionTeam = PickTeam( -1 );
BroadcastTeamChange( client, -1 );
} else {
// always spawn as spectator in team games