From 4d496c11880d8f41dda20e5e2c0e36e60ab052e3 Mon Sep 17 00:00:00 2001
From: gugus <gus_512@hotmail.com>
Date: Fri, 28 Sep 2012 17:02:27 +0200
Subject: [PATCH] correction1

---
 apps/openmw/mwgui/tradewindow.cpp  |  2 +-
 apps/openmw/mwgui/tradewindow.hpp  |  2 +-
 apps/openmw/mwgui/travelwindow.cpp | 14 +++++++-------
 apps/openmw/mwrender/globalmap.cpp |  5 +++--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/openmw/mwgui/tradewindow.cpp b/apps/openmw/mwgui/tradewindow.cpp
index fc4220fc34..74cae380b3 100644
--- a/apps/openmw/mwgui/tradewindow.cpp
+++ b/apps/openmw/mwgui/tradewindow.cpp
@@ -16,7 +16,7 @@ namespace MWGui
 {
     TradeWindow::TradeWindow(MWBase::WindowManager& parWindowManager) :
         WindowBase("openmw_trade_window.layout", parWindowManager)
-        , ContainerBase(NULL) // no drag&drop
+        , ReferenceInterface(NULL) // no drag&drop
         , mCurrentBalance(0)
     {
         MyGUI::ScrollView* itemView;
diff --git a/apps/openmw/mwgui/tradewindow.hpp b/apps/openmw/mwgui/tradewindow.hpp
index 4ec55045c5..7ca3a97b47 100644
--- a/apps/openmw/mwgui/tradewindow.hpp
+++ b/apps/openmw/mwgui/tradewindow.hpp
@@ -20,7 +20,7 @@ namespace MWGui
 
 namespace MWGui
 {
-    class TradeWindow : public ContainerBase, public WindowBase
+    class TradeWindow : public ReferenceInterface, public WindowBase
     {
         public:
             TradeWindow(MWBase::WindowManager& parWindowManager);
diff --git a/apps/openmw/mwgui/travelwindow.cpp b/apps/openmw/mwgui/travelwindow.cpp
index 9e7b0a9751..f561a2c99a 100644
--- a/apps/openmw/mwgui/travelwindow.cpp
+++ b/apps/openmw/mwgui/travelwindow.cpp
@@ -79,7 +79,7 @@ namespace MWGui
     void TravelWindow::startTravel(const MWWorld::Ptr& actor)
     {
         center();
-        mActor = actor;
+        mPtr = actor;
         clearDestinations();
 
         MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
@@ -100,18 +100,18 @@ namespace MWGui
             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;
-            MWBase::Environment::get().getWorld()->positionToIndex(mActor.get<ESM::NPC>()->base->mTransport[i].mPos.pos[0],
-                                                                   mActor.get<ESM::NPC>()->base->mTransport[i].mPos.pos[1],x,y);
+            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);
             if(cellname == "") cellname = MWBase::Environment::get().getWorld()->getExterior(x,y)->cell->name;
             addDestination(cellname);
         }
 
         updateLabels();
-
+        mPtr.get<ESM::NPC>()->base->mTransport[0].
         mDestinationsView->setCanvasSize (MyGUI::IntSize(mDestinationsView->getWidth(), std::max(mDestinationsView->getHeight(), mCurrentY)));
     }
 
@@ -126,7 +126,7 @@ namespace MWGui
             MWMechanics::Spells& spells = stats.getSpells();
             spells.add (mSpellsWidgetMap.find(_sender)->second);
             mWindowManager.getTradeWindow()->addOrRemoveGold(-price);
-            startSpellBuying(mActor);
+            startSpellBuying(mPtr);
 
             MWBase::Environment::get().getSoundManager()->playSound ("Item Gold Up", 1.0, 1.0);
         }*/
diff --git a/apps/openmw/mwrender/globalmap.cpp b/apps/openmw/mwrender/globalmap.cpp
index 5e0a63c77f..dd30a68f77 100644
--- a/apps/openmw/mwrender/globalmap.cpp
+++ b/apps/openmw/mwrender/globalmap.cpp
@@ -53,7 +53,8 @@ namespace MWRender
         {
             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)
             {
@@ -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");