mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-19 22:23:51 +00:00
Fixed some windows issues and got rid of a few tiny warnings while at it.
This commit is contained in:
parent
1a5203749f
commit
113457d934
9 changed files with 14 additions and 6 deletions
|
@ -706,7 +706,7 @@ namespace MWDialogue
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
catch (const Compiler::SourceException& error)
|
catch (const Compiler::SourceException& /* error */)
|
||||||
{
|
{
|
||||||
// error has already been reported via error handler
|
// error has already been reported via error handler
|
||||||
}
|
}
|
||||||
|
|
|
@ -286,7 +286,7 @@ void HUD::onWorldClicked(MyGUI::Widget* _sender)
|
||||||
{
|
{
|
||||||
object = MWBase::Environment::get().getWorld()->getPtrViaHandle(handle);
|
object = MWBase::Environment::get().getWorld()->getPtrViaHandle(handle);
|
||||||
}
|
}
|
||||||
catch (std::exception& e)
|
catch (std::exception& /* e */)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,6 +12,10 @@ namespace MWGui
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ReferenceInterface::~ReferenceInterface()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
void ReferenceInterface::checkReferenceAvailable()
|
void ReferenceInterface::checkReferenceAvailable()
|
||||||
{
|
{
|
||||||
if (mPtr.isEmpty())
|
if (mPtr.isEmpty())
|
||||||
|
|
|
@ -13,6 +13,7 @@ namespace MWGui
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ReferenceInterface();
|
ReferenceInterface();
|
||||||
|
virtual ~ReferenceInterface();
|
||||||
|
|
||||||
void checkReferenceAvailable(); ///< closes the window, if the MW-reference has become unavailable
|
void checkReferenceAvailable(); ///< closes the window, if the MW-reference has become unavailable
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ void ToolTips::onFrame(float frameDuration)
|
||||||
{
|
{
|
||||||
mFocusObject = MWBase::Environment::get().getWorld()->getPtrViaHandle(handle);
|
mFocusObject = MWBase::Environment::get().getWorld()->getPtrViaHandle(handle);
|
||||||
}
|
}
|
||||||
catch (std::exception& e)
|
catch (std::exception /* & e */)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -90,7 +90,7 @@ namespace MWSound
|
||||||
{
|
{
|
||||||
if(devname.empty())
|
if(devname.empty())
|
||||||
throw;
|
throw;
|
||||||
std::cout <<"Failed to open device \""<<devname<<"\", trying default"<< std::endl;
|
std::cout <<"Failed to open device \""<<devname<<"\", trying default."<< std::endl << "The error given was: " << e.what() << std::endl;
|
||||||
mOutput->init();
|
mOutput->init();
|
||||||
Settings::Manager::setString("device", "Sound", "");
|
Settings::Manager::setString("device", "Sound", "");
|
||||||
}
|
}
|
||||||
|
|
|
@ -91,7 +91,7 @@ MWWorld::Ptr MWWorld::Cells::getPtrAndCache (const std::string& name, Ptr::CellS
|
||||||
|
|
||||||
MWWorld::Cells::Cells (const ESMS::ESMStore& store, ESM::ESMReader& reader)
|
MWWorld::Cells::Cells (const ESMS::ESMStore& store, ESM::ESMReader& reader)
|
||||||
: mStore (store), mReader (reader),
|
: mStore (store), mReader (reader),
|
||||||
mIdCache (20, std::pair<std::string, Ptr::CellStore *> ("", 0)), /// \todo make cache size configurable
|
mIdCache (20, std::pair<std::string, Ptr::CellStore *> ("", (Ptr::CellStore*)0)), /// \todo make cache size configurable
|
||||||
mIdCacheIndex (0)
|
mIdCacheIndex (0)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,9 @@
|
||||||
|
|
||||||
#include "../mwmechanics/drawstate.hpp"
|
#include "../mwmechanics/drawstate.hpp"
|
||||||
|
|
||||||
|
#undef DrawState // How did this get defined again?
|
||||||
|
// Maybe it's defined by default in every file for windows?
|
||||||
|
|
||||||
namespace MWBase
|
namespace MWBase
|
||||||
{
|
{
|
||||||
class World;
|
class World;
|
||||||
|
|
|
@ -188,7 +188,7 @@ namespace MWWorld
|
||||||
virtual bool toggleSky();
|
virtual bool toggleSky();
|
||||||
///< \return Resulting mode
|
///< \return Resulting mode
|
||||||
|
|
||||||
virtual void changeWeather (const std::string& region, const unsigned int id);
|
virtual void changeWeather (const std::string& region, unsigned int id);
|
||||||
|
|
||||||
virtual int getCurrentWeather() const;
|
virtual int getCurrentWeather() const;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue