lopar/battles
lopar/battles
0
0
Fork 0
Code Issues 21 Pull Requests Releases Wiki Activity

code clean

Browse Source
This commit is contained in:
lopar 2018-03-09 00:14:29 +02:00
parent 99b306e12b
commit b115f4823b
2 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
functions.php
View File

@ -1650,10 +1650,10 @@ function echoscroll($slot)
$script = 'main';
}
if ($user['battle'] > 0) $bat = mysql_fetch_array(mysql_query("SELECT `id`, `magic` FROM `battle` WHERE `id` = '{$user['battle']}' LIMIT 1"));
if ($user['battle'] > 0) $bat = db::c()->query('SELECT `id`, `magic` FROM `battle` WHERE `id` = ?i', $user['battle'])->fetch_assoc();
$all_magic = unserialize($bat['magic']);
$dress = mysql_fetch_array(mysql_query("SELECT `id`, `magic`, `name`, `img`, `duration`, `maxdur` FROM `inventory` WHERE `id` = '{$user[$slot]}' LIMIT 1"));
$need_charge = mysql_fetch_array(mysql_query("SELECT `needcharge` FROM `magic` WHERE `id` = '{$dress['magic']}' LIMIT 1"));
$dress = db::c()->query('SELECT `id`, `magic`, `name`, `img`, `duration`, `maxdur` FROM `inventory` WHERE `id` = ?i', $user[$slot])->fetch_assoc();
$need_charge = db::c()->query('SELECT `needcharge` FROM `magic` WHERE `id` = ?i', $dress['magic'])->fetch_assoc();
if (($user[$slot] > 0) && ($all_magic[$user['id']] < 1 || $need_charge['needcharge'] == 0)) {
$row['id'] = $user[$slot];
if ($dress['magic']) {
@ -2561,12 +2561,13 @@ function showpersout($pas = 0)
<TBODY>
<?
if (!$pas) {
if ($trt) {
echo "<TR><TD><IMG height=25 src=\"i/travma.gif\" width=40></TD><TD><SMALL>У персонажа $trt травма.</SMALL></TD></TR>";
}
$dd = mysql_query("SELECT * FROM `effects` WHERE `owner` = " . $user['id'] . ";");
// FIXME Научиться отображать травмы
// if ($trt) {
// echo "<TR><TD><IMG height=25 src=\"i/travma.gif\" width=40></TD><TD><SMALL>У персонажа $trt травма.</SMALL></TD></TR>";
// }
$dd = db::c()->query('SELECT `time`, `type` FROM `effects` WHERE `owner` = ?i', $user['id']);
$param_bonus = [];
while ($row = mysql_fetch_array($dd)) {
while ($row = $dd->fetch_assoc()) {
if ($row['time'] < time()) {
$row['time'] = time();
}

32
main.php
View File

@ -2645,32 +2645,12 @@ if ($user['room'] == 666) {
?>
<HTML>
<HEAD>
</SCRIPT>
<link rel=stylesheet type = "text/css" href = "i/main.css" >
<link rel = "stylesheet" href = "newstyle18.css">
< link
rel = "stylesheet"
href = "/i/btn.css"
type = "text/css" >
< meta
content = "text/html; charset=utf-8"
http - equiv = Content - type >
< META
Http - Equiv = Cache - Control
Content = "no-cache, max-age=0, must-revalidate, no-store" >
< meta
http - equiv = PRAGMA
content = NO - CACHE >
< META
Http - Equiv = Expires
Content = 0 >
< link
rel = "stylesheet"
type = "text/css"
href = "css/tooltip.css" / >
< script
src = "js/jquery-1.7.2.min.js" ></script>
<link rel="stylesheet" href="css/main.css">
<link rel="stylesheet" href="css/newstyle18.css">
<link rel="stylesheet" href="css/btn.css">
<meta charset="utf-8">
<link rel="stylesheet" href="css/tooltip.css">
<script src = "js/jquery-1.7.2.min.js" ></script>
<script src="js/tooltip.js"></script>
<script>
$(function () {