Commit 57c4bd12 authored by nanahira's avatar nanahira

merge

parents cb8fa2e7 adc20747
...@@ -1693,7 +1693,9 @@ void Game::AddDebugMsg(const char* msg) { ...@@ -1693,7 +1693,9 @@ void Game::AddDebugMsg(const char* msg) {
sprintf(msgbuf, "[Script Error]: %s", msg); sprintf(msgbuf, "[Script Error]: %s", msg);
ErrorLog(msgbuf); ErrorLog(msgbuf);
} }
#endif //YGOPRO_SERVER_MODE
} }
#ifndef YGOPRO_SERVER_MODE
void Game::ErrorLog(const char* msg) { void Game::ErrorLog(const char* msg) {
FILE* fp = fopen("error.log", "at"); FILE* fp = fopen("error.log", "at");
if(!fp) if(!fp)
...@@ -1704,8 +1706,8 @@ void Game::ErrorLog(const char* msg) { ...@@ -1704,8 +1706,8 @@ void Game::ErrorLog(const char* msg) {
strftime(timebuf, 40, "%Y-%m-%d %H:%M:%S", localedtime); strftime(timebuf, 40, "%Y-%m-%d %H:%M:%S", localedtime);
fprintf(fp, "[%s]%s\n", timebuf, msg); fprintf(fp, "[%s]%s\n", timebuf, msg);
fclose(fp); fclose(fp);
#endif //YGOPRO_SERVER_MODE
} }
#endif //YGOPRO_SERVER_MODE
void Game::initUtils() { void Game::initUtils() {
//user files //user files
FileSystem::MakeDir("replay"); FileSystem::MakeDir("replay");
......
...@@ -129,8 +129,7 @@ public: ...@@ -129,8 +129,7 @@ public:
void MainTestLoop(int code); void MainTestLoop(int code);
void LoadExpansionDB(); void LoadExpansionDB();
void LoadBetaDB(); void LoadBetaDB();
void AddDebugMsg(char* msgbuf); void AddDebugMsg(const char* msgbuf);
bool MakeDirectory(const std::string folder);
void initUtils(); void initUtils();
#else #else
void MainLoop(); void MainLoop();
......
...@@ -8,7 +8,7 @@ project "ygopro" ...@@ -8,7 +8,7 @@ project "ygopro"
if mr and tonumber(mr) then defines { "DEFAULT_DUEL_RULE="..tonumber(mr) } end if mr and tonumber(mr) then defines { "DEFAULT_DUEL_RULE="..tonumber(mr) } end
files { "gframe.cpp", "config.h", files { "gframe.cpp", "config.h",
"game.cpp", "game.h", "game.cpp", "game.h", "myfilesystem.h",
"deck_manager.cpp", "deck_manager.h", "deck_manager.cpp", "deck_manager.h",
"data_manager.cpp", "data_manager.h", "data_manager.cpp", "data_manager.h",
"replay.cpp", "replay.h", "replay.cpp", "replay.h",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment