Merge remote-tracking branch 'scrawl/master'

apps/openmw/mwbase/statemanager.hpp

@@ -55,6 +55,8 @@ namespace MWBase
 
             virtual void endGame() = 0;
 
+            virtual void deleteGame (const MWState::Character *character, const MWState::Slot *slot) = 0;
+
             virtual void saveGame (const std::string& description, const MWState::Slot *slot = 0) = 0;
             ///< Write a saved game to \a slot or create a new slot if \a slot == 0.
             ///

apps/openmw/mwgui/list.cpp

@@ -48,7 +48,7 @@ namespace MWGui
 
         void MWList::redraw(bool scrollbarShown)
         {
-            const int _scrollBarWidth = 24; // fetch this from skin?
+            const int _scrollBarWidth = 20; // fetch this from skin?
             const int scrollBarWidth = scrollbarShown ? _scrollBarWidth : 0;
             const int spacing = 3;
             size_t scrollbarPosition = mScrollView->getScrollPosition();
@@ -83,7 +83,7 @@ namespace MWGui
                 else
                 {
                     MyGUI::ImageBox* separator = mScrollView->createWidget<MyGUI::ImageBox>("MW_HLine",
-                        MyGUI::IntCoord(2, mItemHeight, mScrollView->getWidth()-4, 18),
+                        MyGUI::IntCoord(2, mItemHeight, mScrollView->getWidth() - scrollBarWidth - 4, 18),
                         MyGUI::Align::Left | MyGUI::Align::Top | MyGUI::Align::HStretch);
                     separator->setNeedMouseFocus(false);
 
@@ -91,7 +91,7 @@ namespace MWGui
                 }
                 ++i;
             }
-            mScrollView->setCanvasSize(mClient->getSize().width + (_scrollBarWidth-scrollBarWidth), std::max(mItemHeight, mClient->getSize().height));
+            mScrollView->setCanvasSize(mClient->getSize().width, std::max(mItemHeight, mClient->getSize().height));
 
             if (!scrollbarShown && mItemHeight > mClient->getSize().height)
                 redraw(true);

apps/openmw/mwgui/savegamedialog.cpp

@@ -23,6 +23,7 @@ namespace MWGui
         : WindowModal("openmw_savegame_dialog.layout")
         , mSaving(true)
         , mCurrentCharacter(NULL)
+        , mCurrentSlot(NULL)
     {
         getWidget(mScreenshot, "Screenshot");
         getWidget(mCharacterSelection, "SelectCharacter");
@@ -36,6 +37,7 @@ namespace MWGui
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SaveGameDialog::onCancelButtonClicked);
         mCharacterSelection->eventComboChangePosition += MyGUI::newDelegate(this, &SaveGameDialog::onCharacterSelected);
         mSaveList->eventListChangePosition += MyGUI::newDelegate(this, &SaveGameDialog::onSlotSelected);
+        mSaveList->eventListMouseItemActivate += MyGUI::newDelegate(this, &SaveGameDialog::onSlotMouseClick);
         mSaveList->eventListSelectAccept += MyGUI::newDelegate(this, &SaveGameDialog::onSlotActivated);
         mSaveNameEdit->eventEditSelectAccept += MyGUI::newDelegate(this, &SaveGameDialog::onEditSelectAccept);
         mSaveNameEdit->eventEditTextChange += MyGUI::newDelegate(this, &SaveGameDialog::onSaveNameChanged);
@@ -47,6 +49,37 @@ namespace MWGui
         accept();
     }
 
