Fix NULL pointer bug in meshgen

[dragonblocks_alpha.git] / src / perlin.h

diff --git a/src/perlin.h b/src/perlin.h
index e90b388d00d0ec8a6ae0e3b7e5e108e6043cd8b2..0213c68b00f182ee0bbb9eb3e9890f30c0f6cea2 100644 (file)
--- a/src/perlin.h
+++ b/src/perlin.h
@@ -2,6 +2,7 @@
 #define _PERLIN_H_
 
 #include <perlin/perlin.h>
+#include "types.h"
 
 typedef enum
 {
@@ -10,22 +11,28 @@ typedef enum
        SO_MOUNTAIN,
        SO_OCEAN,
        SO_MOUNTAIN_HEIGHT,
-       SO_BOULDER_CENTER,
        SO_BOULDER,
        SO_WETNESS,
        SO_TEXTURE_OFFSET_S,
        SO_TEXTURE_OFFSET_T,
        SO_TEMPERATURE,
-       SO_PINE_AREA,
-       SO_PINE,
-       SO_PINE_HEIGHT,
-       SO_PINE_BRANCH,
        SO_VULCANO,
        SO_VULCANO_HEIGHT,
        SO_VULCANO_STONE,
        SO_VULCANO_CRATER_TOP,
+       SO_HILLYNESS,
+       SO_VOXELCTX,
+       SO_OAKTREE,
+       SO_OAKTREE_AREA,
+       SO_PINETREE,
+       SO_PINETREE_AREA,
+       SO_PINETREE_HEIGHT,
+       SO_PINETREE_BRANCH,
+       SO_PINETREE_BRANCH_DIR,
+       SO_PALMTREE,
+       SO_PALMTREE_AREA,
 } SeedOffset;
 
-extern int seed;
+extern s32 seed;
 
 #endif