Release candidate 2.

hecrj · Nov 3, 2014 · f1f309b · f1f309b
1 parent 2e0e2ec
commit f1f309b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/res/level/dungeon.tmx b/res/level/dungeon.tmx
@@ -129,8 +129,8 @@
 61,62,0,0,0,0,0,0,0,64,65,187,62,0,0,196,196,0,0,64,190,61,62,0,0,0,0,0,0,0,64,65,
 61,62,0,0,0,0,0,0,0,64,65,217,62,0,0,196,196,0,0,64,220,61,62,0,0,0,0,0,0,0,64,65,
 61,62,145,0,0,0,0,0,145,64,65,61,62,0,0,0,0,0,0,64,65,61,62,145,0,0,0,0,0,145,64,65,
-91,92,93,93,93,93,93,93,93,94,95,91,92,93,93,77,78,93,93,94,95,61,62,93,93,93,93,93,93,93,94,95,
-121,122,123,123,123,123,123,123,123,124,125,121,122,123,123,107,108,123,123,124,125,61,62,123,123,123,123,123,123,123,124,125
+91,92,93,93,93,93,93,93,93,94,95,91,92,93,93,93,93,93,93,94,95,61,62,93,93,93,93,93,93,93,94,95,
+121,122,123,123,123,123,123,123,123,124,125,121,122,123,123,123,123,123,123,124,125,61,62,123,123,123,123,123,123,123,124,125
 </data>
  </layer>
  <layer name="Tile Layer 4" width="32" height="40">
@@ -173,18 +173,11 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,325,325,325,325,325,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,92,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,121,122,0,0,0,0,0,0,0,0,0
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,483,484,0,0,0,0,91,92,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,513,514,0,0,0,0,121,122,0,0,0,0,0,0,0,0,0
 </data>
  </layer>
  <objectgroup name="Objects">
-  <object name="start" type="map_transition" x="250.568" y="630.591" width="11" height="5">
-   <properties>
-    <property name="map" value="overworld"/>
-    <property name="orientation" value="UP"/>
-    <property name="place" value="dungeon_entrance"/>
-   </properties>
-  </object>
   <object type="key_door" gid="301" x="240" y="432"/>
   <object name="stalfos_key1" type="stalfos" x="64" y="464" width="18.5" height="27.5">
    <properties>
@@ -246,5 +239,10 @@
     <property name="place" value="start"/>
    </properties>
   </object>
+  <object name="start" type="location" x="249.333" y="603" width="12" height="10">
+   <properties>
+    <property name="orientation" value="UP"/>
+   </properties>
+  </object>
  </objectgroup>
 </map>
diff --git a/src/entity/door.cpp b/src/entity/door.cpp
@@ -52,3 +52,7 @@ void Door::Open() {
         opened_ = true;
     }
 }
+
+void Door::Dead() {
+    // Do nothing
+}
diff --git a/src/entity/door.hpp b/src/entity/door.hpp
@@ -15,6 +15,7 @@ class Door : public Entity {
 
     void Draw() const;
     void Open();
+    void Dead();
 
 private:
     bool opened_;