minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Last set of minor cleanups

master
kwolekr 2013-01-18 14:12:19 -05:00 committed by Perttu Ahola
parent 1cd8351054
commit b55fb4f2f6
5 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/biome.cpp
View File

@ -181,7 +181,8 @@ int Biome::getSurfaceHeight(float noise_terrain) {
}
void Biome::genColumn(MapgenV7 *mg, int x, int z, int y1, int y2) {
void Biome::genColumn(Mapgen *mapgen, int x, int z, int y1, int y2) {
MapgenV7 *mg = (MapgenV7 *)mapgen;
int i = (z - mg->node_min.Z) * mg->csize.Z + (x - mg->node_min.X);
int surfaceh = np->offset + np->scale * mg->map_terrain[i];
@ -214,7 +215,8 @@ void Biome::genColumn(MapgenV7 *mg, int x, int z, int y1, int y2) {
///////////////////////////// [ Ocean biome ] /////////////////////////////////
void BiomeLiquid::genColumn(MapgenV7 *mg, int x, int z, int y1, int y2) {
void BiomeLiquid::genColumn(Mapgen *mapgen, int x, int z, int y1, int y2) {
MapgenV7 *mg = (MapgenV7 *)mapgen;
int i = (z - mg->node_min.Z) * mg->csize.Z + (x - mg->node_min.X);
int surfaceh = np->offset + np->scale * mg->map_terrain[i];
int y = y1;
@ -239,8 +241,9 @@ int BiomeHell::getSurfaceHeight(float noise_terrain) {
}
void BiomeHell::genColumn(MapgenV7 *mg, int x, int z, int y1, int y2) {
void BiomeHell::genColumn(Mapgen *mapgen, int x, int z, int y1, int y2) {
MapgenV7 *mg = (MapgenV7 *)mapgen;
//stub
}
@ -252,8 +255,9 @@ int BiomeAether::getSurfaceHeight(float noise_terrain) {
}
void BiomeAether::genColumn(MapgenV7 *mg, int x, int z, int y1, int y2) {
void BiomeAether::genColumn(Mapgen *mapgen, int x, int z, int y1, int y2) {
MapgenV7 *mg = (MapgenV7 *)mapgen;
//stub
}
@ -265,7 +269,8 @@ int BiomeSuperflat::getSurfaceHeight(float noise_terrain) {
}
void BiomeSuperflat::genColumn(MapgenV7 *mg, int x, int z, int y1, int y2) {
void BiomeSuperflat::genColumn(Mapgen *mapgen, int x, int z, int y1, int y2) {
MapgenV7 *mg = (MapgenV7 *)mapgen;
int surfaceh = ntopnodes;
int y = y1;

10
src/biome.h
View File

@ -53,26 +53,26 @@ public:
std::string name;
NoiseParams *np;
virtual void genColumn(MapgenV7 *mg, int x, int z, int y1, int y2);
virtual void genColumn(Mapgen *mg, int x, int z, int y1, int y2);
virtual int getSurfaceHeight(float noise_terrain);
};
class BiomeLiquid : public Biome {
virtual void genColumn(MapgenV7 *mg, int x, int z, int y1, int y2);
virtual void genColumn(Mapgen *mg, int x, int z, int y1, int y2);
};
class BiomeHell : public Biome {
virtual void genColumn(MapgenV7 *mg, int x, int z, int y1, int y2);
virtual void genColumn(Mapgen *mg, int x, int z, int y1, int y2);
virtual int getSurfaceHeight(float noise_terrain);
};
class BiomeAether : public Biome {
virtual void genColumn(MapgenV7 *mg, int x, int z, int y1, int y2);
virtual void genColumn(Mapgen *mg, int x, int z, int y1, int y2);
virtual int getSurfaceHeight(float noise_terrain);
};
class BiomeSuperflat : public Biome {
virtual void genColumn(MapgenV7 *mg, int x, int z, int y1, int y2);
virtual void genColumn(Mapgen *mg, int x, int z, int y1, int y2);
virtual int getSurfaceHeight(float noise_terrain);
};

3
src/irrlichttypes.h
View File

@ -28,12 +28,13 @@ using namespace irr;
#if (IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 8)
#ifdef _MSC_VER
// Windows
typedef long long s64;
typedef unsigned long long u64;
#else
// Posix
#include <stdint.h>
typedef int64_t s64;
typedef uint64_t u64;
//typedef unsigned long long u64;
#endif
#endif

14
src/porting.h
View File

@ -35,14 +35,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define SWPRINTF_CHARSTRING L"%s"
#endif
//currently not needed
//template<typename T> struct alignment_trick { char c; T member; };
//#define ALIGNOF(type) offsetof (alignment_trick<type>, member)
#ifdef _WIN32
#include <windows.h>
#define ALIGNOF(x) __alignof(x)
#define sleep_ms(x) Sleep(x)
#define strtok_r(x, y, z) strtok_s(x, y, z)
#define strtof(x, y) (float)strtod(x, y)
#define strtoll(x, y, z) _strtoi64(x, y, z)
#define strtoull(x, y, z) _strtoui64(x, y, z)
#else
#include <unistd.h>
#define ALIGNOF(x) __alignof__(x)
#define sleep_ms(x) usleep(x*1000)
#endif
#define PADDING(x, y) ((ALIGNOF(y) - ((uintptr_t)(x) & (ALIGNOF(y) - 1))) & (ALIGNOF(y) - 1))
namespace porting
{

18
src/settings.h
View File

@ -32,6 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "debug.h"
#include "log.h"
#include "util/string.h"
#include "porting.h"
enum ValueType
{
@ -566,23 +567,6 @@ public:
return value;
}
//template<typename T> struct alignment_trick { char c; T member; };
//#define ALIGNOF(type) offsetof (alignment_trick<type>, member)
#ifdef _WIN32
#define ALIGNOF(x) __alignof(x)
#else
#define ALIGNOF(x) __alignof__(x)
#endif
#define PADDING(x, y) ((ALIGNOF(y) - ((uintptr_t)(x) & (ALIGNOF(y) - 1))) & (ALIGNOF(y) - 1))
#ifdef _WIN32
#define strtok_r(x, y, z) strtok_s(x, y, z)
#define strtof(x, y) (float)strtod(x, y)
#define strtoll(x, y, z) _strtoi64(x, y, z)
#define strtoull(x, y, z) _strtoui64(x, y, z)
#endif
typedef long long int s64; //to be added to src/irrlichttypes.h later
template <class T> T *getStruct(std::string name, std::string format)
{
size_t len = sizeof(T);