Two days one door ...

[uxul-world.git] / game.lisp

diff --git a/game.lisp b/game.lisp
index 49e4e96..5b98d6a 100755 (executable)
--- a/game.lisp
+++ b/game.lisp
@@ -4,7 +4,16 @@
 
 (defparameter *cfont* nil)
 
-(defun start-game (&key (music nil) room-function (15-fps nil))
+(defun run-testing-room ()
+  (start-game :room-function #'make-testing-room))
+
+(defun run-room (item-list)
+  (start-game :room-function
+             #'(lambda () (create-room-from-item-list item-list))))
+
+(defun start-game (&key (music nil)
+                  (room-function #'make-additional-testing-room)
+                  (15-fps nil))
   "Start the Game: Call room-function for getting the room-object to
 run. Music is ignored so far. 15-fps makes only every second frame be
 drawn (for very slow computers)"
@@ -16,12 +25,7 @@ drawn (for very slow computers)"
                   ;:flags (logior sdl:sdl-hw-surface) #| sdl:sdl-fullscreen )|# 
 )
        ;;(if music (sdl-mixer:OPEN-AUDIO :frequency 44100))
-       (let ((*graphics-table*
-             #-ecl (trivial-garbage:make-weak-hash-table
-                    :weakness :value
-                    :test #'equal)
-             #+ecl (make-hash-table :test #'equal)
-             ))         
+       (let ((*graphics-table* (make-hash-table :test #'equal)))
         (if 15-fps
             (setf (sdl:frame-rate) 15)
             (setf (sdl:frame-rate) 30))
@@ -96,4 +100,4 @@ drawn (for very slow computers)"
              (draw my-anim)
              
              (sdl:update-display)
-        ))))))
\ No newline at end of file
+        ))))))