[Tux4kids-commits] [SCM] tuxhistory - Educational history game branch, master, updated. c05573f5494e82f3c879a6b52dfaf5450133d786
julio (none)
julio at julio-desktop.
Mon Jun 7 07:14:42 UTC 2010
The following commit has been merged in the master branch:
commit f62f83a247c6a6da178fb6c14c7d7cb6d9485a78
Author: julio <julio at julio-desktop.(none)>
Date: Mon Jun 7 02:09:45 2010 -0500
Automake files update and correct terrains enum in map.h
diff --git a/data/Makefile.am b/data/Makefile.am
index 9c7ee6c..02c98ee 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,7 +4,7 @@
SUBDIRS = fonts \
images \
menus \
- missions \
+ maps \
sounds
#EXTRA_DIST = options
diff --git a/data/images/terrain/arctic/Makefile.am b/data/images/terrain/arctic/Makefile.am
new file mode 100644
index 0000000..906a1b6
--- /dev/null
+++ b/data/images/terrain/arctic/Makefile.am
@@ -0,0 +1,26 @@
+## Makefile.am for tuxhistory data/images/terrain/arctic:
+
+## Process with AutoMake:
+
+arcticdir = $(pkgdatadir)/images/terrain/arctic
+
+dist_backgrounds_DATA =
+border_E_even.png \
+border_E_odd.png \
+border_NE_even.png \
+border_NE_odd.png \
+border_N_even.png \
+border_N_odd.png \
+border_NW_even.png \
+border_NW_odd.png \
+border_SE_even.png \
+border_SE_odd.png \
+border_S_even.png \
+border_S_odd.png \
+border_SW_even.png \
+border_SW_odd.png \
+border_W_even.png \
+border_W_odd.png \
+center0.png \
+center1.png
+
diff --git a/data/images/terrain/desert/Makefile.am b/data/images/terrain/desert/Makefile.am
new file mode 100644
index 0000000..1ae8e90
--- /dev/null
+++ b/data/images/terrain/desert/Makefile.am
@@ -0,0 +1,26 @@
+## Makefile.am for tuxhistory data/images/terrain/desert:
+
+## Process with AutoMake:
+
+desertdir = $(pkgdatadir)/images/terrain/desert
+
+dist_backgrounds_DATA =
+border_E_even.png \
+border_E_odd.png \
+border_NE_even.png \
+border_NE_odd.png \
+border_N_even.png \
+border_N_odd.png \
+border_NW_even.png \
+border_NW_odd.png \
+border_SE_even.png \
+border_SE_odd.png \
+border_S_even.png \
+border_S_odd.png \
+border_SW_even.png \
+border_SW_odd.png \
+border_W_even.png \
+border_W_odd.png \
+center0.png \
+center1.png
+
diff --git a/data/images/terrain/grassland/Makefile.am b/data/images/terrain/grassland/Makefile.am
new file mode 100644
index 0000000..6e21b83
--- /dev/null
+++ b/data/images/terrain/grassland/Makefile.am
@@ -0,0 +1,26 @@
+## Makefile.am for tuxhistory data/images/terrain/grassland:
+
+## Process with AutoMake:
+
+grasslanddir = $(pkgdatadir)/images/terrain/grassland
+
+dist_backgrounds_DATA =
+border_E_even.png \
+border_E_odd.png \
+border_NE_even.png \
+border_NE_odd.png \
+border_N_even.png \
+border_N_odd.png \
+border_NW_even.png \
+border_NW_odd.png \
+border_SE_even.png \
+border_SE_odd.png \
+border_S_even.png \
+border_S_odd.png \
+border_SW_even.png \
+border_SW_odd.png \
+border_W_even.png \
+border_W_odd.png \
+center0.png \
+center1.png
+
diff --git a/data/images/terrain/highSeas/Makefile.am b/data/images/terrain/highSeas/Makefile.am
new file mode 100644
index 0000000..544f3bd
--- /dev/null
+++ b/data/images/terrain/highSeas/Makefile.am
@@ -0,0 +1,26 @@
+## Makefile.am for tuxhistory data/images/terrain/highSeas:
+
+## Process with AutoMake:
+
+highSeasdir = $(pkgdatadir)/images/terrain/highSeas
+
+dist_backgrounds_DATA =
+border_E_even.png \
+border_E_odd.png \
+border_NE_even.png \
+border_NE_odd.png \
+border_N_even.png \
+border_N_odd.png \
+border_NW_even.png \
+border_NW_odd.png \
+border_SE_even.png \
+border_SE_odd.png \
+border_S_even.png \
+border_S_odd.png \
+border_SW_even.png \
+border_SW_odd.png \
+border_W_even.png \
+border_W_odd.png \
+center0.png \
+center1.png
+
diff --git a/data/images/terrain/marsh/Makefile.am b/data/images/terrain/marsh/Makefile.am
new file mode 100644
index 0000000..653cb63
--- /dev/null
+++ b/data/images/terrain/marsh/Makefile.am
@@ -0,0 +1,26 @@
+## Makefile.am for tuxhistory data/images/terrain/marsh:
+
+## Process with AutoMake:
+
+marshdir = $(pkgdatadir)/images/terrain/marsh
+
+dist_backgrounds_DATA =
+border_E_even.png \
+border_E_odd.png \
+border_NE_even.png \
+border_NE_odd.png \
+border_N_even.png \
+border_N_odd.png \
+border_NW_even.png \
+border_NW_odd.png \
+border_SE_even.png \
+border_SE_odd.png \
+border_S_even.png \
+border_S_odd.png \
+border_SW_even.png \
+border_SW_odd.png \
+border_W_even.png \
+border_W_odd.png \
+center0.png \
+center1.png
+
diff --git a/data/images/terrain/ocean/Makefile.am b/data/images/terrain/ocean/Makefile.am
new file mode 100644
index 0000000..cfcad39
--- /dev/null
+++ b/data/images/terrain/ocean/Makefile.am
@@ -0,0 +1,26 @@
+## Makefile.am for tuxhistory data/images/terrain/ocean:
+
+## Process with AutoMake:
+
+oceandir = $(pkgdatadir)/images/terrain/ocean
+
+dist_backgrounds_DATA =
+border_E_even.png \
+border_E_odd.png \
+border_NE_even.png \
+border_NE_odd.png \
+border_N_even.png \
+border_N_odd.png \
+border_NW_even.png \
+border_NW_odd.png \
+border_SE_even.png \
+border_SE_odd.png \
+border_S_even.png \
+border_S_odd.png \
+border_SW_even.png \
+border_SW_odd.png \
+border_W_even.png \
+border_W_odd.png \
+center0.png \
+center1.png
+
diff --git a/data/images/terrain/plains/Makefile.am b/data/images/terrain/plains/Makefile.am
new file mode 100644
index 0000000..00e76fe
--- /dev/null
+++ b/data/images/terrain/plains/Makefile.am
@@ -0,0 +1,26 @@
+## Makefile.am for tuxhistory data/images/terrain/plains:
+
+## Process with AutoMake:
+
+plainsdir = $(pkgdatadir)/images/terrain/plains
+
+dist_backgrounds_DATA =
+border_E_even.png \
+border_E_odd.png \
+border_NE_even.png \
+border_NE_odd.png \
+border_N_even.png \
+border_N_odd.png \
+border_NW_even.png \
+border_NW_odd.png \
+border_SE_even.png \
+border_SE_odd.png \
+border_S_even.png \
+border_S_odd.png \
+border_SW_even.png \
+border_SW_odd.png \
+border_W_even.png \
+border_W_odd.png \
+center0.png \
+center1.png
+
diff --git a/data/images/terrain/prairie/Makefile.am b/data/images/terrain/prairie/Makefile.am
new file mode 100644
index 0000000..f93a2e2
--- /dev/null
+++ b/data/images/terrain/prairie/Makefile.am
@@ -0,0 +1,26 @@
+## Makefile.am for tuxhistory data/images/terrain/prairie:
+
+## Process with AutoMake:
+
+prairiedir = $(pkgdatadir)/images/terrain/prairie
+
+dist_backgrounds_DATA =
+border_E_even.png \
+border_E_odd.png \
+border_NE_even.png \
+border_NE_odd.png \
+border_N_even.png \
+border_N_odd.png \
+border_NW_even.png \
+border_NW_odd.png \
+border_SE_even.png \
+border_SE_odd.png \
+border_S_even.png \
+border_S_odd.png \
+border_SW_even.png \
+border_SW_odd.png \
+border_W_even.png \
+border_W_odd.png \
+center0.png \
+center1.png
+
diff --git a/data/images/terrain/savannah/Makefile.am b/data/images/terrain/savannah/Makefile.am
new file mode 100644
index 0000000..f84544a
--- /dev/null
+++ b/data/images/terrain/savannah/Makefile.am
@@ -0,0 +1,26 @@
+## Makefile.am for tuxhistory data/images/terrain/savannah:
+
+## Process with AutoMake:
+
+savannahdir = $(pkgdatadir)/images/terrain/savannah
+
+dist_backgrounds_DATA =
+border_E_even.png \
+border_E_odd.png \
+border_NE_even.png \
+border_NE_odd.png \
+border_N_even.png \
+border_N_odd.png \
+border_NW_even.png \
+border_NW_odd.png \
+border_SE_even.png \
+border_SE_odd.png \
+border_S_even.png \
+border_S_odd.png \
+border_SW_even.png \
+border_SW_odd.png \
+border_W_even.png \
+border_W_odd.png \
+center0.png \
+center1.png
+
diff --git a/data/images/terrain/swamp/Makefile.am b/data/images/terrain/swamp/Makefile.am
new file mode 100644
index 0000000..784db27
--- /dev/null
+++ b/data/images/terrain/swamp/Makefile.am
@@ -0,0 +1,26 @@
+## Makefile.am for tuxhistory data/images/terrain/swamp:
+
+## Process with AutoMake:
+
+swampdir = $(pkgdatadir)/images/terrain/swamp
+
+dist_backgrounds_DATA =
+border_E_even.png \
+border_E_odd.png \
+border_NE_even.png \
+border_NE_odd.png \
+border_N_even.png \
+border_N_odd.png \
+border_NW_even.png \
+border_NW_odd.png \
+border_SE_even.png \
+border_SE_odd.png \
+border_S_even.png \
+border_S_odd.png \
+border_SW_even.png \
+border_SW_odd.png \
+border_W_even.png \
+border_W_odd.png \
+center0.png \
+center1.png
+
diff --git a/src/map.h b/src/map.h
index ea0ba50..0c6381f 100644
--- a/src/map.h
+++ b/src/map.h
@@ -6,16 +6,23 @@
* directly.
*/
+// NUM_OF_TERRAINS must be the last element.
+// Feel free to use this arguments in the th_terrain
+// array, and in your xml - map files. Borders
+// will be generated by th_make_map()
enum{
- SEA,
- DEEP_SEA,
+ ARCTIC,
+ TUNDRA,
+ OCEAN,
+ HIGH_SEA,
DESERT,
- SNOW,
- GRASS,
- GRASS2,
- BEACH,
- ROCKS,
- MOUNTAIN
+ PLAINS,
+ GRASSLAND,
+ PRAIRIE,
+ SAVANNAH,
+ SWAMP,
+ MARSH,
+ NUM_OF_TERRAINS
};
// th_map is the main data strucutre
@@ -32,6 +39,8 @@ th_map **map;
void th_draw_map(void);
-//loads the XML map file.
-void th_load(void);
+//Generates the th_map from a XML string.
+th_map** th_make_map(char *);
+
+char* th_serialize_map(th_map **)
--
tuxhistory - Educational history game
More information about the Tux4kids-commits
mailing list