--- specinfo.sma	2007/11/18 00:28:03	20
+++ specinfo.sma	2007/11/18 00:28:32	21
@@ -1,5 +1,5 @@
 /*
-SpecInfo v1.2
+SpecInfo v1.3
 Copyright (C) 2007 Ian (Juan) Cammarata
 
 This program is free software; you can redistribute it and/or modify it under
@@ -53,12 +53,16 @@
 Supported Languages:
 English (100%)
 Spanish (100%) - Thanks to <3 Mely <3 for checking these.
-German (78%) - Thanks to [S]killer for this translation.
+German (63%) - Thanks to [S]killer for this translation.
 
 
 Change Log:
 Key (+ added | - removed | c changed | f fixed)
 
+v1.3 (Nov xx, 2007)
++: Command "/showkeys" to view your own keys.
+c: Minor code optimizations.
+
 v1.2 (Jul 14, 2007)
 +: Command "say /spechide" for immune to toggle hidden state.
 c: Lots of code optimizations.
@@ -82,7 +86,7 @@
 #include <engine>
 #include <fakemeta>
 
-#define VERSION "1.2"
+#define VERSION "1.3b1"
 #define IMMUNE_FLAG ADMIN_IMMUNITY
 
 #define KEYS_STR_LEN 31
@@ -94,30 +98,58 @@
 new p_red, p_grn, p_blu, p_immunity
 
 //data arrays
-new cl_keys[32], cl_prefs[32]
-new keys_string[32][KEYS_STR_LEN+1], list_string[32][LIST_STR_LEN+1]
-new cl_names[32][21], spec_ids[32][32]
+new cl_keys[33], cl_prefs[33]
+new keys_string[33][KEYS_STR_LEN+1], list_string[33][LIST_STR_LEN+1]
+new cl_names[33][21], spec_ids[33][32]
 
 //cl_prefs constants
-#define FL_LIST (1<<0)
-#define FL_KEYS (1<<1)
-#define FL_HIDE (1<<2)
+#define FL_LIST    (1<<0)
+#define FL_KEYS    (1<<1)
+#define FL_OWNKEYS (1<<2)
+#define FL_HIDE    (1<<3)
+
+public plugin_init( )
+{
+	register_plugin( "SpecInfo", VERSION, "Ian Cammarata" )
+	register_cvar( "specinfo_version", VERSION, FCVAR_SERVER )
+	set_cvar_string( "specinfo_version", VERSION )
+	
+	p_enabled = register_cvar( "si_enabled", "1" )
+	p_list_enabled = register_cvar( "si_list_enabled", "1" )
+	p_keys_enabled = register_cvar( "si_keys_enabled", "1" )
+	p_list_default = register_cvar( "si_list_default", "1" )
+	p_keys_default = register_cvar( "si_keys_default", "1" )
+	p_immunity = register_cvar( "si_immunity", "1" )
+	p_red = register_cvar( "si_msg_r", "45" )
+	p_grn = register_cvar( "si_msg_g", "89" )
+	p_blu = register_cvar( "si_msg_b", "116" )
+	
+	register_clcmd( "say /speclist", "toggle_list", _, "Toggle spectator list." )
+	register_clcmd( "say /speckeys", "toggle_keys", _, "Toggle spectator keys." )
+	register_clcmd( "say /showkeys", "toggle_ownkeys", _, "Toggle viewing own keys." ) 
+	register_clcmd( "say /spechide", "toggle_hide", IMMUNE_FLAG, "Admins toggle being hidden from list." )
+	
+	set_task( 1.0, "list_update", _, _, _, "b" )
+	set_task( 0.1, "keys_update", _, _, _, "b" )
+	
+	register_dictionary( "specinfo.txt" )
+}
 
 public client_connect( id )
 {
-	cl_prefs[id-1] = 0
+	cl_prefs[id] = 0
 	if( !is_user_bot( id ) )
 	{
-		if( get_pcvar_num( p_list_default ) ) cl_prefs[id-1] |= FL_LIST
-		if( get_pcvar_num( p_keys_default ) ) cl_prefs[id-1] |= FL_KEYS
+		if( get_pcvar_num( p_list_default ) ) cl_prefs[id] |= FL_LIST
+		if( get_pcvar_num( p_keys_default ) ) cl_prefs[id] |= FL_KEYS
 	}
-	get_user_name( id, cl_names[id-1], 20 )
+	get_user_name( id, cl_names[id], 20 )
 	return PLUGIN_CONTINUE
 }
 
 public client_infochanged( id )
 {
-	get_user_name( id, cl_names[id-1], 20 )
+	get_user_name( id, cl_names[id], 20 )
 	return PLUGIN_CONTINUE
 }
 
@@ -126,12 +158,12 @@
 	if( get_pcvar_num( p_enabled ) && get_pcvar_num ( p_list_enabled ) )
   {
 		new players[32], num, id, id2, i, j
-		for( i=1; i<33; i++ ) spec_ids[i-1][0] = 0
+		for( i=1; i<33; i++ ) spec_ids[i][0] = 0
 		get_players( players, num, "bch" )
 		for( i=0; i<num; i++ )
     {
 			id = players[i]
-			if( !( get_user_flags( id ) & IMMUNE_FLAG && get_pcvar_num( p_immunity ) && cl_prefs[id-1] & FL_HIDE ) )
+			if( !( get_user_flags( id ) & IMMUNE_FLAG && get_pcvar_num( p_immunity ) && cl_prefs[id] & FL_HIDE ) )
 			{
 				id2 = pev( id, pev_iuser2 )
 				if( id2 )
@@ -145,16 +177,16 @@
 		new count, namelen, tmpname[21]
 		for( i=1; i<33; i++ )
     {
-			count = spec_ids[i-1][0]
+			count = spec_ids[i][0]
 			if( count )
 			{
 				namelen = ( LIST_STR_LEN - 10 ) / count
 				clamp( namelen, 10, 20 )
-				format( tmpname, namelen, cl_names[i-1] )
+				format( tmpname, namelen, cl_names[i] )
 				formatex( tmplist, LIST_STR_LEN - 1, "^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t(%d) %s %s:^n", count, "%L", tmpname)
 				for( j=1; j<=count; j++ )
         {
-					format( tmpname, namelen, cl_names[spec_ids[i-1][j]-1])
+					format( tmpname, namelen, cl_names[spec_ids[i][j]])
 					formatex( tmpstr, 40, "^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t%s", tmpname )
 					if( strlen( tmplist ) + strlen( tmpstr ) + ( 11 - j ) < ( LIST_STR_LEN - 1 ) )
 						format( tmplist, LIST_STR_LEN-10, "%s%s^n", tmplist, tmpstr )
@@ -165,12 +197,13 @@
 					}
 				}
 				if( count < 10 )
-          format( tmplist, LIST_STR_LEN,\
-						"%s^n^n^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^tSpecInfo v%s^n",\
-						tmplist, VERSION )
+          format( tmplist, LIST_STR_LEN,
+						"%s^n^n^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^t^tSpecInfo v%s^n",
+						tmplist, VERSION
+					)
 				for( j+=0; j<10; j++ )
           format( tmplist, LIST_STR_LEN, "%s%s", tmplist, "^n" )
-				list_string[i-1] = tmplist
+				list_string[i] = tmplist
 			}
 		}
 		get_players( players, num, "ch" )
@@ -181,37 +214,46 @@
 
 public keys_update( )
 {
-	if( get_pcvar_num( p_enabled ) && get_pcvar_num( p_keys_enabled ) )
-	{
-		new players[32], num, id, i
-		get_players( players, num, "a" )
-		for( i=0; i<num; i++ )
-    {
-			id = players[i]
-			formatex( keys_string[id-1], KEYS_STR_LEN, " ^n^t^t%s^t^t^t%s^n^t%s %s %s^t^t%s",\
-				cl_keys[id-1] & IN_FORWARD ? "W" : " .",\
-				"%L",\
-				cl_keys[id-1] & IN_MOVELEFT ? "A" : ".",\
-				cl_keys[id-1] & IN_BACK ? "S" : ".",\
-				cl_keys[id-1] & IN_MOVERIGHT ? "D" : ".",\
-				"%L" )
-			
-			//Flags stored in string to fill translation char in clmsg function
-			keys_string[id-1][0] = 0 
-			if( cl_keys[id-1] & IN_JUMP ) keys_string[id-1][0] |= IN_JUMP
-			if( cl_keys[id-1] & IN_DUCK ) keys_string[id-1][0] |= IN_DUCK
-			
-			cl_keys[id-1] = 0
-		}
+	if( !get_pcvar_num( p_enabled ) && !get_pcvar_num( p_keys_enabled ) ) return
+
+	new players[32], num, id, i
+	get_players( players, num, "a" )
+	for( i = 0; i < num; i++ )
+  {
+		id = players[i]
+		formatex( keys_string[id], KEYS_STR_LEN, " ^n^t^t%s^t^t^t%s^n^t%s %s %s^t^t%s",
+			cl_keys[id] & IN_FORWARD ? "W" : " .",
+			"%L",
+			cl_keys[id] & IN_MOVELEFT ? "A" : ".",
+			cl_keys[id] & IN_BACK ? "S" : ".",
+			cl_keys[id] & IN_MOVERIGHT ? "D" : ".",
+			"%L"
+		)
 		
-		get_players( players, num, "bch" )
-		for( i=0; i<num; i++ )
-    {
-			id = players[i]
-			if( cl_prefs[id-1] & FL_KEYS && pev( id, pev_iuser2 ) ) clmsg( id )
+		//Flags stored in string to fill translation char in clmsg function
+		keys_string[id][0] = 0 
+		if( cl_keys[id] & IN_JUMP ) keys_string[id][0] |= IN_JUMP
+		if( cl_keys[id] & IN_DUCK ) keys_string[id][0] |= IN_DUCK
+		
+		cl_keys[id] = 0
+	}
+	
+	new id2
+	get_players( players, num, "ch" )
+	for( i=0; i<num; i++ )
+  {
+		id = players[i]
+		if( is_user_alive( id ) )
+		{
+			if( cl_prefs[id] & FL_OWNKEYS ) clmsg( id )
+		}
+		else
+		{
+			id2 = pev( id, pev_iuser2 )
+			if( cl_prefs[id] & FL_KEYS && id2 && id2 != id ) clmsg( id )
 		}
 	}
-	return PLUGIN_HANDLED
+
 }
 
 public server_frame( )
@@ -220,21 +262,21 @@
   {
 		new players[32], num, id
 		get_players( players, num, "a" )
-		for( new i=0; i<num; i++ )
+		for( new i = 0; i < num; i++ )
 		{
 			id = players[i]
-			if( /*!( cl_keys[id-1] & IN_FORWARD ) &&*/ get_user_button( id ) & IN_FORWARD )
-				cl_keys[id-1]|=IN_FORWARD
-			if( /*!( cl_keys[id-1] & IN_BACK ) &&*/ get_user_button( id ) & IN_BACK )
-				cl_keys[id-1]|=IN_BACK
-			if( /*!( cl_keys[id-1] & IN_MOVELEFT ) &&*/ get_user_button( id ) & IN_MOVELEFT )
-				cl_keys[id-1]|=IN_MOVELEFT
-			if( /*!( cl_keys[id-1] & IN_MOVERIGHT ) &&*/ get_user_button( id ) & IN_MOVERIGHT )
-				cl_keys[id-1]|=IN_MOVERIGHT
-			if( /*!( cl_keys[id-1] & IN_DUCK ) &&*/ get_user_button( id ) & IN_DUCK )
-				cl_keys[id-1]|=IN_DUCK
-			if( /*!( cl_keys[id-1] & IN_JUMP ) &&*/ get_user_button( id ) & IN_JUMP )
-				cl_keys[id-1]|=IN_JUMP
+			if( get_user_button( id ) & IN_FORWARD )
+				cl_keys[id] |= IN_FORWARD
+			if( get_user_button( id ) & IN_BACK )
+				cl_keys[id] |= IN_BACK
+			if( get_user_button( id ) & IN_MOVELEFT )
+				cl_keys[id] |= IN_MOVELEFT
+			if( get_user_button( id ) & IN_MOVERIGHT )
+				cl_keys[id] |= IN_MOVERIGHT
+			if( get_user_button( id ) & IN_DUCK )
+				cl_keys[id] |= IN_DUCK
+			if( get_user_button( id ) & IN_JUMP )
+				cl_keys[id] |= IN_JUMP
 		}
 	}
 	return PLUGIN_CONTINUE