+    void SaveGameDialog::onSlotMouseClick(MyGUI::ListBox* sender, size_t pos)
+    {
+        onSlotSelected(sender, pos);
+
+        if (MyGUI::InputManager::getInstance().isShiftPressed())
+        {
+            ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
+            dialog->open("#{sMessage3}");
+            dialog->eventOkClicked.clear();
+            dialog->eventOkClicked += MyGUI::newDelegate(this, &SaveGameDialog::onDeleteSlotConfirmed);
+            dialog->eventCancelClicked.clear();
+        }
+    }
+
+    void SaveGameDialog::onDeleteSlotConfirmed()
+    {
+        MWBase::Environment::get().getStateManager()->deleteGame (mCurrentCharacter, mCurrentSlot);
+        mSaveList->removeItemAt(mSaveList->getIndexSelected());
+        onSlotSelected(mSaveList, MyGUI::ITEM_NONE);
+
+        // The character might be deleted now
+        size_t previousIndex = mCharacterSelection->getIndexSelected();
+        open();
+        if (mCharacterSelection->getItemCount())
+        {
+            size_t nextCharacter = std::min(previousIndex, mCharacterSelection->getItemCount()-1);
+            mCharacterSelection->setIndexSelected(nextCharacter);
+            onCharacterSelected(mCharacterSelection, nextCharacter);
+        }
+    }
+
     void SaveGameDialog::onSaveNameChanged(MyGUI::EditBox *sender)
     {
         // This might have previously been a save slot from the list. If so, that is no longer the case
@@ -69,6 +102,12 @@ namespace MWGui
 
         center();
 
+        mCharacterSelection->setCaption("");
+        mCharacterSelection->removeAllItems();
+        mCurrentCharacter = NULL;
+        mCurrentSlot = NULL;
+        mSaveList->removeAllItems();
+
         MWBase::StateManager* mgr = MWBase::Environment::get().getStateManager();
         if (mgr->characterBegin() == mgr->characterEnd())
             return;
@@ -78,8 +117,6 @@ namespace MWGui
         std::string directory =
             Misc::StringUtils::lowerCase (Settings::Manager::getString ("character", "Saves"));
 
-        mCharacterSelection->removeAllItems();
-
         int selectedIndex = MyGUI::ITEM_NONE;
 
         for (MWBase::StateManager::CharacterIterator it = mgr->characterBegin(); it != mgr->characterEnd(); ++it)
@@ -152,23 +189,10 @@ namespace MWGui
     {
         MWBase::Environment::get().getWindowManager()->setKeyFocusWidget(NULL);
 
-        // Get the selected slot, if any
-        unsigned int i=0;
-        const MWState::Slot* slot = NULL;
-
-        if (mCurrentCharacter)
-        {
-            for (MWState::Character::SlotIterator it = mCurrentCharacter->begin(); it != mCurrentCharacter->end(); ++it,++i)
-            {
-                if (i == mSaveList->getIndexSelected())
-                    slot = &*it;
-            }
-        }
-
         if (mSaving)
         {
             // If overwriting an existing slot, ask for confirmation first
-            if (slot != NULL && !reallySure)
+            if (mCurrentSlot != NULL && !reallySure)
             {
                 ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
                 dialog->open("#{sMessage4}");
@@ -182,13 +206,13 @@ namespace MWGui
                 MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage65}");
                 return;
             }
-            MWBase::Environment::get().getStateManager()->saveGame (mSaveNameEdit->getCaption(), slot);
+            MWBase::Environment::get().getStateManager()->saveGame (mSaveNameEdit->getCaption(), mCurrentSlot);
         }
         else
         {
-            if (mCurrentCharacter && slot)
+            if (mCurrentCharacter && mCurrentSlot)
             {
-                MWBase::Environment::get().getStateManager()->loadGame (mCurrentCharacter, slot);
+                MWBase::Environment::get().getStateManager()->loadGame (mCurrentCharacter, mCurrentSlot);
                 MWBase::Environment::get().getWindowManager()->removeGuiMode (MWGui::GM_MainMenu);
             }
         }
@@ -221,6 +245,7 @@ namespace MWGui
         assert(character && "Can't find selected character");
 
         mCurrentCharacter = character;
+        mCurrentSlot = NULL;
         fillSaveList();
     }
 
