Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added autohud

Browse Source 
format fixes
This commit is contained in:
Borja Ferrer 2005-12-02 23:34:11 +00:00
parent 507a901a9e
commit 186728053a
6 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ns/nextmap.sma
View File

@ -236,7 +236,7 @@ public sayNextMapTimeLeft(){
new a = get_timeleft() new a = get_timeleft()
format(szText, 127, "%s Time Left: %d:%02d", szText, (a / 60) , (a % 60) ) format(szText, 127, "%s Time Left: %d:%02d", szText, (a / 60) , (a % 60) )
} }
client_print(0, print_chat, szText) client_print(0, print_chat, "%s", szText)
} }
public changeMap(szMapName[]) public changeMap(szMapName[])

14
plugins/ns/nscommands.sma
View File

@ -160,7 +160,7 @@ public cmdRandom(id,level,cid) {
case 2: client_print(0,print_chat,"ADMIN %s: random %s",name,name_targ); case 2: client_print(0,print_chat,"ADMIN %s: random %s",name,name_targ);
case 1: client_print(0,print_chat,"ADMIN: random %s",name_targ); case 1: client_print(0,print_chat,"ADMIN: random %s",name_targ);
} }
client_cmd(player,g_AutoAssignAck); client_cmd(player, "%s", g_AutoAssignAck);
} }
else { else {
new cur=0; new cur=0;
@ -197,7 +197,7 @@ public randomStep(index) {
new end = index+5 new end = index+5
while (index < end) { while (index < end) {
if (g_Team[index] == 0 && !(get_user_flags(index) & ADMIN_IMMUNITY)) { if (g_Team[index] == 0 && !(get_user_flags(index) & ADMIN_IMMUNITY)) {
client_cmd(index,g_AutoAssignAck); client_cmd(index, "%s", g_AutoAssignAck);
} }
if (++index > get_maxplayers()) { if (++index > get_maxplayers()) {
return PLUGIN_HANDLED_MAIN return PLUGIN_HANDLED_MAIN
@ -228,7 +228,7 @@ public cmdReadyRoom(id,level,cid) {
case 2: client_print(0,print_chat,"ADMIN %s: ready room %s",name,name_targ); case 2: client_print(0,print_chat,"ADMIN %s: ready room %s",name,name_targ);
case 1: client_print(0,print_chat,"ADMIN: ready room %s",name_targ); case 1: client_print(0,print_chat,"ADMIN: ready room %s",name_targ);
} }
client_cmd(player,g_ReadyRoomAck); client_cmd(player, "%s", g_ReadyRoomAck);
} }
else { else {
new cur=0; new cur=0;
@ -263,7 +263,7 @@ public rrStep(index) {
new end = index+5 new end = index+5
while (index < end) { while (index < end) {
if (is_user_connected(index) && g_Team[index]!=0) { if (is_user_connected(index) && g_Team[index]!=0) {
client_cmd(index,g_ReadyRoomAck) client_cmd(index, "%s", g_ReadyRoomAck)
} }
if (++index > get_maxplayers()) { if (++index > get_maxplayers()) {
return PLUGIN_HANDLED_MAIN return PLUGIN_HANDLED_MAIN
@ -297,7 +297,7 @@ public cmdTeamTwo(id,level,cid) {
case 2: client_print(0,print_chat,"ADMIN %s: alien %s",name,name_targ); case 2: client_print(0,print_chat,"ADMIN %s: alien %s",name,name_targ);
case 1: client_print(0,print_chat,"ADMIN: alien %s",name_targ); case 1: client_print(0,print_chat,"ADMIN: alien %s",name_targ);
} }
client_cmd(player,g_TeamTwoAck); client_cmd(player, "%s", g_TeamTwoAck);
} }
return PLUGIN_HANDLED_MAIN; return PLUGIN_HANDLED_MAIN;
@ -326,7 +326,7 @@ public cmdTeamOne(id,level,cid) {
case 2: client_print(0,print_chat,"ADMIN %s: marine %s",name,name_targ); case 2: client_print(0,print_chat,"ADMIN %s: marine %s",name,name_targ);
case 1: client_print(0,print_chat,"ADMIN: marine %s",name_targ); case 1: client_print(0,print_chat,"ADMIN: marine %s",name_targ);
} }
client_cmd(player,g_TeamOneAck); client_cmd(player, "%s", g_TeamOneAck);
} }
return PLUGIN_HANDLED_MAIN; return PLUGIN_HANDLED_MAIN;
@ -339,7 +339,7 @@ public cmdUnComm(id,level,cid) {
return PLUGIN_HANDLED return PLUGIN_HANDLED
new comm = UTIL_FindCommander(); new comm = UTIL_FindCommander();
if (comm>0&&comm<=get_maxplayers()) { if (comm>0&&comm<=get_maxplayers()) {
client_cmd(comm,g_StopCommAck); client_cmd(comm, "%s", g_StopCommAck);
new name[32],name_targ[32]; new name[32],name_targ[32];
new auth[32],auth_targ[32]; new auth[32],auth_targ[32];
get_user_name(id,name,31); get_user_name(id,name,31);

10
plugins/ns/timeleft.sma
View File

@ -93,7 +93,7 @@ public sayTimeLeft(id){
if ( get_cvar_num("amx_time_voice") ) { if ( get_cvar_num("amx_time_voice") ) {
new svoice[128] new svoice[128]
setTimeVoice( svoice , 127 , 0 , a ) setTimeVoice( svoice , 127 , 0 , a )
client_cmd( id , svoice ) client_cmd( id , "%s", svoice )
} }
client_print(0,print_chat, "Time Left: %d:%02d", (a / 60) , (a % 60) ) client_print(0,print_chat, "Time Left: %d:%02d", (a / 60) , (a % 60) )
} }
@ -219,14 +219,14 @@ public timeRemain(param[]){
if (flags & 1){ // display white text on bottom if (flags & 1){ // display white text on bottom
setTimeText(arg,127,tmlf) setTimeText(arg,127,tmlf)
if (flags & 16) // show/speak if current time is less than this set in parameter if (flags & 16) // show/speak if current time is less than this set in parameter
set_hudmessage(255, 255, 255, -1.0, 0.85, 0, 0.0, 1.1, 0.1, 0.5, 1) set_hudmessage(255, 255, 255, -1.0, 0.85, 0, 0.0, 1.1, 0.1, 0.5, -1)
else else
set_hudmessage(255, 255, 255, -1.0, 0.85, 0, 0.0, 3.0, 0.0, 0.5, 1) set_hudmessage(255, 255, 255, -1.0, 0.85, 0, 0.0, 3.0, 0.0, 0.5, -1)
show_hudmessage(0,arg) show_hudmessage(0, "%s", arg)
} }
if (flags & 2){ // use voice if (flags & 2){ // use voice
setTimeVoice(arg,127,flags,tmlf) setTimeVoice(arg,127,flags,tmlf)
client_cmd(0,arg) client_cmd(0, "%s", arg)
} }
} }
} }

6
plugins/tfc/plmenu.sma
View File

@ -555,13 +555,13 @@ public actionClcmdMenu(id,key) {
replace(command,63,"%authid%",authid) replace(command,63,"%authid%",authid)
replace(command,63,"%name%",name) replace(command,63,"%name%",name)
if (flags & 1) { if (flags & 1) {
server_cmd(command) server_cmd("%s", command)
server_exec() server_exec()
} }
else if (flags & 2) else if (flags & 2)
client_cmd(id,command) client_cmd(id, "%s", command)
else if (flags & 4) else if (flags & 4)
client_cmd(player,command) client_cmd(player, "%s", command)
} }
if (flags & 8) displayClcmdMenu(id,g_menuPosition[id]) if (flags & 8) displayClcmdMenu(id,g_menuPosition[id])
} }

