J :

* Add newlines at end of files. This is for better portability.
* Fix a direct reference to g++ in the makefile

JGE/Makefile

@@ -121,6 +121,6 @@ clean:
 endif
 
 Makefile.linux:
-	g++ -o /dev/null src/testfeatures.c -L$(LIBDIR) -lfmod-3.75 > /dev/null 2>&1 ; if [ "0" = "$$?" ]; then echo 'FMOD=-DWITH_FMOD'; else echo 'FMOD=-DWITHOUT_FMOD'; fi > $@
+	$(CXX) -o /dev/null src/testfeatures.c -L$(LIBDIR) -lfmod-3.75 > /dev/null 2>&1 ; if [ "0" = "$$?" ]; then echo 'FMOD=-DWITH_FMOD'; else echo 'FMOD=-DWITHOUT_FMOD'; fi > $@
 
 -include Makefile.$(TARGET_ARCHITECTURE)

projects/mtg/Makefile

@@ -99,7 +99,7 @@ Makefile.psp:
 	echo > Makefile.psp
 
 Makefile.linux:
-	g++ -o /dev/null src/testfeatures.c $(LIBDIR) -lfmod-3.75 > /dev/null 2>&1 ; if [ "0" = "$$?" ]; then echo 'FMOD=-lfmod-3.75'; else echo 'FMOD='; fi > $@
+	$(CXX) -o /dev/null src/testfeatures.c $(LIBDIR) -lfmod-3.75 > /dev/null 2>&1 ; if [ "0" = "$$?" ]; then echo 'FMOD=-lfmod-3.75'; else echo 'FMOD='; fi > $@
 
 -include $(DEPS)
 -include Makefile.$(TARGET_ARCHITECTURE)

projects/mtg/include/CardPrimitive.h

@@ -79,4 +79,4 @@ class CardPrimitive {
 };
 
 
-#endif
+#endif

projects/mtg/include/Credits.h

@@ -46,4 +46,4 @@ public:
   void Render();
 };
 
-#endif
+#endif

projects/mtg/include/DeckMetaData.h

@@ -24,4 +24,4 @@ private:
   map<string,DeckMetaData *>values;
 };
 
-#endif
+#endif

projects/mtg/include/ExtraCost.h

@@ -51,4 +51,4 @@ public:
   virtual SacrificeCost * clone() const;
 };
 
-#endif
+#endif

projects/mtg/include/GameOptions.h

@@ -235,4 +235,4 @@ private:
 
 extern GameSettings options;
 
-#endif
+#endif

projects/mtg/include/GameStateAwards.h

@@ -39,4 +39,4 @@ class GameStateAwards: public GameState, public JGuiListener
   virtual void ButtonPressed(int controllerId, int controlId);
 };
 
-#endif
+#endif

projects/mtg/include/GameStateOptions.h

@@ -37,4 +37,4 @@ private:
 };
 
 
-#endif
+#endif

projects/mtg/include/GameStateTransitions.h

@@ -30,4 +30,4 @@ public:
   bool mReversed;
 };
 
-#endif
+#endif

projects/mtg/include/ReplacementEffects.h

@@ -40,4 +40,4 @@ public:
   ~ReplacementEffects();
 };
 
-#endif
+#endif

projects/mtg/include/Rules.h

@@ -71,4 +71,4 @@ public:
   static MTGCardInstance * getCardByMTGId(int mtgid);
 };
 
-#endif
+#endif

projects/mtg/include/Translate.h

@@ -37,4 +37,4 @@ public:
 
 string _(string toTranslate);
 
-#endif
+#endif

projects/mtg/include/WCachedResource.h

@@ -118,4 +118,4 @@ protected:
   JSample * sample;
 };
 
-#endif
+#endif

projects/mtg/include/WResourceManager.h

@@ -207,4 +207,4 @@ private:
 };
 
 extern WResourceManager resources;
-#endif
+#endif

projects/mtg/src/DamagerDamaged.cpp

@@ -92,4 +92,4 @@ AttackerDamaged::AttackerDamaged(MTGCardInstance* card, const Pos& ref, bool sho
 AttackerDamaged::~AttackerDamaged(){
 for (vector<DefenserDamaged*>::iterator q = blockers.begin(); q != blockers.end(); ++q)
 	delete(*q);
-}
+}

projects/mtg/src/DeckMetaData.cpp

@@ -1,45 +1,45 @@
-#include "../include/DeckMetaData.h"
+#include "../include/DeckMetaData.h"
-#include "../include/MTGDeck.h"
+#include "../include/MTGDeck.h"
-#include "../include/config.h"
+#include "../include/config.h"
-//Possible improvements:
+//Possible improvements:
-//Merge this with DeckStats
+//Merge this with DeckStats
-//Have this class handle all the Meta Data rather than relying on MTGDeck. Then MTGDeck would have a MetaData object...
+//Have this class handle all the Meta Data rather than relying on MTGDeck. Then MTGDeck would have a MetaData object...
-
+
-
+
-DeckMetaDataList * DeckMetaDataList::decksMetaData = NEW DeckMetaDataList();
+DeckMetaDataList * DeckMetaDataList::decksMetaData = NEW DeckMetaDataList();
-
+
 DeckMetaData::DeckMetaData(string filename){
   load(filename);
 }
