Changeset 59:182de3d026be

Timestamp:

01/13/08 01:55:00 (3 years ago)

Author:

mdoison

Branch:

default

convert_revision:

svn:7c786126-522e-0410-a822-d6d8feae56ca/trunk@190

Message:

• Fix bug #106: Warn don't display reason.

Location:

src/game

Files:

• g_admin.c (modified) (3 diffs)
• g_main.c (modified) (1 diff)

src/game/g_admin.c

@@ -3461 +3461 @@
   return qtrue;
 } 
+
 //!Warn by Gate (Daniel Evans) 
 qboolean G_admin_warn( gentity_t *ent, int skiparg )
-{//mostly copy and paste with the proper lines altered from !mute and !kick
-
-
+{
+  //mostly copy and paste with the proper lines altered from !mute and !kick
   int pids[ MAX_CLIENTS ];
   char name[ MAX_NAME_LENGTH ], *reason, err[ MAX_STRING_CHARS ];
@@ -3482 +3482 @@
   G_SayArgv( 1 + skiparg, name, sizeof( name ) );
   reason = G_SayConcatArgs( 2 + skiparg );
+
   if( G_ClientNumbersFromString( name, pids ) != 1 )
   {
@@ -3497 +3498 @@
   vic = &g_entities[ pids[ 0 ] ];
   //next line is the onscreen warning
-  CPx( pids[ 0 ],va("cp \"^1 %s ^1 %s%s\"", g_adminWarnMessage.string, (*reason)? "REASON: " : "" ,(*reason)? reason : "") );
-  AP( va( "print \"^3!warn: ^7%s^7 has been warned to cease and desist %s by %s \n\"",
-            vic->client->pers.netname, (*reason) ? reason : "his current activity",
-            ( ent ) ? ent->client->pers.netname : "console" ) );//console announcement
+  CPx( pids[ 0 ],va("cp \"^7%s\n^7%s%s\"", g_adminWarnMessage.string, (*reason)? "REASON: ^1" : "" ,(*reason)? reason : "") );
+  AP( va( "print \"^3!warn: ^7%s^7 has been warned by %s. %s%s\n\"",
+            vic->client->pers.netname,
+            ( ent ) ? ent->client->pers.netname : "console", //console announcement
+                        (*reason) ? "Reason: " : "",
+                        (*reason) ? reason : "" ) );
+
   ClientUserinfoChanged( pids[ 0 ] );
   return qtrue;

src/game/g_main.c

@@ -309 +309 @@
   { &g_adminNameProtect, "g_adminNameProtect", "1", CVAR_ARCHIVE, 0, qfalse  },
   { &g_adminTempBan, "g_adminTempBan", "120", CVAR_ARCHIVE, 0, qfalse  },
-  { &g_adminWarnMessage, "g_adminWarnMessage", "^1You have been warned by an administrator.\n ^3Cease imeediately or face admin action!\n", CVAR_ARCHIVE, 0, qfalse },
+  { &g_adminWarnMessage, "g_adminWarnMessage", "You have been warned by an administrator.\n Cease imeediately or face admin action!\n", CVAR_ARCHIVE, 0, qfalse },
   { &g_autoRegister, "g_autoRegister", "0", CVAR_ARCHIVE, 0, qfalse  },