rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-03-27 12:51:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lots of small fixes.

Browse source
This commit is contained in:
Richard Allen 2002-05-20 04:59:33 +00:00
parent 5fbab22c30
commit acb728931f
5 changed files with 99 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

137
reaction/cgame/cg_servercmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.40 2002/05/20 04:59:33 jbravo
// Lots of small fixes.
//
// Revision 1.39 2002/05/19 21:27:51 blaze
// added force and buoyancy to breakables
//
@ -1240,7 +1243,6 @@ void CG_RQ3_Cmd () {
cg.scoreTPMode = 0;
CG_CenterPrint( "LIGHTS...", SCREEN_HEIGHT * 0.30, BIGCHAR_WIDTH );
CG_Printf("\nLIGHTS...\n");
// trap_S_StartLocalSound(cgs.media.lightsSound, CHAN_ANNOUNCER);
CG_AddBufferedSound(cgs.media.lightsSound);
break;
case CAMERA:
@ -1258,7 +1260,6 @@ void CG_RQ3_Cmd () {
CG_SetTeamPlayers();
break;*/
case SELECTPISTOL:
// CG_Printf("Selecting pistol\n");
if (cg.snap) {
switch (cg.snap->ps.weapon) {
case WP_PISTOL:
@ -1278,79 +1279,75 @@ void CG_RQ3_Cmd () {
case ROUND:
trap_Cvar_Set("cg_RQ3_team_round_going", CG_Argv(1));
break;
case MAPSTART:
switch (cg_RQ3_autoAction.integer )
{
case 1:
case 3:
trap_RealTime(&qtime);
Com_sprintf(playerName,sizeof(playerName),"%s",cgs.clientinfo->name);
RemoveColorEscapeSequences(playerName);
//Com_sprintf(scrnshotName, sizeof(scrnshotName), "record %s-%s-%d.%d.%d-%d.%d.%d\n", playerName, cgs.mapname, qtime.tm_year + 1900, qtime.tm_mon + 1, qtime.tm_mday, qtime.tm_hour, qtime.tm_min, qtime.tm_sec);
Com_sprintf(scrnshotName, sizeof(scrnshotName), "record %d-%d-%d_%d-%d-%d_%s_%s\n", qtime.tm_year + 1900, qtime.tm_mon + 1, qtime.tm_mday, qtime.tm_hour, qtime.tm_min, qtime.tm_sec, cgs.mapname, playerName);
for (i=0;i<MAX_QPATH;i++)
{
switch (scrnshotName[i])
{
case '>':
case '<':
case '"':
case '?':
case '*':
case ':':
case '\\':
case '/':
case '|':
scrnshotName[i] = '_';
break;
}
}
trap_SendConsoleCommand ("g_synchronousClients 1\n");
trap_SendConsoleCommand (scrnshotName);
trap_SendConsoleCommand ("g_synchronousClients 0\n");
break;
}
break;
case MAPSTART:
switch (cg_RQ3_autoAction.integer) {
case 1:
case 3:
trap_RealTime (&qtime);
Com_sprintf (playerName, sizeof(playerName), "%s", cgs.clientinfo->name);
RemoveColorEscapeSequences (playerName);
Com_sprintf (scrnshotName, sizeof(scrnshotName), "record %d-%d-%d_%d-%d-%d_%s_%s\n", qtime.tm_year + 1900,
qtime.tm_mon + 1, qtime.tm_mday, qtime.tm_hour, qtime.tm_min, qtime.tm_sec, cgs.mapname, playerName);
for (i=0; i<MAX_QPATH; i++) {
switch (scrnshotName[i]) {
case '>':
case '<':
case '"':
case '?':
case '*':
case ':':
case '\\':
case '/':
case '|':
scrnshotName[i] = '_';
break;
}
}
trap_SendConsoleCommand ("g_synchronousClients 1\n");
trap_SendConsoleCommand (scrnshotName);
trap_SendConsoleCommand ("g_synchronousClients 0\n");
break;
}
break;
case MAPEND:
cg.showScores = qtrue;
cg.scoreTPMode = 0;
switch (cg_RQ3_autoAction.integer )
{
case 3:
trap_SendConsoleCommand ("stoprecord\n");
case 2:
trap_RealTime(&qtime);
Com_sprintf(playerName,sizeof(playerName),"%s",cgs.clientinfo->name);
RemoveColorEscapeSequences(playerName);
//Com_sprintf(scrnshotName, sizeof(scrnshotName), "screenshotjpeg %s-%d.%d.%d-%d.%d.%d\n", playerName, qtime.tm_year + 1900, qtime.tm_mon + 1, qtime.tm_mday, qtime.tm_hour, qtime.tm_min, qtime.tm_sec);
Com_sprintf(scrnshotName, sizeof(scrnshotName), "screenshotjpeg %d-%d-%d_%d-%d-%d_%s_%s\n", qtime.tm_year + 1900, qtime.tm_mon + 1, qtime.tm_mday, qtime.tm_hour, qtime.tm_min, qtime.tm_sec, cgs.mapname, playerName);
for (i=0;i<MAX_QPATH;i++)
{
switch (scrnshotName[i])
{
case '>':
case '<':
case '"':
case '?':
case '*':
case ':':
case '\\':
case '/':
case '|':
scrnshotName[i] = '_';
break;
}
}
trap_SendConsoleCommand (scrnshotName);
break;
case 1:
trap_SendConsoleCommand ("stoprecord\n");
break;
}
switch (cg_RQ3_autoAction.integer) {
case 3:
trap_SendConsoleCommand ("stoprecord\n");
case 2:
trap_RealTime(&qtime);
Com_sprintf(playerName, sizeof(playerName), "%s", cgs.clientinfo->name);
RemoveColorEscapeSequences(playerName);
Com_sprintf(scrnshotName, sizeof(scrnshotName), "screenshotjpeg %d-%d-%d_%d-%d-%d_%s_%s\n",
qtime.tm_year + 1900, qtime.tm_mon + 1, qtime.tm_mday, qtime.tm_hour, qtime.tm_min,
qtime.tm_sec, cgs.mapname, playerName);
for (i=0; i<MAX_QPATH; i++) {
switch (scrnshotName[i]) {
case '>':
case '<':
case '"':
case '?':
case '*':
case ':':
case '\\':
case '/':
case '|':
scrnshotName[i] = '_';
break;
}
}
trap_SendConsoleCommand (scrnshotName);
break;
case 1:
trap_SendConsoleCommand ("stoprecord\n");
break;
}
break;
case SETWEAPON:
cg.weaponSelect = atoi(CG_Argv(1));
i = atoi(CG_Argv(1));
cg.weaponSelect = i;
// cg.snap->ps.stats[STAT_WEAPONS] & ( 1 << i);
break;
case STUFF:
CG_Stuffcmd();

5
reaction/game/g_client.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.76 2002/05/20 04:59:33 jbravo
// Lots of small fixes.
//
// Revision 1.75 2002/05/19 21:27:28 blaze
// added force and buoyancy to breakables
//
@ -991,6 +994,7 @@ void ClientUserinfoChanged( int clientNum ) {
Com_sprintf (headModel, sizeof (headModel) , "%s/%s", model2, skin2);
} else {
Com_sprintf (model, sizeof (model) , "grunt/chowda");
Com_sprintf (headModel, sizeof (headModel) , "grunt/chowda");
}
} else {
Q_strncpyz(model2, g_RQ3_team2model.string, sizeof(model));
@ -1005,6 +1009,7 @@ void ClientUserinfoChanged( int clientNum ) {
Com_sprintf (headModel, sizeof (headModel) , "%s/%s", model2, skin2);
} else {
Com_sprintf (model, sizeof (model) , "grunt/cyrus");
Com_sprintf (headModel, sizeof (headModel) , "grunt/cyrus");
}
}
} else {

12
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.80 2002/05/20 04:59:33 jbravo
// Lots of small fixes.
//
// Revision 1.79 2002/05/19 21:04:37 jbravo
// Tkok popup system
//
@ -819,7 +822,7 @@ void PrintDeathMessage (gentity_t *target, gentity_t *attacker, int location, in
if (attacker->client && attacker != target)
message[0] = '\0';
if (message[0] != '\0') {
Com_sprintf (death_msg, sizeof(death_msg), "%s %s\n", target->client->pers.netname, message);
Com_sprintf (death_msg, sizeof(death_msg), "%s^7 %s\n", target->client->pers.netname, message);
SendObit (death_msg, target, attacker);
return;
}
@ -1082,7 +1085,7 @@ void PrintDeathMessage (gentity_t *target, gentity_t *attacker, int location, in
default:
Com_sprintf (message, sizeof(message), "died via unhandled MOD %i. Report this to JBravo", meansOfDeath);
}
Com_sprintf (death_msg, sizeof(death_msg), "%s%s %s%s\n", target->client->pers.netname, message,
Com_sprintf (death_msg, sizeof(death_msg), "%s^7%s %s^7%s\n", target->client->pers.netname, message,
attacker->client->pers.netname, message2);
SendObit (death_msg, target, attacker);
}
@ -2307,8 +2310,9 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
attacker->client->pers.records[REC_CHESTSHOTS]++;
// Vest stuff - is the knife supposed to be affected?
// NiceAss: Added mod != MOD_KNIFE_THROWN so kevlar doesn't help against thrown knives
// JBravo: added mod != MOD_KNIFE so kevlar doesn't help against slashing knives either
if (bg_itemlist[targ->client->ps.stats[STAT_HOLDABLE_ITEM]].giTag == HI_KEVLAR
&& mod != MOD_KNIFE_THROWN) {
&& mod != MOD_KNIFE_THROWN && mod != MOD_KNIFE) {
targ->client->kevlarHit = qtrue;
if (attacker->client->ps.weapon == WP_SSG3000) {
trap_SendServerCommand(attacker-g_entities, va("print \"%s ^7has a Kevlar Vest, too bad you have AP rounds...\n\"",
@ -2317,7 +2321,7 @@ void G_Damage( gentity_t *targ, gentity_t *inflictor, gentity_t *attacker,
attacker->client->pers.netname));
take = take * 0.325;
} else {
if (mod != MOD_KNIFE) { // && mod != MOD_KNIFE_THROWN)
if (mod != MOD_KNIFE && mod != MOD_KNIFE_THROWN) {
trap_SendServerCommand(attacker-g_entities, va("print \"%s^7 has a Kevlar Vest - AIM FOR THE HEAD!\n\"",
targ->client->pers.netname));
} else {

7
reaction/game/g_svcmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.9 2002/05/20 04:59:33 jbravo
// Lots of small fixes.
//
// Revision 1.8 2002/05/04 16:19:02 jbravo
// Fixing the stuff cmd to work on dedicated servers.
//
@ -477,11 +480,11 @@ qboolean ConsoleCommand( void ) {
if (g_dedicated.integer) {
if (Q_stricmp (cmd, "say") == 0) {
trap_SendServerCommand( -1, va("print \"server: %s\n\"", ConcatArgs(1) ) );
trap_SendServerCommand( -1, va("print \"^1server: %s\n\"", ConcatArgs(1) ) );
return qtrue;
}
// everything else will also be printed as a say command
trap_SendServerCommand( -1, va("print \"server: %s\n\"", ConcatArgs(0) ) );
trap_SendServerCommand( -1, va("print \"^1server: %s\n\"", ConcatArgs(0) ) );
return qtrue;
}

27
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.93 2002/05/20 04:59:33 jbravo
// Lots of small fixes.
//
// Revision 1.92 2002/05/18 21:57:54 blaze
// Transmit round start to clients
// used for cg_rq3_autoaction
@ -522,20 +525,17 @@ void MakeAllLivePlayersObservers()
for (i = 0; i < level.maxclients; i++) {
player = &g_entities[i];
// JBravo: I dont agree. Why allow players that are already spectators to stay in follow
// Mode or zcam mode when there are no other players to follow ?
//Slicer: Need to check if they are solid or not.
// if (!player->inuse || player->client->ps.pm_type != PM_NORMAL)
// continue;
if (!player->inuse)
if (!player->inuse || !player->client)
continue;
//Slicer Adding this..
level.clients[i].ps.pm_type = PM_DEAD;
level.clients[i].ps.weapon = WP_NONE;
level.clients[i].sess.savedTeam = level.clients[i].sess.sessionTeam;
level.clients[i].ps.persistant[PERS_SAVEDTEAM] = level.clients[i].sess.sessionTeam;
StopFollowing (player);
if (level.clients[i].sess.sessionTeam == TEAM_SPECTATOR) {
StopFollowing (player);
} else {
//Slicer Adding this..
level.clients[i].ps.pm_type = PM_DEAD;
level.clients[i].ps.weapon = WP_NONE;
level.clients[i].sess.sessionTeam = TEAM_SPECTATOR;
StopFollowing (player);
}
}
}
@ -1520,6 +1520,7 @@ void GetLastKilledTarget (gentity_t * self, char * buf)
if (kills >= 0) {
strcpy (buf, self->client->lastkilled_client[0]->client->pers.netname);
strcat (buf, "^5");
if (kills > 0) {
for (i = 1; i < kills + 1; i++) {
if (i == kills) {