Function nick5() merged with nick class.

This commit is contained in:
lopar
2018-11-05 22:15:13 +02:00
parent 7514cd121a
commit 073d56fc6b
124 changed files with 232 additions and 245 deletions
+2 -2
View File
@@ -54,7 +54,7 @@ if ($user['battle'] == 0) {
case 'e':$sel='mearth';break;
};
$sex_action="применил";if($user['sex']==0) $sex_action.="а";
addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick5($user['id'],$us_team).' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
addlog($user['battle'],'<span class=date>'.date("H:i").'</span> '.nick::id($user['id'])->short().' '.$sex_action.$targeted.' заклинание '.$log_text.'<BR>');
//mass magic
mysql_query ("UPDATE `users` SET `mana` = `mana`-'".$needmana."' WHERE `id` = '".$user['id']."';");
@@ -90,7 +90,7 @@ if ($user['battle'] == 0) {
//сработало
if($dmg>0) $hit=1; else $hit=0;
$action=preg_replace("/Х/",nick5($target,$tar_team),magic_log($elem,$hit,$target));
$action=preg_replace("/Х/",nick::id($target)->short(),magic_log($elem,$hit,$target));
if(!(($us['id']>0 && $us['hp']<1) || ($bot['id']>0 && $bot['hp']<1)))
if($dmg>0)
{