mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Merged pull request #1844

Browse source
This commit is contained in:
Marc Zinnschlag 2018-08-05 12:25:10 +02:00
commit 31491fdbde
3 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -77,10 +77,11 @@
Bug #4539: Paper Doll is affected by GUI scaling
Bug #4545: Creatures flee from werewolves
Bug #4551: Replace 0 sound range with default range separately
Bug #4553: Forcegreeting on non-actor opens a dialogue window which cannot be closed
Feature #2606: Editor: Implemented (optional) case sensitive global search
Feature #3083: Play animation when NPC is casting spell via script
Feature #3103: Provide option for disposition to get increased by successful trade
Feature #3276: Editor: Search- Show number of (remaining) search results and indicate a search without any results
Feature #3276: Editor: Search - Show number of (remaining) search results and indicate a search without any results
Feature #3641: Editor: Limit FPS in 3d preview window
Feature #3703: Ranged sneak attack criticals
Feature #4012: Editor: Write a log file if OpenCS crashes

6
apps/openmw/mwgui/dialogue.cpp
View file

@ -408,6 +408,12 @@ namespace MWGui
void DialogueWindow::setPtr(const MWWorld::Ptr& actor)
{
if (!actor.getClass().isActor())
{
std::cerr << "Warning: can not talk with non-actor object." << std::endl;
return;
}
bool sameActor = (mPtr == actor);
if (!sameActor)
{

10
apps/openmw/mwscript/dialogueextensions.cpp
View file

@ -1,3 +1,5 @@
#include <iostream>
#include "dialogueextensions.hpp"
#include <components/compiler/extensions.hpp>
@ -134,6 +136,14 @@ namespace MWScript
if (!ptr.getRefData().isEnabled())
return;
if (!ptr.getClass().isActor())
{
const std::string error = "Warning: \"forcegreeting\" command works only for actors.";
runtime.getContext().report (error);
std::cerr << error << std::endl;
return;
}
MWBase::Environment::get().getWindowManager()->pushGuiMode(MWGui::GM_Dialogue, ptr);
}
};