@@ -242,93 +284,110 @@
 
 public clmsg( id )
 {
-	if( id )
+	if( !id ) return
+	
+	new prefs = cl_prefs[id]
+	
+	new bool:show_own = false
+	if( is_user_alive( id ) && prefs & FL_OWNKEYS ) show_own = true
+	
+	if( is_user_alive( id ) && !show_own )
   {
-		if( is_user_alive( id ) )
-    {
-			if( cl_prefs[id-1] & FL_LIST && spec_ids[id-1][0] && get_pcvar_num( p_list_enabled ) )
-			{
-				set_hudmessage(\
-          get_pcvar_num( p_red ),\
-          get_pcvar_num( p_grn ),\
-          get_pcvar_num( p_blu ),\
-          0.7/*x*/,\
-          0.1/*y*/,\
-          0/*fx*/,\
-          0.0/*fx time*/,\
-          1.1/*hold time*/,\
-          0.1/*fade in*/,\
-          0.1/*fade out*/,\
-          3/*chan*/ )
-				show_hudmessage( id, list_string[id-1], id, "SPECTATING" )
-			}
+		if( prefs & FL_LIST && spec_ids[id][0] && get_pcvar_num( p_list_enabled ) )
+		{
+			set_hudmessage(
+        get_pcvar_num( p_red ),
+        get_pcvar_num( p_grn ),
+        get_pcvar_num( p_blu ),
+        0.7, /*x*/
+        0.1, /*y*/
+        0, /*fx*/
+        0.0, /*fx time*/
+        1.1, /*hold time*/
+        0.1, /*fade in*/
+        0.1, /*fade out*/
+        3 /*chan*/
+			)
+			show_hudmessage( id, list_string[id], id, "SPECTATING" )
 		}
-		else
+	}
+	else
+  {
+		new id2
+		if( show_own ) id2 = id
+		else id2 = pev( id, pev_iuser2 )
+		if( !id2 ) return
+		
+		if( prefs & FL_LIST || prefs & FL_KEYS || show_own )
     {
-			new id2 = pev( id, pev_iuser2 )
-			if( ( cl_prefs[id-1] & FL_LIST || cl_prefs[id-1] & FL_KEYS ) && id2 && id != id2 )
+			set_hudmessage(
+        get_pcvar_num( p_red ),
+        get_pcvar_num( p_grn ),
+        get_pcvar_num( p_blu ),
+        0.48, /*x*/
+        0.14, /*y*/
+        0, /*fx*/
+        0.0, /*fx time*/
+        prefs & FL_KEYS || show_own ? 0.1 : 1.1, /*hold time*/
+        0.1, /*fade in*/
+        0.1, /*fade out*/
+        3 /*chan*/
+			)
+			new msg[BOTH_STR_LEN+1]
+			if( prefs & FL_LIST && get_pcvar_num( p_list_enabled ) && spec_ids[id2][0] )
+        formatex(msg,BOTH_STR_LEN,list_string[id2],id,"SPECTATING")
+			else msg ="^n^n^n^n^n^n^n^n^n^n^n^n"
+			if( get_pcvar_num( p_keys_enabled ) && ( prefs & FL_KEYS || show_own ) )
       {
-				set_hudmessage(\
-          get_pcvar_num( p_red ),\
-          get_pcvar_num( p_grn ),\
-          get_pcvar_num( p_blu ),\
-          0.48/*x*/,\
-          0.14/*y*/,\
-          0/*fx*/,\
-          0.0/*fx time*/,\
-          cl_prefs[id-1]&FL_KEYS ? 0.1 : 1.1/*hold time*/,\
-          0.1/*fade in*/,\
-          0.1/*fade out*/,\
-          3/*chan*/ )
-				new msg[BOTH_STR_LEN+1]
-				if( cl_prefs[id-1] & FL_LIST && get_pcvar_num( p_list_enabled ) && spec_ids[id2-1][0] )
-          formatex(msg,BOTH_STR_LEN,list_string[id2-1],id,"SPECTATING")
-				else msg ="^n^n^n^n^n^n^n^n^n^n^n^n"
-				if( cl_prefs[id-1] & FL_KEYS && get_pcvar_num( p_keys_enabled ) )
-        {
-          format( msg, BOTH_STR_LEN, "%s%s", msg, keys_string[id2-1][1] )
-          format( msg, BOTH_STR_LEN, msg,\
-					id,\
-					keys_string[id2-1][0] & IN_JUMP ? "JUMP" : "LAME",\
-					id,\
-					keys_string[id2-1][0] & IN_DUCK ? "DUCK" : "LAME" )
-        }
-				show_hudmessage( id, msg )
-			}
+        format( msg, BOTH_STR_LEN, "%s%s", msg, keys_string[id2][1] )
+        format( msg, BOTH_STR_LEN, msg,
+					id, keys_string[id2][0] & IN_JUMP ? "JUMP" : "LAME",
+					id, keys_string[id2][0] & IN_DUCK ? "DUCK" : "LAME"
+				)
+      }
+			show_hudmessage( id, msg )
 		}
 	}
-	return PLUGIN_HANDLED
 }
 
 public set_hudmsg_flg_notify( )
 {
-	set_hudmessage(\
-		get_pcvar_num( p_red ),\
-		get_pcvar_num( p_grn ),\
-		get_pcvar_num( p_blu ),\
-		-1.0 /*x*/ ,\
-		0.8 /*y*/ ,\
-		0 /*fx*/ ,\
-		0.0 /*fx time*/ ,\
-		3.0 /*hold time*/ ,\
-		0.0 /*fade in*/ ,\
-		0.0 /*fade out*/ ,\
-		-1 /*chan*/ )
+	set_hudmessage(
+		get_pcvar_num( p_red ),
+		get_pcvar_num( p_grn ),
+		get_pcvar_num( p_blu ),
+		-1.0, /*x*/
+		0.8, /*y*/
+		0, /*fx*/
+		0.0, /*fx time*/
+		3.0, /*hold time*/
+		0.0, /*fade in*/
+		0.0, /*fade out*/
+		-1 /*chan*/
+	)
 }
 
 public toggle_list( id )
 {
 	set_hudmsg_flg_notify( )
-	cl_prefs[id-1] ^= FL_LIST
-	show_hudmessage( id, "%L", id, cl_prefs[id-1] & FL_LIST ? "SPEC_LIST_ENABLED" : "SPEC_LIST_DISABLED" )
+	cl_prefs[id] ^= FL_LIST
+	show_hudmessage( id, "%L", id, cl_prefs[id] & FL_LIST ? "SPEC_LIST_ENABLED" : "SPEC_LIST_DISABLED" )
 	return PLUGIN_HANDLED
 }
 
 public toggle_keys( id )
 {
 	set_hudmsg_flg_notify( )
-	cl_prefs[id-1] ^= FL_KEYS
-	show_hudmessage( id, "%L", id, cl_prefs[id-1] & FL_KEYS ? "SPEC_KEYS_ENABLED" : "SPEC_KEYS_DISABLED" )
+	cl_prefs[id] ^= FL_KEYS
+	show_hudmessage( id, "%L", id, cl_prefs[id] & FL_KEYS ? "SPEC_KEYS_ENABLED" : "SPEC_KEYS_DISABLED" )
+	return PLUGIN_HANDLED
+}
+
+public toggle_ownkeys( id )
+{
+	set_hudmsg_flg_notify( )
+	cl_prefs[id] ^= FL_OWNKEYS
+	show_hudmessage( id, "%L", id, cl_prefs[id] & FL_OWNKEYS ? "SPEC_OWNKEYS_ENABLED" : "SPEC_OWNKEYS_DISABLED" )
 	return PLUGIN_HANDLED
 }
 