60
plugins/tfc/stats.sma
View File

@ -197,7 +197,7 @@ public plugin_cfg(){
public cmdStatsMe(id){ public cmdStatsMe(id){
if ( !SayStatsMe || !isActive() ){ if ( !SayStatsMe || !isActive() ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
displayStats(id,id) displayStats(id,id)
@ -225,7 +225,7 @@ displayStats(id,dest) {
public cmdRank(id){ public cmdRank(id){
if ( !SayRank || !isActive() ){ if ( !SayRank || !isActive() ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
displayRank(id,id) displayRank(id,id)
@ -247,7 +247,7 @@ displayRank(id,dest) {
public cmdTop15(id) { public cmdTop15(id) {
if ( !SayTop15 || !isActive() ){ if ( !SayTop15 || !isActive() ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
getTop15() getTop15()
@ -291,7 +291,7 @@ public eInterMission()
public cmdStats(id){ public cmdStats(id){
if ( !SayStatsAll || !isActive() ){ if ( !SayStatsAll || !isActive() ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
showStatsMenu(id,g_userPosition[id]=0) showStatsMenu(id,g_userPosition[id]=0)
@ -371,7 +371,7 @@ public eResetHud( id )
public cmdKiller(id) { public cmdKiller(id) {
if ( !SayHP ){ if ( !SayHP ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
if (g_Killers[id][0]) { if (g_Killers[id][0]) {
@ -384,7 +384,7 @@ public cmdKiller(id) {
if ( get_user_vstats(id,g_Killers[id][0],mstats,mbody) ) { if ( get_user_vstats(id,g_Killers[id][0],mstats,mbody) ) {
client_print(id,print_chat,"You did %d damage to him with %d hit%s",mstats[6], mstats[5],(mstats[5]==1)?"":"s" ) client_print(id,print_chat,"You did %d damage to him with %d hit%s",mstats[6], mstats[5],(mstats[5]==1)?"":"s" )
getMyHits(id,g_Killers[id][0]) getMyHits(id,g_Killers[id][0])
client_print(id,print_chat,g_Buffer) client_print(id,print_chat, "%s", g_Buffer)
} }
else client_print(id,print_chat,"You did no damage to him") else client_print(id,print_chat,"You did no damage to him")
} }
@ -455,9 +455,9 @@ public client_putinserver(id)
public client_damage(attacker,victim,damage,wpnindex,hitplace,TA){ public client_damage(attacker,victim,damage,wpnindex,hitplace,TA){
if ( BulletDamage ) { if ( BulletDamage ) {
if ( attacker==victim || xmod_is_melee_wpn(wpnindex) ) return PLUGIN_CONTINUE if ( attacker==victim || xmod_is_melee_wpn(wpnindex) ) return PLUGIN_CONTINUE
set_hudmessage(0, 100, 200, 0.45, 0.85, 2, 0.1, 4.0, 0.02, 0.02, 1) set_hudmessage(0, 100, 200, 0.45, 0.85, 2, 0.1, 4.0, 0.02, 0.02, -1)
show_hudmessage(attacker,"%i", damage) show_hudmessage(attacker,"%i", damage)
set_hudmessage(200, 0, 0, 0.55, 0.85, 2, 0.1, 4.0, 0.02, 0.02, 2) set_hudmessage(200, 0, 0, 0.55, 0.85, 2, 0.1, 4.0, 0.02, 0.02, -1)
show_hudmessage(victim,"%i", damage) show_hudmessage(victim,"%i", damage)
} }
return PLUGIN_CONTINUE return PLUGIN_CONTINUE
@ -483,17 +483,17 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
new Float:statstime = get_cvar_float("tfcstats_statstime") new Float:statstime = get_cvar_float("tfcstats_statstime")
if ( ShowVictims && getVictims(victim) ){ if ( ShowVictims && getVictims(victim) ){
set_hudmessage(0,80,220,0.55,0.60,0, statstime, 12.0, 1.0, 2.0, 4) set_hudmessage(0,80,220,0.55,0.60,0, statstime, 12.0, 1.0, 2.0, -1)
show_hudmessage(victim,g_Buffer) show_hudmessage(victim, "%s", g_Buffer)
} }
if ( ShowAttackers && getAttackers(victim)){ if ( ShowAttackers && getAttackers(victim)){
set_hudmessage(220,80,0,0.55,0.35,0, statstime, 12.0, 1.0, 2.0, 3) set_hudmessage(220,80,0,0.55,0.35,0, statstime, 12.0, 1.0, 2.0, -1)
show_hudmessage(victim,g_Buffer) show_hudmessage(victim, "%s", g_Buffer)
} }
if ( selfKill && grenade && GrenadeSuicide ){ if ( selfKill && grenade && GrenadeSuicide ){
set_hudmessage(255, 100, 100, -1.0, 0.15, 1, 6.0, 6.0, 0.5, 0.15, 1) set_hudmessage(255, 100, 100, -1.0, 0.15, 1, 6.0, 6.0, 0.5, 0.15, -1)
show_hudmessage(0,g_SHeMessages[ random_num(0,3) ],victim_name) show_hudmessage(0, "%s", g_SHeMessages[ random_num(0,3) ],victim_name)
} }
if ( selfKill || TK ) if ( selfKill || TK )
@ -516,7 +516,7 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
get_user_astats(victim,killer,stats,body,wpn,31) get_user_astats(victim,killer,stats,body,wpn,31)
get_user_vstats(victim,killer,mstats,mbody) get_user_vstats(victim,killer,mstats,mbody)
set_hudmessage(220,80,0,0.05,0.15,0, statstime, 12.0, 1.0, 2.0, 1) set_hudmessage(220,80,0,0.05,0.15,0, statstime, 12.0, 1.0, 2.0, -1)
getHits(victim,killer) getHits(victim,killer)
show_hudmessage(victim,"%s killed you with %s^nfrom distance of %.2f meters.^nHe did %d damage to you with %d hit(s)^nand still has %dhp and %dap.^nYou did %d damage to him with %d hit(s).^nHe hits you in:^n%s", show_hudmessage(victim,"%s killed you with %s^nfrom distance of %.2f meters.^nHe did %d damage to you with %d hit(s)^nand still has %dhp and %dap.^nYou did %d damage to him with %d hit(s).^nHe hits you in:^n%s",
killer_name,wpn,float(g_Killers[victim][3]) * 0.0254, stats[6],stats[5], killer_name,wpn,float(g_Killers[victim][3]) * 0.0254, stats[6],stats[5],
@ -526,9 +526,9 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
if ( KillerHp ){ if ( KillerHp ){
new kmsg[128] new kmsg[128]
format(kmsg,127,"%s still has %dhp and %d ap",killer_name,g_Killers[victim][1],g_Killers[victim][1]) format(kmsg,127,"%s still has %dhp and %d ap",killer_name,g_Killers[victim][1],g_Killers[victim][1])
client_print(victim,print_console,kmsg) client_print(victim,print_console, "%s", kmsg)
set_hudmessage(255,255,255,0.02,0.9,2, 1.5, 3.0, 0.02, 5.0, 2) set_hudmessage(255,255,255,0.02,0.9,2, 1.5, 3.0, 0.02, 5.0, -1)
show_hudmessage(victim,kmsg) show_hudmessage(victim, "%s", kmsg)
} }
if ( KillingStreak || KillingStreakSound ){ if ( KillingStreak || KillingStreakSound ){
@ -538,11 +538,11 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
if ( (a > -1) && !( a % 2 ) ) { if ( (a > -1) && !( a % 2 ) ) {
if ( (a >>= 1) > 6 ) a = 6 if ( (a >>= 1) > 6 ) a = 6
if ( KillingStreak ){ if ( KillingStreak ){
set_hudmessage(0, 100, 255, 0.05, 0.55, 2, 0.02, 6.0, 0.01, 0.1, 3) set_hudmessage(0, 100, 255, 0.05, 0.55, 2, 0.02, 6.0, 0.01, 0.1, -1)
for (new i=1;i<=get_maxplayers();i++){ for (new i=1;i<=get_maxplayers();i++){
if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() ) if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() )
continue continue
show_hudmessage(i,g_KillingMsg[ a ], killer_name) show_hudmessage(i, "%s", g_KillingMsg[ a ], killer_name)
} }
} }
if ( KillingStreakSound ) client_cmd( 0 , "spk misc/%s" , g_Sounds[ a ] ) if ( KillingStreakSound ) client_cmd( 0 , "spk misc/%s" , g_Sounds[ a ] )
@ -562,23 +562,23 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
if ( xmod_is_melee_wpn(wpnindex) && ( KnifeKill || KnifeKillSound ) ){ if ( xmod_is_melee_wpn(wpnindex) && ( KnifeKill || KnifeKillSound ) ){
if ( KnifeKill ){ if ( KnifeKill ){
set_hudmessage(255, 100, 100, -1.0, 0.15, 1, 6.0, 6.0, 0.5, 0.15, 1) set_hudmessage(255, 100, 100, -1.0, 0.15, 1, 6.0, 6.0, 0.5, 0.15, -1)
for (new i=1;i<=get_maxplayers();i++){ for (new i=1;i<=get_maxplayers();i++){
if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() ) if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() )
continue continue
show_hudmessage(i,g_KnifeMsg[ random_num(0,3) ],killer_name,victim_name) show_hudmessage(i, "%s", g_KnifeMsg[ random_num(0,3) ],killer_name,victim_name)
} }
} }
if ( KnifeKillSound ) client_cmd(0,"spk misc/humiliation") if ( KnifeKillSound ) client_cmd(0,"spk misc/humiliation")
} }
else if ( grenade ){ else if ( grenade ){
if ( GrenadeKill ){ if ( GrenadeKill ){
set_hudmessage(255, 100, 100, -1.0, 0.15, 1, 6.0, 6.0, 0.5, 0.15, 1) set_hudmessage(255, 100, 100, -1.0, 0.15, 1, 6.0, 6.0, 0.5, 0.15, -1)
for (new i=1;i<=get_maxplayers();i++){ for (new i=1;i<=get_maxplayers();i++){
if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() ) if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() )
continue continue
show_hudmessage(i,g_HeMessages[ random_num(0,3)],killer_name,victim_name) show_hudmessage(i, "%s", g_HeMessages[ random_num(0,3)],killer_name,victim_name)
} }
} }
} }
@ -591,11 +591,11 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
replace( message, 127 , "$vn", victim_name ) replace( message, 127 , "$vn", victim_name )
replace( message, 127 , "$wn", weapon ) replace( message, 127 , "$wn", weapon )
replace( message, 127 , "$kn", killer_name ) replace( message, 127 , "$kn", killer_name )
set_hudmessage(100, 100, 255, -1.0, 0.19, 0, 6.0, 6.0, 0.5, 0.15, 1) set_hudmessage(100, 100, 255, -1.0, 0.19, 0, 6.0, 6.0, 0.5, 0.15, -1)
for (new i=1;i<=get_maxplayers();i++){ for (new i=1;i<=get_maxplayers();i++){
if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() ) if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() )
continue continue
show_hudmessage(i,message) show_hudmessage(i,"%s", message)
} }
} }
if ( HeadShotKillSound ) client_cmd(0,"spk misc/headshot") if ( HeadShotKillSound ) client_cmd(0,"spk misc/headshot")
@ -631,11 +631,11 @@ public showDoubleKill(){
num_to_str(g_KillCount,kills,2) num_to_str(g_KillCount,kills,2)
replace( message, 127 , "$kk", kills ) replace( message, 127 , "$kk", kills )
} }
set_hudmessage(65, 102, 158, -1.0, 0.25, 0, 6.0, 6.0, 0.5, 0.15, 3) set_hudmessage(65, 102, 158, -1.0, 0.25, 0, 6.0, 6.0, 0.5, 0.15, -1)
for (new i=1;i<=get_maxplayers();i++){ for (new i=1;i<=get_maxplayers();i++){
if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() ) if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() )
continue continue
show_hudmessage(i,message) show_hudmessage(i, "%s", message)
} }
} }
if ( DoubleKillSound ) { if ( DoubleKillSound ) {
@ -653,12 +653,12 @@ public checkKills(param[]){
if ( MultiKill ) { if ( MultiKill ) {
new name[32] new name[32]
get_user_name(id,name,31) get_user_name(id,name,31)
set_hudmessage(255, 0, 100, 0.05, 0.65, 2, 0.02, 6.0, 0.01, 0.1, 2) set_hudmessage(255, 0, 100, 0.05, 0.65, 2, 0.02, 6.0, 0.01, 0.1, -1)
if ( a > 6 ) a = 6 if ( a > 6 ) a = 6
for (new i=1;i<=get_maxplayers();i++){ for (new i=1;i<=get_maxplayers();i++){
if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() ) if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() )
continue continue
show_hudmessage(i,g_MultiKillMsg[a],name,g_multiKills[id][0],g_multiKills[id][1]) show_hudmessage(i, "%s", g_MultiKillMsg[a],name,g_multiKills[id][0],g_multiKills[id][1])
} }
} }
if ( MultiKillSound ) client_cmd(0,"spk misc/%s",g_Sounds[a]) if ( MultiKillSound ) client_cmd(0,"spk misc/%s",g_Sounds[a])

52
plugins/ts/stats.sma
View File

@ -134,7 +134,7 @@ public plugin_cfg(){
public cmdFF(id){ public cmdFF(id){
if ( !SayFF ){ if ( !SayFF ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
client_print( 0, print_chat, "Friendly fire: %s", ( get_cvar_num( "mp_friendlyfire" ) ) ? "ON" : "OFF" ) client_print( 0, print_chat, "Friendly fire: %s", ( get_cvar_num( "mp_friendlyfire" ) ) ? "ON" : "OFF" )
@ -143,7 +143,7 @@ public cmdFF(id){
public cmdStatsMe(id){ public cmdStatsMe(id){
if ( !SayStatsMe ){ if ( !SayStatsMe ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
displayStats(id,id) displayStats(id,id)
@ -171,7 +171,7 @@ public displayStats(id,dest) {
public cmdRank(id){ public cmdRank(id){
if ( !SayRank ){ if ( !SayRank ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
displayRank(id,id) displayRank(id,id)
@ -193,7 +193,7 @@ displayRank(id,dest) {
public cmdTop15(id) { public cmdTop15(id) {
if ( !SayTop15 ){ if ( !SayTop15 ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
getTop15() getTop15()
@ -234,7 +234,7 @@ public eInterMission()
public cmdStats(id){ public cmdStats(id){
if ( !SayStatsAll ){ if ( !SayStatsAll ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
showStatsMenu(id,g_userPosition[id]=0) showStatsMenu(id,g_userPosition[id]=0)
@ -317,9 +317,9 @@ public client_damage(attacker,victim,damage,wpnindex,hitplace,TA) {
} }
if ( BulletDamage ) { if ( BulletDamage ) {
if ( attacker==victim ) return PLUGIN_CONTINUE if ( attacker==victim ) return PLUGIN_CONTINUE
set_hudmessage(0, 100, 200, 0.45, 0.85, 2, 0.1, 4.0, 0.02, 0.02, 3) set_hudmessage(0, 100, 200, 0.45, 0.85, 2, 0.1, 4.0, 0.02, 0.02, -1)
show_hudmessage(attacker, "%i", damage) show_hudmessage(attacker, "%i", damage)
set_hudmessage(200, 0, 0, 0.55, 0.85, 2, 0.1, 4.0, 0.02, 0.02, 4) set_hudmessage(200, 0, 0, 0.55, 0.85, 2, 0.1, 4.0, 0.02, 0.02, -1)
show_hudmessage(victim, "%i", damage) show_hudmessage(victim, "%i", damage)
} }
return PLUGIN_CONTINUE return PLUGIN_CONTINUE
@ -345,8 +345,8 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
if ( killer == victim ){ if ( killer == victim ){
if ( grenade && GrenadeSuicide ){ if ( grenade && GrenadeSuicide ){
set_hudmessage(255, 100, 100, -1.0, 0.25, 1, 6.0, 6.0, 0.5, 0.15, 1) set_hudmessage(255, 100, 100, -1.0, 0.25, 1, 6.0, 6.0, 0.5, 0.15, -1)
show_hudmessage(0,g_SHeMessages[ random_num(0,3) ],victim_name) show_hudmessage(0, "%s", g_SHeMessages[ random_num(0,3) ],victim_name)
} }
return PLUGIN_CONTINUE return PLUGIN_CONTINUE
} }
@ -366,11 +366,11 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
} }
if ( grenade && GrenadeKill ){ if ( grenade && GrenadeKill ){
set_hudmessage(255, 100, 100, -1.0, 0.25, 1, 6.0, 6.0, 0.5, 0.15, 1) set_hudmessage(255, 100, 100, -1.0, 0.25, 1, 6.0, 6.0, 0.5, 0.15, -1)
for (new i=1;i<=get_maxplayers();i++){ for (new i=1;i<=get_maxplayers();i++){
if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() ) if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() )
continue continue
show_hudmessage(i,g_HeMessages[ random_num(0,3)],killer_name,victim_name) show_hudmessage(i, "%s", g_HeMessages[ random_num(0,3)],killer_name,victim_name)
} }
} }
else if ( headshot && (HeadShotKill || HeadShotKillSound) && !xmod_is_melee_wpn(wpnindex) ){ else if ( headshot && (HeadShotKill || HeadShotKillSound) && !xmod_is_melee_wpn(wpnindex) ){
@ -381,11 +381,11 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
replace( message, 127 , "$vn", victim_name ) replace( message, 127 , "$vn", victim_name )
replace( message, 127 , "$wn", weapon ) replace( message, 127 , "$wn", weapon )
replace( message, 127 , "$kn", killer_name ) replace( message, 127 , "$kn", killer_name )
set_hudmessage(100, 100, 255, -1.0, 0.29, 0, 6.0, 6.0, 0.5, 0.15, 1) set_hudmessage(100, 100, 255, -1.0, 0.29, 0, 6.0, 6.0, 0.5, 0.15, -1)
for (new i=1;i<=get_maxplayers();i++){ for (new i=1;i<=get_maxplayers();i++){
if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() ) if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() )
continue continue
show_hudmessage(i,message) show_hudmessage(i, "%s", message)
} }
} }
if ( HeadShotKillSound ) client_cmd(0,"spk misc/headshot") if ( HeadShotKillSound ) client_cmd(0,"spk misc/headshot")
@ -393,7 +393,7 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
if ( killFlags & TSKF_DOUBLEKILL ){ if ( killFlags & TSKF_DOUBLEKILL ){
if ( DoubleKill ){ if ( DoubleKill ){
set_hudmessage(65, 102, 158, -1.0, 0.35, 0, 6.0, 6.0, 0.5, 0.15, 3) set_hudmessage(65, 102, 158, -1.0, 0.35, 0, 6.0, 6.0, 0.5, 0.15, -1)
for (new i=1;i<=get_maxplayers();i++){ for (new i=1;i<=get_maxplayers();i++){
if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() ) if ( g_Killers[i][0] && g_DeathStats[i] > get_gametime() )
continue continue
@ -427,8 +427,8 @@ public client_death(killer,victim,wpnindex,hitplace,TK){
pos += format(kmsg[pos],128-pos,"]") pos += format(kmsg[pos],128-pos,"]")
} }
set_hudmessage(255,255,255,0.02,0.85,2, 1.5, 3.0, 0.02, 5.0, 4) set_hudmessage(255,255,255,0.02,0.85,2, 1.5, 3.0, 0.02, 5.0, -1)
show_hudmessage(killer,kmsg) show_hudmessage(killer, "%s", kmsg)
} }
return PLUGIN_CONTINUE return PLUGIN_CONTINUE
@ -440,7 +440,7 @@ DisplayKillInfo(victim){
get_user_name(g_Killers[victim][0],name,31) get_user_name(g_Killers[victim][0],name,31)
get_user_astats(victim,g_Killers[victim][0],stats,body,wpn,31) get_user_astats(victim,g_Killers[victim][0],stats,body,wpn,31)
get_user_vstats(victim,g_Killers[victim][0],mstats,mbody) get_user_vstats(victim,g_Killers[victim][0],mstats,mbody)
set_hudmessage(220,80,0,0.05,0.15,0, 6.0, 12.0, 1.0, 2.0, 1) set_hudmessage(220,80,0,0.05,0.15,0, 6.0, 12.0, 1.0, 2.0, -1)
getHits(victim,g_Killers[victim][0]) getHits(victim,g_Killers[victim][0])
show_hudmessage(victim,"%s killed you with %s^nfrom distance of %.2f meters.^nHe did %d damage to you with %d hit(s)^nand still has %dhp.^nYou did %d damage to him with %d hit(s).^nHe hits you in:^n%s", show_hudmessage(victim,"%s killed you with %s^nfrom distance of %.2f meters.^nHe did %d damage to you with %d hit(s)^nand still has %dhp.^nYou did %d damage to him with %d hit(s).^nHe hits you in:^n%s",
name,wpn,float(g_Killers[victim][2]) * 0.0254, stats[6],stats[5], name,wpn,float(g_Killers[victim][2]) * 0.0254, stats[6],stats[5],
@ -450,12 +450,12 @@ DisplayKillInfo(victim){
DisplayAVList(victim){ DisplayAVList(victim){
if ( ShowVictims && getVictims(victim) ){ if ( ShowVictims && getVictims(victim) ){
set_hudmessage(0,80,220,0.55,0.60,0, 6.0, 12.0, 1.0, 2.0, 4) set_hudmessage(0,80,220,0.55,0.60,0, 6.0, 12.0, 1.0, 2.0, -1)
show_hudmessage(victim,g_Buffer) show_hudmessage(victim, "%s", g_Buffer)
} }
if ( ShowAttackers && getAttackers(victim)){ if ( ShowAttackers && getAttackers(victim)){
set_hudmessage(220,80,0,0.55,0.35,0, 6.0, 12.0, 1.0, 2.0, 3) set_hudmessage(220,80,0,0.55,0.35,0, 6.0, 12.0, 1.0, 2.0, -1)
show_hudmessage(victim,g_Buffer) show_hudmessage(victim, "%s", g_Buffer)
} }
} }
@ -464,9 +464,9 @@ DisplayKillerHp(victim,con){
new name[32], kmsg[128] new name[32], kmsg[128]
get_user_name(g_Killers[victim][0],name,31) get_user_name(g_Killers[victim][0],name,31)
format(kmsg,127,"%s still has %dhp",name,g_Killers[victim][1]) format(kmsg,127,"%s still has %dhp",name,g_Killers[victim][1])
if ( con ) client_print(victim,print_console,kmsg) if ( con ) client_print(victim,print_console, "%s", kmsg)
set_hudmessage(255,255,255,0.02,0.9,2, 1.5, 3.0, 0.02, 5.0, 2) set_hudmessage(255,255,255,0.02,0.9,2, 1.5, 3.0, 0.02, 5.0, -1)
show_hudmessage(victim,kmsg) show_hudmessage(victim, "%s", kmsg)
} }
} }
@ -485,7 +485,7 @@ public eResetHud( id ){
public cmdKiller(id) { public cmdKiller(id) {
if ( !SayHP ){ if ( !SayHP ){
client_print(id,print_chat, g_disabledMsg ) client_print(id,print_chat, "%s", g_disabledMsg )
return PLUGIN_HANDLED return PLUGIN_HANDLED
} }
if (g_Killers[id][0]) { if (g_Killers[id][0]) {
@ -497,7 +497,7 @@ public cmdKiller(id) {
client_print(id,print_chat,"He did %d damage to you with %d hit(s) and still had %dhp", client_print(id,print_chat,"He did %d damage to you with %d hit(s) and still had %dhp",
stats[6],stats[5], g_Killers[id][1] ) stats[6],stats[5], g_Killers[id][1] )
client_print(id,print_chat,"You did %d damage to him with %d hit(s)",mstats[6], mstats[5] ) client_print(id,print_chat,"You did %d damage to him with %d hit(s)",mstats[6], mstats[5] )
if (getMyHits(id,g_Killers[id][0])) client_print(id,print_chat,g_Buffer) if (getMyHits(id,g_Killers[id][0])) client_print(id,print_chat, "%s", g_Buffer)
} }
else { else {
client_print(id,print_chat,"You have no killer...") client_print(id,print_chat,"You have no killer...")