Fix water-glass and water-lava surfaces

[oweals/minetest.git] / src / servermain.cpp

diff --git a/src/servermain.cpp b/src/servermain.cpp
index 6227901e77785846633daa7df071b78ebca14252..73e1963c1f64616a52037fd0bc3930699e6a9a9c 100644 (file)
--- a/src/servermain.cpp
+++ b/src/servermain.cpp
@@ -117,15 +117,15 @@ u32 getTimeMs()
        return porting::getTimeMs();
 }
 
-class DstreamLogOutput: public ILogOutput
+class StderrLogOutput: public ILogOutput
 {
 public:
        /* line: Full line with timestamp, level and thread */
        void printLog(const std::string &line)
        {
-               dstream<<line<<std::endl;
+               std::cerr<<line<<std::endl;
        }
-} main_dstream_log_out;
+} main_stderr_log_out;
 
 class DstreamNoStderrLogOutput: public ILogOutput
 {
@@ -143,7 +143,7 @@ int main(int argc, char *argv[])
                Initialization
        */
 
-       log_add_output_maxlev(&main_dstream_log_out, LMT_ACTION);
+       log_add_output_maxlev(&main_stderr_log_out, LMT_ACTION);
        log_add_output_all_levs(&main_dstream_no_stderr_log_out);
 
        log_register_thread("main");
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
 #ifdef RUN_IN_PLACE
        std::string debugfile = DEBUGFILE;
 #else
-       std::string debugfile = porting::path_userdata+"/"+DEBUGFILE;
+       std::string debugfile = porting::path_userdata+DIR_DELIM+DEBUGFILE;
 #endif
        debugstreams_init(disable_stderr, debugfile.c_str());
        // Initialize debug stacks
@@ -245,7 +245,7 @@ int main(int argc, char *argv[])
        }
 
        if(cmd_args.getFlag("info-on-stderr"))
-               log_add_output(&main_dstream_log_out, LMT_INFO);
+               log_add_output(&main_stderr_log_out, LMT_INFO);
 
        /*
                Basic initialization
@@ -279,9 +279,11 @@ int main(int argc, char *argv[])
        else
        {
                core::array<std::string> filenames;
-               filenames.push_back(porting::path_userdata + "/minetest.conf");
+               filenames.push_back(porting::path_userdata +
+                               DIR_DELIM + "minetest.conf");
 #ifdef RUN_IN_PLACE
-               filenames.push_back(porting::path_userdata + "/../minetest.conf");
+               filenames.push_back(porting::path_userdata +
+                               DIR_DELIM + ".." + DIR_DELIM + "minetest.conf");
 #endif
 
                for(u32 i=0; i<filenames.size(); i++)
@@ -347,7 +349,7 @@ int main(int argc, char *argv[])
        }
        
        // Figure out path to map
-       std::string map_dir = porting::path_userdata+"/world";
+       std::string map_dir = porting::path_userdata+DIR_DELIM+"world";
        if(cmd_args.exists("map-dir"))
                map_dir = cmd_args.get("map-dir");
        else if(g_settings->exists("map-dir"))