From 8a1304de940575021bb95a837f4a5a7280b49905 Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 20 Mar 2009 22:53:30 -0400 Subject: Update CanvasPlugin to accept a game parameter as well --- sigencore/plugins/CanvasPlugin.cpp | 4 ++-- sigencore/plugins/CanvasPlugin.h | 5 +++-- sigencore/plugins/canvases/SigenCanvases.cpp | 3 ++- sigencore/plugins/canvases/SigenCanvases.h | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) (limited to 'sigencore') diff --git a/sigencore/plugins/CanvasPlugin.cpp b/sigencore/plugins/CanvasPlugin.cpp index e1f52a61..ec097d3a 100644 --- a/sigencore/plugins/CanvasPlugin.cpp +++ b/sigencore/plugins/CanvasPlugin.cpp @@ -40,9 +40,9 @@ CanvasPlugin::~CanvasPlugin() delete d; } -Canvas* CanvasPlugin::getCanvas(const QString& name, Config* parent) +Canvas* CanvasPlugin::getCanvas(const QString& name, GameWrapper* game, Config* parent) { - Canvas* arena = createCanvas(name, parent); + Canvas* arena = createCanvas(name, game, parent); d->addCanvas(arena); return arena; } diff --git a/sigencore/plugins/CanvasPlugin.h b/sigencore/plugins/CanvasPlugin.h index 47d49c7f..b24653be 100644 --- a/sigencore/plugins/CanvasPlugin.h +++ b/sigencore/plugins/CanvasPlugin.h @@ -33,6 +33,7 @@ namespace Sigscript { class Config; +class GameWrapper; } namespace Sigencore @@ -49,13 +50,13 @@ class SIGENCOREPLUGINS_EXPORT CanvasPlugin : public QObject CanvasPlugin(QObject* parent, const QVariantList& args); virtual ~CanvasPlugin(); - Canvas* getCanvas(const QString& name, Sigscript::Config* parent); + Canvas* getCanvas(const QString& name, Sigscript::GameWrapper* game, Sigscript::Config* parent); virtual QStringList canvases() const = 0; virtual QString description(const QString& name) const = 0; virtual QIcon icon(const QString& name) = 0; protected: - virtual Canvas* createCanvas(const QString& name, Sigscript::Config* parent) = 0; + virtual Canvas* createCanvas(const QString& name, Sigscript::GameWrapper* game, Sigscript::Config* parent) = 0; protected slots: virtual void cleanupCanvas(Sigencore::Canvas* arena) = 0; private: diff --git a/sigencore/plugins/canvases/SigenCanvases.cpp b/sigencore/plugins/canvases/SigenCanvases.cpp index 043449a5..48e6f09a 100644 --- a/sigencore/plugins/canvases/SigenCanvases.cpp +++ b/sigencore/plugins/canvases/SigenCanvases.cpp @@ -26,6 +26,7 @@ SIGEN_CANVAS_PLUGIN(SigenCanvases, "sigen_canvases") +using namespace Sigscript; using namespace Sigencore; using namespace Sigencore::Interfaces; @@ -58,7 +59,7 @@ QIcon SigenCanvases::icon(const QString& name) return QIcon(); } -Canvas* SigenCanvases::createCanvas(const QString& name, Config* parent) +Canvas* SigenCanvases::createCanvas(const QString& name, GameWrapper* game, Config* parent) { // if (name == Canvas::name()) // return new Canvas(parent); diff --git a/sigencore/plugins/canvases/SigenCanvases.h b/sigencore/plugins/canvases/SigenCanvases.h index 00d4e2ff..870f259d 100644 --- a/sigencore/plugins/canvases/SigenCanvases.h +++ b/sigencore/plugins/canvases/SigenCanvases.h @@ -33,7 +33,7 @@ class SigenCanvases : public Sigencore::Interfaces::CanvasPlugin QString description(const QString& name) const; QIcon icon(const QString& name); protected: - Sigencore::Canvas* createCanvas(const QString& name, Sigscript::Config* parent); + Sigencore::Canvas* createCanvas(const QString& name, Sigscript::GameWrapper* game, Sigscript::Config* parent); protected slots: void cleanupCanvas(Sigencore::Canvas* canvas); }; -- cgit