Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the build; line endings -> Unix.

Browse Source
This commit is contained in:
wrenczes
2010-11-08 09:23:16 +00:00
parent 6d8e7edcbf
commit 52a2823f7b
2 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/DeckEditorMenu.cpp
+26 -27
View File
@@ -1,14 +1,13 @@
<<<<<<< .mine #include "PrecompiledHeader.h"
#include "PrecompiledHeader.h" #include <iomanip>
#include <iomanip> #include "DeckEditorMenu.h"
#include "DeckEditorMenu.h"
#include "PrecompiledHeader.h" #include "PrecompiledHeader.h"
#include "DeckEditorMenu.h" #include "DeckEditorMenu.h"
#include "DeckDataWrapper.h" #include "DeckDataWrapper.h"
#include "DeckStats.h" #include "DeckStats.h"
#include "JTypes.h" #include "JTypes.h"
#include "GameApp.h" #include "GameApp.h"
DeckEditorMenu::DeckEditorMenu(int id, JGuiListener* listener, int fontId, const char * _title, DeckDataWrapper *_selectedDeck, StatsWrapper *stats) DeckEditorMenu::DeckEditorMenu(int id, JGuiListener* listener, int fontId, const char * _title, DeckDataWrapper *_selectedDeck, StatsWrapper *stats)
: DeckMenu( id, listener, fontId, _title ), selectedDeck(_selectedDeck), stw( stats ) : DeckMenu( id, listener, fontId, _title ), selectedDeck(_selectedDeck), stw( stats )
{ {
@@ -50,18 +49,18 @@ void DeckEditorMenu::Render()
DeckMenu::Render(); DeckMenu::Render();
WFont *mainFont = resources.GetWFont( Fonts::MAIN_FONT ); WFont *mainFont = resources.GetWFont( Fonts::MAIN_FONT );
mainFont->DrawString( deckTitle.c_str(), statsX, statsY ); mainFont->DrawString( deckTitle.c_str(), statsX, statsY );
if ( stw && selectedDeck ) if ( stw && selectedDeck )
drawDeckStatistics(); drawDeckStatistics();
} }
void DeckEditorMenu::drawDeckStatistics() void DeckEditorMenu::drawDeckStatistics()
{ {
ostringstream deckStatsString; ostringstream deckStatsString;
deckStatsString deckStatsString
<< "------- Deck Summary -----" << endl << "------- Deck Summary -----" << endl
<< "Cards: "<< selectedDeck->getCount() << endl << "Cards: "<< selectedDeck->getCount() << endl
<< "Creatures: "<< setw(2) << stw->countCreatures << "Creatures: "<< setw(2) << stw->countCreatures
@@ -88,12 +87,12 @@ void DeckEditorMenu::drawDeckStatistics()
<< "Creature: "<< setprecision(2) << stw->avgCreatureCost << endl << "Creature: "<< setprecision(2) << stw->avgCreatureCost << endl
<< "Mana: " << setprecision(2) << stw->avgManaCost << " " << "Mana: " << setprecision(2) << stw->avgManaCost << " "
<< "Spell: " << setprecision(2) << stw->avgSpellCost << endl; << "Spell: " << setprecision(2) << stw->avgSpellCost << endl;
WFont *mainFont = resources.GetWFont( Fonts::MAIN_FONT ); WFont *mainFont = resources.GetWFont( Fonts::MAIN_FONT );
mainFont->DrawString( deckStatsString.str().c_str(), descX, descY + 25 ); mainFont->DrawString( deckStatsString.str().c_str(), descX, descY + 25 );
} }
DeckEditorMenu::~DeckEditorMenu() DeckEditorMenu::~DeckEditorMenu()
{ {
SAFE_DELETE( scroller ); SAFE_DELETE( scroller );
} }
projects/mtg/src/GameStateDeckViewer.cpp
+1 -1
View File
@@ -1414,7 +1414,7 @@ void GameStateDeckViewer::Render() {
} }
int GameStateDeckViewer::loadDeck(int deckid){ int GameStateDeckViewer::loadDeck(int deckid){
if (!stw) if (!stw)