mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-03 02:45:31 +00:00
Code Issues Releases Wiki Activity

Remove unnecessary WindowManager::messageBox arguments

Browse source
This commit is contained in:
scrawl 2013-03-30 12:56:37 +01:00
parent 04673b2f14
commit e7af718b55
18 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/container.cpp
View file

@ -115,7 +115,7 @@ namespace MWClass
if (needKey && hasKey) if (needKey && hasKey)
{ {
MWBase::Environment::get().getWindowManager ()->messageBox (keyName + " #{sKeyUsed}", std::vector<std::string>()); MWBase::Environment::get().getWindowManager ()->messageBox (keyName + " #{sKeyUsed}");
ptr.getCellRef().mLockLevel = 0; ptr.getCellRef().mLockLevel = 0;
// using a key disarms the trap // using a key disarms the trap
ptr.getCellRef().mTrap = ""; ptr.getCellRef().mTrap = "";

2
apps/openmw/mwclass/door.cpp
View file

@ -98,7 +98,7 @@ namespace MWClass
if (needKey && hasKey) if (needKey && hasKey)
{ {
MWBase::Environment::get().getWindowManager ()->messageBox (keyName + " #{sKeyUsed}", std::vector<std::string>()); MWBase::Environment::get().getWindowManager ()->messageBox (keyName + " #{sKeyUsed}");
ptr.getCellRef().mLockLevel = 0; ptr.getCellRef().mLockLevel = 0;
// using a key disarms the trap // using a key disarms the trap
ptr.getCellRef().mTrap = ""; ptr.getCellRef().mTrap = "";

12
apps/openmw/mwgui/alchemywindow.cpp
View file

@ -77,40 +77,40 @@ namespace MWGui
if (result == MWMechanics::Alchemy::Result_NoName) if (result == MWMechanics::Alchemy::Result_NoName)
{ {
mWindowManager.messageBox("#{sNotifyMessage37}", std::vector<std::string>()); mWindowManager.messageBox("#{sNotifyMessage37}");
return; return;
} }
// check if mortar & pestle is available (always needed) // check if mortar & pestle is available (always needed)
if (result == MWMechanics::Alchemy::Result_NoMortarAndPestle) if (result == MWMechanics::Alchemy::Result_NoMortarAndPestle)
{ {
mWindowManager.messageBox("#{sNotifyMessage45}", std::vector<std::string>()); mWindowManager.messageBox("#{sNotifyMessage45}");
return; return;
} }
// make sure 2 or more ingredients were selected // make sure 2 or more ingredients were selected
if (result == MWMechanics::Alchemy::Result_LessThanTwoIngredients) if (result == MWMechanics::Alchemy::Result_LessThanTwoIngredients)
{ {
mWindowManager.messageBox("#{sNotifyMessage6a}", std::vector<std::string>()); mWindowManager.messageBox("#{sNotifyMessage6a}");
return; return;
} }
if (result == MWMechanics::Alchemy::Result_NoEffects) if (result == MWMechanics::Alchemy::Result_NoEffects)
{ {
mWindowManager.messageBox("#{sNotifyMessage8}", std::vector<std::string>()); mWindowManager.messageBox("#{sNotifyMessage8}");
MWBase::Environment::get().getSoundManager()->playSound("potion fail", 1.f, 1.f); MWBase::Environment::get().getSoundManager()->playSound("potion fail", 1.f, 1.f);
return; return;
} }
if (result == MWMechanics::Alchemy::Result_Success) if (result == MWMechanics::Alchemy::Result_Success)
{ {
mWindowManager.messageBox("#{sPotionSuccess}", std::vector<std::string>()); mWindowManager.messageBox("#{sPotionSuccess}");
MWBase::Environment::get().getSoundManager()->playSound("potion success", 1.f, 1.f); MWBase::Environment::get().getSoundManager()->playSound("potion success", 1.f, 1.f);
} }
else if (result == MWMechanics::Alchemy::Result_RandomFailure) else if (result == MWMechanics::Alchemy::Result_RandomFailure)
{ {
// potion failed // potion failed
mWindowManager.messageBox("#{sNotifyMessage8}", std::vector<std::string>()); mWindowManager.messageBox("#{sNotifyMessage8}");
MWBase::Environment::get().getSoundManager()->playSound("potion fail", 1.f, 1.f); MWBase::Environment::get().getSoundManager()->playSound("potion fail", 1.f, 1.f);
} }

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

@ -150,7 +150,7 @@ void ContainerBase::onSelectedItem(MyGUI::Widget* _sender)
{ {
// user notification "i don't buy this item" // user notification "i don't buy this item"
MWBase::Environment::get().getWindowManager()-> MWBase::Environment::get().getWindowManager()->
messageBox("#{sBarterDialog4}", std::vector<std::string>()); messageBox("#{sBarterDialog4}");
return; return;
} }
} }
@ -294,7 +294,7 @@ void ContainerBase::onContainerClicked(MyGUI::Widget* _sender)
{ {
// user notification // user notification
MWBase::Environment::get().getWindowManager()-> MWBase::Environment::get().getWindowManager()->
messageBox("#{sContentsMessage2}", std::vector<std::string>()); messageBox("#{sContentsMessage2}");
return; return;
} }
@ -318,7 +318,7 @@ void ContainerBase::onContainerClicked(MyGUI::Widget* _sender)
object.getRefData().setCount(origCount); object.getRefData().setCount(origCount);
// user notification // user notification
MWBase::Environment::get().getWindowManager()-> MWBase::Environment::get().getWindowManager()->
messageBox("#{sContentsMessage3}", std::vector<std::string>()); messageBox("#{sContentsMessage3}");
return; return;
} }

