mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-07 03:54:40 +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
@ -706,7 +706,7 @@ namespace MWDialogue
|
||||
}
|
||||
return false;
|
||||
}
|
||||
catch (const Compiler::SourceException& error)
|
||||
catch (const Compiler::SourceException& /* error */)
|
||||
{
|
||||
// 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);
|
||||
}
|
||||
catch (std::exception& e)
|
||||
catch (std::exception& /* e */)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
@ -12,6 +12,10 @@ namespace MWGui
|
||||
{
|
||||
}
|
||||
|
||||
ReferenceInterface::~ReferenceInterface()
|
||||
{
|
||||
}
|
||||
|
||||
void ReferenceInterface::checkReferenceAvailable()
|
||||
{
|
||||
if (mPtr.isEmpty())
|
||||
|
@ -13,6 +13,7 @@ namespace MWGui
|
||||
{
|
||||
public:
|
||||
ReferenceInterface();
|
||||
virtual ~ReferenceInterface();
|
||||
|
||||
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);
|
||||
}
|
||||
catch (std::exception& e)
|
||||
catch (std::exception /* & e */)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
@ -90,7 +90,7 @@ namespace MWSound
|
||||
{
|
||||
if(devname.empty())
|
||||
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();
|
||||
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)
|
||||
: 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)
|
||||
{}
|
||||
|
||||
|
@ -9,6 +9,9 @@
|
||||
|
||||
#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
|
||||
{
|
||||
class World;
|
||||
|
@ -188,7 +188,7 @@ namespace MWWorld
|
||||
virtual bool toggleSky();
|
||||
///< \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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user