From ea8fb5426b0f065b4ef508bb33c2baf30df6b5a4 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sun, 28 Feb 2021 17:58:15 -0500
Subject: Simplified "animation" map sprite parameter

The filenames for these are fairly regular, and we're gonna want to abstract it away further later on anyway.
---
 res/maps/hallucination_beach.tmx      | 2 +-
 res/maps/hallucination_hot_spring.tmx | 2 +-
 res/maps/hallucination_interior.tmx   | 6 +++---
 res/maps/pink_shell.tmx               | 2 +-
 res/maps/underwater_start.tmx         | 2 +-
 src/map.cpp                           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/maps/hallucination_beach.tmx b/res/maps/hallucination_beach.tmx
index ce6c830..9830cf5 100644
--- a/res/maps/hallucination_beach.tmx
+++ b/res/maps/hallucination_beach.tmx
@@ -43,7 +43,7 @@
  <objectgroup id="3" name="Objects">
   <object id="3" name="flint" type="sprite" x="560.14" y="304.895">
    <properties>
-    <property name="animation" value="../res/sprites/flint_anim.txt"/>
+    <property name="animation" value="flint"/>
     <property name="collisionHeight" type="int" value="8"/>
     <property name="collisionOffsetX" type="int" value="-8"/>
     <property name="collisionOffsetY" type="int" value="-8"/>
diff --git a/res/maps/hallucination_hot_spring.tmx b/res/maps/hallucination_hot_spring.tmx
index b019681..7ccc0cb 100644
--- a/res/maps/hallucination_hot_spring.tmx
+++ b/res/maps/hallucination_hot_spring.tmx
@@ -36,7 +36,7 @@
   <object id="3" name="water_ionia" type="sprite" x="312" y="104.5">
    <properties>
     <property name="animName" value="swim_still"/>
-    <property name="animation" value="../res/sprites/ionia_anim.txt"/>
+    <property name="animation" value="ionia"/>
     <property name="collisionHeight" type="int" value="8"/>
     <property name="collisionOffsetX" type="int" value="-8"/>
     <property name="collisionOffsetY" type="int" value="-8"/>
diff --git a/res/maps/hallucination_interior.tmx b/res/maps/hallucination_interior.tmx
index 55e5506..a4ff7b3 100644
--- a/res/maps/hallucination_interior.tmx
+++ b/res/maps/hallucination_interior.tmx
@@ -98,7 +98,7 @@
   </object>
   <object id="7" name="doria" type="sprite" x="328" y="525">
    <properties>
-    <property name="animation" value="../res/sprites/doria_anim.txt"/>
+    <property name="animation" value="doria"/>
     <property name="collisionHeight" type="int" value="8"/>
     <property name="collisionOffsetX" type="int" value="-8"/>
     <property name="collisionOffsetY" type="int" value="-8"/>
@@ -114,7 +114,7 @@
   </object>
   <object id="9" name="join_claus" type="sprite" x="640.334" y="153.667">
    <properties>
-    <property name="animation" value="../res/sprites/claus_anim.txt"/>
+    <property name="animation" value="claus"/>
     <property name="collisionHeight" type="int" value="8"/>
     <property name="collisionOffsetX" type="int" value="-8"/>
     <property name="collisionOffsetY" type="int" value="-8"/>
@@ -126,7 +126,7 @@
   </object>
   <object id="10" name="ionia" type="sprite" x="821.333" y="135.333">
    <properties>
-    <property name="animation" value="../res/sprites/ionia_anim.txt"/>
+    <property name="animation" value="ionia"/>
     <property name="collisionHeight" type="int" value="8"/>
     <property name="collisionOffsetX" type="int" value="-8"/>
     <property name="collisionOffsetY" type="int" value="-8"/>
diff --git a/res/maps/pink_shell.tmx b/res/maps/pink_shell.tmx
index 12eea42..ecff5a8 100644
--- a/res/maps/pink_shell.tmx
+++ b/res/maps/pink_shell.tmx
@@ -51,7 +51,7 @@
   </object>
   <object id="3" name="ocho" type="sprite" x="280" y="222">
    <properties>
-    <property name="animation" value="../res/sprites/human_ocho_anim.txt"/>
+    <property name="animation" value="human_ocho"/>
     <property name="collisionHeight" type="int" value="8"/>
     <property name="collisionOffsetX" type="int" value="-8"/>
     <property name="collisionOffsetY" type="int" value="-8"/>
diff --git a/res/maps/underwater_start.tmx b/res/maps/underwater_start.tmx
index 0ced9c4..cd73e07 100644
--- a/res/maps/underwater_start.tmx
+++ b/res/maps/underwater_start.tmx
@@ -82,7 +82,7 @@
   </object>
   <object id="2" name="fish1" type="sprite" x="216.923" y="198.462">
    <properties>
-    <property name="animation" value="../res/sprites/fish_anim.txt"/>
+    <property name="animation" value="fish"/>
     <property name="collisionHeight" type="int" value="8"/>
     <property name="collisionOffsetX" type="int" value="-8"/>
     <property name="collisionOffsetY" type="int" value="-8"/>
diff --git a/src/map.cpp b/src/map.cpp
index 7a3de78..0cf9402 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -88,7 +88,7 @@ Map::Map(std::string_view name) : name_(name) {
             } else if (property.getName() == "collisionHeight") {
               p.collisionSize.h() = property.getIntValue();
             } else if (property.getName() == "animation") {
-              p.animationFilename = property.getStringValue();
+              p.animationFilename = "../res/sprites/" + property.getStringValue() + "_anim.txt";
             } else if (property.getName() == "animName") {
               p.animName = property.getStringValue();
             } else if (property.getName() == "interactionScript") {
-- 
cgit 1.4.1