From f88ce7089249a47d204a9c8e02f5c2c50e5de92f Mon Sep 17 00:00:00 2001
From: Felix Geyer <SniperBeamer>
Date: Thu, 5 Aug 2004 11:09:42 +0000
Subject: [PATCH] some optimizations

---
 plugins/admin.sma       |  4 +---
 plugins/adminchat.sma   |  7 +++---
 plugins/admincmd.sma    | 50 ++++++++++++++++++++---------------------
 plugins/adminvote.sma   |  9 --------
 plugins/lang/common.txt | 11 +++++----
 5 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/plugins/admin.sma b/plugins/admin.sma
index 62f71233..757447b9 100755
--- a/plugins/admin.sma
+++ b/plugins/admin.sma
@@ -337,9 +337,7 @@ public client_infochanged(id)
 }
 
 public ackSignal(id) {
-  new no_entry[64]
-  format(no_entry,63,"%L",id,"NO_ENTRY")
-  server_cmd("kick #%d ^"%L^"", get_user_userid(id), no_entry )
+  server_cmd("kick #%d ^"%L^"", get_user_userid(id), id, "NO_ENTRY" )
 }
 
 public client_authorized(id)
diff --git a/plugins/adminchat.sma b/plugins/adminchat.sma
index 2a76cfb5..a2ec2f26 100755
--- a/plugins/adminchat.sma
+++ b/plugins/adminchat.sma
@@ -77,14 +77,13 @@ public cmdSayChat(id) {
     case 'c': a = 6
     case 'o': a = 7
   }
-  new name[32], authid[32], userid, color[16]
+  new name[32], authid[32], userid
   get_user_authid(id,authid,31)
   get_user_name(id,name,31)
   userid = get_user_userid(id)
-  format(color,15,"%L","en",g_Colors[a])
   log_amx("Chat: ^"%s<%d><%s><>^" tsay ^"%s^"",name,userid,authid,message[i+1])
-  log_message("^"%s<%d><%s><>^" triggered ^"amx_tsay^" (text ^"%s^") (color ^"%s^")",
-    name,userid,authid,message[ i+1 ],color)
+  log_message("^"%s<%d><%s><>^" triggered ^"amx_tsay^" (text ^"%s^") (color ^"%L^")",
+    name,userid,authid,message[ i+1 ],"en",g_Colors[a])
   if (++g_msgChannel>6||g_msgChannel<3)
     g_msgChannel = 3
   new Float:verpos = g_Pos[i][1] + float(g_msgChannel) / 35.0
diff --git a/plugins/admincmd.sma b/plugins/admincmd.sma
index a2e798c2..82dfbf64 100755
--- a/plugins/admincmd.sma
+++ b/plugins/admincmd.sma
@@ -220,7 +220,6 @@ public cmdBan(id,level,cid) {
     get_players(players,pnum,"c")
     for (new i=0;i<pnum;i++) {
       len = format(msg,255,"%L",players[i],"ADMIN")
-      strtoupper(msg)
       if (activity==1)
         len += copy(msg[len],255-len,":")
       else
@@ -235,6 +234,7 @@ public cmdBan(id,level,cid) {
     }
   }
 
+
   console_print(id,"[AMXX] %L",id,"CLIENT_BANNED",name2)
   return PLUGIN_HANDLED
 }
