mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-20 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

correction1

Browse Source
This commit is contained in:
gugus 2012-09-28 17:02:27 +02:00
parent 1971ba66f1
commit 4d496c1188
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/mwgui/tradewindow.cpp
View File

@ -16,7 +16,7 @@ namespace MWGui
{ {
TradeWindow::TradeWindow(MWBase::WindowManager& parWindowManager) : TradeWindow::TradeWindow(MWBase::WindowManager& parWindowManager) :
WindowBase("openmw_trade_window.layout", parWindowManager) WindowBase("openmw_trade_window.layout", parWindowManager)
, ContainerBase(NULL) // no drag&drop , ReferenceInterface(NULL) // no drag&drop
, mCurrentBalance(0) , mCurrentBalance(0)
{ {
MyGUI::ScrollView* itemView; MyGUI::ScrollView* itemView;

2
apps/openmw/mwgui/tradewindow.hpp
View File

@ -20,7 +20,7 @@ namespace MWGui
namespace MWGui namespace MWGui
{ {
class TradeWindow : public ContainerBase, public WindowBase class TradeWindow : public ReferenceInterface, public WindowBase
{ {
public: public:
TradeWindow(MWBase::WindowManager& parWindowManager); TradeWindow(MWBase::WindowManager& parWindowManager);

14
apps/openmw/mwgui/travelwindow.cpp
View File

@ -79,7 +79,7 @@ namespace MWGui
void TravelWindow::startTravel(const MWWorld::Ptr& actor) void TravelWindow::startTravel(const MWWorld::Ptr& actor)
{ {
center(); center();
mActor = actor; mPtr = actor;
clearDestinations(); clearDestinations();
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer(); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
@ -100,18 +100,18 @@ namespace MWGui
addDestination (*iter); addDestination (*iter);
}*/ }*/
for(int i = 0;i<mActor.get<ESM::NPC>()->base->mTransport.size();i++) for(int i = 0;i<mPtr.get<ESM::NPC>()->base->mTransport.size();i++)
{ {
std::string cellname = mActor.get<ESM::NPC>()->base->mTransport[i].mCellName; std::string cellname = mPtr.get<ESM::NPC>()->base->mTransport[i].mCellName;
int x,y; int x,y;
MWBase::Environment::get().getWorld()->positionToIndex(mActor.get<ESM::NPC>()->base->mTransport[i].mPos.pos[0], MWBase::Environment::get().getWorld()->positionToIndex(mPtr.get<ESM::NPC>()->base->mTransport[i].mPos.pos[0],
mActor.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;
addDestination(cellname); addDestination(cellname);
} }
updateLabels(); updateLabels();
mPtr.get<ESM::NPC>()->base->mTransport[0].
mDestinationsView->setCanvasSize (MyGUI::IntSize(mDestinationsView->getWidth(), std::max(mDestinationsView->getHeight(), mCurrentY))); mDestinationsView->setCanvasSize (MyGUI::IntSize(mDestinationsView->getWidth(), std::max(mDestinationsView->getHeight(), mCurrentY)));
} }
@ -126,7 +126,7 @@ namespace MWGui
MWMechanics::Spells& spells = stats.getSpells(); MWMechanics::Spells& spells = stats.getSpells();
spells.add (mSpellsWidgetMap.find(_sender)->second); spells.add (mSpellsWidgetMap.find(_sender)->second);
mWindowManager.getTradeWindow()->addOrRemoveGold(-price); mWindowManager.getTradeWindow()->addOrRemoveGold(-price);
startSpellBuying(mActor); startSpellBuying(mPtr);
MWBase::Environment::get().getSoundManager()->playSound ("Item Gold Up", 1.0, 1.0); MWBase::Environment::get().getSoundManager()->playSound ("Item Gold Up", 1.0, 1.0);
}*/ }*/

5
apps/openmw/mwrender/globalmap.cpp
View File

@ -53,7 +53,8 @@ namespace MWRender
{ {
Ogre::Image image; Ogre::Image image;
Ogre::uchar data[mWidth * mHeight * 3]; std::vector<Ogre::uchar> data;
data.resize(mWidth * mHeight * 3);
for (int x = mMinX; x <= mMaxX; ++x) for (int x = mMinX; x <= mMaxX; ++x)
{ {
@ -150,7 +151,7 @@ namespace MWRender
} }
} }
image.loadDynamicImage (data, mWidth, mHeight, Ogre::PF_B8G8R8); image.loadDynamicImage (data.data(), mWidth, mHeight, Ogre::PF_B8G8R8);
//image.save (mCacheDir + "/GlobalMap.png"); //image.save (mCacheDir + "/GlobalMap.png");