@@ -240,6 +265,7 @@ namespace MWGui
     {
         if (pos == MyGUI::ITEM_NONE)
         {
+            mCurrentSlot = NULL;
             mInfoText->setCaption("");
             mScreenshot->setImageTexture("");
             return;
@@ -248,17 +274,17 @@ namespace MWGui
         if (mSaving)
             mSaveNameEdit->setCaption(sender->getItemNameAt(pos));
 
-        const MWState::Slot* slot = NULL;
+        mCurrentSlot = NULL;
         unsigned int i=0;
         for (MWState::Character::SlotIterator it = mCurrentCharacter->begin(); it != mCurrentCharacter->end(); ++it, ++i)
         {
             if (i == pos)
-                slot = &*it;
+                mCurrentSlot = &*it;
         }
-        assert(slot && "Can't find selected slot");
+        assert(mCurrentSlot && "Can't find selected slot");
 
         std::stringstream text;
-        time_t time = slot->mTimeStamp;
+        time_t time = mCurrentSlot->mTimeStamp;
         struct tm* timeinfo;
         timeinfo = localtime(&time);
 
@@ -269,24 +295,24 @@ namespace MWGui
         char buffer[size];
         if (std::strftime(buffer, size, "%x %X", timeinfo) > 0)
             text << buffer << "\n";
-        text << "Level " << slot->mProfile.mPlayerLevel << "\n";
-        text << slot->mProfile.mPlayerCell << "\n";
+        text << "Level " << mCurrentSlot->mProfile.mPlayerLevel << "\n";
+        text << mCurrentSlot->mProfile.mPlayerCell << "\n";
         // text << "Time played: " << slot->mProfile.mTimePlayed << "\n";
 
-        int hour = int(slot->mProfile.mInGameTime.mGameHour);
+        int hour = int(mCurrentSlot->mProfile.mInGameTime.mGameHour);
         bool pm = hour >= 12;
         if (hour >= 13) hour -= 12;
         if (hour == 0) hour = 12;
 
         text
-            << slot->mProfile.mInGameTime.mDay << " "
-            << MWBase::Environment::get().getWorld()->getMonthName(slot->mProfile.mInGameTime.mMonth)
+            << mCurrentSlot->mProfile.mInGameTime.mDay << " "
+            << MWBase::Environment::get().getWorld()->getMonthName(mCurrentSlot->mProfile.mInGameTime.mMonth)
             <<  " " << hour << " " << (pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}");
 
         mInfoText->setCaptionWithReplacing(text.str());
 
         // Decode screenshot
-        std::vector<char> data = slot->mProfile.mScreenshot; // MemoryDataStream doesn't work with const data :(
+        std::vector<char> data = mCurrentSlot->mProfile.mScreenshot; // MemoryDataStream doesn't work with const data :(
         Ogre::DataStreamPtr stream(new Ogre::MemoryDataStream(&data[0], data.size()));
         Ogre::Image image;
         image.load(stream, "jpg");

apps/openmw/mwgui/savegamedialog.hpp

@@ -6,6 +6,7 @@
 namespace MWState
 {
     class Character;
+    class Slot;
 }
 
 namespace MWGui
@@ -24,8 +25,15 @@ namespace MWGui
         void onCancelButtonClicked (MyGUI::Widget* sender);
         void onOkButtonClicked (MyGUI::Widget* sender);
         void onCharacterSelected (MyGUI::ComboBox* sender, size_t pos);
+        // Slot selected (mouse click or arrow keys)
         void onSlotSelected (MyGUI::ListBox* sender, size_t pos);
+        // Slot activated (double click or enter key)
         void onSlotActivated (MyGUI::ListBox* sender, size_t pos);
+        // Slot clicked with mouse
+        void onSlotMouseClick(MyGUI::ListBox* sender, size_t pos);
+
+        void onDeleteSlotConfirmed();
+
         void onEditSelectAccept (MyGUI::EditBox* sender);
         void onSaveNameChanged (MyGUI::EditBox* sender);
         void onConfirmationGiven();
@@ -46,6 +54,7 @@ namespace MWGui
         MyGUI::Widget* mSpacer;
 
         const MWState::Character* mCurrentCharacter;
+        const MWState::Slot* mCurrentSlot;
 
     };
 

apps/openmw/mwscript/interpretercontext.cpp

@@ -302,15 +302,23 @@ namespace MWScript
         std::string factionId = MWWorld::Class::get (mReference).getNpcStats (mReference).getFactionRanks().begin()->first;
 
         std::map<std::string, int> ranks = MWWorld::Class::get (player).getNpcStats (player).getFactionRanks();
-        std::map<std::string, int>::const_iterator it = ranks.begin();
+        std::map<std::string, int>::const_iterator it = ranks.find(factionId);
+        int rank = -1;
+        if (it != ranks.end())
+            rank = it->second;
+
+        // If you are not in the faction, PcRank returns the first rank, for whatever reason.
+        // This is used by the dialogue when joining the Thieves Guild in Balmora.
+        if (rank == -1)
+            rank = 0;
 
         const MWWorld::ESMStore &store = world->getStore();
         const ESM::Faction *faction = store.get<ESM::Faction>().find(factionId);
 
-        if(it->second < 0 || it->second > 9) // there are only 10 ranks
+        if(rank < 0 || rank > 9) // there are only 10 ranks
             return "";
 
-        return faction->mRanks[it->second];
+        return faction->mRanks[rank];
     }
 
     std::string InterpreterContext::getPCNextRank() const
