From 5a2bae75d590cd264589f0dc91a4b2972c5956a6 Mon Sep 17 00:00:00 2001 From: "jean.chalard" Date: Tue, 2 Feb 2010 10:19:43 +0000 Subject: [PATCH] J : * Add newlines at end of files. This is for better portability. * Fix a direct reference to g++ in the makefile --- JGE/Makefile | 2 +- projects/mtg/Makefile | 2 +- projects/mtg/include/CardPrimitive.h | 2 +- projects/mtg/include/Credits.h | 2 +- projects/mtg/include/DeckMetaData.h | 2 +- projects/mtg/include/ExtraCost.h | 2 +- projects/mtg/include/GameOptions.h | 2 +- projects/mtg/include/GameStateAwards.h | 2 +- projects/mtg/include/GameStateOptions.h | 2 +- projects/mtg/include/GameStateTransitions.h | 2 +- projects/mtg/include/ReplacementEffects.h | 2 +- projects/mtg/include/Rules.h | 2 +- projects/mtg/include/Translate.h | 2 +- projects/mtg/include/WCachedResource.h | 2 +- projects/mtg/include/WResourceManager.h | 2 +- projects/mtg/src/DamagerDamaged.cpp | 2 +- projects/mtg/src/DeckMetaData.cpp | 84 ++++++++++----------- projects/mtg/src/GameApp.cpp | 2 +- projects/mtg/src/GameState.cpp | 2 +- projects/mtg/src/GameStateAwards.cpp | 2 +- projects/mtg/src/GameStateOptions.cpp | 2 +- projects/mtg/src/GameStateShop.cpp | 2 +- projects/mtg/src/GameStateTransitions.cpp | 2 +- projects/mtg/src/MTGCard.cpp | 2 +- projects/mtg/src/OptionItem.cpp | 2 +- projects/mtg/src/ShopItem.cpp | 2 +- projects/mtg/src/SimpleMenu.cpp | 2 +- 27 files changed, 68 insertions(+), 68 deletions(-) diff --git a/JGE/Makefile b/JGE/Makefile index 10cf32a82..fdfa0bdf5 100644 --- a/JGE/Makefile +++ b/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) diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index a4db9e254..6e889e735 100644 --- a/projects/mtg/Makefile +++ b/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) diff --git a/projects/mtg/include/CardPrimitive.h b/projects/mtg/include/CardPrimitive.h index 005381cdd..86f6d4e59 100644 --- a/projects/mtg/include/CardPrimitive.h +++ b/projects/mtg/include/CardPrimitive.h @@ -79,4 +79,4 @@ class CardPrimitive { }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/Credits.h b/projects/mtg/include/Credits.h index 83b73153c..0ebe1d838 100644 --- a/projects/mtg/include/Credits.h +++ b/projects/mtg/include/Credits.h @@ -46,4 +46,4 @@ public: void Render(); }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/DeckMetaData.h b/projects/mtg/include/DeckMetaData.h index 199dac83c..fb86985a0 100644 --- a/projects/mtg/include/DeckMetaData.h +++ b/projects/mtg/include/DeckMetaData.h @@ -24,4 +24,4 @@ private: mapvalues; }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/ExtraCost.h b/projects/mtg/include/ExtraCost.h index 8a3777092..2483ce80a 100644 --- a/projects/mtg/include/ExtraCost.h +++ b/projects/mtg/include/ExtraCost.h @@ -51,4 +51,4 @@ public: virtual SacrificeCost * clone() const; }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/GameOptions.h b/projects/mtg/include/GameOptions.h index 736a31d0e..52e420f07 100644 --- a/projects/mtg/include/GameOptions.h +++ b/projects/mtg/include/GameOptions.h @@ -235,4 +235,4 @@ private: extern GameSettings options; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/GameStateAwards.h b/projects/mtg/include/GameStateAwards.h index 1a26b755c..889248060 100644 --- a/projects/mtg/include/GameStateAwards.h +++ b/projects/mtg/include/GameStateAwards.h @@ -39,4 +39,4 @@ class GameStateAwards: public GameState, public JGuiListener virtual void ButtonPressed(int controllerId, int controlId); }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/GameStateOptions.h b/projects/mtg/include/GameStateOptions.h index 455173748..ed71ee3e5 100644 --- a/projects/mtg/include/GameStateOptions.h +++ b/projects/mtg/include/GameStateOptions.h @@ -37,4 +37,4 @@ private: }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/GameStateTransitions.h b/projects/mtg/include/GameStateTransitions.h index 8dab5e9eb..f4a4631b7 100644 --- a/projects/mtg/include/GameStateTransitions.h +++ b/projects/mtg/include/GameStateTransitions.h @@ -30,4 +30,4 @@ public: bool mReversed; }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/ReplacementEffects.h b/projects/mtg/include/ReplacementEffects.h index dfffd4429..873da7428 100644 --- a/projects/mtg/include/ReplacementEffects.h +++ b/projects/mtg/include/ReplacementEffects.h @@ -40,4 +40,4 @@ public: ~ReplacementEffects(); }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/Rules.h b/projects/mtg/include/Rules.h index f863850b2..5811f77fb 100644 --- a/projects/mtg/include/Rules.h +++ b/projects/mtg/include/Rules.h @@ -71,4 +71,4 @@ public: static MTGCardInstance * getCardByMTGId(int mtgid); }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/Translate.h b/projects/mtg/include/Translate.h index 43384fe75..e51bfa733 100644 --- a/projects/mtg/include/Translate.h +++ b/projects/mtg/include/Translate.h @@ -37,4 +37,4 @@ public: string _(string toTranslate); -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/WCachedResource.h b/projects/mtg/include/WCachedResource.h index 01211bc6c..fd256a8ce 100644 --- a/projects/mtg/include/WCachedResource.h +++ b/projects/mtg/include/WCachedResource.h @@ -118,4 +118,4 @@ protected: JSample * sample; }; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/include/WResourceManager.h b/projects/mtg/include/WResourceManager.h index a830ce237..e084caf1d 100644 --- a/projects/mtg/include/WResourceManager.h +++ b/projects/mtg/include/WResourceManager.h @@ -207,4 +207,4 @@ private: }; extern WResourceManager resources; -#endif \ No newline at end of file +#endif diff --git a/projects/mtg/src/DamagerDamaged.cpp b/projects/mtg/src/DamagerDamaged.cpp index 6f4ce5bdf..0fbf6468e 100644 --- a/projects/mtg/src/DamagerDamaged.cpp +++ b/projects/mtg/src/DamagerDamaged.cpp @@ -92,4 +92,4 @@ AttackerDamaged::AttackerDamaged(MTGCardInstance* card, const Pos& ref, bool sho AttackerDamaged::~AttackerDamaged(){ for (vector::iterator q = blockers.begin(); q != blockers.end(); ++q) delete(*q); -} \ No newline at end of file +} diff --git a/projects/mtg/src/DeckMetaData.cpp b/projects/mtg/src/DeckMetaData.cpp index 79b42d69a..32f95cb16 100644 --- a/projects/mtg/src/DeckMetaData.cpp +++ b/projects/mtg/src/DeckMetaData.cpp @@ -1,45 +1,45 @@ -#include "../include/DeckMetaData.h" -#include "../include/MTGDeck.h" -#include "../include/config.h" -//Possible improvements: -//Merge this with DeckStats -//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(); - +#include "../include/DeckMetaData.h" +#include "../include/MTGDeck.h" +#include "../include/config.h" +//Possible improvements: +//Merge this with DeckStats +//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(); + DeckMetaData::DeckMetaData(string filename){ load(filename); } -void DeckMetaData::load(string filename){ - MTGDeck * mtgd = NEW MTGDeck(filename.c_str(),NULL,1); - name = mtgd->meta_name; - desc = mtgd->meta_desc; - delete(mtgd); -} - -DeckMetaDataList::~DeckMetaDataList(){ - for(map::iterator it = values.begin(); it != values.end(); ++it){ - SAFE_DELETE(it->second); - } - values.clear(); -} - -void DeckMetaDataList::invalidate(string filename){ - map::iterator it = values.find(filename); - if (it !=values.end()){ - SAFE_DELETE(it->second); - values.erase(it); - } -} - -DeckMetaData * DeckMetaDataList::get(string filename){ - map::iterator it = values.find(filename); - if (it ==values.end()){ - if (fileExists(filename.c_str())) { - values[filename] = NEW DeckMetaData(filename); - } - } - - return values[filename]; //this creates a NULL entry if the file does not exist -} \ No newline at end of file +void DeckMetaData::load(string filename){ + MTGDeck * mtgd = NEW MTGDeck(filename.c_str(),NULL,1); + name = mtgd->meta_name; + desc = mtgd->meta_desc; + delete(mtgd); +} + +DeckMetaDataList::~DeckMetaDataList(){ + for(map::iterator it = values.begin(); it != values.end(); ++it){ + SAFE_DELETE(it->second); + } + values.clear(); +} + +void DeckMetaDataList::invalidate(string filename){ + map::iterator it = values.find(filename); + if (it !=values.end()){ + SAFE_DELETE(it->second); + values.erase(it); + } +} + +DeckMetaData * DeckMetaDataList::get(string filename){ + map::iterator it = values.find(filename); + if (it ==values.end()){ + if (fileExists(filename.c_str())) { + values[filename] = NEW DeckMetaData(filename); + } + } + + return values[filename]; //this creates a NULL entry if the file does not exist +} diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp index e45275a74..b657ea28f 100644 --- a/projects/mtg/src/GameApp.cpp +++ b/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); -} \ No newline at end of file +} diff --git a/projects/mtg/src/GameState.cpp b/projects/mtg/src/GameState.cpp index 41f1b95e0..78e5112a6 100644 --- a/projects/mtg/src/GameState.cpp +++ b/projects/mtg/src/GameState.cpp @@ -44,4 +44,4 @@ int GameState::fillDeckMenu(SimpleMenu * _menu, string path, string smallDeckPre } } return nbDecks; -} \ No newline at end of file +} diff --git a/projects/mtg/src/GameStateAwards.cpp b/projects/mtg/src/GameStateAwards.cpp index 8511bc474..59a0a0219 100644 --- a/projects/mtg/src/GameStateAwards.cpp +++ b/projects/mtg/src/GameStateAwards.cpp @@ -349,4 +349,4 @@ void GameStateAwards::ButtonPressed(int controllerId, int controlId) mState = STATE_DETAILS; } } -} \ No newline at end of file +} diff --git a/projects/mtg/src/GameStateOptions.cpp b/projects/mtg/src/GameStateOptions.cpp index 02c407a0d..b2565e399 100644 --- a/projects/mtg/src/GameStateOptions.cpp +++ b/projects/mtg/src/GameStateOptions.cpp @@ -235,4 +235,4 @@ void GameStateOptions::ButtonPressed(int controllerId, int controlId) } else optionsTabs->ButtonPressed(controllerId, controlId); -}; \ No newline at end of file +}; diff --git a/projects/mtg/src/GameStateShop.cpp b/projects/mtg/src/GameStateShop.cpp index 00a2ebac5..771ef9af8 100644 --- a/projects/mtg/src/GameStateShop.cpp +++ b/projects/mtg/src/GameStateShop.cpp @@ -256,4 +256,4 @@ void GameStateShop::ButtonPressed(int controllerId, int controlId) } SAFE_DELETE(menu); } -} \ No newline at end of file +} diff --git a/projects/mtg/src/GameStateTransitions.cpp b/projects/mtg/src/GameStateTransitions.cpp index 0ec2b3410..f717bcbdb 100644 --- a/projects/mtg/src/GameStateTransitions.cpp +++ b/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; -}; \ No newline at end of file +}; diff --git a/projects/mtg/src/MTGCard.cpp b/projects/mtg/src/MTGCard.cpp index ae9a781e0..1db00b1f4 100644 --- a/projects/mtg/src/MTGCard.cpp +++ b/projects/mtg/src/MTGCard.cpp @@ -72,4 +72,4 @@ char * MTGCard::getImageName(){ void MTGCard::setPrimitive(CardPrimitive * cp){ data = cp; -} \ No newline at end of file +} diff --git a/projects/mtg/src/OptionItem.cpp b/projects/mtg/src/OptionItem.cpp index ffcf05e08..e19f50d36 100644 --- a/projects/mtg/src/OptionItem.cpp +++ b/projects/mtg/src/OptionItem.cpp @@ -1632,4 +1632,4 @@ bool WSrcMTGSet::thisCard(int mtgid){ } } return false; -} \ No newline at end of file +} diff --git a/projects/mtg/src/ShopItem.cpp b/projects/mtg/src/ShopItem.cpp index 3d29a85d4..75e8cc32e 100644 --- a/projects/mtg/src/ShopItem.cpp +++ b/projects/mtg/src/ShopItem.cpp @@ -551,4 +551,4 @@ bool ShopItems::CheckUserInput(u32 key){ return dialog->CheckUserInput(key); return JGuiController::CheckUserInput(key); -} \ No newline at end of file +} diff --git a/projects/mtg/src/SimpleMenu.cpp b/projects/mtg/src/SimpleMenu.cpp index 55f1007df..ac765c911 100644 --- a/projects/mtg/src/SimpleMenu.cpp +++ b/projects/mtg/src/SimpleMenu.cpp @@ -184,4 +184,4 @@ void SimpleMenu::destroy(){ SAFE_DELETE(SimpleMenu::jewel); SAFE_DELETE(SimpleMenu::stars); SAFE_DELETE(SimpleMenu::jewelTex); -} \ No newline at end of file +}