More OutputDebugString() -> DebugTrace changes.

projects/mtg/include/DebugRoutines.h

@@ -4,6 +4,8 @@
 // dirty, but I get OS header includes this way
 #include "JGE.h"
 
+#include "../include/config.h"
+
 #include <iostream>
 #include <stdio.h>
 #include <string>

projects/mtg/src/GameStateMenu.cpp

@@ -5,6 +5,7 @@
 
 #include <math.h>
 #include "../include/config.h"
+#include "../include/DebugRoutines.h"
 #include "../include/GameStateMenu.h"
 #include "../include/MenuItem.h"
 #include "../include/GameOptions.h"
@@ -415,12 +416,10 @@ void GameStateMenu::Update(float dt)
       if (!nextDirectory(RESPATH"/sets/","_cards.dat")){
         //Remove temporary translations
         Translator::GetInstance()->tempValues.clear();
-        //Debug
+
-#ifdef _DEBUG
+        DebugTrace(std::endl << "==" << std::endl << 
-        char buf[4096];
+                    "Total MTGCards: " << mParent->collection->collection.size() << std::endl <<
-        sprintf(buf, "\n==\nTotal MTGCard: %lu\nTotal CardPrimitives: %lu\n==\n", (long unsigned)mParent->collection->collection.size(), (long unsigned)mParent->collection->primitives.size());
+                    "Total CardPrimitives: " << mParent->collection->primitives.size() << std::endl << "==");
-        OutputDebugString(buf);
-#endif
 
         //Force default, if necessary.
         if(options[Options::ACTIVE_PROFILE].str == "") 
@@ -636,11 +635,8 @@ void GameStateMenu::Render()
 void GameStateMenu::ButtonPressed(int controllerId, int controlId)
 {
   WFont * mFont = resources.GetWFont(Constants::MENU_FONT);
-#if defined (WIN32) || defined (LINUX)
+
-  char buf[4096];
+  DebugTrace("GameStateMenu: controllerId " << controllerId << " selected");
-  sprintf(buf, "cnotrollerId: %i", controllerId);
-  OutputDebugString(buf);
-#endif
   switch (controllerId){
   case MENU_LANGUAGE_SELECTION:
     setLang(controlId);

projects/mtg/src/ManaCost.cpp

@@ -1,4 +1,5 @@
 #include "../include/config.h"
+#include "../include/DebugRoutines.h"
 #include "../include/ManaCost.h"
 #include "../include/ManaCostHybrid.h"
 #include "../include/ExtraCost.h"
@@ -490,22 +491,18 @@ ManaCost * ManaCost::Diff(ManaCost * _cost){
 
 #ifdef WIN32
 void ManaCost::Dump(){
-  char buf[4096];
+  DebugTrace("\n===ManaCost===\n");
-  OutputDebugString("\n===ManaCost===\n");
   for (int i=0; i<= Constants::MTG_NB_COLORS; i++){
     if (cost[i]) {
-      sprintf(buf, "%c:%i - ", Constants::MTGColorChars[i],cost[i]);
+      DebugTrace(Constants::MTGColorChars[i] << ":" << cost[i] << " - ");
-      OutputDebugString(buf);
     }
   }
 
   for (unsigned int i=0; i< nbhybrids; i++){
       ManaCostHybrid * h = hybrids[i];
-
+      DebugTrace("H:{" << Constants::MTGColorChars[h->color1] << ":" <<  h->value1 << "}/{" << Constants::MTGColorChars[h->color2] << ":" << h->value2 << "}");
-      sprintf(buf, "H:{%c:%i}/{%c:%i}", Constants::MTGColorChars[h->color1], h->value1, Constants::MTGColorChars[h->color2], h->value2);
-      OutputDebugString(buf);
   }
-  OutputDebugString("\n=============\n");
+  DebugTrace("\n=============\n");
 }
 
 #endif

projects/mtg/src/PhaseRing.cpp

@@ -1,3 +1,4 @@
+#include "../include/DebugRoutines.h"
 #include "../include/PhaseRing.h"
 #include "../include/MTGDefinitions.h"
 #include "../include/Player.h"
@@ -19,9 +20,8 @@ int PhaseRing::phaseStrToInt(string s){
   if (s.compare("secondmain") == 0)return Constants::MTG_PHASE_SECONDMAIN;
   if (s.compare("endofturn") == 0)return Constants::MTG_PHASE_ENDOFTURN;
   if (s.compare("cleanup") == 0)return Constants::MTG_PHASE_CLEANUP;
-  OutputDebugString("PHASERING: Unknown Phase name:");
+  DebugTrace("PHASERING: Unknown Phase name: " << s);
-  OutputDebugString(s.c_str());
+
-  OutputDebugString("\n");
   return Constants::MTG_PHASE_FIRSTMAIN;
 }
 
@@ -90,9 +90,9 @@ Phase * PhaseRing::forward(bool sendEvents){
 Phase * PhaseRing::goToPhase(int id, Player * player, bool sendEvents){
   Phase * currentPhase = *current;
   while(currentPhase->id !=id || currentPhase->player != player){ //Dangerous, risk for inifinte loop !
-#ifdef WIN32
+
-    OutputDebugString("goto");
+    DebugTrace("PhasingRing: goToPhase called, current phase is " << phaseName(currentPhase->id));
-#endif
+
     currentPhase = forward(sendEvents);
   }
   return currentPhase;