diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-11-14 00:19:48 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:41 +0200 |
commit | abceeee92f99b84ebb79968269835a4f509bfb90 (patch) | |
tree | 669edeca68fae4eb086ac4e4c1846b55d3aa779d /src/servermain.cpp | |
parent | 5fc791ac9a15ea6f234ca2d23041c83679255746 (diff) | |
download | hax-minetest-server-abceeee92f99b84ebb79968269835a4f509bfb90.tar.gz hax-minetest-server-abceeee92f99b84ebb79968269835a4f509bfb90.zip |
Create framework for getting rid of global definitions of node/tool/item/whatever types
Diffstat (limited to 'src/servermain.cpp')
-rw-r--r-- | src/servermain.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/servermain.cpp b/src/servermain.cpp index 6bfcf2b75..deae90bba 100644 --- a/src/servermain.cpp +++ b/src/servermain.cpp @@ -88,9 +88,6 @@ Settings *g_settings = &main_settings; Profiler main_profiler; Profiler *g_profiler = &main_profiler; -// A dummy thing -ITextureSource *g_texturesource = NULL; - /* Debug streams */ @@ -305,10 +302,10 @@ int main(int argc, char *argv[]) // Initialize stuff - // Initialize content feature table - init_contentfeatures(); - // Initialize mapnode content without textures (with g_texturesource=NULL) - content_mapnode_init(); + // Initialize content feature table without textures + init_contentfeatures(NULL); + // Initialize mapnode content without textures + content_mapnode_init(NULL); init_mineral(); |