Commit: caf0fdcafe278634ba84a13882a6d2c02ad79c26 - main (git)

Commit MetaInfo

• Revision: caf0fdcafe278634ba84a13882a6d2c02ad79c26 (tree)
• Time: 2012-09-08 21:26:46
• Author: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

UISuper.cppのyuidoc用コメントを削除
一部ファイルの文字コードを変更
ログを標準出力に常時流すよう変更

Change Summary

• modified: client/Card.cpp
• modified: client/Player.cpp
• modified: client/ui/UISuper.cpp
• modified: common/Logger.hpp

Incremental Difference

Binary files a/client/Card.cpp and b/client/Card.cpp differ

Binary files a/client/Player.cpp and b/client/Player.cpp differ

--- a/client/ui/UISuper.cpp
+++ b/client/ui/UISuper.cpp
@@ -2,16 +2,6 @@
 // UISuper.cpp
 //
 
-/**
-* @module global
-* @submodule UI
- */
-
-/**
- * @class Base
- * @namespace UI
- */
-
 #include "UISuper.hpp"
 
 int UISuper::max_focus_index = 0;

--- a/common/Logger.hpp
+++ b/common/Logger.hpp
@@ -7,7 +7,7 @@
 #include "unicode.hpp"
 
 #ifndef _WIN32
-#define OutputDebugString(str) std::cout << str
+#define OutputDebugString(str) (str)
 #endif
 
 class Logger {
@@ -114,6 +114,7 @@ class Logger {
         void Log(const tstring& prefix, const tstring& format) {
             auto out = prefix + format + _T("\n");
             OutputDebugString(out.c_str());
+			std::wcout << unicode::ToWString(out);
 			ofs_ << unicode::ToString(out);
         }
 
@@ -121,6 +122,7 @@ class Logger {
         void Log(const tstring& prefix, const tstring& format, const T1& t1) {
             auto out = prefix + (tformat(format) % t1).str() + _T("\n");
             OutputDebugString(out.c_str());
+			std::wcout << unicode::ToWString(out);
 			ofs_ << unicode::ToString(out);
         }
 
@@ -128,6 +130,7 @@ class Logger {
         void Log(const tstring& prefix, const tstring& format, const T1& t1, const T2& t2) {
             auto out = prefix + (tformat(format) % t1 % t2).str() + _T("\n");
             OutputDebugString(out.c_str());
+			std::wcout << unicode::ToWString(out);
 			ofs_ << unicode::ToString(out);
         }
 
@@ -135,6 +138,7 @@ class Logger {
         void Log(const tstring& prefix, const tstring& format, const T1& t1, const T2& t2, const T3& t3) {
             auto out = prefix + (tformat(format) % t1 % t2 % t3).str() + _T("\n");
             OutputDebugString(out.c_str());
+			std::wcout << unicode::ToWString(out);
 			ofs_ << unicode::ToString(out);
         }
 
@@ -142,6 +146,7 @@ class Logger {
         void Log(const tstring& prefix, const tstring& format, const T1& t1, const T2& t2, const T3& t3, const T4& t4) {
             auto out = prefix + (tformat(format) % t1 % t2 % t3 % t4).str() + _T("\n");
             OutputDebugString(out.c_str());
+			std::wcout << unicode::ToWString(out);
 			ofs_ << unicode::ToString(out);
         }