Зачем-то инкапсуляция...
This commit is contained in:
+12
-12
@@ -17,7 +17,7 @@ if (empty($_SESSION['uid'])) {
|
||||
$user = new User($_SESSION['uid']);
|
||||
}
|
||||
|
||||
if ($user->id && $user->block) {
|
||||
if ($user->getId() && $user->block) {
|
||||
exit('user blocked!');
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ function takeshopitem($item, $table = "shop", $present = '', $onlyonetrip = '',
|
||||
$flds = [];
|
||||
$goden = '';
|
||||
if (!$uid) {
|
||||
$uid = $user->id;
|
||||
$uid = $user->getId();
|
||||
}
|
||||
|
||||
$r = db::c()->query('SHOW FIELDS FROM ?f', $table);
|
||||
@@ -300,7 +300,7 @@ function echoscroll($slot)
|
||||
$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 || empty($need_charge['needcharge']))) {
|
||||
if (($user->$slot > 0) && ($all_magic[$user->getId()] < 1 || empty($need_charge['needcharge']))) {
|
||||
$row['id'] = $user->$slot;
|
||||
if ($dress['magic']) {
|
||||
$magic = db::c()->query('SELECT targeted FROM `magic` WHERE `id` = ?i', $dress['magic'])->fetch_assoc();
|
||||
@@ -318,7 +318,7 @@ function echoscroll($slot)
|
||||
echo <<<ACTIVE_SCROLL
|
||||
<img class='tooltip' src="i/sh/{$dress['img']}" width='40' title="<b>{$dress['name']}</b><br> Прочность {$dress['duration']} / {$dress['maxdur']} " height='25' alt="Свиток"></a>
|
||||
ACTIVE_SCROLL;
|
||||
} elseif (($user->$slot > 0) && ($all_magic[$user->id] >= 1) && $need_charge['needcharge'] > 0) {
|
||||
} elseif (($user->$slot > 0) && ($all_magic[$user->getId()] >= 1) && $need_charge['needcharge'] > 0) {
|
||||
echo <<<INACTIVE_SCROLL
|
||||
<img src="i/sh/magicclock.gif" width="40" height="25" title='Произведите размен ударами и магия снова станет доступна' alt="Свиток">
|
||||
INACTIVE_SCROLL;
|
||||
@@ -650,11 +650,11 @@ function dropitem($slot)
|
||||
`u`.`fauvorot` = `u`.`fauvorot` - `i`.`mfauvorot`,
|
||||
`u`.`uminu` = `u`.`uminu` - `i`.`minu`,
|
||||
`u`.`umaxu` = `u`.`umaxu` - `i`.`maxu`
|
||||
WHERE `i`.`id` = `u`.?f AND `i`.`dressed` = 1 AND `i`.`owner` = ?i AND u.id = ?i', $slot1, $slot1, $user->id, $user->id)) {
|
||||
db::c()->query('UPDATE `users` SET `hp` = `maxhp`, `fullhptime` = ?i WHERE `hp` > `maxhp` AND `id` = ?i', time(), $user->id);
|
||||
WHERE `i`.`id` = `u`.?f AND `i`.`dressed` = 1 AND `i`.`owner` = ?i AND u.id = ?i', $slot1, $slot1, $user->getId(), $user->getId())) {
|
||||
db::c()->query('UPDATE `users` SET `hp` = `maxhp`, `fullhptime` = ?i WHERE `hp` > `maxhp` AND `id` = ?i', time(), $user->getId());
|
||||
}
|
||||
|
||||
$wear_raw = db::c()->query('SELECT * FROM `inventory` where `owner` = ?i AND `dressed` = 1', $user->id);
|
||||
$wear_raw = db::c()->query('SELECT * FROM `inventory` where `owner` = ?i AND `dressed` = 1', $user->getId());
|
||||
while ($wear_list = $wear_raw->fetch_assoc()) {
|
||||
$wear_arr[] = $wear_list['prototype'];
|
||||
}
|
||||
@@ -714,7 +714,7 @@ function dropitem($slot)
|
||||
`u`.`mlight = `u`.`mlight - `s`.`glight`,
|
||||
`u`.`mgray = `u`.`mgray - `s`.`ggray`
|
||||
WHERE
|
||||
`u`.`id` = ?i AND `s`.`set_id`= ?i', $user->id, $set_id);
|
||||
`u`.`id` = ?i AND `s`.`set_id`= ?i', $user->getId(), $set_id);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
@@ -781,7 +781,7 @@ function ref_drop()
|
||||
function destructitem($id)
|
||||
{
|
||||
global $user;
|
||||
$item = db::c()->query('SELECT 1 FROM inventory WHERE owner_id = ?i AND item_id = ?i', $user->id, $id);
|
||||
$item = db::c()->query('SELECT 1 FROM inventory WHERE owner_id = ?i AND item_id = ?i', $user->getId(), $id);
|
||||
if ($item->getNumRows()) {
|
||||
db::c()->query('DELETE FROM `inventory` WHERE `id` = ?i', $id);
|
||||
}
|
||||
@@ -791,7 +791,7 @@ function destructitem($id)
|
||||
function usemagic($id, $target)
|
||||
{
|
||||
global $user;
|
||||
$row = db::c()->query('SELECT * FROM `inventory` WHERE `owner` = ?i AND id = ?i', $user->id, $id)->fetch_assoc_array();
|
||||
$row = db::c()->query('SELECT * FROM `inventory` WHERE `owner` = ?i AND id = ?i', $user->getId(), $id)->fetch_assoc_array();
|
||||
$bat = db::c()->query('SELECT * FROM `battle` WHERE `id` = ?i', $user->battle)->fetch_assoc_array();
|
||||
$all_magic = unserialize($bat['magic']);
|
||||
$charge = 0;
|
||||
@@ -806,7 +806,7 @@ function usemagic($id, $target)
|
||||
$charge = $incmagic['needcharge'];
|
||||
}
|
||||
//Переделать под новую базу
|
||||
if (($all_magic[$user->id] < 1 || $charge == 0) &&
|
||||
if (($all_magic[$user->getId()] < 1 || $charge == 0) &&
|
||||
($user['sila'] >= $row['nsila'] &&
|
||||
$user['lovk'] >= $row['nlovk'] &&
|
||||
$user['inta'] >= $row['ninta'] &&
|
||||
@@ -867,7 +867,7 @@ function usemagic($id, $target)
|
||||
} else {
|
||||
$all_magic = unserialize($bat['magic']);
|
||||
}
|
||||
$all_magic[$user->id] += $charge;
|
||||
$all_magic[$user->getId()] += $charge;
|
||||
db::c()->query('UPDATE `battle` SET `magic`= "?s" WHERE id = ?i', serialize($all_magic), $user->battle);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user