X-Git-Url: https://disinclined.org/git/?a=blobdiff_plain;f=mud.php;h=7dae85396233e767a707cc6fced429134d2862cc;hb=015246c8a445dfad325cb9df846885d34d6284ff;hp=74607f3305e911b321805f7a37faf9e0efc426b1;hpb=61350d3c8d37c34cd66384e7170831a354a0ae0f;p=mudd.git

diff --git a/mud.php b/mud.php
index 74607f3..7dae853 100644
--- a/mud.php
+++ b/mud.php
@@ -49,6 +49,14 @@ abstract class model {
         return $this->db->insert_id;
     }
 
+    public function update() {
+        $args = func_get_args();
+        $statement = $this->db->prepare(array_shift($args));
+        call_user_func_array(array($statement, 'bind_param'), &$args);
+        $statement->execute();
+        return $this->db->insert_id;
+    }
+
 }
 
 class universe {
@@ -57,7 +65,7 @@ class universe {
     public $rooms = array();
 
     public function __construct($db) {
-        $rooms = $db->query("SELECT id,x,y,state FROM rooms");
+        $rooms = $db->query('SELECT id,x,y,state FROM rooms');
         if ($rooms) {
             foreach ($rooms as $room) {
                 $this->rooms[$room['x']][$room['y']] =
@@ -126,22 +134,16 @@ class mud extends model {
     }
 
     private function join() {
-        $x = 0;
-        $y = 0;
-        if (isset($_SESSION['id'])) {
-            $x = $this->player->x;
-            $y = $this->player->y;
-            $id = $this->player->id;
-        } else {
-            do {
-                $x = rand(0, count($this->universe->rooms)-1);
-                $y = rand(0, count($this->universe->rooms[0])-1);
-            } while ($this->universe->rooms[$x][$y]['state']);
-            $id = $this->insert('INSERT INTO players (name,room) VALUES(?,?)',
-                                'si', 'majuscule', $this->universe->rooms[$x][$y]['id']);
-            $_SESSION['id'] = $id;
-        }
-        return array('x' => $x, 'y' => $y, 'id' => $id);
+        $x = $y = 0;
+        do {
+            $x = rand(0, count($this->universe->rooms)-1);
+            $y = rand(0, count($this->universe->rooms[0])-1);
+        } while ($this->universe->rooms[$x][$y]['state']);
+        $id = $this->insert('INSERT INTO players (name,room) VALUES(?,?)',
+                            'si', $_GET['name'], $this->universe->rooms[$x][$y]['id']);
+        $_SESSION['id'] = $id;
+        //$others = $this->query('SELECT id, room FROM players WHERE id != ?', 'i', $this->player->id);
+        return array('x' => $x, 'y' => $y, 'id' => $id, 'name' => $name, 'poll' => $this->poll());
     }
 
     private function yell($msg) {
@@ -150,13 +152,6 @@ class mud extends model {
             'ssii', $msg, 'yell', $this->player->room, $this->player->id);
     }
 
-//    private function tell($msg) {
-//        // lookup dest
-//        $this->insert(
-//            'INSERT INTO messages (message,type,room,source) VALUES(?,?,?,?)',
-//            'ssii', $msg, 'tell', $this->player->room, $this->player->id);
-//    }
-
     private function say($msg) {
         $this->insert(
             'INSERT INTO messages (message,type,room,source) VALUES(?,?,?,?)',
@@ -164,7 +159,6 @@ class mud extends model {
     }
 
     private function move() {
-        // ahhhhhhhhhhhhhhhhhhhh
     }
 
     private function poll() {
@@ -179,8 +173,12 @@ class mud extends model {
                 . ' OR (type = "tell" AND destination = ?)'
                 . ' OR (type = "say" AND messages.room = ?))',
             'iii', $time, $this->player->id, $this->player->room);
+        $players = $this->query(
+            'SELECT players.id, name, x ,y '
+            . 'FROM players JOIN rooms '
+            . 'ON players.room = rooms.id');
         $_SESSION['last_polled'] = time();
-        return $messages;
+        return array('messages' => $messages, 'players' => $players);
     }
 
     public function response($content) {
@@ -197,7 +195,6 @@ class mud extends model {
         switch ($cmd) {
             case 'start':
                 $this->response($this->universe->serialize());
-//                $this->response($this->universe->serialize($_GET['restart']));
                 break;
             case 'join':
                 $this->response($this->join());
@@ -220,10 +217,6 @@ class mud extends model {
             case 'poll':
                 echo json_encode($this->poll());
                 break;
-//            case 'respawn':
-//                session_destroy()
-//                session_start()
-//                $this->response($this->join());
             default:
                 $this->error(400, 'Unknown command');
         }