[Tux4kids-commits] [SCM] tuxhistory - Educational history game branch, master, updated. ca8d3816b9d91ceef61395acb486a3d9b6435184
julio (none)
julio at julio-desktop.
Fri Jul 2 22:15:32 UTC 2010
The following commit has been merged in the master branch:
commit ca8d3816b9d91ceef61395acb486a3d9b6435184
Author: julio <julio at julio-desktop.(none)>
Date: Fri Jul 2 17:14:52 2010 -0500
Scroll is ready?
diff --git a/data/maps/map.xml b/data/maps/map.xml
index 7ffa363..6f129d7 100644
--- a/data/maps/map.xml
+++ b/data/maps/map.xml
@@ -34,10 +34,1537 @@
<object></object>
<unit></unit>
<building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
</tilde>
</row>
+
+
<row>
<tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
<height>1</height>
<terrain>GRASSLAND</terrain>
<object></object>
@@ -59,6 +1586,27 @@
<building></building>
</tilde>
<tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
<height>1</height>
<terrain>SWAMP</terrain>
<object></object>
@@ -66,8 +1614,17 @@
<building></building>
</tilde>
</row>
+
+
<row>
<tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
<height>1</height>
<terrain>GRASSLAND</terrain>
<object></object>
@@ -87,6 +1644,26 @@
<object></object>
<unit></unit>
<building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
</tilde>
<tilde>
<height>1</height>
@@ -94,8 +1671,14 @@
<object></object>
<unit></unit>
<building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
</tilde>
- </row> <row>
<tilde>
<height>1</height>
<terrain>GRASSLAND</terrain>
@@ -112,6 +1695,20 @@
</tilde>
<tilde>
<height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
<terrain>GRASSLAND</terrain>
<object></object>
<unit></unit>
@@ -124,8 +1721,130 @@
<unit></unit>
<building></building>
</tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ </row>
+
+ <row>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde> <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>0</height>
+ <terrain>OCEAN</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>GRASSLAND</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
+ <tilde>
+ <height>1</height>
+ <terrain>SWAMP</terrain>
+ <object></object>
+ <unit></unit>
+ <building></building>
+ </tilde>
</row>
+
</data>
diff --git a/src/game.c b/src/game.c
index 459b136..fcc488b 100644
--- a/src/game.c
+++ b/src/game.c
@@ -40,6 +40,8 @@
#define FPS 15 /* 15 frames per second */
#define MS_PER_FRAME (1000 / FPS)
+#define IN_SCROLL 3 // Scroll speed
+#define OUT_SCROLL 6
/************ Static Variable definitions ***********/
//Game variables
@@ -66,18 +68,27 @@ static SDL_Surface* scaled_bkgd = NULL; //native resolution (fullscreen)
// Game vars
static SDL_Rect origin;
+static int screen_x;
+static int screen_y;
+
+static th_point Pmouse;
+static th_point Pscreen;
+static int screen_margin_in;
+static int screen_margin_out;
/********** Static functions definitions *********/
static int game_init(void);
static void game_draw(void);
static void game_handle_user_events(void);
+static void game_handle_mouse(void);
static int game_mouse_event(SDL_Event event);
static int check_exit_conditions(void);
static int game_over(int);
static int pause_game(void);
+static void get_mouse_pos(int, int);
/************** Implementation *******************/
static SDL_Surface* current_bkgd()
@@ -98,11 +109,16 @@ static int game_init(void)
//SDL_Flip(map_image);
quit = 0;
- origin.x = 0;
- origin.y = 0;
+ Pscreen.x = 500;//map_image->w/2 - screen->w/2;
+ Pscreen.y = 100;//map_image->h/2 - screen->h/2;
+ origin.x = Pscreen.x;
+ origin.y = Pscreen.y;
origin.w = screen->w;
origin.h = screen->h;
+ screen_margin_in = (int)screen->w/15;
+ screen_margin_out= (int)screen->w/50;
+
//Control variables init
left_pressed = 0;
right_pressed = 0;
@@ -160,6 +176,8 @@ int game(void)
last_time = SDL_GetTicks();
game_handle_user_events();
+ game_handle_mouse();
+
game_status = check_exit_conditions();
game_draw();
SDL_Flip(screen);
@@ -187,12 +205,19 @@ static void game_draw(void)
{
SDL_Rect dest;
-
-
- origin.x = 0;
- origin.y = 0;
+ origin.x = Pscreen.x;
+ origin.y = Pscreen.y;
+
+ /*
origin.w = screen->w;
origin.h = screen->h;
+
+
+ origin.x = map_image->w/2 - screen->w/2;
+ origin.y = map_image->h/2 - screen->h/2;
+ origin.w = screen->w;
+ origin.h = screen->h;*/
+
dest.x = 0;
dest.y = 0;
SDL_BlitSurface(map_image, &origin, screen, &dest);
@@ -202,6 +227,48 @@ static void game_draw(void)
}
+static void game_handle_mouse(void)
+{
+ if( Pscreen.x < (map_image->w - screen->h) &&
+ Pscreen.x > 0 &&
+ Pscreen.y < (map_image->h - screen->h) &&
+ Pscreen.y > 0)
+ {
+ // Is the mouse close to the border? Move the
+ // map...
+ if(Pmouse.x < screen_margin_in && Pscreen.x > IN_SCROLL){
+ Pscreen.x = Pscreen.x - IN_SCROLL;
+ }
+ if(Pmouse.x > screen->w - screen_margin_in &&
+ (Pscreen.x + screen->w) < (map_image->w - IN_SCROLL)){
+ Pscreen.x = Pscreen.x + IN_SCROLL;
+ }
+ if(Pmouse.y < screen_margin_in && Pscreen.y > IN_SCROLL){
+ Pscreen.y = Pscreen.y - IN_SCROLL;
+ }
+ if(Pmouse.y > screen->h - screen_margin_in &&
+ (Pscreen.y + screen->h) < (map_image->h - IN_SCROLL)){
+ Pscreen.y = Pscreen.y + IN_SCROLL;
+ }
+
+ // Is the mouse VERY close to the border?
+ // Move the map faster!
+ if(Pmouse.x < screen_margin_out && Pscreen.x > OUT_SCROLL){
+ Pscreen.x = Pscreen.x - OUT_SCROLL;
+ }
+ if(Pmouse.x > screen->w - screen_margin_out &&
+ (Pscreen.x + screen->w) < (map_image->w - OUT_SCROLL)){
+ Pscreen.x = Pscreen.x + OUT_SCROLL;
+ }
+ if(Pmouse.y < screen_margin_out && Pscreen.y > OUT_SCROLL){
+ Pscreen.y = Pscreen.y - OUT_SCROLL;
+ }
+ if(Pmouse.y > screen->h - screen_margin_out &&
+ (Pscreen.y + screen->h) < (map_image->h - OUT_SCROLL)){
+ Pscreen.y = Pscreen.y + OUT_SCROLL;
+ }
+ }
+}
static int pause_game(void)
{
@@ -389,11 +456,17 @@ static void game_handle_user_events(void)
while (SDL_PollEvent(&event) > 0)
{
+ //eval_mouse_pos(event.);
if (event.type == SDL_QUIT)
{
SDL_quit_received = 1;
quit = 1;
}
+ if (event.type == SDL_MOUSEMOTION)
+ {
+ get_mouse_pos(event.motion.x, event.motion.y);
+ }
+
if (event.type == SDL_MOUSEBUTTONDOWN)
{
key = game_mouse_event(event);
@@ -520,3 +593,9 @@ static int check_exit_conditions(void)
return GAME_IN_PROGRESS;
}
+static void get_mouse_pos(int x, int y)
+{
+ Pmouse.x = x;
+ Pmouse.y = y;
+}
+
diff --git a/src/map.c b/src/map.c
index 98069d2..8f87a70 100644
--- a/src/map.c
+++ b/src/map.c
@@ -364,7 +364,7 @@ static int *get_draw_tilde(int *array, int oe)
}
- for(i = 0; i < 9; i++)
+ for(i = 1; i < 9; i++)
{
printf("I: %d ", i);
if(*(array+i) != -1)
@@ -424,8 +424,8 @@ int generate_map(void)
map_image = NULL;
int w, h;
- w = terrain[TUNDRA_CENTER_1]->w * x_tildes * 2;
- h = terrain[TUNDRA_CENTER_1]->h * y_tildes * 2;
+ w = terrain[TUNDRA_CENTER_1]->w * x_tildes + x_tildes;
+ h = terrain[TUNDRA_CENTER_1]->h * y_tildes + y_tildes;
map_image = SDL_CreateRGBSurface(SDL_SWSURFACE, w, h,
32, rmask, gmask, bmask, amask);
@@ -467,7 +467,7 @@ int generate_map(void)
printf("ENUM: %d GRASSLAND: %d\n", *img_enums, GRASSLAND_CENTER_0);
//Draw in the map buffer the resulting values
- for(l = 0; l < 9; l++)
+ for(l = 0; l < 1; l++)
{
if (*(img_enums+l)!=-1)
{
diff --git a/src/tuxhistory.h b/src/tuxhistory.h
index 7ff1cdc..12b1c0a 100644
--- a/src/tuxhistory.h
+++ b/src/tuxhistory.h
@@ -43,6 +43,11 @@ typedef struct {
int cur;
} sprite;
+typedef struct {
+ int x;
+ int y;
+} th_point;
+
/* Global data gets 'externed' here: */
/* declared in setup.c */
--
tuxhistory - Educational history game
More information about the Tux4kids-commits
mailing list