diff --git a/apps/openmw/mwmechanics/mechanicsmanager.cpp b/apps/openmw/mwmechanics/mechanicsmanager.cpp index 229a351ac..f0aa15652 100644 --- a/apps/openmw/mwmechanics/mechanicsmanager.cpp +++ b/apps/openmw/mwmechanics/mechanicsmanager.cpp @@ -83,4 +83,29 @@ namespace MWMechanics } } } + + void MechanicsManager::setPlayerName (const std::string& name) + { + + } + + void MechanicsManager::setPlayerRace (const std::string& race, bool male) + { + + } + + void MechanicsManager::setPlayerBirthsign (const std::string& id) + { + + } + + void MechanicsManager::setPlayerClass (const std::string& id) + { + + } + + void MechanicsManager::setPlayerClass (const ESM::Class& class_) + { + + } } diff --git a/apps/openmw/mwmechanics/mechanicsmanager.hpp b/apps/openmw/mwmechanics/mechanicsmanager.hpp index 5c96ce21f..8955e464b 100644 --- a/apps/openmw/mwmechanics/mechanicsmanager.hpp +++ b/apps/openmw/mwmechanics/mechanicsmanager.hpp @@ -26,30 +26,44 @@ namespace MWMechanics std::set mActors; MWWorld::Ptr mWatched; CreatureStats mWatchedCreature; - + public: - + MechanicsManager (const ESMS::ESMStore& store, MWGui::WindowManager& windowManager); - + void configureGUI(); - + void addActor (const MWWorld::Ptr& ptr); ///< Register an actor for stats management void removeActor (const MWWorld::Ptr& ptr); ///< Deregister an actor for stats management - + void dropActors (const MWWorld::Ptr::CellStore *cellStore); ///< Deregister all actors in the given cell. - + void watchActor (const MWWorld::Ptr& ptr); ///< On each update look for changes in a previously registered actor and update the /// GUI accordingly. - + void update(); ///< Update actor stats + + void setPlayerName (const std::string& name); + ///< Set player name. + + void setPlayerRace (const std::string& id, bool male); + ///< Set player race. + + void setPlayerBirthsign (const std::string& id); + ///< Set player birthsign. + + void setPlayerClass (const std::string& id); + ///< Set player class to stock class. + + void setPlayerClass (const ESM::Class& class_); + ///< Set player class to custom class. }; } #endif - diff --git a/apps/openmw/mwscript/cellextensions.cpp b/apps/openmw/mwscript/cellextensions.cpp index 93e77ee48..4d3025469 100644 --- a/apps/openmw/mwscript/cellextensions.cpp +++ b/apps/openmw/mwscript/cellextensions.cpp @@ -41,9 +41,20 @@ namespace MWScript runtime.pop(); ESM::Position pos; - pos.pos[0] = pos.pos[1] = pos.pos[2] = 0; pos.rot[0] = pos.rot[1] = pos.rot[2] = 0; - context.getWorld().changeCell (cell, pos); + pos.pos[2] = 0; + + if (const ESM::Cell *exterior = context.getWorld().getExterior (cell)) + { + context.getWorld().indexToPosition (exterior->data.gridX, exterior->data.gridY, + pos.pos[0], pos.pos[1], true); + context.getWorld().changeToExteriorCell (pos); + } + else + { + pos.pos[0] = pos.pos[1] = 0; + context.getWorld().changeCell (cell, pos); + } } }; @@ -64,7 +75,7 @@ namespace MWScript ESM::Position pos; - context.getWorld().indexToPosition (x, y, pos.pos[0], pos.pos[1]); + context.getWorld().indexToPosition (x, y, pos.pos[0], pos.pos[1], true); pos.pos[2] = 0; pos.rot[0] = pos.rot[1] = pos.rot[2] = 0; diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index 496da44ef..ca29facfd 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -691,6 +691,30 @@ namespace MWWorld changeCell (x, y, position); } + const ESM::Cell *World::getExterior (const std::string& cellName) const + { + // first try named cells + if (const ESM::Cell *cell = mStore.cells.searchExtByName (cellName)) + return cell; + + // didn't work -> now check for regions + std::string cellName2 = ESMS::RecListT::toLower (cellName); + + for (ESMS::RecListT::MapType::const_iterator iter (mStore.regions.list.begin()); + iter!=mStore.regions.list.end(); ++iter) + { + if (ESMS::RecListT::toLower (iter->second.name)==cellName2) + { + if (const ESM::Cell *cell = mStore.cells.searchExtByRegion (iter->first)) + return cell; + + break; + } + } + + return 0; + } + void World::markCellAsUnchanged() { mCellChanged = false; @@ -756,12 +780,18 @@ namespace MWWorld // TODO cell change for non-player ref } - void World::indexToPosition (int cellX, int cellY, float &x, float &y) const + void World::indexToPosition (int cellX, int cellY, float &x, float &y, bool centre) const { const int cellSize = 8192; x = cellSize * cellX; y = cellSize * cellY; + + if (centre) + { + x += cellSize/2; + y += cellSize/2; + } } void World::positionToIndex (float x, float y, int &cellX, int &cellY) const diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp index 2ff2d3ccc..832c90bf0 100644 --- a/apps/openmw/mwworld/world.hpp +++ b/apps/openmw/mwworld/world.hpp @@ -145,6 +145,9 @@ namespace MWWorld void changeToExteriorCell (const ESM::Position& position); + const ESM::Cell *getExterior (const std::string& cellName) const; + ///< Return a cell matching the given name or a 0-pointer, if there is no such cell. + void markCellAsUnchanged(); std::string getFacedHandle(); @@ -154,7 +157,7 @@ namespace MWWorld void moveObject (Ptr ptr, float x, float y, float z); - void indexToPosition (int cellX, int cellY, float &x, float &y) const; + void indexToPosition (int cellX, int cellY, float &x, float &y, bool centre = false) const; ///< Convert cell numbers to position. void positionToIndex (float x, float y, int &cellX, int &cellY) const; diff --git a/components/esm/loadskil.hpp b/components/esm/loadskil.hpp index 893cfe1e2..fbe11f1db 100644 --- a/components/esm/loadskil.hpp +++ b/components/esm/loadskil.hpp @@ -65,6 +65,7 @@ struct Skill void load(ESMReader &esm) { + esm.getHNT(index, "INDX"); esm.getHNT(data, "SKDT", 24); description = esm.getHNOString("DESC"); } diff --git a/components/esm_store/reclists.hpp b/components/esm_store/reclists.hpp index 3711a20b1..acfbe7b1a 100644 --- a/components/esm_store/reclists.hpp +++ b/components/esm_store/reclists.hpp @@ -49,10 +49,14 @@ namespace ESMS // Find the given object ID, or return NULL if not found. const X* search(const std::string &id) const { - std::string id2 = toLower (id); - if(list.find(id2) == list.end()) - return NULL; - return &list.find(id2)->second; + std::string id2 = toLower (id); + + typename MapType::const_iterator iter = list.find (id2); + + if (iter == list.end()) + return NULL; + + return &iter->second; } // Find the given object ID (throws an exception if not found) @@ -87,10 +91,13 @@ namespace ESMS // Find the given object ID, or return NULL if not found. const X* search(const std::string &id) const { - std::string id2 = toLower (id); - if(list.find(id2) == list.end()) - return NULL; - return &list.find(id2)->second; + std::string id2 = toLower (id); + + typename MapType::const_iterator iter = list.find (id2); + + if (iter == list.end()) + return NULL; + return &iter->second; } // Find the given object ID (throws an exception if not found) @@ -129,10 +136,14 @@ namespace ESMS // Find the given object ID, or return NULL if not found. const X* search(const std::string &id) const { - std::string id2 = toLower (id); - if(list.find(id2) == list.end()) - return NULL; - return &list.find(id2)->second; + std::string id2 = toLower (id); + + typename MapType::const_iterator iter = list.find (id2); + + if (iter == list.end()) + return NULL; + + return &iter->second; } // Find the given object ID (throws an exception if not found) @@ -209,6 +220,38 @@ namespace ESMS return it2->second; } + const Cell *searchExtByName (const std::string& id) const + { + for (ExtCells::const_iterator iter = extCells.begin(); iter!=extCells.end(); ++iter) + { + const ExtCellsCol& column = iter->second; + for (ExtCellsCol::const_iterator iter = column.begin(); iter!=column.end(); ++iter) + { + if (iter->second->name==id) + return iter->second; + } + } + + return 0; + } + + const Cell *searchExtByRegion (const std::string& id) const + { + std::string id2 = toLower (id); + + for (ExtCells::const_iterator iter = extCells.begin(); iter!=extCells.end(); ++iter) + { + const ExtCellsCol& column = iter->second; + for (ExtCellsCol::const_iterator iter = column.begin(); iter!=column.end(); ++iter) + { + if (toLower (iter->second->region)==id) + return iter->second; + } + } + + return 0; + } + void load(ESMReader &esm, const std::string &id) { using namespace std; @@ -256,10 +299,14 @@ namespace ESMS // Find the given object ID, or return NULL if not found. const X* search(const std::string &id) const { - std::string id2 = toLower (id); - if(list.find(id2) == list.end()) - return NULL; - return &list.find(id2)->second; + std::string id2 = toLower (id); + + typename MapType::const_iterator iter = list.find (id2); + + if (iter == list.end()) + return NULL; + + return &iter->second; } // Find the given object ID (throws an exception if not found) @@ -276,12 +323,55 @@ namespace ESMS int getSize() { return list.size(); } }; + template + struct IndexListT + { + typedef std::map MapType; + + MapType list; + + void load(ESMReader &esm) + { + X ref; + ref.load (esm); + int index = ref.index; + list[index] = ref; + } + + int getSize() + { + return list.size(); + } + + // Find the given object ID, or return NULL if not found. + const X* search (int id) const + { + typename MapType::const_iterator iter = list.find (id); + + if (iter == list.end()) + return NULL; + + return &iter->second; + } + + // Find the given object ID (throws an exception if not found) + const X* find (int id) const + { + const X *object = search (id); + + if (!object) + { + std::ostringstream error; + error << "object " << id << " not found"; + throw std::runtime_error (error.str()); + } + + return object; + } + }; + /* We need special lists for: - Magic effects - Skills - Dialog / Info combo - Scripts Land Path grids Land textures diff --git a/components/esm_store/store.cpp b/components/esm_store/store.cpp index c43855873..8204c6304 100644 --- a/components/esm_store/store.cpp +++ b/components/esm_store/store.cpp @@ -46,15 +46,21 @@ void ESMStore::load(ESMReader &esm) { std::cerr << "error: info record without dialog" << std::endl; esm.skipRecord(); - continue; } } + else if (n.val==ESM::REC_MGEF) + { + magicEffects.load (esm); + } + else if (n.val==ESM::REC_SKIL) + { + skills.load (esm); + } else { // Not found (this would be an error later) esm.skipRecord(); missing.insert(n.toString()); - continue; } } else diff --git a/components/esm_store/store.hpp b/components/esm_store/store.hpp index 1b9184aa6..b0f75785d 100644 --- a/components/esm_store/store.hpp +++ b/components/esm_store/store.hpp @@ -71,9 +71,9 @@ namespace ESMS RecIDListT gameSettings; //RecListT lands; //RecListT landTexts; - //RecListT magicEffects; + IndexListT magicEffects; ScriptListT