Commit a4bc4d4c authored by nanahira's avatar nanahira

Merge branch 'develop' into another-develop

parents 4ddd58ec d21a3b31
...@@ -981,7 +981,7 @@ uint32 ReplayMode::MessageHandler(intptr_t fduel, uint32 type) { ...@@ -981,7 +981,7 @@ uint32 ReplayMode::MessageHandler(intptr_t fduel, uint32 type) {
if(!enable_log) if(!enable_log)
return 0; return 0;
char msgbuf[1024]; char msgbuf[1024];
get_log_message(fduel, (byte*)msgbuf); get_log_message(fduel, msgbuf);
mainGame->AddDebugMsg(msgbuf); mainGame->AddDebugMsg(msgbuf);
return 0; return 0;
} }
......
...@@ -1606,7 +1606,7 @@ uint32 SingleDuel::MessageHandler(intptr_t fduel, uint32 type) { ...@@ -1606,7 +1606,7 @@ uint32 SingleDuel::MessageHandler(intptr_t fduel, uint32 type) {
if(!enable_log) if(!enable_log)
return 0; return 0;
char msgbuf[1024]; char msgbuf[1024];
get_log_message(fduel, (byte*)msgbuf); get_log_message(fduel, msgbuf);
mainGame->AddDebugMsg(msgbuf); mainGame->AddDebugMsg(msgbuf);
return 0; return 0;
} }
......
...@@ -843,7 +843,7 @@ uint32 SingleMode::MessageHandler(intptr_t fduel, uint32 type) { ...@@ -843,7 +843,7 @@ uint32 SingleMode::MessageHandler(intptr_t fduel, uint32 type) {
if(!enable_log) if(!enable_log)
return 0; return 0;
char msgbuf[1024]; char msgbuf[1024];
get_log_message(fduel, (byte*)msgbuf); get_log_message(fduel, msgbuf);
mainGame->AddDebugMsg(msgbuf); mainGame->AddDebugMsg(msgbuf);
return 0; return 0;
} }
......
...@@ -1755,7 +1755,7 @@ uint32 TagDuel::MessageHandler(intptr_t fduel, uint32 type) { ...@@ -1755,7 +1755,7 @@ uint32 TagDuel::MessageHandler(intptr_t fduel, uint32 type) {
if(!enable_log) if(!enable_log)
return 0; return 0;
char msgbuf[1024]; char msgbuf[1024];
get_log_message(fduel, (byte*)msgbuf); get_log_message(fduel, msgbuf);
mainGame->AddDebugMsg(msgbuf); mainGame->AddDebugMsg(msgbuf);
return 0; return 0;
} }
......
Subproject commit 47c224dbac247767b3eb55068d08f68645089b11 Subproject commit f3813158d7afeb8508eb80082c0c997d4cb7be68
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