Use proper format for size_t printf

[dragonblocks_alpha.git] / src / perlin.h

diff --git a/src/perlin.h b/src/perlin.h
index c1af34be0b39bf4726b63dddd6da5b7ed763cc38..2aab5e121d05adb6c902a8e8cd6a54ec55abd466 100644 (file)
--- a/src/perlin.h
+++ b/src/perlin.h
@@ -1,31 +1,39 @@
 #ifndef _PERLIN_H_
 #define _PERLIN_H_
 
-#include <perlin/perlin.h> // include perlin submodule header file
+#include <perlin/perlin.h>
+#include "types.h"
 
-typedef enum
-{
-       SO_NONE,
-       SO_HEIGHT,
-       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,
+#define U32(x) (((u32) 1 << 31) + (x))
+
+typedef enum {
+       OFFSET_NONE,
+       OFFSET_HEIGHT,
+       OFFSET_MOUNTAIN,
+       OFFSET_OCEAN,
+       OFFSET_MOUNTAIN_HEIGHT,
+       OFFSET_BOULDER,
+       OFFSET_WETNESS,
+       OFFSET_TEXTURE_OFFSET_S,
+       OFFSET_TEXTURE_OFFSET_T,
+       OFFSET_TEMPERATURE,
+       OFFSET_VULCANO,
+       OFFSET_VULCANO_HEIGHT,
+       OFFSET_VULCANO_STONE,
+       OFFSET_VULCANO_CRATER_TOP,
+       OFFSET_HILLYNESS,
+       OFFSET_VOXEL_PROCEDURAL,
+       OFFSET_OAKTREE,
+       OFFSET_OAKTREE_AREA,
+       OFFSET_PINETREE,
+       OFFSET_PINETREE_AREA,
+       OFFSET_PINETREE_HEIGHT,
+       OFFSET_PINETREE_BRANCH,
+       OFFSET_PINETREE_BRANCH_DIR,
+       OFFSET_PALMTREE,
+       OFFSET_PALMTREE_AREA,
 } SeedOffset;
 
-extern int seed;
+extern s32 seed;
 
-#endif
+#endif // _PERLIN_H_