krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

traveling.

Browse source
This commit is contained in:
gugus 2012-10-08 11:14:22 +02:00
parent 1f4de03613
commit 5a611b66d7
2 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
apps/openmw/mwgui/travelwindow.cpp
View file

@ -47,7 +47,7 @@ namespace MWGui
mSelect->getHeight()); mSelect->getHeight());
} }
void TravelWindow::addDestination(const std::string& travelId) void TravelWindow::addDestination(const std::string& travelId,ESM::Position pos,bool interior)
{ {
//std::cout << "travel to" << travelId; //std::cout << "travel to" << travelId;
/*const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().spells.find(spellId); /*const ESM::Spell* spell = MWBase::Environment::get().getWorld()->getStore().spells.find(spellId);
@ -56,12 +56,17 @@ namespace MWGui
MyGUI::Button* toAdd = mDestinationsView->createWidget<MyGUI::Button>((price>mWindowManager.getInventoryWindow()->getPlayerGold()) ? "SandTextGreyedOut" : "SpellText", 0, mCurrentY, 200, sLineHeight, MyGUI::Align::Default); MyGUI::Button* toAdd = mDestinationsView->createWidget<MyGUI::Button>((price>mWindowManager.getInventoryWindow()->getPlayerGold()) ? "SandTextGreyedOut" : "SpellText", 0, mCurrentY, 200, sLineHeight, MyGUI::Align::Default);
mCurrentY += sLineHeight; mCurrentY += sLineHeight;
/// \todo price adjustment depending on merchantile skill /// \todo price adjustment depending on merchantile skill
toAdd->setUserData(price); std::ostringstream oss;
oss << price;
toAdd->setUserString("price",oss.str());
if(interior) toAdd->setUserString("interior","y");
else toAdd->setUserString("interior","n");
toAdd->setCaptionWithReplacing(travelId+" - "+boost::lexical_cast<std::string>(price)+"#{sgp}"); toAdd->setCaptionWithReplacing(travelId+" - "+boost::lexical_cast<std::string>(price)+"#{sgp}");
toAdd->setSize(toAdd->getTextSize().width,sLineHeight); toAdd->setSize(toAdd->getTextSize().width,sLineHeight);
toAdd->eventMouseWheel += MyGUI::newDelegate(this, &TravelWindow::onMouseWheel); toAdd->eventMouseWheel += MyGUI::newDelegate(this, &TravelWindow::onMouseWheel);
//toAdd->setUserString("ToolTipType", "Spell"); //toAdd->setUserString("ToolTipType", "Spell");
toAdd->setUserString("Destination", travelId); toAdd->setUserString("Destination", travelId);
toAdd->setUserData(pos);
toAdd->eventMouseButtonClick += MyGUI::newDelegate(this, &TravelWindow::onTravelButtonClick); toAdd->eventMouseButtonClick += MyGUI::newDelegate(this, &TravelWindow::onTravelButtonClick);
mDestinationsWidgetMap.insert(std::make_pair (toAdd, travelId)); mDestinationsWidgetMap.insert(std::make_pair (toAdd, travelId));
} }
@ -102,11 +107,12 @@ namespace MWGui
for(int i = 0;i<mPtr.get<ESM::NPC>()->base->mTransport.size();i++) for(int i = 0;i<mPtr.get<ESM::NPC>()->base->mTransport.size();i++)
{ {
std::string cellname = mPtr.get<ESM::NPC>()->base->mTransport[i].mCellName; std::string cellname = mPtr.get<ESM::NPC>()->base->mTransport[i].mCellName;
bool interior = true;
int x,y; int x,y;
MWBase::Environment::get().getWorld()->positionToIndex(mPtr.get<ESM::NPC>()->base->mTransport[i].mPos.pos[0], MWBase::Environment::get().getWorld()->positionToIndex(mPtr.get<ESM::NPC>()->base->mTransport[i].mPos.pos[0],
mPtr.get<ESM::NPC>()->base->mTransport[i].mPos.pos[1],x,y); mPtr.get<ESM::NPC>()->base->mTransport[i].mPos.pos[1],x,y);
if(cellname == "") cellname = MWBase::Environment::get().getWorld()->getExterior(x,y)->cell->name; if(cellname == "") {cellname = MWBase::Environment::get().getWorld()->getExterior(x,y)->cell->name; interior= false;}
addDestination(cellname); addDestination(cellname,mPtr.get<ESM::NPC>()->base->mTransport[i].mPos,interior);
} }
updateLabels(); updateLabels();
@ -117,19 +123,25 @@ namespace MWGui
void TravelWindow::onTravelButtonClick(MyGUI::Widget* _sender) void TravelWindow::onTravelButtonClick(MyGUI::Widget* _sender)
{ {
std::cout << "traveling to:" << _sender->getUserString("Destination"); std::cout << "traveling to:" << _sender->getUserString("Destination");
/*int price = *_sender->getUserData<int>(); std::istringstream iss(_sender->getUserString("price"));
int price;
iss >> price;
if (mWindowManager.getInventoryWindow()->getPlayerGold()>=price) if (mWindowManager.getInventoryWindow()->getPlayerGold()>=price)
{ {
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer(); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
MWMechanics::CreatureStats& stats = MWWorld::Class::get(player).getCreatureStats(player); ESM::Position pos = *_sender->getUserData<ESM::Position>();
MWMechanics::Spells& spells = stats.getSpells(); std::string cellname = _sender->getUserString("Destination");
spells.add (mSpellsWidgetMap.find(_sender)->second); int x,y;
mWindowManager.getTradeWindow()->addOrRemoveGold(-price); bool interior = _sender->getUserString("interior") == "y";
startSpellBuying(mPtr); MWBase::Environment::get().getWorld()->positionToIndex(pos.pos[0],pos.pos[1],x,y);
MWWorld::CellStore* cell;
MWBase::Environment::get().getSoundManager()->playSound ("Item Gold Up", 1.0, 1.0); if(interior) cell = MWBase::Environment::get().getWorld()->getInterior(cellname);
}*/ else cell = MWBase::Environment::get().getWorld()->getExterior(x,y);
MWBase::Environment::get().getWorld()->moveObject(player,*cell,pos.pos[0],pos.pos[1],pos.pos[2]);
mWindowManager.removeGuiMode(GM_Travel);
mWindowManager.removeGuiMode(GM_Dialogue);
}
} }
void TravelWindow::onCancelButtonClicked(MyGUI::Widget* _sender) void TravelWindow::onCancelButtonClicked(MyGUI::Widget* _sender)

2
apps/openmw/mwgui/travelwindow.hpp
View file

@ -40,7 +40,7 @@ namespace MWGui
void onCancelButtonClicked(MyGUI::Widget* _sender); void onCancelButtonClicked(MyGUI::Widget* _sender);
void onTravelButtonClick(MyGUI::Widget* _sender); void onTravelButtonClick(MyGUI::Widget* _sender);
void onMouseWheel(MyGUI::Widget* _sender, int _rel); void onMouseWheel(MyGUI::Widget* _sender, int _rel);
void addDestination(const std::string& destinationID); void addDestination(const std::string& destinationID,ESM::Position pos,bool interior);
void clearDestinations(); void clearDestinations();
int mLastPos,mCurrentY; int mLastPos,mCurrentY;