@@ -370,7 +370,6 @@ public cmdCvar(id,level,cid) {
     get_players(players,pnum,"c")
     for (new i=0;i<pnum;i++) {
       len = format(admin,255,"%L",players[i],"ADMIN")
-      strtoupper(admin)
       if (activity == 1)
         len += copy(admin[len],255-len,":")
       else
@@ -393,13 +392,13 @@ public cmdPlugins(id,level,cid) {
     return PLUGIN_HANDLED
 
   new name[32],version[32],author[32],filename[32],status[32]
-  new Lname[32],Lversion[32],Lauthor[32],Lfile[32],Lstatus[32]
+  new lName[32],lVersion[32],lAuthor[32],lFile[32],lStatus[32]
 
-  format(Lname,31,"%L",id,"NAME")
-  format(Lversion,31,"%L",id,"VERSION")
-  format(Lauthor,31,"%L",id,"AUTHOR")
-  format(Lfile,31,"%L",id,"FILE")
-  format(Lstatus,31,"%L",id,"STATUS")
+  format(lName,31,"%L",id,"NAME")
+  format(lVersion,31,"%L",id,"VERSION")
+  format(lAuthor,31,"%L",id,"AUTHOR")
+  format(lFile,31,"%L",id,"FILE")
+  format(lStatus,31,"%L",id,"STATUS")
 
 /*
   new motd_body[MOTD_LEN],state[4]
@@ -425,7 +424,7 @@ public cmdPlugins(id,level,cid) {
   new running = 0
   console_print(id,"%L:",id,"LOADED_PLUGINS")
 
-  console_print(id,"%-18.17s %-8.7s %-17.16s %-16.15s %-9.8s",Lname,Lversion,Lauthor,Lfile,Lstatus)
+  console_print(id,"%-18.17s %-8.7s %-17.16s %-16.15s %-9.8s",lName,lVersion,lAuthor,lFile,lStatus)
   for (new i=0;i<num;i++) {
     get_plugin(i,filename,31,name,31,version,31,author,31,status,31)
     console_print(id,"%-18.17s %-8.7s %-17.16s %-16.15s %-9.8s",name,version,author,filename,status)
@@ -442,11 +441,11 @@ public cmdModules(id,level,cid) {
     return PLUGIN_HANDLED
 
   new name[32],version[32],author[32],status,sStatus[16]
-  new Lname[32],Lversion[32],Lauthor[32]
+  new lName[32],lVersion[32],lAuthor[32]
 
-  format(Lname,31,"%L",id,"NAME")
-  format(Lversion,31,"%L",id,"VERSION")
-  format(Lauthor,31,"%L",id,"AUTHOR")
+  format(lName,31,"%L",id,"NAME")
+  format(lVersion,31,"%L",id,"VERSION")
+  format(lAuthor,31,"%L",id,"AUTHOR")
 
 /*
   new motd_body[MOTD_LEN],state[4]
@@ -467,7 +466,7 @@ public cmdModules(id,level,cid) {
 */
   new num = get_modulesnum()
   console_print(id,"%L:",id,"LOADED_MODULES")
-  console_print(id,"%-23.22s %-8.7s %-20.19s",Lname,Lversion,Lauthor)
+  console_print(id,"%-23.22s %-8.7s %-20.19s",lName,lVersion,lAuthor)
   for (new i=0;i<num;i++) {
     get_module(i,name,31,author,31,version,31,status)
     switch (status) {
@@ -486,9 +485,9 @@ public cmdCfg(id,level,cid) {
     return PLUGIN_HANDLED
   new arg[128]
   read_argv(1,arg,127)
-  if (!file_exists(arg)){
+  if (!file_exists(arg)) {
     console_print(id,"[AMXX] %L",id,"FILE_NOT_FOUND",arg)
-    return PLUGIN_HANDLED 
+    return PLUGIN_HANDLED
   }
   new authid[32],name[32]
   get_user_authid(id,authid,31)
@@ -497,26 +496,26 @@ public cmdCfg(id,level,cid) {
     name,get_user_userid(id),authid, arg)
   console_print(id,"[AMXX] Executing file ^"%s^"",arg)
   server_cmd("exec %s",arg)
-  
+
   switch(get_cvar_num("amx_show_activity")) {
-      case 2: client_print(0,print_chat,"%L",LANG_PLAYER,"ADMIN_CONF_2",name,arg)
-      case 1: client_print(0,print_chat,"%L",LANG_PLAYER,"ADMIN_CONF_1",arg)
+    case 2: client_print(0,print_chat,"%L",LANG_PLAYER,"ADMIN_CONF_2",name,arg)
+    case 1: client_print(0,print_chat,"%L",LANG_PLAYER,"ADMIN_CONF_1",arg)
   }
-  
+
   return PLUGIN_HANDLED
 }
 
-public cmdLBack() { 
+public cmdLBack() {
   new paused[16]
   format(paused,15,"%L",g_pauseCon,g_Paused ? "UNPAUSED" : "PAUSED")
   set_cvar_float("pausable",g_pausAble)
-  console_print(g_pauseCon,"[AMXX] Server %s", paused) 
+  console_print(g_pauseCon,"[AMXX] Server %s", paused)
   if (g_Paused) g_Paused = false
   else g_Paused = true
   return PLUGIN_HANDLED
 }
 
-public cmdPause(id,level,cid) { 
+public cmdPause(id,level,cid) {
   if (!cmd_access(id,level,cid,1))
     return PLUGIN_HANDLED 
   new authid[32],name[32],slayer = id
@@ -524,7 +523,7 @@ public cmdPause(id,level,cid) {
   get_user_name(id,name,31) 
   g_pausAble = get_cvar_float("pausable")
   if (!slayer) slayer = find_player("h") 
-  if (!slayer){ 
+  if (!slayer) { 
     console_print(id,"[AMXX] %L",id,"UNABLE_PAUSE") 
     return PLUGIN_HANDLED  
   }
@@ -533,7 +532,7 @@ public cmdPause(id,level,cid) {
   log_amx("Cmd: ^"%s<%d><%s><>^" %s server", 
     name,get_user_userid(id),authid, g_Paused ? "unpause" : "pause" )
   new pausing[16]
-  format(pausing,15,"%L",id,g_Paused ? "unpausing" : "pausing")
+  format(pausing,15,"%L",id,g_Paused ? "UNPAUSING" : "PAUSING")
   console_print(id,"[AMXX] %L", id, pausing)
 
   new activity = get_cvar_num("amx_show_activity")
@@ -542,7 +541,6 @@ public cmdPause(id,level,cid) {
     get_players(players,pnum,"c")
     for (new i=0;i<pnum;i++) {
       len = format(msg,127,"%L",players[i],"ADMIN")
-      strtoupper(msg)
       if (activity==1)
         len += copy(msg[len],127-len,":")
       else
diff --git a/plugins/adminvote.sma b/plugins/adminvote.sma
index 81a39975..525a0240 100755
--- a/plugins/adminvote.sma
+++ b/plugins/adminvote.sma
@@ -78,7 +78,6 @@ public cmdCancelVote(id,level,cid) {
     get_players(players,pnum,"c")
     for (new i=0;i<pnum;i++) {
       format(lTag,15,"%L",players[i],is_user_admin(id) ? "ADMIN" : "PLAYER")
-      strtoupper(lTag)
       switch (activity) {
         case 2: client_print(players[i],print_chat,"%L", LANG_PLAYER, "ADMIN_CANC_VOTE_2", lTag, name)
         case 1: client_print(players[i],print_chat,"%L", LANG_PLAYER, "ADMIN_CANC_VOTE_1", lTag)
@@ -150,8 +149,6 @@ public checkVotes() {
       format(lTheResult,31,"%L",g_voteCaller,"THE_RESULT")
       format(lYes,15,"%L",g_voteCaller,"YES")
       format(lNo,15,"%L",g_voteCaller,"NO")
-      ucfirst(lYes)
-      ucfirst(lNo)
       new len = format(menuBody,511,g_coloredMenus ? "\y%s: \w%s^n^n" : "%s: %s^n^n", lTheResult, g_Execute )
       len += format( menuBody[len] ,511 - len, g_coloredMenus ? "\y%L^n\w" : "%L^n", g_voteCaller, "WANT_CONTINUE" )
       format( menuBody[len] ,511 - len, "^n1. %s^n2. %s",lYes,lNo)
@@ -233,8 +230,6 @@ public cmdVoteMap(id,level,cid) {
     format(lChangeMap,31,"%L",LANG_SERVER,"CHANGE_MAP_TO")
     format(lYes,15,"%L",LANG_SERVER,"YES")
     format(lNo,15,"%L",LANG_SERVER,"NO")
-    ucfirst(lYes)
-    ucfirst(lNo)
     format(menu_msg,255,g_coloredMenus ? "\y%s %s?\w^n^n1.  %s^n2.  %s"
         : "%s %s?^n^n1.  %s^n2.  %s",lChangeMap,g_optionName[0],lYes,lNo)
     keys = MENU_KEY_1|MENU_KEY_2
@@ -256,7 +251,6 @@ public cmdVoteMap(id,level,cid) {
     get_players(players,pnum,"c")
     for (new i=0;i<pnum;i++) {
       format(lTag,15,"%L",players[i],is_user_admin(id)?"ADMIN":"PLAYER")
-      strtoupper(lTag)
       switch (activity) {
         case 2: client_print(players[i],print_chat,"%L",
           players[i],"ADMIN_VOTE_MAP_2",lTag,name)
@@ -314,7 +308,6 @@ public cmdVote(id,level,cid) {
     get_players(players,pnum,"c")
     for (new i=0;i<pnum;i++) {
       format(lTag,15,"%L",players[i],is_user_admin(id)?"ADMIN":"PLAYER")
-      strtoupper(lTag)
       switch (activity) {
         case 2: client_print(players[i],print_chat,"%L","ADMIN_VOTE_CUS_2",lTag,name)
         case 1: client_print(players[i],print_chat,"%L","ADMIN_VOTE_CUS_1",lTag)
@@ -372,8 +365,6 @@ public cmdVoteKickBan(id,level,cid) {
   format(lYes,15,"%L",LANG_SERVER,"YES")
   format(lNo,15,"%L",LANG_SERVER,"NO")
   format(lKickBan,15,"%L",LANG_SERVER,voteban?"BAN":"KICK")
-  ucfirst(lYes)
-  ucfirst(lNo)
   ucfirst(lKickBan)
   get_user_name(player,arg,31)
   format(menu_msg,255,g_coloredMenus ?
diff --git a/plugins/lang/common.txt b/plugins/lang/common.txt
index f384fba1..261a306e 100755
--- a/plugins/lang/common.txt
+++ b/plugins/lang/common.txt
@@ -2,12 +2,11 @@
 BACK = Back
 EXIT = Exit
 MORE = More
-ADMIN = admin
-ADMINS = admins
-PLAYER = player
-PLAYERS = players
+NONE = None
+ADMIN = ADMIN
+PLAYER = PLAYER
 ERROR = error
-YES = yes
-NO = no
+YES = Yes
+NO = No
 BAN = ban
 KICK = kick
\ No newline at end of file