summaryrefslogtreecommitdiff
path: root/common.h
diff options
context:
space:
mode:
authorKris Parker2009-12-10 12:30:22 +0000
committerKris Parker2009-12-10 12:30:22 +0000
commitafba6ea721bc363502f07826d2c0cfb184e447fa (patch)
treed8bc5cdbde815131315838ed170b1c47d7c4f618 /common.h
parent35ea344b23fa77945fcf8a267e04cc2494e71a36 (diff)
downloadstonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.gz
stonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.bz2
stonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.xz
Merge terrain config to the trunk
Diffstat (limited to 'common.h')
-rw-r--r--common.h20
1 files changed, 9 insertions, 11 deletions
diff --git a/common.h b/common.h
index fb31d5e..434a5e2 100644
--- a/common.h
+++ b/common.h
@@ -6,11 +6,11 @@
#include <assert.h>
#include <vector>
+#include <map>
#include <allegro.h>
using namespace std;
-
#include "dfhack/library/DFTypes.h"
#include "dfhack/library/DFTileTypes.h"
#include "dfhack/library/DFHackAPI.h"
@@ -86,13 +86,14 @@ using namespace DFHack;
#define BASE_SHADOW_TILE 160
-enum material{
- MAT_WILLOW = 9,
- MAT_DOLOMITE = 135,
- MAT_FLINT = 136,
- MAT_TALC = 171,
-
-};
+// this shouldn't change with mods, so should
+// be know ahead of time (especially since we
+// use it for fake terrains already)
+#define MAX_BASE_TERRAIN 525
+#define FAKE_TERRAIN_COUNT 0
+// we only need as many as our translation system
+// in ContentLoader/lookupMaterialType deals with
+#define MAX_MATGLOSS 24
enum dirTypes{
eSimpleInvalid = -1,
@@ -158,8 +159,6 @@ extern bool animationFrameShown;
// binary 00111111
#define ALL_FRAMES 63
-extern vector<t_matgloss> v_stonetypes;
-
#define TMR1_START (ClockedTime = clock())
#define TMR1_STOP (ClockedTime = clock() - ClockedTime)
#define TMR2_START (ClockedTime2 = clock())
@@ -180,4 +179,3 @@ bool loadConfigFile();
//xmlBuildingReader.cpp
class BuildingConfiguration;
-