projects
/
oweals
/
minetest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow server-side teleporting
[oweals/minetest.git]
/
src
/
servermain.cpp
diff --git
a/src/servermain.cpp
b/src/servermain.cpp
index 6bfcf2b75f06d60c34793a6e1fe8a44c80ab6478..64853604b1a8ec64c11de1411005e66dec95a43f 100644
(file)
--- a/
src/servermain.cpp
+++ b/
src/servermain.cpp
@@
-74,7
+74,7
@@
with this program; if not, write to the Free Software Foundation, Inc.,
#include "settings.h"
#include "profiler.h"
#include "log.h"
#include "settings.h"
#include "profiler.h"
#include "log.h"
-#include "
mapnode_contentfeatures
.h" // For init_contentfeatures
+#include "
nodedef
.h" // For init_contentfeatures
#include "content_mapnode.h" // For content_mapnode_init
/*
#include "content_mapnode.h" // For content_mapnode_init
/*
@@
-88,9
+88,6
@@
Settings *g_settings = &main_settings;
Profiler main_profiler;
Profiler *g_profiler = &main_profiler;
Profiler main_profiler;
Profiler *g_profiler = &main_profiler;
-// A dummy thing
-ITextureSource *g_texturesource = NULL;
-
/*
Debug streams
*/
/*
Debug streams
*/
@@
-305,11
+302,6
@@
int main(int argc, char *argv[])
// Initialize stuff
// Initialize stuff
- // Initialize content feature table
- init_contentfeatures();
- // Initialize mapnode content without textures (with g_texturesource=NULL)
- content_mapnode_init();
-
init_mineral();
/*
init_mineral();
/*