mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-26 18:35:20 +00:00
Merge remote-tracking branch 'upstream/master' into osgshadow-test-vdsm
This commit is contained in:
commit
ef7102899a
@ -497,6 +497,7 @@ if(WIN32)
|
||||
SET(CPACK_NSIS_HELP_LINK "http:\\\\\\\\www.openmw.org")
|
||||
SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\www.openmw.org")
|
||||
SET(CPACK_NSIS_INSTALLED_ICON_NAME "openmw-launcher.exe")
|
||||
SET(CPACK_NSIS_MUI_FINISHPAGE_RUN "openmw-launcher.exe")
|
||||
SET(CPACK_NSIS_MUI_ICON "${OpenMW_SOURCE_DIR}/files/windows/openmw.ico")
|
||||
SET(CPACK_NSIS_MUI_UNIICON "${OpenMW_SOURCE_DIR}/files/windows/openmw.ico")
|
||||
SET(CPACK_PACKAGE_ICON "${OpenMW_SOURCE_DIR}\\\\files\\\\openmw.bmp")
|
||||
|
@ -142,6 +142,9 @@ void ContainerItemModel::update()
|
||||
|
||||
for (MWWorld::ContainerStoreIterator it = store.begin(); it != store.end(); ++it)
|
||||
{
|
||||
if (!(*it).getClass().showsInInventory(*it))
|
||||
continue;
|
||||
|
||||
std::vector<ItemStack>::iterator itemStack = mItems.begin();
|
||||
for (; itemStack != mItems.end(); ++itemStack)
|
||||
{
|
||||
|
@ -203,4 +203,10 @@ namespace MWGui
|
||||
checkReferenceAvailable();
|
||||
mTimeAdvancer.onFrame(dt);
|
||||
}
|
||||
|
||||
bool TrainingWindow::exit()
|
||||
{
|
||||
return !mTimeAdvancer.isRunning();
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -16,7 +16,7 @@ namespace MWGui
|
||||
|
||||
virtual void onOpen();
|
||||
|
||||
bool exit() { return false; }
|
||||
bool exit();
|
||||
|
||||
void setPtr(const MWWorld::Ptr& actor);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user