Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- applied changes from Muwuum for full translatable game experience

This commit is contained in:
Mark Vejvoda 2013-01-16 21:16:59 +00:00
parent 11392c69c9
commit 51a0b50bc2
10 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/glest_game/type_instances/unit.cpp
View File

@ -794,7 +794,7 @@ const Level *Unit::getNextLevel() const{
string Unit::getFullName() const{
string str="";
if(level != NULL){
str += (level->getName() + " ");
str += (level->getName(true) + " ");
}
if(type == NULL) {
throw megaglest_runtime_error("type == NULL in Unit::getFullName()!");
@ -2649,7 +2649,7 @@ string Unit::getDesc() const {
if(totalUpgrade.getArmor()!=0){
str+="+"+intToStr(totalUpgrade.getArmor());
}
str+= " ("+getType()->getArmorType()->getName()+")";
str+= " ("+getType()->getArmorType()->getName(true)+")";
//sight
str+="\n"+ lang.get("Sight")+ ": " + intToStr(getType()->getSight());
@ -2662,7 +2662,7 @@ string Unit::getDesc() const {
if(enemyKills > 0 || nextLevel != NULL) {
str+= "\n" + lang.get("Kills") +": " + intToStr(enemyKills);
if(nextLevel != NULL) {
str+= " (" + nextLevel->getName() + ": " + intToStr(nextLevel->getKills()) + ")";
str+= " (" + nextLevel->getName(true) + ": " + intToStr(nextLevel->getKills()) + ")";
}
}

26
source/glest_game/types/command_type.cpp
View File

@ -121,7 +121,7 @@ string StopCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
string str;
Lang &lang= Lang::getInstance();
str= name+"\n";
str= getName(true)+"\n";
str+= lang.get("ReactionSpeed")+": "+ intToStr(stopSkillType->getSpeed())+"\n";
if(stopSkillType->getEpCost()!=0)
str+= lang.get("EpCost")+": "+intToStr(stopSkillType->getEpCost())+"\n";
@ -177,7 +177,7 @@ string MoveCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
string str;
Lang &lang= Lang::getInstance();
str= name+"\n";
str=getName(true)+"\n";
str+= lang.get("WalkSpeed")+": "+ intToStr(moveSkillType->getSpeed());
if(totalUpgrade->getMoveSpeed(moveSkillType) != 0) {
str+= "+" + intToStr(totalUpgrade->getMoveSpeed(moveSkillType));
@ -233,7 +233,7 @@ string AttackCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
string str;
Lang &lang= Lang::getInstance();
str= name+"\n";
str=getName(true)+"\n";
if(attackSkillType->getEpCost()!=0){
str+= lang.get("EpCost") + ": " + intToStr(attackSkillType->getEpCost()) + "\n";
}
@ -249,7 +249,7 @@ string AttackCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
if(totalUpgrade->getAttackStrength(attackSkillType) != 0) {
str+= "+"+intToStr(totalUpgrade->getAttackStrength(attackSkillType));
}
str+= " ("+ attackSkillType->getAttackType()->getName() +")";
str+= " ("+ attackSkillType->getAttackType()->getName(true) +")";
str+= "\n";
//splash radius
@ -327,7 +327,7 @@ string AttackStoppedCommandType::getDesc(const TotalUpgrade *totalUpgrade) const
Lang &lang= Lang::getInstance();
string str;
str= name+"\n";
str=getName(true)+"\n";
if(attackSkillType->getEpCost()!=0){
str+= lang.get("EpCost")+": "+intToStr(attackSkillType->getEpCost())+"\n";
}
@ -342,7 +342,7 @@ string AttackStoppedCommandType::getDesc(const TotalUpgrade *totalUpgrade) const
str+= intToStr(attackSkillType->getAttackStrength()+attackSkillType->getAttackVar());
if(totalUpgrade->getAttackStrength(attackSkillType) != 0)
str+= "+"+intToStr(totalUpgrade->getAttackStrength(attackSkillType));
str+= " ("+ attackSkillType->getAttackType()->getName() +")";
str+= " ("+ attackSkillType->getAttackType()->getName(true) +")";
str+="\n";
//splash radius
@ -462,7 +462,7 @@ string BuildCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
string str;
Lang &lang= Lang::getInstance();
str= name+"\n";
str=getName(true)+"\n";
str+= lang.get("BuildSpeed")+": "+ intToStr(buildSkillType->getSpeed())+"\n";
if(buildSkillType->getEpCost()!=0){
str+= lang.get("EpCost")+": "+intToStr(buildSkillType->getEpCost())+"\n";
@ -536,7 +536,7 @@ string HarvestCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
Lang &lang= Lang::getInstance();
string str;
str= name+"\n";
str=getName(true)+"\n";
str+= lang.get("HarvestSpeed")+": "+ intToStr(harvestSkillType->getSpeed()/hitsPerUnit)+"\n";
str+= lang.get("MaxLoad")+": "+ intToStr(maxLoad)+"\n";
str+= lang.get("LoadedSpeed")+": "+ intToStr(moveLoadedSkillType->getSpeed())+"\n";
@ -612,7 +612,7 @@ string RepairCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
Lang &lang= Lang::getInstance();
string str;
str= name+"\n";
str=getName(true)+"\n";
str+= lang.get("RepairSpeed")+": "+ intToStr(repairSkillType->getSpeed())+"\n";
if(repairSkillType->getEpCost()!=0){
str+= lang.get("EpCost")+": "+intToStr(repairSkillType->getEpCost())+"\n";
@ -677,7 +677,7 @@ void ProduceCommandType::load(int id, const XmlNode *n, const string &dir,
}
string ProduceCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
string str= name+"\n";
string str=getName(true)+"\n";
Lang &lang= Lang::getInstance();
//prod speed
@ -747,7 +747,7 @@ string UpgradeCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
string str;
Lang &lang= Lang::getInstance();
str= name+"\n";
str=getName(true)+"\n";
str+= lang.get("UpgradeSpeed")+": "+ intToStr(upgradeSkillType->getSpeed())+"\n";
if(upgradeSkillType->getEpCost()!=0)
str+= lang.get("EpCost")+": "+intToStr(upgradeSkillType->getEpCost())+"\n";
@ -816,7 +816,7 @@ void MorphCommandType::load(int id, const XmlNode *n, const string &dir,
}
string MorphCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
string str= name+"\n";
string str=getName(true)+"\n";
Lang &lang= Lang::getInstance();
//prod speed
@ -881,7 +881,7 @@ void SwitchTeamCommandType::load(int id, const XmlNode *n, const string &dir,
}
string SwitchTeamCommandType::getDesc(const TotalUpgrade *totalUpgrade) const{
string str= name+"\n";
string str= getName(true)+"\n";
//Lang &lang= Lang::getInstance();
//prod speed

14
source/glest_game/types/damage_multiplier.cpp
View File

@ -11,6 +11,7 @@
#include "damage_multiplier.h"
#include "conversion.h"
#include "lang.h"
#include "leak_dumper.h"
using namespace Shared::Util;
@ -27,6 +28,13 @@ void AttackType::saveGame(XmlNode *rootNode) {
attackTypeNode->addAttribute("id",intToStr(id), mapTagReplacements);
}
string AttackType::getName(bool translatedValue) const {
if(translatedValue == false) return name;
Lang &lang = Lang::getInstance();
return lang.getTechTreeString("AttackTypeName_" + name,name.c_str());
}
void ArmorType::saveGame(XmlNode *rootNode) {
std::map<string,string> mapTagReplacements;
XmlNode *armorTypeNode = rootNode->addChild("ArmorType");
@ -37,6 +45,12 @@ void ArmorType::saveGame(XmlNode *rootNode) {
armorTypeNode->addAttribute("id",intToStr(id), mapTagReplacements);
}
string ArmorType::getName(bool translatedValue) const {
if(translatedValue == false) return name;
Lang &lang = Lang::getInstance();
return lang.getTechTreeString("ArmorTypeName_" + name,name.c_str());
}
// =====================================================
// class DamageMultiplierTable
// =====================================================

4
source/glest_game/types/damage_multiplier.h
View File

@ -40,7 +40,7 @@ public:
id = -1;
}
int getId() const {return id;}
const string &getName() const {return name;}
string getName(bool translatedValue=false) const;
void setName(const string &name) {this->name= name;}
void setId(int id) {this->id= id;}
@ -62,7 +62,7 @@ public:
id = -1;
}
int getId() const {return id;}
const string &getName() const {return name;}
string getName(bool translatedValue=false) const;
void setName(const string &name) {this->name= name;}
void setId(int id) {this->id= id;}

7
source/glest_game/types/element_type.cpp
View File

@ -35,6 +35,13 @@ DisplayableType::DisplayableType(){
image= NULL;
}
string DisplayableType::getName(bool translatedValue) const {
if(translatedValue == false) return name;
Lang &lang = Lang::getInstance();
return lang.getTechTreeString("CommandName_" + name,name.c_str());
}
//void DisplayableType::saveGame(XmlNode *rootNode) const {
// std::map<string,string> mapTagReplacements;
// XmlNode *displayableTypeNode = rootNode->addChild("DisplayableType");

2
source/glest_game/types/element_type.h
View File

@ -53,7 +53,7 @@ public:
virtual ~DisplayableType(){};
//get
virtual string getName(bool translatedValue=false) const { return name; }
virtual string getName(bool translatedValue=false) const;
virtual const Texture2D *getImage() const { return image; }
//virtual void saveGame(XmlNode *rootNode) const;

7
source/glest_game/types/faction_type.cpp
View File

@ -908,6 +908,13 @@ std::string FactionType::toString() const {
return result;
}
string FactionType::getName(bool translatedValue) const {
if(translatedValue == false) return name;
Lang &lang = Lang::getInstance();
return lang.getTechTreeString("FactionName_" + name,name.c_str());
}
void FactionType::saveGame(XmlNode *rootNode) {
std::map<string,string> mapTagReplacements;
XmlNode *factionTypeNode = rootNode->addChild("FactionType");

2
source/glest_game/types/faction_type.h
View File

@ -111,7 +111,7 @@ public:
bool getIsLinked() const { return isLinked; }
int getUnitTypeCount() const {return unitTypes.size();}
int getUpgradeTypeCount() const {return upgradeTypes.size();}
string getName() const {return name;}
virtual string getName(bool translatedValue=false) const;
const UnitType *getUnitType(int i) const {return &unitTypes[i];}
const UpgradeType *getUpgradeType(int i) const {return &upgradeTypes[i];}
StrSound *getMusic() const {return music;}

7
source/glest_game/types/unit_type.cpp
View File

@ -45,6 +45,13 @@ void Level::init(string name, int kills){
this->kills= kills;
}
string Level::getName(bool translatedValue) const {
if(translatedValue == false) return name;
Lang &lang = Lang::getInstance();
return lang.getTechTreeString("LevelName_" + name,name.c_str());
}
void Level::saveGame(XmlNode *rootNode) const {
std::map<string,string> mapTagReplacements;
XmlNode *levelNode = rootNode->addChild("Level");

2
source/glest_game/types/unit_type.h
View File

@ -56,7 +56,7 @@ public:
}
void init(string name, int kills);
const string &getName() const {return name;}
string getName(bool translatedValue=false) const;
int getKills() const {return kills;}
void saveGame(XmlNode *rootNode) const ;