2
apps/openmw/mwgui/levelupdialog.cpp
View file

@ -162,7 +162,7 @@ namespace MWGui
MWMechanics::NpcStats& pcStats = MWWorld::Class::get(player).getNpcStats (player); MWMechanics::NpcStats& pcStats = MWWorld::Class::get(player).getNpcStats (player);
if (mSpentAttributes.size() < 3) if (mSpentAttributes.size() < 3)
MWBase::Environment::get().getWindowManager ()->messageBox("#{sNotifyMessage36}", std::vector<std::string>()); MWBase::Environment::get().getWindowManager ()->messageBox("#{sNotifyMessage36}");
else else
{ {
// increase attributes // increase attributes

4
apps/openmw/mwgui/quickkeysmenu.cpp
View file

@ -291,7 +291,7 @@ namespace MWGui
if (item.getRefData ().getCount() == 0) if (item.getRefData ().getCount() == 0)
{ {
MWBase::Environment::get().getWindowManager ()->messageBox ( MWBase::Environment::get().getWindowManager ()->messageBox (
"#{sQuickMenu5} " + MWWorld::Class::get(item).getName(item), std::vector<std::string>()); "#{sQuickMenu5} " + MWWorld::Class::get(item).getName(item));
return; return;
} }
@ -317,7 +317,7 @@ namespace MWGui
if (item.getRefData ().getCount() == 0) if (item.getRefData ().getCount() == 0)
{ {
MWBase::Environment::get().getWindowManager ()->messageBox ( MWBase::Environment::get().getWindowManager ()->messageBox (
"#{sQuickMenu5} " + MWWorld::Class::get(item).getName(item), std::vector<std::string>()); "#{sQuickMenu5} " + MWWorld::Class::get(item).getName(item));
return; return;
} }

4
apps/openmw/mwgui/settingswindow.cpp
View file

@ -362,7 +362,7 @@ namespace MWGui
{ {
std::string msg = "This resolution is not supported in Fullscreen mode. Please select a resolution from the list."; std::string msg = "This resolution is not supported in Fullscreen mode. Please select a resolution from the list.";
MWBase::Environment::get().getWindowManager()-> MWBase::Environment::get().getWindowManager()->
messageBox(msg, std::vector<std::string>()); messageBox(msg);
_sender->castType<MyGUI::Button>()->setCaption(off); _sender->castType<MyGUI::Button>()->setCaption(off);
} }
else else
@ -593,7 +593,7 @@ namespace MWGui
static_cast<MyGUI::Button*>(_sender)->setCaptionWithReplacing("#{sNone}"); static_cast<MyGUI::Button*>(_sender)->setCaptionWithReplacing("#{sNone}");
MWBase::Environment::get().getWindowManager ()->messageBox ("#{sControlsMenu3}", std::vector<std::string>()); MWBase::Environment::get().getWindowManager ()->messageBox ("#{sControlsMenu3}");
MWBase::Environment::get().getWindowManager ()->disallowMouse(); MWBase::Environment::get().getWindowManager ()->disallowMouse();
MWBase::Environment::get().getInputManager ()->enableDetectingBindingMode (actionId); MWBase::Environment::get().getInputManager ()->enableDetectingBindingMode (actionId);

12
apps/openmw/mwgui/spellcreationdialog.cpp
View file

@ -310,25 +310,25 @@ namespace MWGui
{ {
if (mEffects.size() <= 0) if (mEffects.size() <= 0)
{ {
mWindowManager.messageBox ("#{sNotifyMessage30}", std::vector<std::string>()); mWindowManager.messageBox ("#{sNotifyMessage30}");
return; return;
} }
if (mNameEdit->getCaption () == "") if (mNameEdit->getCaption () == "")
{ {
mWindowManager.messageBox ("#{sNotifyMessage10}", std::vector<std::string>()); mWindowManager.messageBox ("#{sNotifyMessage10}");
return; return;
} }
if (mMagickaCost->getCaption() == "0") if (mMagickaCost->getCaption() == "0")
{ {
mWindowManager.messageBox ("#{sEnchantmentMenu8}", std::vector<std::string>()); mWindowManager.messageBox ("#{sEnchantmentMenu8}");
return; return;
} }
if (boost::lexical_cast<int>(mPriceLabel->getCaption()) > mWindowManager.getInventoryWindow()->getPlayerGold()) if (boost::lexical_cast<int>(mPriceLabel->getCaption()) > mWindowManager.getInventoryWindow()->getPlayerGold())
{ {
mWindowManager.messageBox ("#{sNotifyMessage18}", std::vector<std::string>()); mWindowManager.messageBox ("#{sNotifyMessage18}");
return; return;
} }
@ -517,7 +517,7 @@ namespace MWGui
{ {
if (mEffects.size() >= 8) if (mEffects.size() >= 8)
{ {
MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage28}", std::vector<std::string>()); MWBase::Environment::get().getWindowManager()->messageBox("#{sNotifyMessage28}");
return; return;
} }
@ -528,7 +528,7 @@ namespace MWGui
{ {
if (it->mEffectID == effectId) if (it->mEffectID == effectId)
{ {
MWBase::Environment::get().getWindowManager()->messageBox ("#{sOnetypeEffectMessage}", std::vector<std::string>()); MWBase::Environment::get().getWindowManager()->messageBox ("#{sOnetypeEffectMessage}");
return; return;
} }
} }

2
apps/openmw/mwgui/spellwindow.cpp
View file

@ -404,7 +404,7 @@ namespace MWGui
if (spell->mData.mFlags & ESM::Spell::F_Always if (spell->mData.mFlags & ESM::Spell::F_Always
|| spell->mData.mType == ESM::Spell::ST_Power) || spell->mData.mType == ESM::Spell::ST_Power)
{ {
mWindowManager.messageBox("#{sDeleteSpellError}", std::vector<std::string>()); mWindowManager.messageBox("#{sDeleteSpellError}");
} }
else else
{ {

4
apps/openmw/mwgui/text_input.cpp
View file

@ -50,7 +50,7 @@ void TextInputDialog::onOkClicked(MyGUI::Widget* _sender)
{ {
if (mTextEdit->getCaption() == "") if (mTextEdit->getCaption() == "")
{ {
mWindowManager.messageBox ("#{sNotifyMessage37}", std::vector<std::string>()); mWindowManager.messageBox ("#{sNotifyMessage37}");
MyGUI::InputManager::getInstance ().setKeyFocusWidget (mTextEdit); MyGUI::InputManager::getInstance ().setKeyFocusWidget (mTextEdit);
} }
else else
@ -61,7 +61,7 @@ void TextInputDialog::onTextAccepted(MyGUI::Edit* _sender)
{ {
if (mTextEdit->getCaption() == "") if (mTextEdit->getCaption() == "")
{ {
mWindowManager.messageBox ("#{sNotifyMessage37}", std::vector<std::string>()); mWindowManager.messageBox ("#{sNotifyMessage37}");
MyGUI::InputManager::getInstance ().setKeyFocusWidget (mTextEdit); MyGUI::InputManager::getInstance ().setKeyFocusWidget (mTextEdit);
} }
else else

10
apps/openmw/mwgui/tradewindow.cpp
View file

@ -181,7 +181,7 @@ namespace MWGui
{ {
// user notification // user notification
MWBase::Environment::get().getWindowManager()-> MWBase::Environment::get().getWindowManager()->
messageBox("#{sBarterDialog11}", std::vector<std::string>()); messageBox("#{sBarterDialog11}");
return; return;
} }
@ -190,7 +190,7 @@ namespace MWGui
{ {
// user notification // user notification
MWBase::Environment::get().getWindowManager()-> MWBase::Environment::get().getWindowManager()->
messageBox("#{sBarterDialog1}", std::vector<std::string>()); messageBox("#{sBarterDialog1}");
return; return;
} }
@ -199,7 +199,7 @@ namespace MWGui
{ {
// user notification // user notification
MWBase::Environment::get().getWindowManager()-> MWBase::Environment::get().getWindowManager()->
messageBox("#{sBarterDialog2}", std::vector<std::string>()); messageBox("#{sBarterDialog2}");
return; return;
} }
@ -209,7 +209,7 @@ namespace MWGui
if (mPtr.getTypeName() != typeid(ESM::NPC).name()) if (mPtr.getTypeName() != typeid(ESM::NPC).name())
{ {
MWBase::Environment::get().getWindowManager()-> MWBase::Environment::get().getWindowManager()->
messageBox("#{sNotifyMessage9}", std::vector<std::string>()); messageBox("#{sNotifyMessage9}");
return; return;
} }
@ -245,7 +245,7 @@ namespace MWGui
if(roll > x) //trade refused if(roll > x) //trade refused
{ {
MWBase::Environment::get().getWindowManager()-> MWBase::Environment::get().getWindowManager()->
messageBox("#{sNotifyMessage9}", std::vector<std::string>()); messageBox("#{sNotifyMessage9}");
int iBarterFailDisposition = gmst.find("iBarterFailDisposition")->getInt(); int iBarterFailDisposition = gmst.find("iBarterFailDisposition")->getInt();
MWBase::Environment::get().getDialogueManager()->applyTemporaryDispositionChange(iBarterFailDisposition); MWBase::Environment::get().getDialogueManager()->applyTemporaryDispositionChange(iBarterFailDisposition);

2
apps/openmw/mwgui/trainingwindow.cpp
View file

@ -129,7 +129,7 @@ namespace MWGui
MWMechanics::NpcStats& npcStats = MWWorld::Class::get(mPtr).getNpcStats (mPtr); MWMechanics::NpcStats& npcStats = MWWorld::Class::get(mPtr).getNpcStats (mPtr);
if (npcStats.getSkill (skillId).getBase () <= pcStats.getSkill (skillId).getBase ()) if (npcStats.getSkill (skillId).getBase () <= pcStats.getSkill (skillId).getBase ())
{ {
mWindowManager.messageBox ("#{sServiceTrainingWords}", std::vector<std::string>()); mWindowManager.messageBox ("#{sServiceTrainingWords}");
return; return;
} }

2
apps/openmw/mwgui/waitdialog.cpp
View file

@ -83,7 +83,7 @@ namespace MWGui
if (canRest == 2) if (canRest == 2)
{ {
// resting underwater or mid-air not allowed // resting underwater or mid-air not allowed
mWindowManager.messageBox ("#{sNotifyMessage1}", std::vector<std::string>()); mWindowManager.messageBox ("#{sNotifyMessage1}");
mWindowManager.popGuiMode (); mWindowManager.popGuiMode ();
} }

2
apps/openmw/mwmechanics/actors.cpp
View file

@ -256,7 +256,7 @@ namespace MWMechanics
if(MWWorld::Class::get(iter->first).isEssential(iter->first)) if(MWWorld::Class::get(iter->first).isEssential(iter->first))
MWBase::Environment::get().getWindowManager()->messageBox( MWBase::Environment::get().getWindowManager()->messageBox(
"#{sKilledEssential}", std::vector<std::string>()); "#{sKilledEssential}");
} }
} }

4
apps/openmw/mwmechanics/npcstats.cpp
View file

@ -221,12 +221,12 @@ void MWMechanics::NpcStats::increaseSkill(int skillIndex, const ESM::Class &clas
message << boost::format(MWBase::Environment::get().getWindowManager ()->getGameSettingString ("sNotifyMessage39", "")) message << boost::format(MWBase::Environment::get().getWindowManager ()->getGameSettingString ("sNotifyMessage39", ""))
% std::string("#{" + ESM::Skill::sSkillNameIds[skillIndex] + "}") % std::string("#{" + ESM::Skill::sSkillNameIds[skillIndex] + "}")
% static_cast<int> (base); % static_cast<int> (base);
MWBase::Environment::get().getWindowManager ()->messageBox(message.str(), std::vector<std::string>()); MWBase::Environment::get().getWindowManager ()->messageBox(message.str());
if (mLevelProgress >= 10) if (mLevelProgress >= 10)
{ {
// levelup is possible now // levelup is possible now
MWBase::Environment::get().getWindowManager ()->messageBox ("#{sLevelUpMsg}", std::vector<std::string>()); MWBase::Environment::get().getWindowManager ()->messageBox ("#{sLevelUpMsg}");
} }
getSkill (skillIndex).setBase (base); getSkill (skillIndex).setBase (base);

4
apps/openmw/mwscript/containerextensions.cpp
View file

@ -83,7 +83,7 @@ namespace MWScript
msgBox = boost::str(boost::format(msgBox) % count % itemName); msgBox = boost::str(boost::format(msgBox) % count % itemName);
} }
MWBase::Environment::get().getWindowManager()->messageBox(msgBox, std::vector<std::string>()); MWBase::Environment::get().getWindowManager()->messageBox(msgBox);
} }
} }
}; };
@ -179,7 +179,7 @@ namespace MWScript
} }
if (numRemoved > 0) if (numRemoved > 0)
MWBase::Environment::get().getWindowManager()->messageBox(msgBox, std::vector<std::string>()); MWBase::Environment::get().getWindowManager()->messageBox(msgBox);
} }
} }
}; };

