mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-02 22:45:33 +00:00
Code Issues Releases Wiki Activity

Access to Fallback via getFallback

Browse source
This commit is contained in:
Glorf 2013-03-17 13:50:15 +01:00
parent 485b6c855a
commit ea7f386e7d
5 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwbase/world.hpp
View file

@ -46,6 +46,7 @@ namespace MWRender
namespace MWWorld namespace MWWorld
{ {
class Fallback;
class CellStore; class CellStore;
class Player; class Player;
class LocalScripts; class LocalScripts;
@ -103,7 +104,7 @@ namespace MWBase
virtual void getTriangleBatchCount(unsigned int &triangles, unsigned int &batches) = 0; virtual void getTriangleBatchCount(unsigned int &triangles, unsigned int &batches) = 0;
virtual std::string getFallback (const std::string& key) const = 0; virtual MWWorld::Fallback *getFallback () = 0;
virtual MWWorld::Player& getPlayer() = 0; virtual MWWorld::Player& getPlayer() = 0;

12
apps/openmw/mwgui/charactercreation.cpp
View file

@ -12,6 +12,7 @@
#include "../mwbase/environment.hpp" #include "../mwbase/environment.hpp"
#include "../mwbase/soundmanager.hpp" #include "../mwbase/soundmanager.hpp"
#include "../mwbase/mechanicsmanager.hpp" #include "../mwbase/mechanicsmanager.hpp"
#include "../mwworld/fallback.hpp"
namespace namespace
{ {
@ -23,14 +24,13 @@ namespace
}; };
const ESM::Class::Specialization mSpecializations[3]={ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}; // The specialization for each answer const ESM::Class::Specialization mSpecializations[3]={ESM::Class::Combat, ESM::Class::Magic, ESM::Class::Stealth}; // The specialization for each answer
Step sGenerateClassSteps(int number) { Step sGenerateClassSteps(int number) {
MWBase::World *world = MWBase::Environment::get().getWorld();
number++; number++;
Step step = {world->getFallback("Question_"+boost::lexical_cast<std::string>(number)+"_Question"), MWWorld::Fallback* fallback=MWBase::Environment::get().getWorld()->getFallback();
{world->getFallback("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerOne"), Step step = {fallback->getFallbackString("Question_"+boost::lexical_cast<std::string>(number)+"_Question"),
world->getFallback("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerTwo"), {fallback->getFallbackString("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerOne"),
world->getFallback("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerThree")}, fallback->getFallbackString("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerTwo"),
fallback->getFallbackString("Question_"+boost::lexical_cast<std::string>(number)+"_AnswerThree")},
"vo\\misc\\chargen qa"+boost::lexical_cast<std::string>(number)+".wav" "vo\\misc\\chargen qa"+boost::lexical_cast<std::string>(number)+".wav"
}; };
return step; return step;

5
apps/openmw/mwgui/levelupdialog.cpp
View file

@ -9,6 +9,7 @@
#include "../mwworld/player.hpp" #include "../mwworld/player.hpp"
#include "../mwworld/class.hpp" #include "../mwworld/class.hpp"
#include "../mwworld/esmstore.hpp" #include "../mwworld/esmstore.hpp"
#include "../mwworld/fallback.hpp"
#include "../mwmechanics/creaturestats.hpp" #include "../mwmechanics/creaturestats.hpp"
#include "../mwmechanics/npcstats.hpp" #include "../mwmechanics/npcstats.hpp"
@ -138,9 +139,9 @@ namespace MWGui
std::string levelupdescription; std::string levelupdescription;
if(level>20) if(level>20)
levelupdescription=world->getFallback("Level_Up_Default"); levelupdescription=world->getFallback()->getFallbackString("Level_Up_Default");
else else
levelupdescription=world->getFallback("Level_Up_Level"+boost::lexical_cast<std::string>(level)); levelupdescription=world->getFallback()->getFallbackString("Level_Up_Level"+boost::lexical_cast<std::string>(level));
mLevelDescription->setCaption (levelupdescription); mLevelDescription->setCaption (levelupdescription);

10
apps/openmw/mwworld/worldimp.cpp
View file

@ -154,11 +154,6 @@ namespace MWWorld
mRendering->skyDisable(); mRendering->skyDisable();
} }
std::string World::getFallback (const std::string& key) const
{
return mFallback.getFallbackString(key);
}
World::World (OEngine::Render::OgreRenderer& renderer, World::World (OEngine::Render::OgreRenderer& renderer,
const Files::Collections& fileCollections, const Files::Collections& fileCollections,
const std::vector<std::string>& master, const std::vector<std::string>& plugins, const std::vector<std::string>& master, const std::vector<std::string>& plugins,
@ -267,6 +262,11 @@ namespace MWWorld
return 0; return 0;
} }
MWWorld::Fallback *World::getFallback ()
{
return &mFallback;
}
Ptr::CellStore *World::getExterior (int x, int y) Ptr::CellStore *World::getExterior (int x, int y)
{ {
return mCells.getExterior (x, y); return mCells.getExterior (x, y);

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -133,7 +133,7 @@ namespace MWWorld
virtual void getTriangleBatchCount(unsigned int &triangles, unsigned int &batches); virtual void getTriangleBatchCount(unsigned int &triangles, unsigned int &batches);
virtual std::string getFallback (const std::string& key) const; virtual Fallback *getFallback ();
virtual Player& getPlayer(); virtual Player& getPlayer();