@@ -337,33 +396,8 @@
 	if( cmd_access( id, level, cid, 0 ) )
 	{
 		set_hudmsg_flg_notify( )
-		cl_prefs[id-1] ^= FL_HIDE
-		show_hudmessage( id, "%L", id, cl_prefs[id-1] & FL_HIDE ? "SPEC_HIDE_ENABLED" : "SPEC_HIDE_DISABLED" )
+		cl_prefs[id] ^= FL_HIDE
+		show_hudmessage( id, "%L", id, cl_prefs[id] & FL_HIDE ? "SPEC_HIDE_ENABLED" : "SPEC_HIDE_DISABLED" )
 	}
 	return PLUGIN_HANDLED
 }
-
-public plugin_init( )
-{
-	register_plugin( "SpecInfo", VERSION, "Ian Cammarata" )
-	register_cvar( "specinfo_version", VERSION, FCVAR_SERVER )
-	
-	p_enabled = register_cvar( "si_enabled", "1" )
-	p_list_enabled = register_cvar( "si_list_enabled", "1" )
-	p_keys_enabled = register_cvar( "si_keys_enabled", "1" )
-	p_list_default = register_cvar( "si_list_default", "1" )
-	p_keys_default = register_cvar( "si_keys_default", "1" )
-	p_immunity = register_cvar( "si_immunity", "1" )
-	p_red = register_cvar( "si_msg_r", "45" )
-	p_grn = register_cvar( "si_msg_g", "89" )
-	p_blu = register_cvar( "si_msg_b", "116" )
-	
-	register_clcmd( "say /speclist", "toggle_list", _, "Toggle spectator list." )
-	register_clcmd( "say /speckeys", "toggle_keys", _, "Toggle spectator keys." )
-	register_clcmd( "say /spechide", "toggle_hide", IMMUNE_FLAG, "Admins toggle being hidden from list." )
-	
-	set_task( 1.0, "list_update", _, _, _, "b" )
-	set_task( 0.1, "keys_update", _, _, _, "b" )
-	
-	register_dictionary( "specinfo.txt" )
-}
\ No newline at end of file