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

Erwan

Browse Source 
- Added translation mechanism, and basic french translation as an example
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-05-16 15:23:26 +00:00
parent 94bebd795c
commit f94df3862b
23 changed files with 242 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/include/ActionStack.h
+1 -1
View File
@@ -124,7 +124,7 @@ class ActionStack :public GuiLayer{
Interruptible * getNext(Interruptible * previous, int type = 0, int state = 0 , int display = -1);
int getNextIndex(Interruptible * previous, int type = 0, int state = 0 , int display = -1);
void Fizzle(Interruptible * action);
Interruptible * _(int id);
Interruptible * getAt(int id);
void cancelInterruptOffer(int cancelMode = 1);
void endOfInterruption();
Interruptible * getLatest(int state);
projects/mtg/include/AllAbilities.h
+3 -3
View File
@@ -538,7 +538,7 @@ class ASpellCastLife:public MTGAbility{
int isReactingToClick(MTGCardInstance * _card, ManaCost * mana = NULL){
if (_card == source && game->currentlyActing()->game->inPlay->hasCard(source)){
if (game->currentlyActing()->getManaPool()->canAfford(cost)){
Interruptible * laststackitem = game->mLayers->stackLayer()->_(-1);
Interruptible * laststackitem = game->mLayers->stackLayer()->getAt(-1);
if (laststackitem && laststackitem->type == ACTION_SPELL){
Spell * spell = (Spell*)laststackitem;
if (spell->source != lastUsedOn && trigger.match(spell->source)){
@@ -2517,7 +2517,7 @@ class AIslandSanctuary:public MTGAbility{
int isReactingToClick(MTGCardInstance * card, ManaCost * mana = NULL){
if (card==source && game->currentPlayer == card->controller() && currentPhase == Constants::MTG_PHASE_DRAW){
Interruptible * action = game->mLayers->stackLayer()->_(-1);
Interruptible * action = game->mLayers->stackLayer()->getAt(-1);
if (action->type == ACTION_DRAW) return 1;
}
return 0;
@@ -2526,7 +2526,7 @@ class AIslandSanctuary:public MTGAbility{
int reactToClick(MTGCardInstance * card){
if (!isReactingToClick(card)) return 0;
game->mLayers->stackLayer()->Remove(game->mLayers->stackLayer()->_(-1));
game->mLayers->stackLayer()->Remove(game->mLayers->stackLayer()->getAt(-1));
initThisTurn = 1;
return 1;
}
projects/mtg/include/GameStateDeckViewer.h
+21 -20
View File
@@ -13,6 +13,7 @@
#include "../include/PriceList.h"
#include "../include/PlayerData.h"
#include "../include/DeckDataWrapper.h"
#include "../include/Translate.h"
#define NO_USER_ACTIVITY_HELP_DELAY 10
#define NO_USER_ACTIVITY_SHOWCARD_DELAY 0.1
@@ -330,7 +331,7 @@ class GameStateDeckViewer: public GameState, public JGuiListener
int rnd = (rand() % 20);
price = pricelist->getPrice(card->getMTGId()) / 2;
price = price - price * (rnd -10)/100;
sprintf(buffer,"%s : %i credits",card->getName(),price);
sprintf(buffer,"%s : %i %s",_(card->getName()).c_str(),price,_("credits").c_str());
sellMenu = NEW SimpleMenu(2,this,mFont,SCREEN_WIDTH-300,SCREEN_HEIGHT/2,buffer);
sellMenu->Add(20,"Yes");
sellMenu->Add(21,"No");
@@ -534,12 +535,12 @@ class GameStateDeckViewer: public GameState, public JGuiListener
r->RenderQuad(pspIcons[3],leftPspX + 20, leftPspY,0,pspIconsSize,pspIconsSize);
font->DrawString("Prev.", leftPspX - 35, leftPspY-15);
font->DrawString("Next", leftPspX + 15, leftPspY-15);
font->DrawString("card", leftPspX - 35, leftPspY);
font->DrawString("card", leftPspX + 15, leftPspY);
font->DrawString("Next color", leftPspX - 33, leftPspY - 35);
font->DrawString("Prev. color", leftPspX -33 , leftPspY +25);
font->DrawString(_("Prev.").c_str(), leftPspX - 35, leftPspY-15);
font->DrawString(_("Next").c_str(), leftPspX + 15, leftPspY-15);
font->DrawString(_("card").c_str(), leftPspX - 35, leftPspY);
font->DrawString(_("card").c_str(), leftPspX + 15, leftPspY);
font->DrawString(_("Next color").c_str(), leftPspX - 33, leftPspY - 35);
font->DrawString(_("Prev. color").c_str(), leftPspX -33 , leftPspY +25);
//RIGHT PSP CIRCLE render
r->FillCircle(rightPspX+(onScreenTransition*204),rightPspY,40,ARGB(128,50,50,50));
@@ -549,16 +550,16 @@ class GameStateDeckViewer: public GameState, public JGuiListener
r->RenderQuad(pspIcons[7],rightPspX, rightPspY + 20,0,pspIconsSize,pspIconsSize);
if (displayed_deck == myCollection){
font->DrawString("Add card", rightPspX + 20, rightPspY-15);
font->DrawString("Display Deck", rightPspX - 35, rightPspY - 40);
font->DrawString(_("Add card").c_str(), rightPspX + 20, rightPspY-15);
font->DrawString(_("Display Deck").c_str(), rightPspX - 35, rightPspY - 40);
}else{
font->DrawString("Remove card", rightPspX + 20, rightPspY-15);
font->DrawString("Display Collection", rightPspX - 35, rightPspY - 40);
font->DrawString(_("Remove card").c_str(), rightPspX + 20, rightPspY-15);
font->DrawString(_("Display Collection").c_str(), rightPspX - 35, rightPspY - 40);
}
font->DrawString("Deck info", rightPspX - 70 , rightPspY-15);
font->DrawString("Sell card", rightPspX - 30 , rightPspY+20);
font->DrawString(_("Deck info").c_str(), rightPspX - 70 , rightPspY-15);
font->DrawString(_("Sell card").c_str(), rightPspX - 30 , rightPspY+20);
//Bottom menus
font->DrawString("menu", SCREEN_WIDTH-35 +rightTransition, SCREEN_HEIGHT-15);
font->DrawString(_("menu").c_str(), SCREEN_WIDTH-35 +rightTransition, SCREEN_HEIGHT-15);
@@ -575,7 +576,7 @@ class GameStateDeckViewer: public GameState, public JGuiListener
}
}
int value = myDeck->getCount();
sprintf(buffer, "Your Deck: %i cards", value);
sprintf(buffer, "%s: %i %s", _("Your Deck").c_str(), value, _("cards").c_str());
font->DrawString(buffer, SCREEN_WIDTH-200+rightTransition, SCREEN_HEIGHT/2 + 25);
//TODO, put back !
@@ -587,13 +588,13 @@ class GameStateDeckViewer: public GameState, public JGuiListener
*/
font->DrawString("You are currently viewing your", SCREEN_WIDTH-200+rightTransition, 5);
font->DrawString(_("You are currently viewing your").c_str(), SCREEN_WIDTH-200+rightTransition, 5);
if (displayed_deck == myCollection){
font->DrawString("collection. Press TRIANGLE", SCREEN_WIDTH-200+rightTransition, 20);
font->DrawString("to switch to your deck", SCREEN_WIDTH-200+rightTransition, 35);
font->DrawString(_("collection. Press TRIANGLE").c_str(), SCREEN_WIDTH-200+rightTransition, 20);
font->DrawString(_("to switch to your deck").c_str(), SCREEN_WIDTH-200+rightTransition, 35);
}else{
font->DrawString("deck. Press TRIANGLE to", SCREEN_WIDTH-200+rightTransition, 20);
font->DrawString("switch to your collection", SCREEN_WIDTH-200+rightTransition, 35);
font->DrawString(_("deck. Press TRIANGLE to").c_str(), SCREEN_WIDTH-200+rightTransition, 20);
font->DrawString(_("switch to your collection").c_str(), SCREEN_WIDTH-200+rightTransition, 35);
}
}
projects/mtg/include/MenuItem.h
+2 -2
View File
@@ -15,7 +15,7 @@ class MenuItem: public JGuiObject
private:
bool mHasFocus;
JLBFont *mFont;
const char* const mText;
string mText;
int mX;
int mY;
int updatedSinceLastRender;
@@ -29,7 +29,7 @@ class MenuItem: public JGuiObject
public:
MenuItem(int id, JLBFont *font, const char* text, int x, int y, JQuad * _off, JQuad * _on, const char * particle, JQuad * particleQuad, bool hasFocus = false);
MenuItem(int id, JLBFont *font, string text, int x, int y, JQuad * _off, JQuad * _on, const char * particle, JQuad * particleQuad, bool hasFocus = false);
~MenuItem();
virtual void Render();
virtual void Update(float dt);
projects/mtg/include/SimpleMenuItem.h
+1 -1
View File
@@ -24,7 +24,7 @@ class SimpleMenuItem: public JGuiObject
float mTargetScale;
public:
SimpleMenuItem(SimpleMenu* _parent, int id, JLBFont *font, const char* text, int x, int y, bool hasFocus = false);
SimpleMenuItem(SimpleMenu* _parent, int id, JLBFont *font, string text, int x, int y, bool hasFocus = false);
int mX;
int mY;
projects/mtg/include/Translate.h
+23
View File
@@ -0,0 +1,23 @@
#ifndef _TRANSLATE_H_
#define _TRANSLATE_H_
#include <string>
#include <map>
using namespace std;
class Translator{
protected:
static Translator * mInstance;
public:
map<string,string> values;
string translate(string toTranslate);
Translator();
int Add(string from, string to);
static Translator * GetInstance();
static void EndInstance();
};
string _(string toTranslate);
#endif