@@ -320,25 +328,25 @@ namespace MWScript
 
         std::string factionId = MWWorld::Class::get (mReference).getNpcStats (mReference).getFactionRanks().begin()->first;
 
-        const MWWorld::ESMStore &store = world->getStore();
-        const ESM::Faction *faction = store.get<ESM::Faction>().find(factionId);
-
         std::map<std::string, int> ranks = MWWorld::Class::get (player).getNpcStats (player).getFactionRanks();
+        std::map<std::string, int>::const_iterator it = ranks.find(factionId);
+        int rank = -1;
+        if (it != ranks.end())
+            rank = it->second;
 
-        if (!ranks.empty())
-        {
-            std::map<std::string, int>::const_iterator it = ranks.begin();
+        ++rank; // Next rank
 
-            if(it->second < -1 || it->second > 9)
+        // if we are already at max rank, there is no next rank
+        if (rank > 9)
+            rank = 9;
+
+        const MWWorld::ESMStore &store = world->getStore();
+        const ESM::Faction *faction = store.get<ESM::Faction>().find(factionId);
+
+        if(rank < 0 || rank > 9)
             return "";
 
-            if(it->second <= 8) // If player is at max rank, there is no next rank
-                return faction->mRanks[it->second + 1];
-            else
-                return faction->mRanks[it->second];
-        }
-        else
-            return faction->mRanks[0];
+        return faction->mRanks[rank];
     }
 
     int InterpreterContext::getPCBounty() const
@@ -370,10 +378,14 @@ namespace MWScript
 
     float InterpreterContext::getDistance (const std::string& name, const std::string& id) const
     {
-        // TODO handle exterior cells (when ref and ref2 are located in different cells)
-        const MWWorld::Ptr ref2 = getReference (id, false);
+        const MWWorld::Ptr ref2 = getReference (id, false, false);
+        // If either actor is in a non-active cell, return a large value (just like vanilla)
+        if (ref2.isEmpty())
+            return std::numeric_limits<float>().max();
 
-        const MWWorld::Ptr ref = MWBase::Environment::get().getWorld()->getPtr (name, true);
+        const MWWorld::Ptr ref = getReference (name, false, false);
+        if (ref.isEmpty())
+            return std::numeric_limits<float>().max();
 
         double diff[3];
 

apps/openmw/mwstate/character.cpp

@@ -95,6 +95,21 @@ MWState::Character::Character (const boost::filesystem::path& saves, const std::
     }
 }
 
+void MWState::Character::cleanup()
+{
+    if (mSlots.size() == 0)
+    {
+        // All slots are gone, no need to keep the empty directory
+        if (boost::filesystem::is_directory (mPath))
+        {
+            // Extra safety check to make sure the directory is empty (e.g. slots failed to parse header)
+            boost::filesystem::directory_iterator it(mPath);
+            if (it == boost::filesystem::directory_iterator())
+                boost::filesystem::remove_all(mPath);
+        }
+    }
+}
+
 const MWState::Slot *MWState::Character::createSlot (const ESM::SavedGame& profile)
 {
     addSlot (profile);
@@ -102,6 +117,21 @@ const MWState::Slot *MWState::Character::createSlot (const ESM::SavedGame& profi
     return &mSlots.back();
 }
 
+void MWState::Character::deleteSlot (const Slot *slot)
+{
+    int index = slot - &mSlots[0];
+
+    if (index<0 || index>=static_cast<int> (mSlots.size()))
+    {
+        // sanity check; not entirely reliable
+        throw std::logic_error ("slot not found");
+    }
+
+    boost::filesystem::remove(slot->mPath);
+
+    mSlots.erase (mSlots.begin()+index);
+}
+
 const MWState::Slot *MWState::Character::updateSlot (const Slot *slot, const ESM::SavedGame& profile)
 {
     int index = slot - &mSlots[0];

apps/openmw/mwstate/character.hpp

@@ -36,11 +36,19 @@ namespace MWState
 
             Character (const boost::filesystem::path& saves, const std::string& game);
 
+            void cleanup();
+            ///< Delete the directory we used, if it is empty
+
             const Slot *createSlot (const ESM::SavedGame& profile);
             ///< Create new slot.
             ///
             /// \attention The ownership of the slot is not transferred.
 
+            /// \note Slot must belong to this character.
+            ///
+            /// \attention The \a slot pointer will be invalidated by this call.
+            void deleteSlot (const Slot *slot);
+
             const Slot *updateSlot (const Slot *slot, const ESM::SavedGame& profile);
             /// \note Slot must belong to this character.
             ///

apps/openmw/mwstate/charactermanager.cpp

@@ -47,6 +47,25 @@ MWState::Character *MWState::CharacterManager::getCurrentCharacter (bool create)
     return mCurrent;
 }
 
+void MWState::CharacterManager::deleteSlot(const MWState::Character *character, const MWState::Slot *slot)
+{
+    int index = character - &mCharacters[0];
+
+    if (index<0 || index>=static_cast<int> (mCharacters.size()))
+        throw std::logic_error ("invalid character");
+
+    mCharacters[index].deleteSlot(slot);
+
+    if (mCharacters[index].begin() == mCharacters[index].end())
+    {
+        // All slots deleted, cleanup and remove this character
+        mCharacters[index].cleanup();
+        if (character == mCurrent)
+            mCurrent = NULL;
+        mCharacters.erase(mCharacters.begin() + index);
+    }
+}
+
 void MWState::CharacterManager::createCharacter()
 {
     std::ostringstream stream;

apps/openmw/mwstate/charactermanager.hpp

@@ -30,6 +30,8 @@ namespace MWState
             Character *getCurrentCharacter (bool create = true);
             ///< \param create Create a new character, if there is no current character.
 
+            void deleteSlot(const MWState::Character *character, const MWState::Slot *slot);
+
             void createCharacter();
             ///< Create new character within saved game management
 

apps/openmw/mwstate/statemanagerimp.cpp

@@ -374,6 +374,11 @@ void MWState::StateManager::quickLoad()
         }
 }
 
