Skip to content

Commit 55e9409

Browse files
committed
Also load player object from map
1 parent 84b802e commit 55e9409

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

Resources/maps/test.tmx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="40" height="23" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="7">
2+
<map version="1.8" tiledversion="1.8.6" orientation="orthogonal" renderorder="right-down" width="40" height="23" tilewidth="16" tileheight="16" infinite="0" nextlayerid="8" nextobjectid="8">
33
<tileset firstgid="1" name="Dungeon tiles" tilewidth="16" tileheight="16" tilecount="625" columns="25">
44
<image source="../images/Environment/Dungeon Prison/Assets/Tiles.png" width="400" height="400"/>
55
<tile id="0">
@@ -279,5 +279,15 @@
279279
</properties>
280280
<point/>
281281
</object>
282+
<object id="7" name="player" x="80.6667" y="82">
283+
<properties>
284+
<property name="object">((:player)
285+
(:character :speed 75.0)
286+
(:animation-state :sprite :player)
287+
(:sprite-sheet)
288+
(:size))</property>
289+
</properties>
290+
<point/>
291+
</object>
282292
</objectgroup>
283293
</map>

src/characters.lisp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
(in-package #:lisp-jam-spring-2023)
22

33

4-
(ecs:defcomponent player)
4+
(ecs:defcomponent player
5+
(player 1 :type bit :index player :unique t))
56

67
(ecs:defcomponent character
78
(speed 0.0 :type single-float)

src/main.lisp

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,8 @@
8787
(load-sounds)
8888
(load-map "../Resources/maps/test.tmx")
8989
;; TODO : create player object last (render order purposes)
90-
(let ((player (ecs:make-object
91-
*storage*
92-
`((:player)
93-
(:character :speed 75.0
94-
:target-x 160.0
95-
:target-y 160.0)
96-
(:animation-state :sprite :player)
97-
(:sprite-sheet)
98-
(:size)
99-
(:position :x 160.0 :y 160.0)))))
100-
(change-animation *storage* player :idle)
101-
(setf *player-entity* player
102-
*deathp* nil))
90+
(setf *player-entity* (player-entity *storage* 1)
91+
*deathp* nil)
10392
(ecs:run-systems *storage* :dt 0d0) ;; HACK: prime system bitmaps
10493
(setf *ui-context*
10594
(nk:allegro-init

0 commit comments

Comments
 (0)