summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2018-07-19 05:20:23 +0200
committerRicardo Wurmus <rekado@elephly.net>2018-07-27 17:15:45 +0200
commit1df73ad3f1d0ed1bbade0e7359ca1783219b21ca (patch)
tree89c93a3d54a39c138ad6fe935f347392c699c697
parent1591de13bba97142b92dd8e204b3ed52cf021b38 (diff)
Set reaper start position through map.
-rw-r--r--assets/maps/01.tmx5
-rw-r--r--scenes/game.scm2
2 files changed, 4 insertions, 3 deletions
diff --git a/assets/maps/01.tmx b/assets/maps/01.tmx
index 6a07816..1647a8e 100644
--- a/assets/maps/01.tmx
+++ b/assets/maps/01.tmx
@@ -580,7 +580,8 @@
<object id="43" name="rock" type="obstacle" x="929.339" y="757.511" width="29.6503" height="25.1849"/>
<object id="52" name="enter-house" type="action" x="870.638" y="763.599" width="34.3533" height="8.35621"/>
<object id="53" name="exit-house" type="action" x="647.617" y="86.325" width="31.6779" height="27.3826"/>
- <object id="57" name="talk-to-reaper" type="action" x="864.653" y="802.013" width="57.047" height="46.4206"/>
- <object id="60" name="player" type="start-position" x="752.547" y="1216.53" width="15" height="15"/>
+ <object id="57" name="talk-to-reaper" type="action" x="759.03" y="1200.95" width="57.047" height="46.4206"/>
+ <object id="60" name="player" type="start-position" x="752" y="1215.92" width="16" height="16"/>
+ <object id="62" name="reaper" type="start-position" x="800.087" y="1216.11" width="16" height="16"/>
</objectgroup>
</map>
diff --git a/scenes/game.scm b/scenes/game.scm
index a889f73..c14dd33 100644
--- a/scenes/game.scm
+++ b/scenes/game.scm
@@ -186,7 +186,7 @@ map's object layer."
(list 8 12 16 12 8))))))
(list (make <reaper>
#:name 'reaper
- #:position (vec2 720.0 1100.0)
+ #:position (start-position game "reaper")
#:children
;; Simple shadow. This should better be done with a
;; single ellipse shader.