diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index 649bd22b8..bb89da929 100644 --- a/projects/mtg/Makefile +++ b/projects/mtg/Makefile @@ -1,4 +1,4 @@ -OBJS = objs/ActionElement.o objs/ActionLayer.o objs/ActionStack.o objs/AIMomirPlayer.o objs/AIPlayer.o objs/AIStats.o objs/Blocker.o objs/CardGui.o objs/CardDescriptor.o objs/CardDisplay.o objs/CardEffect.o objs/CardSelector.o objs/ConstraintResolver.o objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o objs/DamageResolverLayer.o objs/DeckDataWrapper.o objs/DeckStats.o objs/DuelLayers.o objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o objs/GameObserver.o objs/GameOptions.o objs/GameState.o objs/GameStateDuel.o objs/GameStateMenu.o objs/GameStateOptions.o objs/GameStateShop.o objs/GuiAvatars.o objs/GuiBackground.o objs/GuiCardsController.o objs/GuiCombat.o objs/GuiFrame.o objs/GuiHand.o objs/GuiLayers.o objs/GuiMana.o objs/GuiPhaseBar.o objs/GuiPlay.o objs/GuiStatic.o objs/Logger.o objs/ManaCost.o objs/ManaCostHybrid.o objs/MenuItem.o objs/MTGAbility.o objs/MTGCardInstance.o objs/MTGCard.o objs/MTGDeck.o objs/MTGDefinitions.o objs/MTGGamePhase.o objs/MTGGameZones.o objs/MTGGuiHand.o objs/MTGRules.o objs/OptionItem.o objs/PhaseRing.o objs/Player.o objs/PlayerData.o objs/PlayGuiObjectController.o objs/PlayGuiObject.o objs/Pos.o objs/PriceList.o objs/ReplacementEffects.o objs/ShopItem.o objs/SimpleMenu.o objs/SimpleMenuItem.o objs/Subtypes.o objs/TargetChooser.o objs/TargetsList.o objs/TextScroller.o objs/TexturesCache.o objs/SimplePad.o objs/Token.o objs/Translate.o objs/utils.o objs/WEvent.o objs/WResourceManager.o +OBJS = objs/ActionElement.o objs/ActionLayer.o objs/ActionStack.o objs/AIMomirPlayer.o objs/AIPlayer.o objs/AIStats.o objs/Blocker.o objs/CardGui.o objs/CardDescriptor.o objs/CardDisplay.o objs/CardEffect.o objs/CardSelector.o objs/ConstraintResolver.o objs/Counters.o objs/Credits.o objs/Damage.o objs/DamagerDamaged.o objs/DamageResolverLayer.o objs/DeckDataWrapper.o objs/DeckStats.o objs/DuelLayers.o objs/Effects.o objs/ExtraCost.o objs/GameApp.o objs/GameLauncher.o objs/GameObserver.o objs/GameOptions.o objs/GameState.o objs/GameStateDuel.o objs/GameStateMenu.o objs/GameStateOptions.o objs/GameStateShop.o objs/GuiAvatars.o objs/GuiBackground.o objs/GuiCardsController.o objs/GuiCombat.o objs/GuiFrame.o objs/GuiHand.o objs/GuiLayers.o objs/GuiMana.o objs/GuiPhaseBar.o objs/GuiPlay.o objs/GuiStatic.o objs/Logger.o objs/ManaCost.o objs/ManaCostHybrid.o objs/MenuItem.o objs/MTGAbility.o objs/MTGCardInstance.o objs/MTGCard.o objs/MTGDeck.o objs/MTGDefinitions.o objs/MTGGamePhase.o objs/MTGGameZones.o objs/MTGRules.o objs/OptionItem.o objs/PhaseRing.o objs/Player.o objs/PlayerData.o objs/PlayGuiObjectController.o objs/PlayGuiObject.o objs/Pos.o objs/PriceList.o objs/ReplacementEffects.o objs/ShopItem.o objs/SimpleMenu.o objs/SimpleMenuItem.o objs/Subtypes.o objs/TargetChooser.o objs/TargetsList.o objs/TextScroller.o objs/TexturesCache.o objs/SimplePad.o objs/Token.o objs/Translate.o objs/utils.o objs/WEvent.o objs/WResourceManager.o DEPS = $(patsubst objs/%.o, deps/%.d, $(OBJS)) RESULT = $(shell psp-config --psp-prefix 2> Makefile.cache) diff --git a/projects/mtg/include/MTGGuiHand.h b/projects/mtg/include/MTGGuiHand.h deleted file mode 100644 index fd350ef6d..000000000 --- a/projects/mtg/include/MTGGuiHand.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef _MTGGUIHAND_H_ -#define _MTGGUIHAND_H_ - - - -#include "GuiCardsController.h" -#include "Player.h" -#include "GameObserver.h" - -#define HAND_SHOW_ANIMATION 1 -#define HAND_HIDE_ANIMATION 2 -#define HAND_SHOW 3 -#define HAND_HIDE 4 - -class Player; -class GuiCardscontroller; - -class MTGGuiHand: public GuiCardsController{ - protected: - GameObserver* game; - int currentId[2]; - Player * currentPlayer; - int mShowHand; - float mAnimState; - JLBFont * mFont; - public: - MTGGuiHand(GameObserver*); - void Update(float dt); - bool CheckUserInput(u32 key); - virtual void Render(); - void updateCards(); - void showHand (bool show);// WALDORF - added - -}; - -#endif diff --git a/projects/mtg/src/GameApp.cpp b/projects/mtg/src/GameApp.cpp index 8e527e35e..c87906ce2 100644 --- a/projects/mtg/src/GameApp.cpp +++ b/projects/mtg/src/GameApp.cpp @@ -137,9 +137,6 @@ void GameApp::Create() CommonRes->GetQuad("DefenderIcon")->SetHotSpot(12, 12); CommonRes->GetQuad("shadow")->SetHotSpot(0.5, 0.5); - //CommonRes->CreateTexture("graphics/interrupt.png"); - //CommonRes->CreateQuad("interrupt", "graphics/interrupt.png", 0, 0, 256, 128); - collection = NEW MTGAllCards(&cache); Particles[0] = NEW hgeParticleSystem("graphics/particle1.psi", CommonRes->GetQuad("particles")); @@ -164,8 +161,6 @@ void GameApp::Create() mGameStates[GAME_STATE_OPTIONS] = NEW GameStateOptions(this); mGameStates[GAME_STATE_OPTIONS]->Create(); - //mGameStates[GAME_STATE_GAME] = NEW GameStateGAME(this); - mCurrentState = NULL; mNextState = mGameStates[GAME_STATE_MENU]; @@ -180,9 +175,6 @@ void GameApp::Create() void GameApp::LoadGameStates() { - //mGameStates[GAME_STATE_MENU]->Create(); - //mGameStates[GAME_STATE_GAME]->Create(); - } diff --git a/projects/mtg/src/MTGGuiHand.cpp b/projects/mtg/src/MTGGuiHand.cpp deleted file mode 100644 index 765decc87..000000000 --- a/projects/mtg/src/MTGGuiHand.cpp +++ /dev/null @@ -1,111 +0,0 @@ -#include "../include/config.h" -#include "../include/MTGGuiHand.h" -#include "../include/CardGui.h" - -MTGGuiHand::MTGGuiHand(GameObserver* game) : game(game) { - mShowHand = HAND_HIDE; - mAnimState = 0; - currentPlayer = NULL; - mFont = GameApp::CommonRes->GetJLBFont("simon"); - for (int i = 0; i < 2; i++){ - currentId[i] = 0; - } - -} - - -void MTGGuiHand::updateCards(){ - Player * player = GameObserver::GetInstance()->currentlyActing(); - if (player->isAI()) player = GameObserver::GetInstance()->players[0]; - int nb_cards = player->game->hand->nb_cards; - if (mCount != nb_cards || player != currentPlayer ){ //if the number of cards has changed, then an update occured (is this test engouh ?) - resetObjects(); - if (currentId[player->getId()] >= nb_cards) currentId[player->getId()] = nb_cards - 1; - for (int i = 0;igame->hand->cards[i], (float)450 - (nb_cards-i) *35, SCREEN_HEIGHT_F - mAnimState*60); - Add(object); - if ( i == currentId[player->getId()]) mCurr = i; - } - currentPlayer = player; - } - - -} - - -void MTGGuiHand::Update(float dt){ - updateCards(); - for (int i=0;iy = SCREEN_HEIGHT - mAnimState*60; - } - } - - if (mShowHand == HAND_SHOW_ANIMATION){ - mAnimState +=7 *dt; - if (mAnimState > 1){ - mAnimState = 1; - mShowHand = HAND_SHOW; - } - }else if(mShowHand == HAND_HIDE_ANIMATION){ - mAnimState -=7 *dt; - if (mAnimState < 0){ - mAnimState = 0; - mShowHand = HAND_HIDE; - modal = false; - } - } - - GuiCardsController::Update(dt); - currentId[game->currentlyActing()->getId()] = mCurr; -} - - - -bool MTGGuiHand::CheckUserInput(u32 key){ - if (PSP_CTRL_LTRIGGER == key) { - if (mShowHand == HAND_HIDE){ - mShowHand = HAND_SHOW_ANIMATION; - modal = true; - } - if (mShowHand == HAND_SHOW){ - mShowHand = HAND_HIDE_ANIMATION; - } - return true; - }else if (PSP_CTRL_LEFT == key){ - //mGamePhase = NO_USER_INPUT; - } - - if (mShowHand == HAND_HIDE || currentPlayer->isAI()){ - return false; - }else{ - // GuiCardsController::CheckUserInput(key); - return true; - } -} - - - - -void MTGGuiHand::Render(){ - if (mShowHand != HAND_HIDE){ - // if (currentPlayer && !currentPlayer->isAI()){ - RenderMessageBackground(440-mCount * 35 , SCREEN_HEIGHT - mAnimState*60 - 10, mCount * 35 + 20, 70); - for (int i=0;iRender(); - } - } - if (mCount && mObjects[mCurr] != NULL){ - mObjects[mCurr]->Render(); - // if (showBigCards) ((CardGui *)mObjects[mCurr])->RenderBig(10,-1,showBigCards-1); - } - } -} - -// WALDORF - added method -void MTGGuiHand::showHand (bool show) -{ - if (show) mShowHand = HAND_SHOW; - else mShowHand = HAND_HIDE; -} diff --git a/projects/mtg/template.vcproj b/projects/mtg/template.vcproj index 35967c6b1..2049ddc26 100644 --- a/projects/mtg/template.vcproj +++ b/projects/mtg/template.vcproj @@ -460,10 +460,6 @@ RelativePath=".\src\MTGGameZones.cpp" > - - @@ -809,10 +805,6 @@ RelativePath=".\include\MTGGameZones.h" > - -