diff options
| -rw-r--r-- | assets.lisp | 12 | ||||
| -rw-r--r-- | the-price-of-a-cup-of-coffee.lisp | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/assets.lisp b/assets.lisp index beb6312..413d5a4 100644 --- a/assets.lisp +++ b/assets.lisp @@ -93,15 +93,17 @@ -(defparameter +nance-sheet-image+ "assets/Nance.png") -(defparameter +suit-sheet-image+ "assets/Suit.png") -(defparameter +nomry-sheet-image+ "assets/Normy.png") -(defparameter +kid-sheet-image+ "assets/KidSheet.png") +(defparameter +nance-sheet-image+ #P"assets/Nance.png") +(defparameter +suit-sheet-image+ #P"assets/Suit.png") +(defparameter +nomry-sheet-image+ #P"assets/Normy.png") +(defparameter +kid-sheet-image+ #P"assets/KidSheet.png") (defparameter +things-look-up-track-path+ #P"assets/thingslookup.mp3") (defparameter +cold-day-track-path+ #P"assets/coldday.mp3") (defparameter +emoji-sheet-image+ #P"assets/emoji.png") (defparameter +sliding-door-image+ #P"assets/sliding-door.png") (defparameter +backdrop-image+ #P"assets/backdrop.png") +(defparameter +speechbubble-image+ #P"assets/Speechbubble.png") + (defvar *nance-texture*) (defvar *suit-texture*) @@ -110,6 +112,7 @@ (defvar *expression-texture*) (defvar *backdrop-texture*) (defvar *sliding-door-texture*) +(defvar *speech-bubble-texture*) (defparameter +sliding-door-open-x+ 800) (defparameter +sliding-door-closed-x+ 868) @@ -140,6 +143,7 @@ (setf *backdrop-texture* (make-texture-from-file renderer +backdrop-image+)) + (setf *speech-bubble-texture* (make-texture-from-file renderer +speechbubble-image+)) (unless *harmony-initialized-p* diff --git a/the-price-of-a-cup-of-coffee.lisp b/the-price-of-a-cup-of-coffee.lisp index 275fe45..487e3b9 100644 --- a/the-price-of-a-cup-of-coffee.lisp +++ b/the-price-of-a-cup-of-coffee.lisp @@ -194,6 +194,8 @@ :source-rect (get-frame-rect human)) (let-when (source-rect (and expression (get-expression expression))) (set-expression-rect human) + (sdl2:render-copy renderer *speech-bubble-texture* + :dest-rect *expression-rect*) (sdl2:render-copy renderer *expression-texture* :dest-rect *expression-rect* :source-rect source-rect)))) @@ -294,7 +296,6 @@ (setf (sdl2:rect-x (pos *nance*)) 292) (setf (sdl2:rect-y (pos *nance*)) 38) - (push *nance* *to-render-by-y*) ;; boot up initial pedestrians |