Куча мелких фиксов, уборка мусора.

cave.php

@@ -7,16 +7,6 @@ if (empty($_SESSION['uid'])) {
 require_once 'functions.php';
 //require_once 'cave/cave_bots.php';
 
-class Cave
-{
-    use CaveBots, CaveItems;
-    public static function cancarry($m, $user)
-    {
-
-    }
-}
-
-
 function cancarry($m, $u)
 {
     global $user;
@@ -297,7 +287,7 @@ function takeusage($x, $y)
 function makedeath()
 {
     global $user, $floor, $loses, $x, $y, $dir;
-    include("cavedata.php");
+    $cavedata = Config::$cavedata ?? [];
     if (!isset($cavedata[$user['room']]['x' . $floor])) {
         $floor = 1;
         loadmap();
@@ -753,7 +743,7 @@ if ($ambushes[$y * 2][$x * 2 - 2] && $map[$y * 2][$x * 2 - 1] == 0) {
 }
 
 if ($ax && $ay && $user['hp'] > 0) {
-    include_once("cavedata.php");
+    $cavedata = Config::$cavedata ?? [];
     if (!($cavedata[$user['room']]['x' . $floor] == $x && $cavedata[$user['room']]['y' . $floor] == $y)) {
         if ($ax < $x) {
             $dir1 = 0;