diff options
31 files changed, 65 insertions, 64 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp index 6f821f7327..582ea9ebc4 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -148,6 +148,9 @@ public: #if PLUGIN_ENABLED_STATIC(SWORD2) LINK_PLUGIN(SWORD2) #endif + #if PLUGIN_ENABLED_STATIC(TEENAGENT) + LINK_PLUGIN(TEENAGENT) + #endif #if PLUGIN_ENABLED_STATIC(TINSEL) LINK_PLUGIN(TINSEL) #endif @@ -157,9 +160,6 @@ public: #if PLUGIN_ENABLED_STATIC(TUCKER) LINK_PLUGIN(TUCKER) #endif - #if PLUGIN_ENABLED_STATIC(TEENAGENT) - LINK_PLUGIN(TEENAGENT) - #endif // Music plugins // TODO: Use defines to disable or enable each MIDI driver as a @@ -102,10 +102,10 @@ add_engine sci32 "SCI32 games" no add_engine sky "Beneath a Steel Sky" yes add_engine sword1 "Broken Sword 1" yes add_engine sword2 "Broken Sword 2" yes +add_engine teenagent "Teen Agent" no add_engine tinsel "Tinsel" yes add_engine touche "Touche: The Adventures of the Fifth Musketeer" yes add_engine tucker "Bud Tucker in Double Trouble" yes -add_engine teenagent "Teen Agent" no # diff --git a/engines/engines.mk b/engines/engines.mk index 19f99020ec..750291e4d8 100644 --- a/engines/engines.mk +++ b/engines/engines.mk @@ -131,6 +131,11 @@ DEFINES += -DENABLE_SWORD2=$(ENABLE_SWORD2) MODULES += engines/sword2 endif +ifdef ENABLE_TEENAGENT +DEFINES += -DENABLE_TEENAGENT=$(ENABLE_TEENAGENT) +MODULES += engines/teenagent +endif + ifdef ENABLE_TINSEL DEFINES += -DENABLE_TINSEL=$(ENABLE_TINSEL) MODULES += engines/tinsel @@ -146,7 +151,3 @@ DEFINES += -DENABLE_TUCKER=$(ENABLE_TUCKER) MODULES += engines/tucker endif -ifdef ENABLE_TEENAGENT -DEFINES += -DENABLE_TEENAGENT=$(ENABLE_TEENAGENT) -MODULES += engines/teenagent -endif diff --git a/engines/teenagent/actor.cpp b/engines/teenagent/actor.cpp index 9c8ff8e14a..9904da42f2 100644 --- a/engines/teenagent/actor.cpp +++ b/engines/teenagent/actor.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/actor.cpp $ - * $Id: objects.h 172 2009-08-11 08:06:58Z megath $ + * $URL$ + * $Id$ */ #include "actor.h" #include "objects.h" diff --git a/engines/teenagent/actor.h b/engines/teenagent/actor.h index d69364a64b..d295d2227b 100644 --- a/engines/teenagent/actor.h +++ b/engines/teenagent/actor.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/objects.h $ - * $Id: objects.h 172 2009-08-11 08:06:58Z megath $ + * $URL$ + * $Id$ */ #include "animation.h" diff --git a/engines/teenagent/animation.cpp b/engines/teenagent/animation.cpp index 3330acee2f..5a480d91a3 100644 --- a/engines/teenagent/animation.cpp +++ b/engines/teenagent/animation.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/animation.cpp $ - * $Id: animation.cpp 296 2009-09-01 19:55:58Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/animation.h b/engines/teenagent/animation.h index 4304dc92a4..dc561ebfad 100644 --- a/engines/teenagent/animation.h +++ b/engines/teenagent/animation.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/animation.h $ - * $Id: animation.h 214 2009-08-14 06:09:26Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/callbacks.cpp b/engines/teenagent/callbacks.cpp index 2d78fc8c01..6f7c065489 100644 --- a/engines/teenagent/callbacks.cpp +++ b/engines/teenagent/callbacks.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/objects.h $ - * $Id: objects.h 172 2009-08-11 08:06:58Z megath $ + * $URL$ + * $Id$ */ #include "scene.h" diff --git a/engines/teenagent/detection.cpp b/engines/teenagent/detection.cpp index 7519448e6e..1801d7abbf 100644 --- a/engines/teenagent/detection.cpp +++ b/engines/teenagent/detection.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/detection.cpp $ - * $Id: detection.cpp 215 2009-08-14 07:11:27Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/dialog.cpp b/engines/teenagent/dialog.cpp index 1ecffeefa0..8b14eafe9a 100644 --- a/engines/teenagent/dialog.cpp +++ b/engines/teenagent/dialog.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/objects.h $ - * $Id: objects.h 172 2009-08-11 08:06:58Z megath $ + * $URL$ + * $Id$ */ #include "dialog.h" diff --git a/engines/teenagent/dialog.h b/engines/teenagent/dialog.h index 7bac3a0d4f..bb5c43058d 100644 --- a/engines/teenagent/dialog.h +++ b/engines/teenagent/dialog.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/objects.h $ - * $Id: objects.h 172 2009-08-11 08:06:58Z megath $ + * $URL$ + * $Id$ */ #ifndef TEENAGENT_DIALOG_H__ diff --git a/engines/teenagent/font.cpp b/engines/teenagent/font.cpp index b0527011f3..6221428f29 100644 --- a/engines/teenagent/font.cpp +++ b/engines/teenagent/font.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/font.cpp $ - * $Id: font.cpp 242 2009-08-15 11:44:27Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/font.h b/engines/teenagent/font.h index 1012a1cf33..d4d6feb831 100644 --- a/engines/teenagent/font.h +++ b/engines/teenagent/font.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/font.h $ - * $Id: font.h 173 2009-08-11 08:10:22Z megath $ + * $URL$ + * $Id$ */ #ifndef TEENAGENT_FONT_H__ diff --git a/engines/teenagent/inventory.cpp b/engines/teenagent/inventory.cpp index 6ee720d3f5..608d759321 100644 --- a/engines/teenagent/inventory.cpp +++ b/engines/teenagent/inventory.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/objects.h $ - * $Id: objects.h 172 2009-08-11 08:06:58Z megath $ + * $URL$ + * $Id$ */ #include "inventory.h" diff --git a/engines/teenagent/inventory.h b/engines/teenagent/inventory.h index f2f8f94a52..74128773f0 100644 --- a/engines/teenagent/inventory.h +++ b/engines/teenagent/inventory.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/objects.h $ - * $Id: objects.h 172 2009-08-11 08:06:58Z megath $ + * $URL$ + * $Id$ */ #ifndef TEENAGENT_INVENTORY_H__ diff --git a/engines/teenagent/music.cpp b/engines/teenagent/music.cpp index ba902e571a..58b12e7a17 100644 --- a/engines/teenagent/music.cpp +++ b/engines/teenagent/music.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/old_engine/music.cpp $ - * $Id: music.cpp 121 2009-08-02 20:04:53Z megath $ + * $URL$ + * $Id$ * */ diff --git a/engines/teenagent/music.h b/engines/teenagent/music.h index b76891ae7c..6008e8f965 100644 --- a/engines/teenagent/music.h +++ b/engines/teenagent/music.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/old_engine/music.h $ - * $Id: music.h 121 2009-08-02 20:04:53Z megath $ + * $URL$ + * $Id$ * */ diff --git a/engines/teenagent/objects.cpp b/engines/teenagent/objects.cpp index 2bfe4bb5d9..201ed16100 100644 --- a/engines/teenagent/objects.cpp +++ b/engines/teenagent/objects.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/objects.h $ - * $Id: objects.h 172 2009-08-11 08:06:58Z megath $ + * $URL$ + * $Id$ */ #include "objects.h" diff --git a/engines/teenagent/objects.h b/engines/teenagent/objects.h index 04f1cd335c..967fe03c69 100644 --- a/engines/teenagent/objects.h +++ b/engines/teenagent/objects.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/objects.h $ - * $Id: objects.h 282 2009-08-30 22:12:01Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/pack.cpp b/engines/teenagent/pack.cpp index a0d9bbd499..a6bf5777ab 100644 --- a/engines/teenagent/pack.cpp +++ b/engines/teenagent/pack.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/pack.cpp $ - * $Id: pack.cpp 182 2009-08-11 21:16:14Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/pack.h b/engines/teenagent/pack.h index 5765151ac9..e5fdda47eb 100644 --- a/engines/teenagent/pack.h +++ b/engines/teenagent/pack.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/pack.h $ - * $Id: pack.h 182 2009-08-11 21:16:14Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp index 94a23d14a0..acd610001e 100644 --- a/engines/teenagent/resources.cpp +++ b/engines/teenagent/resources.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/resources.cpp $ - * $Id: resources.cpp 274 2009-08-25 21:04:54Z megath $ + * $URL$ + * $Id$ */ #include "resources.h" diff --git a/engines/teenagent/resources.h b/engines/teenagent/resources.h index d3fea56e95..eba0744b72 100644 --- a/engines/teenagent/resources.h +++ b/engines/teenagent/resources.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/resources.h $ - * $Id: resources.h 260 2009-08-19 07:29:19Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/scene.cpp b/engines/teenagent/scene.cpp index 8e39008e8e..8621ffb638 100644 --- a/engines/teenagent/scene.cpp +++ b/engines/teenagent/scene.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/scene.cpp $ - * $Id: scene.cpp 303 2009-09-03 20:09:57Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/scene.h b/engines/teenagent/scene.h index 88427f33d8..c5d1b0ed73 100644 --- a/engines/teenagent/scene.h +++ b/engines/teenagent/scene.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/scene.h $ - * $Id: scene.h 296 2009-09-01 19:55:58Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/segment.cpp b/engines/teenagent/segment.cpp index f6b029ae34..b1a57514ad 100644 --- a/engines/teenagent/segment.cpp +++ b/engines/teenagent/segment.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/segment.cpp $ - * $Id: segment.cpp 188 2009-08-12 07:22:11Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/segment.h b/engines/teenagent/segment.h index 42b6cc0df9..373e82337b 100644 --- a/engines/teenagent/segment.h +++ b/engines/teenagent/segment.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/segment.h $ - * $Id: segment.h 188 2009-08-12 07:22:11Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/surface.cpp b/engines/teenagent/surface.cpp index 154bbdb049..7de4dc08b1 100644 --- a/engines/teenagent/surface.cpp +++ b/engines/teenagent/surface.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/surface.cpp $ - * $Id: surface.cpp 214 2009-08-14 06:09:26Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/surface.h b/engines/teenagent/surface.h index 857d256c05..44242bab11 100644 --- a/engines/teenagent/surface.h +++ b/engines/teenagent/surface.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/surface.h $ - * $Id: surface.h 154 2009-08-10 20:10:23Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp index 2d5d42ba3c..11ab91f965 100644 --- a/engines/teenagent/teenagent.cpp +++ b/engines/teenagent/teenagent.cpp @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/tagent.cpp $ - * $Id: tagent.cpp 304 2009-09-03 20:10:22Z megath $ + * $URL$ + * $Id$ */ diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h index b99d108024..c5b31de99b 100644 --- a/engines/teenagent/teenagent.h +++ b/engines/teenagent/teenagent.h @@ -18,8 +18,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * - * $URL: https://www.switchlink.se/svn/teen/tagent.h $ - * $Id: tagent.h 304 2009-09-03 20:10:22Z megath $ + * $URL$ + * $Id$ */ |