diff --git a/city.php b/city.php index b9c5787..e9de19a 100644 --- a/city.php +++ b/city.php @@ -30,28 +30,28 @@ switch ($location[0]) { default: break; case 'cp': - Travel::toRoom(20); + Travel::toRoom(20,$user->room); break; case 'strah': - Travel::toRoom(21); + Travel::toRoom(21,$user->room); break; case 'bps': - Travel::toRoom(26); + Travel::toRoom(26,$user->room); break; case 'ps': - Travel::toRoom(51); + Travel::toRoom(51,$user->room); break; case 'zaliv': - Travel::toRoom(2111); + Travel::toRoom(2111,$user->room); break; case 'zamk': - Travel::toRoom(2601); + Travel::toRoom(2601,$user->room); break; case 'abog': - Travel::toRoom(2655); + Travel::toRoom(2655,$user->room); break; case 'torg': - Travel::toRoom(2702); + Travel::toRoom(2702,$user->room); break; case 'got': if ($user->room == 20) { diff --git a/classes/Travel.php b/classes/Travel.php index f24ea7b..392225d 100644 --- a/classes/Travel.php +++ b/classes/Travel.php @@ -45,7 +45,7 @@ class Travel * @param int $roomIdCurrent ID откуда идём. * @throws \Krugozor\Database\Mysql\Exception */ - public static function toRoom(int $roomId, int $roomIdCurrent = 0): void + public static function toRoom(int $roomId, int $roomIdCurrent): void { $itemsWeight = db::c()->query('SELECT SUM(weight) AS all_weight FROM `inventory` WHERE owner_id = ?i AND on_sale = 0', $_SESSION['uid'])->fetch_assoc(); $eff = db::c()->query('SELECT type FROM users_effects WHERE owner_id = ?i AND (`type` = 10 OR `type` = 13 OR `type` = 14)', $_SESSION['uid'])->fetch_assoc(); @@ -90,7 +90,7 @@ class Travel * 17 Room 50 ashop.php * 222 Room 2702 [STREET] */ - $room[20] = [20, 401, 660, 777, 2601]; + $room[20] = [21, 401, 660, 777, 2601]; /* * 3 Room 2111 [STREET] * 4 Room 20 [STREET] @@ -118,8 +118,6 @@ class Travel $room[2111] = [21, 620, 666, 1055]; $room[2701] = [402, 2111]; $room[2702] = [20, 61]; - // Улицы - $room[0] = [20, 21, 26, 51, 2111, 2601, 2655, 2702]; if ($room[$roomId] === null) { return []; }