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

J :

Browse Source 
* Fix a number of warnings
This commit is contained in:
jean.chalard
2009-01-18 14:13:13 +00:00
parent 1cbf9c32e9
commit 5466a7004c
6 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/CardGui.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ void CardGui::alternateRender(MTGCard * card, JLBFont * mFont, JQuad ** manaIcon
ManaCostHybrid * h; ManaCostHybrid * h;
unsigned int j = 0; unsigned int j = 0;
while (h = manacost->getHybridCost(j)){ while ((h = manacost->getHybridCost(j))){
OutputDebugString("Hybrid\n"); OutputDebugString("Hybrid\n");
for (int i = 0; i < 2; i++){ for (int i = 0; i < 2; i++){
int color = h->color1; int color = h->color1;
projects/mtg/src/GameStateMenu.cpp
+2 -2
View File
@@ -411,9 +411,9 @@ void GameStateMenu::ButtonPressed(int controllerId, int controlId)
{ {
case MENUITEM_PLAY: case MENUITEM_PLAY:
#ifdef TESTSUITE #ifdef TESTSUITE
subMenuController = NEW SimpleMenu(102, this, mFont, 180,110); subMenuController = NEW SimpleMenu(102, this, mFont, 150,60);
#else #else
subMenuController = NEW SimpleMenu(102, this, mFont, 180,110); subMenuController = NEW SimpleMenu(102, this, mFont, 150,60);
#endif #endif
if (subMenuController){ if (subMenuController){
subMenuController->Add(SUBMENUITEM_1PLAYER,"1 Player"); subMenuController->Add(SUBMENUITEM_1PLAYER,"1 Player");
projects/mtg/src/MTGAbility.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card){
MultiAbility * multi = NULL; MultiAbility * multi = NULL;
int delimiter = line.find("}:"); unsigned int delimiter = line.find("}:");
ManaCost * cost = NULL; ManaCost * cost = NULL;
if (delimiter!= string::npos){ if (delimiter!= string::npos){
cost = ManaCost::parseManaCost(line.substr(0,delimiter+1)); cost = ManaCost::parseManaCost(line.substr(0,delimiter+1));
projects/mtg/src/ManaCost.cpp
+8 -8
View File
@@ -113,7 +113,7 @@ ManaCost::ManaCost(ManaCost * _manaCost){
ManaCost::~ManaCost(){ ManaCost::~ManaCost(){
LOG("==Deleting ManaCost=="); LOG("==Deleting ManaCost==");
for (int i = 0; i < nbhybrids ; i++){ for (unsigned int i = 0; i < nbhybrids ; i++){
SAFE_DELETE(hybrids[i]); SAFE_DELETE(hybrids[i]);
} }
} }
@@ -132,10 +132,10 @@ void ManaCost::init(){
void ManaCost::copy(ManaCost * _manaCost){ void ManaCost::copy(ManaCost * _manaCost){
for (int i=0; i<= Constants::MTG_NB_COLORS; i++){ for (unsigned int i = 0; i <= Constants::MTG_NB_COLORS; i++){
cost[i] = _manaCost->getCost(i); cost[i] = _manaCost->getCost(i);
} }
for (int i=0; i< _manaCost->nbhybrids; i++){ for (unsigned int i = 0; i < _manaCost->nbhybrids; i++){
hybrids[i] = NEW ManaCostHybrid((*_manaCost->hybrids[i])); hybrids[i] = NEW ManaCostHybrid((*_manaCost->hybrids[i]));
} }
nbhybrids = _manaCost->nbhybrids; nbhybrids = _manaCost->nbhybrids;
@@ -159,7 +159,7 @@ int ManaCost::getMainColor(){
int ManaCost::hasColor(int color){ int ManaCost::hasColor(int color){
if (cost[color]) return 1; if (cost[color]) return 1;
for (int i = 0; i < nbhybrids; i++){ for (unsigned int i = 0; i < nbhybrids; i++){
if (hybrids[i]->hasColor(color)) return 1; if (hybrids[i]->hasColor(color)) return 1;
} }
return 0; return 0;
@@ -167,10 +167,10 @@ int ManaCost::hasColor(int color){
int ManaCost::getConvertedCost(){ int ManaCost::getConvertedCost(){
int result = 0; int result = 0;
for (int i=0; i< Constants::MTG_NB_COLORS; i++){ for (unsigned int i = 0; i < Constants::MTG_NB_COLORS; i++){
result += cost[i]; result += cost[i];
} }
for (int i = 0; i < nbhybrids; i++){ for (unsigned int i = 0; i < nbhybrids; i++){
result+= hybrids[i]->getConvertedCost(); result+= hybrids[i]->getConvertedCost();
} }
return result; return result;
@@ -188,10 +188,10 @@ int ManaCost::add(int color, int value){
int ManaCost::add(ManaCost * _cost){ int ManaCost::add(ManaCost * _cost){
if(!_cost) return 0; if(!_cost) return 0;
for (int i=0; i< Constants::MTG_NB_COLORS; i++){ for (unsigned int i = 0; i < Constants::MTG_NB_COLORS; i++){
cost[i]+= _cost->getCost(i); cost[i]+= _cost->getCost(i);
} }
for (int i=0; i< _cost->nbhybrids; i++){ for (unsigned int i = 0; i < _cost->nbhybrids; i++){
hybrids[nbhybrids] = NEW ManaCostHybrid((*_cost->hybrids[i])); hybrids[nbhybrids] = NEW ManaCostHybrid((*_cost->hybrids[i]));
nbhybrids++; nbhybrids++;
} }
projects/mtg/src/PhaseRing.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ Phase * PhaseRing::forward(){
Phase * PhaseRing::goToPhase(int id, Player * player){ Phase * PhaseRing::goToPhase(int id, Player * player){
Phase * currentPhase = *current; Phase * currentPhase = *current;
while(currentPhase->id !=id || currentPhase->player !=player){ //Dangerous, risk for inifinte loop ! while(currentPhase->id !=id || currentPhase->player != player){ //Dangerous, risk for inifinte loop !
#ifdef WIN32 #ifdef WIN32
OutputDebugString("goto"); OutputDebugString("goto");
#endif #endif
projects/mtg/src/SimpleMenu.cpp
+3 -3
View File
@@ -5,9 +5,9 @@
#include "../include/GameApp.h" #include "../include/GameApp.h"
const unsigned SimpleMenu::SIDE_SIZE = 7; const unsigned SimpleMenu::SIDE_SIZE = 7;
const unsigned SimpleMenu::VMARGIN = 12; const unsigned SimpleMenu::VMARGIN = 16;
const unsigned SimpleMenu::HMARGIN = 27; const unsigned SimpleMenu::HMARGIN = 30;
const signed SimpleMenu::LINE_HEIGHT = 16; const signed SimpleMenu::LINE_HEIGHT = 28;
const char* SimpleMenu::spadeLPath = "graphics/spade_ul.png"; const char* SimpleMenu::spadeLPath = "graphics/spade_ul.png";
const char* SimpleMenu::spadeRPath = "graphics/spade_ur.png"; const char* SimpleMenu::spadeRPath = "graphics/spade_ur.png";
const char* SimpleMenu::jewelPath = "graphics/jewel.png"; const char* SimpleMenu::jewelPath = "graphics/jewel.png";