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

Erwan

Browse Source 
- some cleanup (gcc warnings)
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-07-26 07:27:27 +00:00
parent 514b507e91
commit 94e199d92a
14 changed files with 20 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/include/AIMomirPlayer.h
View File

@@ -6,7 +6,7 @@
class AIMomirPlayer:public AIPlayerBaka{
public:
AIMomirPlayer(MTGPlayerCards * _deck, char * file, char * fileSmall, char * avatarFile);
AIMomirPlayer(MTGPlayerCards * _deck, char * file, const char * fileSmall, char * avatarFile);
int getEfficiency(AIAction * action);
int momir();
int computeActions();

2
projects/mtg/include/AIPlayer.h
View File

@@ -86,7 +86,7 @@ class AIPlayerBaka: public AIPlayer{
float timer;
MTGCardInstance * FindCardToPlay(ManaCost * potentialMana, const char * type);
public:
AIPlayerBaka(MTGPlayerCards * _deck, char * deckFile, char * deckfileSmall, char * avatarFile);
AIPlayerBaka(MTGPlayerCards * _deck, char * deckFile, const char * deckfileSmall, char * avatarFile);
virtual int Act(float dt);
void initTimer();
virtual int computeActions();

4
projects/mtg/include/AllAbilities.h
View File

@@ -29,7 +29,7 @@ class TrCardAddedToZone:public TriggeredAbility{
public:
TargetChooser * toTc;
TargetZoneChooser * fromTc;
TrCardAddedToZone(int id,MTGCardInstance * source, TargetChooser * toTc, TargetZoneChooser * fromTc = NULL):TriggeredAbility(id,source), fromTc(fromTc),toTc(toTc){
TrCardAddedToZone(int id,MTGCardInstance * source, TargetChooser * toTc, TargetZoneChooser * fromTc = NULL):TriggeredAbility(id,source), toTc(toTc),fromTc(fromTc){
}
int resolve(){
@@ -63,7 +63,7 @@ class AACounter: public ActivatedAbility{
int nb;
int power;
int toughness;
AACounter(int id, MTGCardInstance * _source, MTGCardInstance * _target, int _power, int _toughness, int nb,ManaCost * cost=NULL, int doTap = 0):ActivatedAbility(id,_source,cost,0,doTap),power(_power),toughness(_toughness),nb(nb){
AACounter(int id, MTGCardInstance * _source, MTGCardInstance * _target, int _power, int _toughness, int nb,ManaCost * cost=NULL, int doTap = 0):ActivatedAbility(id,_source,cost,0,doTap),nb(nb),power(_power),toughness(_toughness){
target=_target;
}

1
projects/mtg/include/GameStateDeckViewer.h
View File

@@ -183,7 +183,6 @@ class GameStateDeckViewer: public GameState, public JGuiListener
//menuFont = NEW JLBFont("graphics/f3",16);
menuFont = GameApp::CommonRes->GetJLBFont("graphics/f3");
welcome_menu = NEW SimpleMenu(10,this,menuFont,20,20);
char buffer[100];
int nbDecks = fillDeckMenu(welcome_menu,RESPATH"/player");
welcome_menu->Add(nbDecks+1, "--NEW--");
welcome_menu->Add(-1, "Cancel");

2
projects/mtg/src/AIMomirPlayer.cpp
View File

@@ -9,7 +9,7 @@
MTGAbility * AIMomirPlayer::momirAbility = NULL;
AIMomirPlayer::AIMomirPlayer(MTGPlayerCards * _deck, char * file, char * fileSmall, char * avatarFile): AIPlayerBaka(_deck,file, fileSmall, avatarFile){
AIMomirPlayer::AIMomirPlayer(MTGPlayerCards * _deck, char * file, const char * fileSmall, char * avatarFile): AIPlayerBaka(_deck,file, fileSmall, avatarFile){
momirAbility = NULL;
agressivity = 100;
}

2
projects/mtg/src/AIPlayer.cpp
View File

@@ -621,7 +621,7 @@ MTGCardInstance * AIPlayerBaka::FindCardToPlay(ManaCost * potentialMana, const c
return nextCardToPlay;
}
AIPlayerBaka::AIPlayerBaka(MTGPlayerCards * _deck, char * file, char * fileSmall, char * avatarFile): AIPlayer(_deck,file, fileSmall){
AIPlayerBaka::AIPlayerBaka(MTGPlayerCards * _deck, char * file, const char * fileSmall, char * avatarFile): AIPlayer(_deck,file, fileSmall){
if (fileExists(avatarFile)){
mAvatarTex = JRenderer::GetInstance()->LoadTexture(avatarFile, TEX_TYPE_USE_VRAM);
}else{

3
projects/mtg/src/ActionStack.cpp
View File

@@ -177,7 +177,6 @@ void Spell::Render(){
else
{
MTGCard * mtgcard = source->model;
JLBFont * font = GameApp::CommonRes->GetJLBFont("graphics/magic");
CardGui::alternateRender(mtgcard, NULL, 10 + 90 , 20 + 130, 0.0f,0.9f);
quad = source->getThumb();
@@ -351,7 +350,7 @@ Spell * ActionStack::addSpell(MTGCardInstance * _source, Targetable * _targets[]
OutputDebugString(buf);
#endif
Spell * spell = NEW Spell(mCount,_source,_targets,_nbtargets, mana);
int result = addAction(spell);
addAction(spell);
if (!game->players[0]->isAI() &&
_source->controller()==game->players[0] &&
GameOptions::GetInstance()->values[OPTIONS_INTERRUPTMYSPELLS].getIntValue() == 0){

8
projects/mtg/src/CardGui.cpp
View File

@@ -74,7 +74,6 @@ void CardGui::alternateRender(MTGCard * card, JQuad ** manaIcons, float x, float
color = h->color2;
value = h->value2;
}
int offset = 2*i-1;
v.x = (width/2 - 24 - 16*nbicons + 8*i)*scale;
v.y = ((-height/2) + 16 + 8*i) * scale;
v.Rotate(rotation);
@@ -271,7 +270,6 @@ void CardGui::RenderBig(float xpos, float ypos, int alternate){
if (alternate){
MTGCard * mtgcard = card->model;
JLBFont * font = GameApp::CommonRes->GetJLBFont("graphics/magic");
CardGui::alternateRender(mtgcard, NULL, xpos + 90 , ypos + 130, 0.0f,0.9f);
if (quad){
float scale = 250 / quad->mHeight;
@@ -357,10 +355,10 @@ void CardGui::Render(){
}
if (mIcon) mIcon->SetHotSpot(16,16);
if (card->isTapped()){
renderer->FillRect(myX - myH , myY , myH, myW, ARGB(255,Constants::_r[color]/2+50,Constants::_g[color]/2+50,Constants::_b[color]/2+50));
renderer->FillRect(myX - myH , myY , myH, myW, ARGB(255,(Constants::_r[color]) /2 + 50,(Constants::_g[color]) /2 + 50,(Constants::_b[color])/ 2 + 50));
renderer->DrawRect(myX - myH , myY , myH, myW, ARGB(255,Constants::_r[color],Constants::_g[color],Constants::_b[color]));
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE * 0.8 * mScale);
mFont->DrawString(buffer,myX - (myH)+4,myY + 1);
mFont->DrawString(buffer,myX - myH + 4, myY + 1);
if (mIcon) renderer->RenderQuad(mIcon,myX - myH/2, myY + myW/2,M_PI_2,mScale,mScale);
if (tc){
if (!tc->canTarget(card)){
@@ -368,7 +366,7 @@ void CardGui::Render(){
}
}
}else{
renderer->FillRect(myX , myY , myW, myH, ARGB(255,Constants::_r[color]/2+50,Constants::_g[color]/2+50,Constants::_b[color]/2+50));
renderer->FillRect(myX , myY , myW, myH, ARGB(255,(Constants::_r[color]) /2 + 50,(Constants::_g[color]) /2 + 50,(Constants::_b[color]) /2 + 50));
renderer->DrawRect(myX , myY , myW, myH, ARGB(255,Constants::_r[color],Constants::_g[color],Constants::_b[color]));
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE * 0.5 * mScale);
mFont->DrawString(buffer,myX+4,myY + 1);

8
projects/mtg/src/Credits.cpp
View File

@@ -79,22 +79,22 @@ void Credits::compute(Player * _p1, Player * _p2, GameApp * _app){
unlockedQuad = NEW JQuad(unlockedTex, 2, 2, 396, 96);
GameOptions::GetInstance()->values[OPTIONS_DIFFICULTY_MODE_UNLOCKED] = GameOption(1);
GameOptions::GetInstance()->save();
}else if(unlocked = isMomirUnlocked()) {
}else if((unlocked = isMomirUnlocked())) {
unlockedTex = JRenderer::GetInstance()->LoadTexture("graphics/momir_unlocked.png", TEX_TYPE_USE_VRAM);
unlockedQuad = NEW JQuad(unlockedTex, 2, 2, 396, 96);
GameOptions::GetInstance()->values[OPTIONS_MOMIR_MODE_UNLOCKED] = GameOption(1);
GameOptions::GetInstance()->save();
}else if(unlocked = isEvilTwinUnlocked()) {
}else if((unlocked = isEvilTwinUnlocked())) {
unlockedTex = JRenderer::GetInstance()->LoadTexture("graphics/eviltwin_unlocked.png", TEX_TYPE_USE_VRAM);
unlockedQuad = NEW JQuad(unlockedTex, 2, 2, 396, 96);
GameOptions::GetInstance()->values[OPTIONS_EVILTWIN_MODE_UNLOCKED] = GameOption(1);
GameOptions::GetInstance()->save();
}else if(unlocked = isRandomDeckUnlocked()) {
}else if((unlocked = isRandomDeckUnlocked())) {
unlockedTex = JRenderer::GetInstance()->LoadTexture("graphics/randomdeck_unlocked.png", TEX_TYPE_USE_VRAM);
unlockedQuad = NEW JQuad(unlockedTex, 2, 2, 396, 96);
GameOptions::GetInstance()->values[OPTIONS_RANDOMDECK_MODE_UNLOCKED] = GameOption(1);
GameOptions::GetInstance()->save();
}else if(unlocked = unlockRandomSet()) {
}else if((unlocked = unlockRandomSet())) {
unlockedTex = JRenderer::GetInstance()->LoadTexture("graphics/set_unlocked.png", TEX_TYPE_USE_VRAM);
unlockedQuad = NEW JQuad(unlockedTex, 2, 2, 396, 96);
char buffer[4096];

6
projects/mtg/src/GameStateDuel.cpp
View File

@@ -136,7 +136,7 @@ void GameStateDuel::loadPlayerRandom(int playerId, int isAI, int mode){
if (!isAI){ //Human Player
mPlayers[playerId] = NEW HumanPlayer(deck[playerId],deckFile, deckFileSmall);
}else{
mPlayers[playerId] = NEW AIPlayerBaka(deck[playerId],deckFile, "random", "");
mPlayers[playerId] = NEW AIPlayerBaka(deck[playerId],deckFile, deckFileSmall.c_str() , "");
}
delete tempDeck;
}
@@ -144,14 +144,14 @@ void GameStateDuel::loadPlayerRandom(int playerId, int isAI, int mode){
void GameStateDuel::loadPlayerMomir(int playerId, int isAI){
char deckFile[] = RESPATH"/player/momir.txt";
char deckFileSmall[] = "momir";
string deckFileSmall = "momir";
char empty[] = "";
MTGDeck * tempDeck = NEW MTGDeck(deckFile, NULL, mParent->collection);
deck[playerId] = NEW MTGPlayerCards(mParent->collection,tempDeck);
if (!isAI){ //Human Player
mPlayers[playerId] = NEW HumanPlayer(deck[playerId],deckFile, deckFileSmall);
}else{
mPlayers[playerId] = NEW AIMomirPlayer(deck[playerId],deckFile,deckFileSmall, empty);
mPlayers[playerId] = NEW AIMomirPlayer(deck[playerId],deckFile,deckFileSmall.c_str(), empty);
}
delete tempDeck;
}

8
projects/mtg/src/MTGAbility.cpp
View File

@@ -604,8 +604,6 @@ int AbilityFactory::abilityEfficiency(MTGAbility * a, Player * p, int mode){
MayAbility * maya = dynamic_cast<MayAbility*>(a);
if (maya) return abilityEfficiency(maya->ability,p, mode);
GameObserver * g = GameObserver::GetInstance();
ALord * alord = dynamic_cast<ALord *>(a);
if (alord) {
int myCards = countCards(alord->tc, p);
@@ -778,7 +776,6 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card){
int dryMode = 0;
if (!spell) dryMode = 1;
GameObserver * game = GameObserver::GetInstance();
if (!card && spell) card = spell->source;
if (!card) return 0;
MTGCardInstance * target = card->target;
@@ -1653,10 +1650,11 @@ void AbilityFactory::addAbilities(int _id, Spell * spell){
}
case 130542: //Flowstone Slide
{
TargetChooser * lordTargets = NULL;
int x = computeX(spell,card);
MTGAbility * a = NEW AInstantPowerToughnessModifierUntilEOT(id, card, card,x,-x);
TargetChooserFactory tcf;
lordTargets = tcf.createTargetChooser("creature", card);
TargetChooser * lordTargets = tcf.createTargetChooser("creature", card);
game->addObserver(NEW ALord(id, card, lordTargets, 0, a));
break;
}

1
projects/mtg/src/MTGCardInstance.cpp
View File

@@ -417,7 +417,6 @@ int MTGCardInstance::setAttacker(int value){
}
int MTGCardInstance::toggleAttacker(){
GameObserver * g = GameObserver::GetInstance();
if (!attacker){
if (!basicAbilities[Constants::VIGILANCE]) tap();
setAttacker(1);

3
projects/mtg/src/MTGGuiPlay.cpp
View File

@@ -119,7 +119,6 @@ void MTGGuiPlay::adjustCardPosition(CardGui * cardg){
}
void MTGGuiPlay::setCardPosition(CardGui * cardg, int player, int playerTurn, int spellMode){
GameObserver * g = GameObserver::GetInstance();
MTGCardInstance * card = cardg->card;
if (!(cardg->x ==0 && cardg->y ==0)) return ;
if (card->target)
@@ -268,7 +267,6 @@ void MTGGuiPlay::updateCards(){
}
for (int i =0; i<nb_cards; i++){
CardGui * cardGui = (CardGui *)mObjects[i + offset];
MTGCardInstance * card = cardGui->card;
setCardPosition(cardGui, 0, player0Mode, 0);
}
}else{
@@ -278,7 +276,6 @@ void MTGGuiPlay::updateCards(){
}
for (int i =0; i<opponent_cards; i++){
CardGui * cardGui = (CardGui *)mObjects[nb_cards + i + offset];
MTGCardInstance * card = cardGui->card;
setCardPosition(cardGui, 1, !player0Mode,0);
}
}

9
projects/mtg/src/TargetChooser.cpp
View File

@@ -10,7 +10,6 @@
TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInstance * card){
if (!s.size()) return NULL;
GameObserver * game = GameObserver::GetInstance();
int zones[10];
int nbzones = 0;
unsigned int found;
@@ -361,7 +360,6 @@ TypeTargetChooser::TypeTargetChooser(const char * _type, MTGCardInstance * card,
int id = Subtypes::subtypesList->Add(_type);
nbtypes = 0;
addType(id);
GameObserver * game = GameObserver::GetInstance();
int default_zones[] = {MTGGameZone::MY_BATTLEFIELD, MTGGameZone::OPPONENT_BATTLEFIELD};
init(default_zones,2);
}
@@ -370,7 +368,6 @@ TypeTargetChooser::TypeTargetChooser(const char * _type, int * _zones, int nbzon
int id = Subtypes::subtypesList->Add(_type);
nbtypes = 0;
addType(id);
GameObserver * game = GameObserver::GetInstance();
if (nbzones == 0){
int default_zones[] = {MTGGameZone::MY_BATTLEFIELD, MTGGameZone::OPPONENT_BATTLEFIELD};
init(default_zones,2);
@@ -418,14 +415,12 @@ int TypeTargetChooser::canTarget(Targetable * target ){
A Target Chooser associated to a Card Descriptor object, for fine tuning of targets description
**/
DescriptorTargetChooser::DescriptorTargetChooser(CardDescriptor * _cd, MTGCardInstance * card, int _maxtargets):TargetZoneChooser(card, _maxtargets){
GameObserver * game = GameObserver::GetInstance();
int default_zones[] = {MTGGameZone::MY_BATTLEFIELD, MTGGameZone::OPPONENT_BATTLEFIELD};
init(default_zones,2);
cd = _cd;
}
DescriptorTargetChooser::DescriptorTargetChooser(CardDescriptor * _cd, int * _zones, int nbzones, MTGCardInstance * card, int _maxtargets):TargetZoneChooser(card, _maxtargets){
GameObserver * game = GameObserver::GetInstance();
if (nbzones == 0){
int default_zones[] = {MTGGameZone::MY_BATTLEFIELD, MTGGameZone::OPPONENT_BATTLEFIELD};
init(default_zones,2);
@@ -460,7 +455,6 @@ DescriptorTargetChooser::~DescriptorTargetChooser(){
**/
CreatureTargetChooser::CreatureTargetChooser( MTGCardInstance * card, int _maxtargets):TargetZoneChooser(card, _maxtargets){
GameObserver * game = GameObserver::GetInstance();
int default_zones[] = {MTGGameZone::MY_BATTLEFIELD, MTGGameZone::OPPONENT_BATTLEFIELD};
init(default_zones,2);
maxpower= -1;
@@ -468,7 +462,6 @@ CreatureTargetChooser::CreatureTargetChooser( MTGCardInstance * card, int _maxta
}
CreatureTargetChooser::CreatureTargetChooser(int * _zones, int nbzones, MTGCardInstance * card, int _maxtargets):TargetZoneChooser(card, _maxtargets){
GameObserver * game = GameObserver::GetInstance();
if (nbzones == 0){
int default_zones[] = {MTGGameZone::MY_BATTLEFIELD, MTGGameZone::OPPONENT_BATTLEFIELD};
init(default_zones,2);
@@ -591,7 +584,6 @@ int SpellTargetChooser::canTarget(Targetable * target){
/*Spell or Permanent */
SpellOrPermanentTargetChooser::SpellOrPermanentTargetChooser(MTGCardInstance * card,int _color, int _maxtargets):TargetZoneChooser(card, _maxtargets){
GameObserver * game = GameObserver::GetInstance();
int default_zones[] = {MTGGameZone::MY_BATTLEFIELD, MTGGameZone::OPPONENT_BATTLEFIELD};
init(default_zones,2);
color = _color;
@@ -641,7 +633,6 @@ int DamageTargetChooser::canTarget(Targetable * target){
/*Damage or Permanent */
DamageOrPermanentTargetChooser::DamageOrPermanentTargetChooser(MTGCardInstance * card,int _color, int _maxtargets):TargetZoneChooser(card, _maxtargets){
GameObserver * game = GameObserver::GetInstance();
int default_zones[] = {MTGGameZone::MY_BATTLEFIELD, MTGGameZone::OPPONENT_BATTLEFIELD};
init(default_zones,2);
color = _color;