Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 5c9399d2 authored by Tomas Mecir's avatar Tomas Mecir

and more porting

parent af7dcff2
......@@ -106,7 +106,6 @@ CMapManager::CMapManager (QWidget *parent, KMuddyMapper *mapper, int sessId) :
setDefaultOptions();
speedwalkActive = false;
pathToWalk.setAutoDelete(true);
speedwalkProgressDlg = new DlgSpeedwalkProgress();
speedwalkProgressDlg->hide();
......@@ -1542,7 +1541,7 @@ void CMapManager::walkPlayerTo(CMapRoom *toRoom)
}
}
pathToWalk.push(new QString(directionToText(foundPath->getSrcDir(),foundPath->getSpecialCmd())));
pathToWalk.append(directionToText(foundPath->getSrcDir(),foundPath->getSpecialCmd()));
destRoom=foundRoom;
// Check to make sure that tings are not stuck in a loop and abort
......@@ -1589,10 +1588,10 @@ void CMapManager::slotWalkPlayerAlongPath(void)
{
if (speedwalkActive)
{
QString *dir = pathToWalk.pop();
QString dir = pathToWalk.takeFirst();
// TODO: using active session isn't a very good idea; progress bar should be shown on the mapper window, not in KMuddy's status bar; furthermore, the mapper should distinguish sessions and switch maps when session changes or something - until all this gets done, we cannot implement this any better
mapperPlugin->sendCommand (mapperPlugin->activeSession(), *dir);
mapperPlugin->sendCommand (mapperPlugin->activeSession(), dir);
speedwalkProgressDlg->setProgress(++speedwalkProgress);
// Walk the path
......
......@@ -26,7 +26,7 @@
#include <qobject.h>
#include <q3ptrlist.h>
#include <qworkspace.h>
#include <q3ptrstack.h>
#include <QStringList>
#include <qcursor.h>
#include <kurl.h>
......@@ -343,7 +343,7 @@ private:
/** Used to tell if speedwalk is active */
bool speedwalkActive;
/** The rooms that are to be speed walked */
Q3PtrStack<QString> pathToWalk;
QStringList pathToWalk;
KMuddyMapper *mapperPlugin;
private:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment