From 723064588ac8812669c98f2bbfae40aaf02de648 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 19 Jul 2009 12:40:38 +0100
Subject: [PATCH] Make all existing maps into resources

---
 maps/{ => coal_mine}/coal_mine.bin | Bin
 maps/{ => coal_mine}/coal_mine.xml |   2 +-
 maps/{ => points}/points.bin       | Bin
 maps/{ => points}/points.xml       |   2 +-
 src/Map.cpp                        |   7 +++----
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename maps/{ => coal_mine}/coal_mine.bin (100%)
 rename maps/{ => coal_mine}/coal_mine.xml (99%)
 rename maps/{ => points}/points.bin (100%)
 rename maps/{ => points}/points.xml (99%)

diff --git a/maps/coal_mine.bin b/maps/coal_mine/coal_mine.bin
similarity index 100%
rename from maps/coal_mine.bin
rename to maps/coal_mine/coal_mine.bin
diff --git a/maps/coal_mine.xml b/maps/coal_mine/coal_mine.xml
similarity index 99%
rename from maps/coal_mine.xml
rename to maps/coal_mine/coal_mine.xml
index 4fc95b0..14fd965 100644
--- a/maps/coal_mine.xml
+++ b/maps/coal_mine/coal_mine.xml
@@ -16,7 +16,7 @@
 <name>Coal Mine</name>
 </station>
 
-<heightmap>maps/coal_mine.bin</heightmap>
+<heightmap>coal_mine.bin</heightmap>
 
 <tileset>
 <tile x="2" y="10">
diff --git a/maps/points.bin b/maps/points/points.bin
similarity index 100%
rename from maps/points.bin
rename to maps/points/points.bin
diff --git a/maps/points.xml b/maps/points/points.xml
similarity index 99%
rename from maps/points.xml
rename to maps/points/points.xml
index 6bdf5f9..61b79c4 100644
--- a/maps/points.xml
+++ b/maps/points/points.xml
@@ -4,7 +4,7 @@
 
 <start x="32" y="34" dirX="0" dirY="-1"/>
 
-<heightmap>maps/points.bin</heightmap>
+<heightmap>points.bin</heightmap>
 
 <tileset>
 <tile x="0" y="15">
diff --git a/src/Map.cpp b/src/Map.cpp
index 0bdba24..be816c4 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -40,7 +40,7 @@
 #include <boost/lexical_cast.hpp>
 
 // A single piece of track may appear multiple times in the map - this
-// will be true for all track segments that cover multiple tiles
+// will be true for all track segments that cover multiple tiles.
 // For various map algorithms (e.g. drawing) it is useful to keep track
 // of which track segments have already been visited. So track segments
 // are wrapped inside TrackNode which is used to store map-specific
@@ -112,9 +112,7 @@ public:
                      Point<int> botLeft, Point<int> topRight);
    void postRenderSector(IGraphicsPtr aContext, int id,
                          Point<int> botLeft, Point<int> topRight);
-
-   // Inteface used soley by MapLoader
-   void setStationAt(int x, int y, IStationPtr aStation);
+   
 private:
    // Tiles on the map
    struct Tile {
@@ -176,6 +174,7 @@ private:
    void tileVertices(int x, int y, int* indexes) const;
    void renderPickSector(Point<int> botLeft, Point<int> topRight);
    void drawStartLocation() const;
+   void setStationAt(int x, int y, IStationPtr aStation);
 
    // Mesh modification
    void buildMesh(int id, Point<int> botLeft, Point<int> topRight);
-- 
2.39.2