diff --git a/city.php b/city.php index 4456bf2..b202416 100644 --- a/city.php +++ b/city.php @@ -30,6 +30,7 @@ if ($user['zayavka'] != 0) { */ function can_i_move() { + global $user; $d = db::c()->query('SELECT SUM(`massa`) AS `mass` FROM `inventory` WHERE `owner` = ?i AND `setsale` = 0', $user['id'])->fetch_assoc(); $eff = db::c()->query('SELECT `type` FROM `effects` WHERE `owner` = ?i AND (`type` = 10 OR `type` = 13 OR `type` = 14)', $user['id'])->fetch_assoc(); if ($d['mass'] > get_meshok()) { @@ -401,9 +402,9 @@ $online = db::c()->query('SELECT 1 FROM `online` WHERE `real_time` >= ?i', (time buildset(222, "cap_arr_top", 180, 650, "Торговая улица", 1); buildset(8, "cap_arr_left", 258, 21, "Большая парковая улица",1); buildset(17, "cap_berezka", 205, 435, "Березка"); - buildset(11, "cap_loto", 230, 615, "Лотерея Сталкера"); - buildset(9, "cap_tree2", 260, 530, "Новогодняя елка"); - buildset(14, "cap_sneg_3", 210, 390, "Снеговик"); + buildset(11, "cap_loto", 230, 615, "Лотерея"); + //buildset(9, "cap_tree2", 260, 530, "Новогодняя елка"); + //buildset(14, "cap_sneg_3", 210, 390, "Снеговик"); echo ""; } elseif ($user['room'] == 21) { bgset('cap_strash'); diff --git a/functions.php b/functions.php index 66af9a1..f1c133d 100644 --- a/functions.php +++ b/functions.php @@ -5177,8 +5177,8 @@ function tele_check($to, $text) function get_meshok() { global $user; - $d = db::c()->query('SELECT SUM(`gmeshok`) FROM `inventory` WHERE `owner` = ?i AND `setsale` = 0 AND `gmeshok` > 0', $user['id'])->fetch_assoc(); - return ($user['sila'] * 4 + $d[0]); + $d = db::c()->query('SELECT SUM(`gmeshok`) AS `ves` FROM `inventory` WHERE `owner` = ?i AND `setsale` = 0 AND `gmeshok` > 0', $user['id'])->fetch_assoc(); + return ($user['sila'] * 4 + $d['ves']); } function get_meshok_to($to) diff --git a/i/city/sub/arr_left_png.png b/i/city/sub/arr_left_png.png deleted file mode 100644 index 4d26818..0000000 Binary files a/i/city/sub/arr_left_png.png and /dev/null differ diff --git a/i/city/sub/arr_right_png.png b/i/city/sub/arr_right_png.png deleted file mode 100644 index a7b1f6b..0000000 Binary files a/i/city/sub/arr_right_png.png and /dev/null differ