-void DeckMetaData::load(string filename){
+void DeckMetaData::load(string filename){
-  MTGDeck * mtgd = NEW MTGDeck(filename.c_str(),NULL,1);
+  MTGDeck * mtgd = NEW MTGDeck(filename.c_str(),NULL,1);
-  name = mtgd->meta_name;
+  name = mtgd->meta_name;
-  desc = mtgd->meta_desc;
+  desc = mtgd->meta_desc;
-  delete(mtgd);
+  delete(mtgd);
-}
+}
-
+
-DeckMetaDataList::~DeckMetaDataList(){
+DeckMetaDataList::~DeckMetaDataList(){
-  for(map<string,DeckMetaData *>::iterator it = values.begin(); it != values.end(); ++it){
+  for(map<string,DeckMetaData *>::iterator it = values.begin(); it != values.end(); ++it){
-    SAFE_DELETE(it->second);
+    SAFE_DELETE(it->second);
-  }
+  }
-  values.clear();
+  values.clear();
-}
+}
-
+
-void DeckMetaDataList::invalidate(string filename){
+void DeckMetaDataList::invalidate(string filename){
-   map<string,DeckMetaData *>::iterator it = values.find(filename);
+   map<string,DeckMetaData *>::iterator it = values.find(filename);
-   if (it !=values.end()){
+   if (it !=values.end()){
-     SAFE_DELETE(it->second);
+     SAFE_DELETE(it->second);
-     values.erase(it);
+     values.erase(it);
-   }
+   }
-}
+}
-
+
-DeckMetaData * DeckMetaDataList::get(string filename){
+DeckMetaData * DeckMetaDataList::get(string filename){
-  map<string,DeckMetaData *>::iterator it = values.find(filename);
+  map<string,DeckMetaData *>::iterator it = values.find(filename);
-  if (it ==values.end()){
+  if (it ==values.end()){
-    if (fileExists(filename.c_str())) {
+    if (fileExists(filename.c_str())) {
-      values[filename] = NEW DeckMetaData(filename);
+      values[filename] = NEW DeckMetaData(filename);
-    }
+    }
-  }
+  }
-
+
-   return values[filename]; //this creates a NULL entry if the file does not exist
+   return values[filename]; //this creates a NULL entry if the file does not exist
-}
+}

projects/mtg/src/GameApp.cpp

@@ -394,4 +394,4 @@ void GameApp::DoTransition(int trans, int tostate, float dur, bool animonly){
 
 void GameApp::DoAnimation(int trans, float dur){
   DoTransition(trans,GAME_STATE_NONE,dur,true);
-}
+}

projects/mtg/src/GameState.cpp

@@ -44,4 +44,4 @@ int GameState::fillDeckMenu(SimpleMenu * _menu, string path, string smallDeckPre
     }
   }
   return nbDecks;
-}
+}

projects/mtg/src/GameStateAwards.cpp

@@ -349,4 +349,4 @@ void GameStateAwards::ButtonPressed(int controllerId, int controlId)
        mState = STATE_DETAILS;
      }
    }
-}
+}

projects/mtg/src/GameStateOptions.cpp

@@ -235,4 +235,4 @@ void GameStateOptions::ButtonPressed(int controllerId, int controlId)
   }
   else
     optionsTabs->ButtonPressed(controllerId, controlId);
-};
+};

projects/mtg/src/GameStateShop.cpp

@@ -256,4 +256,4 @@ void GameStateShop::ButtonPressed(int controllerId, int controlId)
     }
     SAFE_DELETE(menu);
   }
-}
+}

projects/mtg/src/GameStateTransitions.cpp

@@ -53,4 +53,4 @@ void TransitionFade::Render(){
 TransitionFade::TransitionFade(GameApp* p, GameState* f, GameState* t, float dur, bool reversed):
 TransitionBase(p, f,t,dur) {
   mReversed = reversed;
-};
+};

projects/mtg/src/MTGCard.cpp

@@ -72,4 +72,4 @@ char * MTGCard::getImageName(){
 
 void MTGCard::setPrimitive(CardPrimitive * cp){
   data = cp;
-}
+}

projects/mtg/src/OptionItem.cpp

@@ -1632,4 +1632,4 @@ bool WSrcMTGSet::thisCard(int mtgid){
     }
   }
   return false;
-}
+}

projects/mtg/src/ShopItem.cpp

@@ -551,4 +551,4 @@ bool ShopItems::CheckUserInput(u32 key){
    return dialog->CheckUserInput(key);
 
  return JGuiController::CheckUserInput(key);
-}
+}

projects/mtg/src/SimpleMenu.cpp

@@ -184,4 +184,4 @@ void SimpleMenu::destroy(){
   SAFE_DELETE(SimpleMenu::jewel);
   SAFE_DELETE(SimpleMenu::stars);
   SAFE_DELETE(SimpleMenu::jewelTex);
-}
+}