server builds now!

This commit is contained in:
Perttu Ahola 2011-01-28 02:11:44 +02:00
parent 364c961200
commit 1c776c3df8
7 changed files with 70 additions and 11 deletions

55
src/iirrlichtwrapper.h Normal file

@ -0,0 +1,55 @@
/*
Minetest-c55
Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef IIRRLICHTWRAPPER_HEADER
#define IIRRLICHTWRAPPER_HEADER
#include "common_irrlicht.h"
/*
IrrlichtWrapper prototype.
Server supplies this as a dummy wrapper.
*/
class IIrrlichtWrapper
{
public:
IIrrlichtWrapper()
{
}
virtual ~IIrrlichtWrapper()
{
}
virtual u32 getTime()
{
return 0;
}
virtual textureid_t getTextureId(const std::string &name){ return 0; }
virtual std::string getTextureName(textureid_t id){ return ""; }
virtual video::ITexture* getTexture(const std::string &name){ return NULL; }
virtual video::ITexture* getTexture(const TextureSpec &spec){ return NULL; }
private:
};
#endif

@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "debug.h" #include "debug.h"
#include "utility.h" #include "utility.h"
#include "texture.h" #include "texture.h"
#include "iirrlichtwrapper.h"
#include <jmutex.h> #include <jmutex.h>
#include <jmutexautolock.h> #include <jmutexautolock.h>
@ -125,7 +126,7 @@ private:
Also caches texture specification strings to ids and textures. Also caches texture specification strings to ids and textures.
*/ */
class IrrlichtWrapper class IrrlichtWrapper : public IIrrlichtWrapper
{ {
public: public:
/* /*

@ -36,7 +36,7 @@ ContentFeatures & content_features(u8 i)
return g_content_features[i]; return g_content_features[i];
} }
void init_mapnode(IrrlichtWrapper *irrlicht) void init_mapnode(IIrrlichtWrapper *irrlicht)
{ {
u8 i; u8 i;
ContentFeatures *f = NULL; ContentFeatures *f = NULL;

@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "exceptions.h" #include "exceptions.h"
#include "serialization.h" #include "serialization.h"
#include "tile.h" #include "tile.h"
#include "irrlichtwrapper.h" #include "iirrlichtwrapper.h"
/* /*
Initializes all kind of stuff in here. Initializes all kind of stuff in here.
@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
irrlicht: Used for getting texture ids. irrlicht: Used for getting texture ids.
*/ */
void init_mapnode(IrrlichtWrapper *irrlicht); void init_mapnode(IIrrlichtWrapper *irrlicht);
// Initializes g_content_inventory_texture_paths // Initializes g_content_inventory_texture_paths
void init_content_inventory_texture_paths(); void init_content_inventory_texture_paths();

@ -19,7 +19,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mineral.h" #include "mineral.h"
#ifndef SERVER
const char *mineral_filenames[MINERAL_COUNT] = const char *mineral_filenames[MINERAL_COUNT] =
{ {
@ -30,7 +29,7 @@ const char *mineral_filenames[MINERAL_COUNT] =
textureid_t mineral_textures[MINERAL_COUNT] = {0}; textureid_t mineral_textures[MINERAL_COUNT] = {0};
void init_mineral(IrrlichtWrapper *irrlicht) void init_mineral(IIrrlichtWrapper *irrlicht)
{ {
for(u32 i=0; i<MINERAL_COUNT; i++) for(u32 i=0; i<MINERAL_COUNT; i++)
{ {
@ -48,6 +47,5 @@ textureid_t mineral_block_texture(u8 mineral)
return mineral_textures[mineral]; return mineral_textures[mineral];
} }
#endif

@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "inventory.h" #include "inventory.h"
#include "texture.h" #include "texture.h"
#include "irrlichtwrapper.h" #include "iirrlichtwrapper.h"
/* /*
Minerals Minerals
@ -31,10 +31,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
type param. type param.
*/ */
#ifndef SERVER
// Caches textures // Caches textures
void init_mineral(IrrlichtWrapper *irrlicht); void init_mineral(IIrrlichtWrapper *irrlicht);
#endif
#define MINERAL_NONE 0 #define MINERAL_NONE 0
#define MINERAL_COAL 1 #define MINERAL_COAL 1

@ -68,6 +68,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "porting.h" #include "porting.h"
#include "materials.h" #include "materials.h"
#include "config.h" #include "config.h"
#include "mineral.h"
/* /*
Settings. Settings.
@ -256,6 +257,12 @@ int main(int argc, char *argv[])
run_tests(); run_tests();
} }
// Initialize stuff
IIrrlichtWrapper irrlicht; // Dummy
init_mapnode(&irrlicht);
init_mineral(&irrlicht);
// Read map parameters from settings // Read map parameters from settings
HMParams hm_params; HMParams hm_params;