From 63611932ebae93620386b26cfa82f7c4552b22ff Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sun, 29 May 2011 21:11:16 +0300 Subject: player passwords and privileges in world/auth.txt --HG-- extra : rebase_source : 7260636295d9068fbeeddf4143c89f2b8a91446c --- src/servermain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/servermain.cpp') diff --git a/src/servermain.cpp b/src/servermain.cpp index 254b1f28a..f3b17000c 100644 --- a/src/servermain.cpp +++ b/src/servermain.cpp @@ -301,7 +301,7 @@ int main(int argc, char *argv[]) } // Figure out path to map - std::string map_dir = porting::path_userdata+"/map"; + std::string map_dir = porting::path_userdata+"/world"; if(cmd_args.exists("map-dir")) map_dir = cmd_args.get("map-dir"); else if(g_settings.exists("map-dir")) -- cgit v1.2.3 From 63ae3d7387ba755c288d783cc2fa1a567addd0df Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Tue, 31 May 2011 00:26:47 +0300 Subject: forgot to add profiler to servermain.cpp --- src/servermain.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/servermain.cpp') diff --git a/src/servermain.cpp b/src/servermain.cpp index f3b17000c..f83e2ae76 100644 --- a/src/servermain.cpp +++ b/src/servermain.cpp @@ -79,6 +79,9 @@ Settings g_settings; extern void set_default_settings(); +// Global profiler +Profiler g_profiler; + // A dummy thing ITextureSource *g_texturesource = NULL; -- cgit v1.2.3 From 1b8cff8fbf6a1ae121bba93b12318a6f20f1daad Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Thu, 2 Jun 2011 19:30:03 +0300 Subject: In a globally installed build, debug.txt is now placed in userdata directory. Needs testing still. --- src/servermain.cpp | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) (limited to 'src/servermain.cpp') diff --git a/src/servermain.cpp b/src/servermain.cpp index f83e2ae76..907d0d2db 100644 --- a/src/servermain.cpp +++ b/src/servermain.cpp @@ -115,6 +115,15 @@ u32 getTimeMs() int main(int argc, char *argv[]) { + /* + Initialization + */ + + // Set locale. This is for forcing '.' as the decimal point. + std::locale::global(std::locale("C")); + // This enables printing all characters in bitmap font + setlocale(LC_CTYPE, "en_US"); + /* Low-level initialization */ @@ -124,20 +133,28 @@ int main(int argc, char *argv[]) disable_stderr = true; #endif + porting::signal_handler_init(); + bool &kill = *porting::signal_handler_killstatus(); + + // Initialize porting::path_data and porting::path_userdata + porting::initializePaths(); + // Initialize debug streams - debugstreams_init(disable_stderr, DEBUGFILE); +#ifdef RUN_IN_PLACE + std::string debugfile = DEBUGFILE; +#else + std::string debugfile = porting::path_userdata+"/"+DEBUGFILE; +#endif + debugstreams_init(disable_stderr, debugfile.c_str()); // Initialize debug stacks debug_stacks_init(); DSTACK(__FUNCTION_NAME); - porting::signal_handler_init(); - bool &kill = *porting::signal_handler_killstatus(); - - porting::initializePaths(); - + // Init material properties table initializeMaterialProperties(); + // Debug handler BEGIN_DEBUG_EXCEPTION_HANDLER // Print startup message @@ -202,19 +219,10 @@ int main(int argc, char *argv[]) // Initialize default settings set_default_settings(); - // Set locale. This is for forcing '.' as the decimal point. - std::locale::global(std::locale("C")); - // This enables printing all characters in bitmap font - setlocale(LC_CTYPE, "en_US"); - // Initialize sockets sockets_init(); atexit(sockets_cleanup); - /* - Initialization - */ - /* Read config file */ -- cgit v1.2.3 From dc5319b6c9f2e39d93f2fa881403f36fc47ffaac Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Fri, 17 Jun 2011 22:20:15 +0300 Subject: Moved some mapnode content stuff from mapnode.{h,cpp} and digging property stuff from material.cpp to content_mapnode.{h,cpp} --- src/servermain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/servermain.cpp') diff --git a/src/servermain.cpp b/src/servermain.cpp index 907d0d2db..6eb45ea22 100644 --- a/src/servermain.cpp +++ b/src/servermain.cpp @@ -152,7 +152,7 @@ int main(int argc, char *argv[]) DSTACK(__FUNCTION_NAME); // Init material properties table - initializeMaterialProperties(); + //initializeMaterialProperties(); // Debug handler BEGIN_DEBUG_EXCEPTION_HANDLER -- cgit v1.2.3 From 051c0048d8068b8690eee70e5491751e12c0fa30 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Mon, 20 Jun 2011 18:04:49 +0300 Subject: path_userdata is now created before potentially creating debug.txt in there --- src/servermain.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/servermain.cpp') diff --git a/src/servermain.cpp b/src/servermain.cpp index 6eb45ea22..91b31fb58 100644 --- a/src/servermain.cpp +++ b/src/servermain.cpp @@ -139,6 +139,9 @@ int main(int argc, char *argv[]) // Initialize porting::path_data and porting::path_userdata porting::initializePaths(); + // Create user data directory + fs::CreateDir(porting::path_userdata); + // Initialize debug streams #ifdef RUN_IN_PLACE std::string debugfile = DEBUGFILE; -- cgit v1.2.3 From c1844a921d507b54b6170e2aee5293dc802c26cb Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Wed, 22 Jun 2011 14:21:55 +0300 Subject: fixed servermain.cpp lacking filesys.h --- src/servermain.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/servermain.cpp') diff --git a/src/servermain.cpp b/src/servermain.cpp index 91b31fb58..146c548c5 100644 --- a/src/servermain.cpp +++ b/src/servermain.cpp @@ -69,6 +69,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "materials.h" #include "config.h" #include "mineral.h" +#include "filesys.h" /* Settings. -- cgit v1.2.3