+void MWState::StateManager::deleteGame(const MWState::Character *character, const MWState::Slot *slot)
+{
+    mCharacterManager.deleteSlot(character, slot);
+}
+
 MWState::Character *MWState::StateManager::getCurrentCharacter (bool create)
 {
     return mCharacterManager.getCurrentCharacter (create);

apps/openmw/mwstate/statemanagerimp.hpp

@@ -44,6 +44,9 @@ namespace MWState
 
             virtual void endGame();
 
+            virtual void deleteGame (const MWState::Character *character, const MWState::Slot *slot);
+            ///< Delete a saved game slot from this character. If all save slots are deleted, the character will be deleted too.
+
             virtual void saveGame (const std::string& description, const Slot *slot = 0);
             ///< Write a saved game to \a slot or create a new slot if \a slot == 0.
             ///

apps/openmw/mwworld/worldimp.cpp

@@ -2506,7 +2506,17 @@ namespace MWWorld
 
     bool World::isDark() const
     {
+        MWWorld::CellStore* cell = mPlayer->getPlayer().getCell();
+        if (cell->isExterior())
             return mWeatherManager->isDark();
+        else
+        {
+            uint32_t ambient = cell->getCell()->mAmbi.mAmbient;
+            int ambientTotal = (ambient & 0xff)
+                    + ((ambient>>8) & 0xff)
+                    + ((ambient>>16) & 0xff);
+            return !(cell->getCell()->mData.mFlags & ESM::Cell::NoSleep) && ambientTotal <= 201;
+        }
     }
 
     bool World::findInteriorPositionInWorldSpace(MWWorld::CellStore* cell, Ogre::Vector3& result)

files/mygui/openmw_scroll_skin.xml

@@ -3,12 +3,12 @@
 <MyGUI type="Skin">
 
     <Skin name="MW_ScrollView" size="516 516">
-        <Child type="Widget" skin="" offset="0 0 516 516" align="Stretch" name="Client"/>
+        <Child type="Widget" skin="" offset="0 0 502 516" align="Stretch" name="Client"/>
         <Child type="MWScrollBar" skin="MW_VScroll" offset="498 3 14 509" align="Right Top VStretch" name="VScroll"/>
     </Skin>
 
     <Skin name="MW_ScrollViewH" size="516 516">
-        <Child type="Widget" skin="" offset="0 0 516 516" align="Stretch" name="Client"/>
+        <Child type="Widget" skin="" offset="0 0 516 502" align="Stretch" name="Client"/>
         <Child type="MWScrollBar" skin="MW_HScroll" offset="3 498 509 14" align="Left Bottom HStretch" name="HScroll"/>
     </Skin>