692ec1bec892

Display world generation progress.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Sat, 07 Jan 2017 16:14:15 +0000
parents ebd641c91236
children 4922d66cbba5
branches/tags (none)
files src/main.lisp

Changes

diff -r ebd641c91236 -r 692ec1bec892 src/main.lisp
--- a/src/main.lisp	Sat Jan 07 15:09:46 2017 +0000
+++ b/src/main.lisp	Sat Jan 07 16:14:15 2017 +0000
@@ -108,22 +108,22 @@
 
 
 ;;;; World Generation ---------------------------------------------------------
-(defun generate-world% ()
-  (setf *terrain* (ap.generation::generate-heightmap))
-  (destructuring-bind (map-width map-height) (array-dimensions *terrain*)
-    (setf *view-x* (truncate map-width 2)
-          *view-y* (truncate map-height 2)))
-  (setf *player* (make-player)))
-
 (defun generate-world ()
-  (with-dims (20 2)
+  (with-dims (30 (+ 2 2))
     (with-panel-and-window
         (pan win *width* *height*
              (center *width* *screen-width*)
              (center *height* *screen-height*))
-      (write-string-centered win "Generating world..." 0)
-      (redraw)
-      (generate-world%)))
+      (border win)
+      (progn
+        (write-string-left win "Generating terrain..." 1 1)
+        (redraw)
+        (setf *terrain* (ap.generation::generate-heightmap)
+              *view-x* 0 *view-y* 0))
+      (progn
+        (write-string-left win "Spawning player..." 1 2)
+        (redraw)
+        (setf *player* (make-player)))))
   (world-map))