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

Merge remote-tracking branch 'origin/itminf' into itminf

Browse Source
This commit is contained in:
lopar
2019-01-18 21:56:35 +02:00
parent b8a9a0622b 76bd11d0f4
commit 645c6cb600
3 changed files with 49 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions.php
+2 -37
View File
@@ -1676,11 +1676,11 @@ function showitem($row, $type = null, $returned = false, $infOnly = false)
if ($type != 10) {
$returnHTML .= '<br />ID: ' . $row['id'] . '<br />';
if ($row["koll"] > 1) $returnHTML .= "<a title=\"Разделить\" onclick=\"splitstack('$row[name]','main.php?edit=1&unstack=$row[id]', '$row[img]', 1);return false;\" href=\"javascript:void(0)\"><img border=\"0\" src=\"i/unstack.gif\"></a>&nbsp;";
$returnHTML .= "<img src=i/clear.gif style=\"cursor:hand;\" onclick=\"delItmsNo('Выкинуть предмет?','deleteItems',0,'','" . $row['img'] . "','" . $row['name'] . "','main.php?edit=1&destruct=" . $row['id'] . "');\"></TD><td>";
$returnHTML .= "<img src=i/clear.gif style=\"cursor:hand;\" onclick=\"delItmsNo('Выкинуть предмет?','deleteItems',0,'','" . $row['img'] . "','" . $row['name'] . "','main.php?edit=1&destruct=" . $row['id'] . ")>";
}
}
$returnHTML .= "<td style='vertical-align: top;'>";
$returnHTML .= "<td 'style=vertical-align: top;'>";
// Первая строчка
$returnHTML .= $row['name'];
@@ -1941,15 +1941,6 @@ function dropitemid($slot, $id)
case 23:
$slot1 = 'plaw';
break;
case 24:
$slot1 = 'rune_1';
break;
case 25:
$slot1 = 'rune_2';
break;
case 26:
$slot1 = 'rune_3';
break;
default:
$slot1 = '';
break;
@@ -2039,15 +2030,6 @@ function dropitem($slot)
case 23:
$slot1 = 'plaw';
break;
case 24:
$slot1 = 'rune_1';
break;
case 25:
$slot1 = 'rune_2';
break;
case 26:
$slot1 = 'rune_3';
break;
default:
$slot1 = '';
break;
@@ -2265,15 +2247,6 @@ function destructitem($id)
case 23:
$slot1 = 'plaw';
break;
case 24:
$slot1 = 'rune_1';
break;
case 25:
$slot1 = 'rune_2';
break;
case 26:
$slot1 = 'rune_3';
break;
}
if ($dress['type'] == 5) {
if ($user['r1'] == $dress['id']) {
@@ -2283,14 +2256,6 @@ function destructitem($id)
} elseif ($user['r3'] == $dress['id']) {
$slot1 = 'r3';
}
} elseif ($dress['type'] == 24) {
if ($user['rune_1'] == $dress['id']) {
$slot1 = 'rune_1';
} elseif ($user['rune_2'] == $dress['id']) {
$slot1 = 'rune_2';
} elseif ($user['rune_3'] == $dress['id']) {
$slot1 = 'rune_3';
}
} elseif ($dress['type'] == 12) {
if ($user['m1'] == $dress['id']) {
$slot1 = 'm1';