6
apps/openmw/mwworld/actionequip.cpp
View file

@ -62,7 +62,7 @@ namespace MWWorld
if((*itr).mPart == ESM::PRT_Head) if((*itr).mPart == ESM::PRT_Head)
{ {
if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() ) if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}", std::vector<std::string>()); MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage13}");
allow = false; allow = false;
break; break;
@ -90,12 +90,12 @@ namespace MWWorld
if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() ) if(actor == MWBase::Environment::get().getWorld()->getPlayer().getPlayer() )
{ {
if(it.getType() == MWWorld::ContainerStore::Type_Clothing){ // It's shoes if(it.getType() == MWWorld::ContainerStore::Type_Clothing){ // It's shoes
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage15}", std::vector<std::string>()); MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage15}");
} }
else // It's boots else // It's boots
{ {
MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage14}", std::vector<std::string>()); MWBase::Environment::get().getWindowManager()->messageBox ("#{sNotifyMessage14}");
} }
} }
break; break;

2
apps/openmw/mwworld/failedaction.cpp
View file

@ -15,7 +15,7 @@ namespace MWWorld
{ {
if ( actor.getRefData().getHandle()=="player" && !(message.empty())) if ( actor.getRefData().getHandle()=="player" && !(message.empty()))
{ {
MWBase::Environment::get().getWindowManager() ->messageBox(message, std::vector<std::string>()); MWBase::Environment::get().getWindowManager() ->messageBox(message);
} }
} }
} }