From 3386b8b93a7567c94c6d746d0b5e539c3d1b9c52 Mon Sep 17 00:00:00 2001 From: Boutade Date: Tue, 15 Oct 2019 07:37:53 -0500 Subject: reorganized asset loading code --- the-price-of-a-cup-of-coffee.lisp | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) (limited to 'the-price-of-a-cup-of-coffee.lisp') diff --git a/the-price-of-a-cup-of-coffee.lisp b/the-price-of-a-cup-of-coffee.lisp index 2de4a4d..f04908e 100644 --- a/the-price-of-a-cup-of-coffee.lisp +++ b/the-price-of-a-cup-of-coffee.lisp @@ -176,12 +176,11 @@ (defun boot-up (renderer) - (with-surface-from-file (surf +nance-sheet-image+) - (setf *nance-texture* (sdl2:create-texture-from-surface renderer surf))) - (with-surface-from-file (surf +suit-sheet-image+) - (setf *suit-texture* (sdl2:create-texture-from-surface renderer surf))) + (boot-up-assets renderer) + + (setf *nance* (make-instance 'hero :sheet *nance-texture*))) @@ -378,11 +377,6 @@ ;; present (sdl2:render-present renderer)) -(defvar *harmony-initialized-p* nil) -(defvar *cold-day-track*) -(defvar *looking-up-track*) -(defvar *current-track*) - (defun play-track (track) (harmony-simple:stop *current-track*) (harmony-simple:resume track) @@ -396,14 +390,6 @@ (defun start () - ;; (unless *harmony-initialized-p* - ;; (harmony-simple:initialize) - ;; (setf *looking-up-track* (harmony-simple:play #p"assets/thingslookup.mp3" :music :loop t)) - ;; (harmony-simple:stop *looking-up-track*) - ;; (setf *cold-day-track* (harmony-simple:play #p"assets/coldday.mp3" :music :loop t)) - ;; (setf *current-track* *cold-day-track*) - ;; (setf *harmony-initialized-p* t)) - ;; (play-track *cold-day-track*) (sdl2:with-init (:everything) @@ -429,9 +415,6 @@ (:quit () ; (harmony-simple:stop *current-track*) - (free-assets) t)))))) -(defun free-assets () - (setf (sheet *nance*) nil)) -- cgit v1.2.3