minenux
/
minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

In a globally installed build, debug.txt is now placed in userdata directory. Needs testing still.

mutilcraft-mt53
Perttu Ahola 2011-06-02 19:30:03 +03:00
parent fd64dd5e20
commit 1b8cff8fbf
3 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -9,7 +9,7 @@ project(minetest)
set(VERSION_MAJOR 0)
set(VERSION_MINOR 2)
set(VERSION_PATCH 20110602_0)
set(VERSION_PATCH 20110602_1_dev)
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
# Configuration options

37
src/main.cpp
View File

@ -1028,6 +1028,15 @@ void drawMenuBackground(video::IVideoDriver* driver)
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");
/*
Parse command line
*/
@ -1091,21 +1100,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();
// Create user data directory
fs::CreateDir(porting::path_userdata);
// C-style stuff initialization
// Init material properties table
initializeMaterialProperties();
// Debug handler
@ -1124,19 +1140,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
*/

38
src/servermain.cpp
View File

@ -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
*/