[Scummvm-git-logs] scummvm master -> 16e260685366bdb173441a8ed270f1786382fe62

sev- noreply at scummvm.org
Thu Mar 7 20:07:18 UTC 2024


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
16e2606853 TWP: Pull the engine by request


Commit: 16e260685366bdb173441a8ed270f1786382fe62
    https://github.com/scummvm/scummvm/commit/16e260685366bdb173441a8ed270f1786382fe62
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-03-07T21:06:51+01:00

Commit Message:
TWP: Pull the engine by request

Changed paths:
  R engines/twp/POTFILES
  R engines/twp/actions.h
  R engines/twp/actorlib.cpp
  R engines/twp/actorswitcher.cpp
  R engines/twp/actorswitcher.h
  R engines/twp/audio.cpp
  R engines/twp/audio.h
  R engines/twp/callback.cpp
  R engines/twp/callback.h
  R engines/twp/camera.cpp
  R engines/twp/camera.h
  R engines/twp/clipper/clipper.cpp
  R engines/twp/clipper/clipper.hpp
  R engines/twp/configure.engine
  R engines/twp/console.cpp
  R engines/twp/console.h
  R engines/twp/credits.pl
  R engines/twp/debugtools.cpp
  R engines/twp/debugtools.h
  R engines/twp/detection.cpp
  R engines/twp/detection.h
  R engines/twp/detection_tables.h
  R engines/twp/dialog.cpp
  R engines/twp/dialog.h
  R engines/twp/dialogs.cpp
  R engines/twp/dialogs.h
  R engines/twp/enginedialogtarget.cpp
  R engines/twp/enginedialogtarget.h
  R engines/twp/font.cpp
  R engines/twp/font.h
  R engines/twp/genlib.cpp
  R engines/twp/gfx.cpp
  R engines/twp/gfx.h
  R engines/twp/ggpack.cpp
  R engines/twp/ggpack.h
  R engines/twp/graph.cpp
  R engines/twp/graph.h
  R engines/twp/hud.cpp
  R engines/twp/hud.h
  R engines/twp/ids.h
  R engines/twp/lighting.cpp
  R engines/twp/lighting.h
  R engines/twp/lip.cpp
  R engines/twp/lip.h
  R engines/twp/metaengine.cpp
  R engines/twp/metaengine.h
  R engines/twp/module.mk
  R engines/twp/motor.cpp
  R engines/twp/motor.h
  R engines/twp/object.cpp
  R engines/twp/object.h
  R engines/twp/objectanimation.h
  R engines/twp/objlib.cpp
  R engines/twp/rectf.cpp
  R engines/twp/rectf.h
  R engines/twp/resmanager.cpp
  R engines/twp/resmanager.h
  R engines/twp/room.cpp
  R engines/twp/room.h
  R engines/twp/roomlib.cpp
  R engines/twp/savegame.cpp
  R engines/twp/savegame.h
  R engines/twp/scenegraph.cpp
  R engines/twp/scenegraph.h
  R engines/twp/shaders.cpp
  R engines/twp/shaders.h
  R engines/twp/soundlib.cpp
  R engines/twp/spritesheet.cpp
  R engines/twp/spritesheet.h
  R engines/twp/sqgame.cpp
  R engines/twp/sqgame.h
  R engines/twp/squirrel/sqapi.cpp
  R engines/twp/squirrel/sqarray.h
  R engines/twp/squirrel/sqbaselib.cpp
  R engines/twp/squirrel/sqclass.cpp
  R engines/twp/squirrel/sqclass.h
  R engines/twp/squirrel/sqclosure.h
  R engines/twp/squirrel/sqcompiler.cpp
  R engines/twp/squirrel/sqcompiler.h
  R engines/twp/squirrel/sqconfig.h
  R engines/twp/squirrel/sqdebug.cpp
  R engines/twp/squirrel/sqfuncproto.h
  R engines/twp/squirrel/sqfuncstate.cpp
  R engines/twp/squirrel/sqfuncstate.h
  R engines/twp/squirrel/sqlexer.cpp
  R engines/twp/squirrel/sqlexer.h
  R engines/twp/squirrel/sqmem.cpp
  R engines/twp/squirrel/sqobject.cpp
  R engines/twp/squirrel/sqobject.h
  R engines/twp/squirrel/sqopcodes.h
  R engines/twp/squirrel/sqpcheader.h
  R engines/twp/squirrel/sqstate.cpp
  R engines/twp/squirrel/sqstate.h
  R engines/twp/squirrel/sqstdaux.cpp
  R engines/twp/squirrel/sqstdaux.h
  R engines/twp/squirrel/sqstdblob.cpp
  R engines/twp/squirrel/sqstdblob.h
  R engines/twp/squirrel/sqstdblobimpl.h
  R engines/twp/squirrel/sqstdio.cpp
  R engines/twp/squirrel/sqstdio.h
  R engines/twp/squirrel/sqstdmath.cpp
  R engines/twp/squirrel/sqstdmath.h
  R engines/twp/squirrel/sqstdrex.cpp
  R engines/twp/squirrel/sqstdstream.cpp
  R engines/twp/squirrel/sqstdstream.h
  R engines/twp/squirrel/sqstdstring.cpp
  R engines/twp/squirrel/sqstdstring.h
  R engines/twp/squirrel/sqstdsystem.h
  R engines/twp/squirrel/sqstring.h
  R engines/twp/squirrel/sqtable.cpp
  R engines/twp/squirrel/sqtable.h
  R engines/twp/squirrel/squirrel.dsp
  R engines/twp/squirrel/squirrel.h
  R engines/twp/squirrel/squserdata.h
  R engines/twp/squirrel/squtils.h
  R engines/twp/squirrel/sqvm.cpp
  R engines/twp/squirrel/sqvm.h
  R engines/twp/squtil.cpp
  R engines/twp/squtil.h
  R engines/twp/syslib.cpp
  R engines/twp/task.h
  R engines/twp/thread.cpp
  R engines/twp/thread.h
  R engines/twp/time.cpp
  R engines/twp/time.h
  R engines/twp/tsv.cpp
  R engines/twp/tsv.h
  R engines/twp/twp.cpp
  R engines/twp/twp.h
  R engines/twp/util.cpp
  R engines/twp/util.h
  R engines/twp/vm.cpp
  R engines/twp/vm.h
  R engines/twp/walkboxnode.cpp
  R engines/twp/walkboxnode.h
  R engines/twp/yack.cpp
  R engines/twp/yack.h


diff --git a/engines/twp/POTFILES b/engines/twp/POTFILES
deleted file mode 100644
index 523f89adf63..00000000000
--- a/engines/twp/POTFILES
+++ /dev/null
@@ -1,2 +0,0 @@
-engines/twp/dialogs.cpp
-engines/twp/metaengine.cpp
diff --git a/engines/twp/actions.h b/engines/twp/actions.h
deleted file mode 100644
index 58a92e8e5f6..00000000000
--- a/engines/twp/actions.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_ACTIONS_H
-#define TWP_ACTIONS_H
-
-namespace Twp {
-
-enum TwpAction {
-	kSkipCutscene,
-	kSelectActor1,
-	kSelectActor2,
-	kSelectActor3,
-	kSelectActor4,
-	kSelectActor5,
-	kSelectActor6,
-	kSelectChoice1,
-	kSelectChoice2,
-	kSelectChoice3,
-	kSelectChoice4,
-	kSelectChoice5,
-	kSelectChoice6,
-	kSelectPreviousActor,
-	kSelectNextActor,
-	kSkipText,
-	kShowHotspots
-};
-
-}
-
-#endif
diff --git a/engines/twp/actorlib.cpp b/engines/twp/actorlib.cpp
deleted file mode 100644
index 1fee934f276..00000000000
--- a/engines/twp/actorlib.cpp
+++ /dev/null
@@ -1,1120 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "twp/twp.h"
-#include "twp/detection.h"
-#include "twp/hud.h"
-#include "twp/object.h"
-#include "twp/resmanager.h"
-#include "twp/room.h"
-#include "twp/sqgame.h"
-#include "twp/squtil.h"
-
-namespace Twp {
-
-// Sets the transparency for an actor's image in [0.0..1.0]
-static SQInteger actorAlpha(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqobj(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	float alpha;
-	if (SQ_FAILED(sqget(v, 3, alpha)))
-		return sq_throwerror(v, "failed to get alpha");
-	debugC(kDebugActScript, "actorAlpha(%s, %f)", actor->_key.c_str(), alpha);
-	actor->_node->setAlpha(alpha);
-	return 0;
-}
-
-static SQInteger actorAnimationFlags(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqobj(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	sqpush(v, actor->_animFlags);
-	return 1;
-}
-
-static SQInteger actorAnimationNames(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-
-	HSQOBJECT table;
-	if (SQ_FAILED(sqget(v, 3, table)))
-		return sq_throwerror(v, "failed to get table");
-	if (!sq_istable(table))
-		return sq_throwerror(v, "failed to get animation table");
-
-	Common::String head;
-	Common::String stand;
-	Common::String walk;
-	Common::String reach;
-	sqgetf(table, "head", head);
-	sqgetf(table, "stand", stand);
-	sqgetf(table, "walk", walk);
-	sqgetf(table, "reach", reach);
-	actor->setAnimationNames(head, stand, walk, reach);
-	return 0;
-}
-
-// Moves the specified actor to the room and x, y coordinates specified.
-// Also makes the actor face to given direction (options are: FACE_FRONT, FACE_BACK, FACE_LEFT, FACE_RIGHT).
-// If using a spot, moves the player to the spot as specified in a Wimpy file.
-static SQInteger actorAt(HSQUIRRELVM v) {
-	SQInteger numArgs = sq_gettop(v);
-	switch (numArgs) {
-	case 3: {
-		Common::SharedPtr<Object> actor = sqactor(v, 2);
-		if (!actor)
-			return sq_throwerror(v, "failed to get actor");
-		Common::SharedPtr<Object> spot = sqobj(v, 3);
-		if (spot) {
-			Math::Vector2d pos(spot->_node->getPos() + spot->_usePos);
-			Object::setRoom(actor, spot->_room);
-			actor->stopWalking();
-			debugC(kDebugActScript, "actorAt %s at %s (%d, %d), room '%s'", actor->_key.c_str(), spot->_key.c_str(), (int)pos.getX(), (int)pos.getY(), spot->_room->_name.c_str());
-			actor->_node->setPos(pos);
-			actor->setFacing(getFacing(spot->_useDir, actor->getFacing()));
-		} else {
-			Common::SharedPtr<Room> room = sqroom(v, 3);
-			if (!room)
-				return sq_throwerror(v, "failed to get spot or room");
-			debugC(kDebugActScript, "actorAt %s room '%s'", actor->_key.c_str(), room->_name.c_str());
-			actor->stopWalking();
-			Object::setRoom(actor, room);
-		}
-		return 0;
-	}
-	case 4: {
-		Common::SharedPtr<Object> actor = sqactor(v, 2);
-		if (!actor)
-			return sq_throwerror(v, "failed to get actor");
-		SQInteger x, y;
-		if (SQ_FAILED(sqget(v, 3, x)))
-			return sq_throwerror(v, "failed to get x");
-		if (SQ_FAILED(sqget(v, 4, y)))
-			return sq_throwerror(v, "failed to get y");
-		debugC(kDebugActScript, "actorAt %s room %lld, %lld", actor->_key.c_str(), x, y);
-		actor->stopWalking();
-		actor->_node->setPos(Math::Vector2d(x, y));
-		return 0;
-	}
-	case 5:
-	case 6: {
-		Common::SharedPtr<Object> actor = sqactor(v, 2);
-		if (!actor)
-			return sq_throwerror(v, "failed to get actor");
-		Common::SharedPtr<Room> room = sqroom(v, 3);
-		if (!room)
-			return sq_throwerror(v, "failed to get room");
-		SQInteger x, y;
-		if (SQ_FAILED(sqget(v, 4, x)))
-			return sq_throwerror(v, "failed to get x");
-		if (SQ_FAILED(sqget(v, 5, y)))
-			return sq_throwerror(v, "failed to get y");
-		SQInteger dir = 0;
-		if ((numArgs == 6) && SQ_FAILED(sqget(v, 6, dir)))
-			return sq_throwerror(v, "failed to get direction");
-		debugC(kDebugActScript, "actorAt %s, pos = (%lld,%lld), dir = %lld", actor->_key.c_str(), x, y, dir);
-		actor->stopWalking();
-		actor->_node->setPos(Math::Vector2d(x, y));
-		actor->setFacing(getFacing(dir, actor->getFacing()));
-		Object::setRoom(actor, room);
-		return 0;
-	}
-	default:
-		return sq_throwerror(v, "invalid number of arguments");
-	}
-}
-
-static SQInteger actorBlinkRate(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	float min;
-	if (SQ_FAILED(sqget(v, 3, min)))
-		return sq_throwerror(v, "failed to get min");
-	float max;
-	if (SQ_FAILED(sqget(v, 4, max)))
-		return sq_throwerror(v, "failed to get max");
-	Object::blinkRate(actor, min, max);
-	return 0;
-}
-
-// Adjusts the colour of the actor.
-//
-// . code-block:: Squirrel
-// actorColor(coroner, 0xc0c0c0)
-static SQInteger actorColor(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	SQInteger c;
-	if (SQ_FAILED(sqget(v, 3, c)))
-		return sq_throwerror(v, "failed to get color");
-	actor->_node->setColor(Color::fromRgba(c));
-	return 0;
-}
-
-// Sets the actor's costume to the (JSON) filename animation file.
-// If the actor is expected to preform the standard walk, talk, stand, reach animations, they need to exist in the file.
-// If a sheet is given, this is a sprite sheet containing all the images needed for the animation.
-static SQInteger actorCostume(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-
-	Common::String name;
-	if (SQ_FAILED(sqget(v, 3, name)))
-		return sq_throwerror(v, "failed to get name");
-
-	Common::String sheet;
-	if (sq_gettop(v) == 4)
-		sqget(v, 4, sheet);
-	debugC(kDebugActScript, "Actor costume %s %s", name.c_str(), sheet.c_str());
-	actor->setCostume(name, sheet);
-	return 0;
-}
-
-static SQInteger actorDistanceTo(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	Common::SharedPtr<Object> obj;
-	if (sq_gettop(v) == 3) {
-		obj = sqobj(v, 3);
-		if (!obj)
-			return sq_throwerror(v, "failed to get object");
-	} else {
-		obj = g_twp->_actor;
-	}
-	sqpush(v, distance(actor->_node->getPos(), obj->getUsePos()));
-	return 1;
-}
-
-static SQInteger actorDistanceWithin(HSQUIRRELVM v) {
-	SQInteger nArgs = sq_gettop(v);
-	if (nArgs == 3) {
-		Common::SharedPtr<Object> actor1(g_twp->_actor);
-		Common::SharedPtr<Object> actor2(sqactor(v, 2));
-		if (!actor2)
-			return sq_throwerror(v, "failed to get actor");
-		Common::SharedPtr<Object> obj = sqobj(v, 3);
-		if (!obj)
-			return sq_throwerror(v, "failed to get spot");
-		if (actor1->_room != actor2->_room)
-			return false;
-		// not sure about this, needs to be check one day ;)
-		sqpush(v, distance(actor1->_node->getAbsPos(), obj->getUsePos()) < distance(actor2->_node->getAbsPos(), obj->getUsePos()));
-		return 1;
-	}
-
-	if (nArgs == 4) {
-		Common::SharedPtr<Object> actor(sqactor(v, 2));
-		if (!actor)
-			return sq_throwerror(v, "failed to get actor");
-		Common::SharedPtr<Object> obj(sqobj(v, 3));
-		if (!obj)
-			return sq_throwerror(v, "failed to get object");
-		SQInteger dist;
-		if (SQ_FAILED(sqget(v, 4, dist)))
-			return sq_throwerror(v, "failed to get distance");
-		if (actor->_room != obj->_room)
-			return false;
-		sqpush(v, distance(actor->_node->getAbsPos(), obj->getUsePos()) < dist);
-		return 1;
-	}
-	return sq_throwerror(v, "actorDistanceWithin not implemented");
-}
-
-// Makes the actor face a given direction.
-// Directions are: FACE_FRONT, FACE_BACK, FACE_LEFT, FACE_RIGHT.
-// Similar to actorTurnTo, but will not animate the change, it will instantly be in the specified direction.
-static SQInteger actorFace(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	SQInteger nArgs = sq_gettop(v);
-	if (nArgs == 2) {
-		Facing dir = actor->getFacing();
-		sqpush(v, (int)dir);
-		return 1;
-	}
-
-	if (sq_gettype(v, 3) == OT_INTEGER) {
-		SQInteger dir = 0;
-		if (SQ_FAILED(sqget(v, 3, dir)))
-			return sq_throwerror(v, "failed to get direction");
-		// FACE_FLIP ?
-		if (dir == 0x10) {
-			Facing facing = flip(actor->getFacing());
-			actor->setFacing(facing);
-		} else {
-			actor->setFacing((Facing)dir);
-		}
-	} else {
-		Common::SharedPtr<Object> actor2 = sqactor(v, 3);
-		if (!actor2)
-			return sq_throwerror(v, "failed to get actor to face to");
-		Facing facing = getFacingToFaceTo(actor, actor2);
-		actor->setFacing(facing);
-	}
-	return 0;
-}
-
-static SQInteger actorHidden(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	SQInteger hidden = 0;
-	if (SQ_FAILED(sqget(v, 3, hidden)))
-		return sq_throwerror(v, "failed to get hidden");
-	if (hidden && (g_twp->_actor == actor)) {
-		g_twp->follow(nullptr);
-	}
-	actor->_node->setVisible(hidden == 0);
-	return 0;
-}
-
-// Returns an array of all the actors that are currently within a specified trigger box.
-//
-// . code-block:: Squirrel
-// local stepsArray = triggerActors(AStreet.bookStoreLampTrigger)
-// if (stepsArray.len()) {    // someone's on the steps
-// }
-static SQInteger actorInTrigger(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	Common::SharedPtr<Object> obj = sqobj(v, 3);
-	if (!obj)
-		return sq_throwerror(v, "failed to get object");
-	bool inside = obj->contains(actor->_node->getAbsPos());
-	sqpush(v, inside);
-	return 1;
-}
-
-// Returns true if the specified actor is inside the specified walkbox from the wimpy file.
-//
-// . code-block:: Squirrel
-// sheriffsOfficeJailDoor =
-// {
-//     name = "jail door"
-//     actorInWalkbox(currentActor, "jail")
-//     verbOpen = function()
-//     {
-//         if (jail_door_state == OPEN) {
-//             sayLine("The door is already open.")
-//         } else {
-//             if (actorInWalkbox(currentActor, "jail")) {
-//                 sayLine("I can't open it from in here.")
-//                 return
-//             } else {
-//                startthread(openJailDoor)
-//             }
-//         }
-//     }
-// }
-static SQInteger actorInWalkbox(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	Common::String name;
-	if (SQ_FAILED(sqget(v, 3, name)))
-		return sq_throwerror(v, "failed to get name");
-	for (const auto &walkbox : g_twp->_room->_walkboxes) {
-		if (walkbox._name == name) {
-			if (walkbox.contains(actor->_node->getAbsPos())) {
-				sqpush(v, true);
-				return 1;
-			}
-		}
-	}
-	sqpush(v, false);
-	return 1;
-}
-
-static SQInteger actorRoom(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	Common::SharedPtr<Room> room = actor->_room;
-	if (!room) {
-		sq_pushnull(v);
-	} else {
-		sqpush(v, room->_table);
-	}
-	return 1;
-}
-
-static SQInteger actorShowHideLayer(HSQUIRRELVM v, bool visible) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	Common::String layer;
-	if (SQ_FAILED(sqget(v, 3, layer)))
-		return sq_throwerror(v, "failed to get layer");
-	actor->showLayer(layer, visible);
-	return 0;
-}
-
-static SQInteger actorHideLayer(HSQUIRRELVM v) {
-	return actorShowHideLayer(v, false);
-}
-
-static SQInteger actorShowLayer(HSQUIRRELVM v) {
-	return actorShowHideLayer(v, true);
-}
-
-static SQInteger actorSlotSelectable(HSQUIRRELVM v) {
-	SQInteger nArgs = sq_gettop(v);
-	switch (nArgs) {
-	case 2: {
-		SQInteger selectable;
-		if (SQ_FAILED(sqget(v, 2, selectable)))
-			return sq_throwerror(v, "failed to get selectable");
-		switch (selectable) {
-		case OFF:
-			g_twp->_actorSwitcher._mode &= (~asOn);
-			break;
-		case ON:
-			g_twp->_actorSwitcher._mode |= asOn;
-			break;
-		case TEMP_UNSELECTABLE:
-			g_twp->_actorSwitcher._mode |= asTemporaryUnselectable;
-			break;
-		case TEMP_SELECTABLE:
-			g_twp->_actorSwitcher._mode &= ~asTemporaryUnselectable;
-			break;
-		default:
-			return sq_throwerror(v, "invalid selectable value");
-		}
-		return 0;
-	}
-	case 3: {
-		bool selectable;
-		if (SQ_FAILED(sqget(v, 3, selectable)))
-			return sq_throwerror(v, "failed to get selectable");
-		if (sq_gettype(v, 2) == OT_INTEGER) {
-			SQInteger slot;
-			if (SQ_FAILED(sqget(v, 2, slot)))
-				return sq_throwerror(v, "failed to get slot");
-			g_twp->_hud->_actorSlots[slot - 1].selectable = selectable;
-		} else {
-			Common::SharedPtr<Object> actor = sqactor(v, 2);
-			if (!actor)
-				return sq_throwerror(v, "failed to get actor");
-			Common::String key;
-			sqgetf(actor->_table, "_key", key);
-			debugC(kDebugActScript, "actorSlotSelectable(%s, %s)", key.c_str(), selectable ? "yes" : "no");
-			ActorSlot *slot = g_twp->_hud->actorSlot(actor);
-			if (!slot)
-				warning("slot for actor %s not found", key.c_str());
-			else
-				slot->selectable = selectable;
-		}
-		return 0;
-	}
-	default:
-		return sq_throwerror(v, "invalid number of arguments");
-	}
-}
-
-// If a direction is specified: makes the actor face a given direction, which cannot be changed no matter what the player does.
-// Directions are: FACE_FRONT, FACE_BACK, FACE_LEFT, FACE_RIGHT.
-// If "NO" is specified, it removes all locking and allows the actor to change its facing direction based on player input or otherwise.
-static SQInteger actorLockFacing(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	switch (sq_gettype(v, 3)) {
-	case OT_INTEGER: {
-		SQInteger facing = 0;
-		if (SQ_FAILED(sqget(v, 3, facing)))
-			return sq_throwerror(v, "failed to get facing");
-		if (facing == 0)
-			actor->resetLockFacing();
-		else
-			actor->lockFacing(facing);
-	} break;
-	case OT_TABLE: {
-		HSQOBJECT obj;
-		SQInteger back = static_cast<SQInteger>(Facing::FACE_BACK);
-		SQInteger front = static_cast<SQInteger>(Facing::FACE_FRONT);
-		SQInteger left = static_cast<SQInteger>(Facing::FACE_LEFT);
-		SQInteger right = static_cast<SQInteger>(Facing::FACE_RIGHT);
-		SQInteger reset = 0;
-		sq_getstackobj(v, 3, &obj);
-		sqgetf(v, obj, "back", back);
-		sqgetf(v, obj, "front", front);
-		sqgetf(v, obj, "left", left);
-		sqgetf(v, obj, "right", right);
-		sqgetf(v, obj, "reset", reset);
-		if (reset != 0)
-			actor->resetLockFacing();
-		else
-			actor->lockFacing((Facing)left, (Facing)right, (Facing)front, (Facing)back);
-	} break;
-	default:
-		return sq_throwerror(v, "unknown facing type");
-	}
-	return 0;
-}
-
-static SQInteger actorPosX(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	sqpush(v, actor->_node->getPos().getX());
-	return 1;
-}
-
-static SQInteger actorPosY(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	sqpush(v, actor->_node->getPos().getY());
-	return 1;
-}
-
-// Plays the specified animation from the player's costume JSON filename.
-// If YES loop the animation. Default is NO.
-static SQInteger actorPlayAnimation(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	Common::String animation;
-	if (SQ_FAILED(sqget(v, 3, animation)))
-		return sq_throwerror(v, "failed to get animation");
-	SQInteger loop = 0;
-	if ((sq_gettop(v) >= 4) && (SQ_FAILED(sqget(v, 4, loop))))
-		return sq_throwerror(v, "failed to get loop");
-	debugC(kDebugActScript, "Play anim %s %s loop=%s", actor->_key.c_str(), animation.c_str(), loop ? "yes" : "no");
-	actor->play(animation, loop != 0);
-	return 0;
-}
-
-// Sets the rendering offset of the actor to x and y.
-//
-// A rendering offset of 0,0 would cause them to be rendered from the middle of their image.
-// Actor's are typically adjusted so they are rendered from the middle of the bottom of their feet.
-// To maintain sanity, it is best if all actors have the same image size and are all adjust the same, but this is not a requirement.
-static SQInteger actorRenderOffset(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	SQInteger x, y;
-	if (SQ_FAILED(sqget(v, 3, x)))
-		return sq_throwerror(v, "failed to get x");
-	if (SQ_FAILED(sqget(v, 4, y)))
-		return sq_throwerror(v, "failed to get y");
-	actor->_node->setRenderOffset(Math::Vector2d(x, y));
-	return 0;
-}
-
-static SQInteger actorStand(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	actor->stand();
-	return 0;
-}
-
-// Makes the specified actor stop moving immediately.
-//
-// . code-block:: Squirrel
-// actorStopWalking(currentActor)
-// actorStopWalking(postalworker)
-static SQInteger actorStopWalking(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	actor->stopWalking();
-	actor->stand();
-	return 0;
-}
-
-// Set the text color of the specified actor's text that appears when they speak.
-static SQInteger actorTalkColors(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqobj(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	SQInteger color;
-	if (SQ_FAILED(sqget(v, 3, color)))
-		return sq_throwerror(v, "failed to get talk color");
-	actor->_talkColor = Color::rgb(color);
-	return 0;
-}
-
-// If an actor is specified, returns true if that actor is currently talking.
-// If no actor is specified, returns true if the player's current actor is currently talking.
-//
-// . code-block:: Squirrel
-// actorTalking()
-// actorTalking(vo)
-static SQInteger actorTalking(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor;
-	if (sq_gettop(v) == 2) {
-		actor = sqobj(v, 2);
-	} else {
-		actor = g_twp->_actor;
-	}
-	bool isTalking = actor && actor->getTalking() && actor->getTalking()->isEnabled();
-	sqpush(v, isTalking);
-	return 1;
-}
-
-// Turn to the pos, dir, object or actor over 2 frames.
-static SQInteger actorTurnTo(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	if (sq_gettype(v, 3) == OT_INTEGER) {
-		SQInteger facing = 0;
-		if (SQ_FAILED(sqget(v, 3, facing)))
-			return sq_throwerror(v, "failed to get facing");
-		actor->turn((Facing)facing);
-	} else {
-		Common::SharedPtr<Object> obj = sqobj(v, 3);
-		if (!obj)
-			return sq_throwerror(v, "failed to get object to face to");
-		Object::turn(actor, obj);
-	}
-	return 0;
-}
-
-// Specifies the offset that will be applied to the actor's speech text that appears on screen.
-static SQInteger actorTalkOffset(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqobj(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	SQInteger x, y;
-	if (SQ_FAILED(sqget(v, 3, x)))
-		return sq_throwerror(v, "failed to get x");
-	if (SQ_FAILED(sqget(v, 4, y)))
-		return sq_throwerror(v, "failed to get y");
-	actor->_talkOffset = Math::Vector2d(x, y);
-	return 0;
-}
-
-static SQInteger actorUsePos(HSQUIRRELVM v) {
-	Math::Vector2d usePos;
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	Common::SharedPtr<Object> obj = sqobj(v, 3);
-	if (!obj)
-		usePos = Math::Vector2d();
-	else
-		usePos = obj->_usePos;
-	if (sq_gettop(v) == 4) {
-		SQInteger dir;
-		if (SQ_FAILED(sqget(v, 4, dir)))
-			return sq_throwerror(v, "failed to get direction");
-		else
-			actor->_useDir = (Direction)dir;
-	}
-	actor->_usePos = usePos;
-	return 0;
-}
-
-// Specifies whether the actor needs to abide by walkboxes or not.
-//
-// . code-block:: Squirrel
-// actorUseWalkboxes(coroner, NO)
-static SQInteger actorUseWalkboxes(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	SQInteger useWalkboxes = 1;
-	if (SQ_FAILED(sqget(v, 3, useWalkboxes)))
-		return sq_throwerror(v, "failed to get useWalkboxes");
-	actor->_useWalkboxes = useWalkboxes != 0;
-	return 0;
-}
-
-static SQInteger actorVolume(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	float volume = 0.0f;
-	if (SQ_FAILED(sqget(v, 3, volume)))
-		return sq_throwerror(v, "failed to get volume");
-	actor->_volume = volume;
-	return 0;
-}
-
-// Gets the specified actor to walk forward the distance specified.
-//
-// . code-block:: Squirrel
-// script sheriffOpening2() {
-//     cutscene(@() {
-//         actorAt(sheriff, CityHall.spot1)
-//         actorWalkForward(currentActor, 50)
-//         ...
-//     }
-// }
-static SQInteger actorWalkForward(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	SQInteger dist;
-	if (SQ_FAILED(sqget(v, 3, dist)))
-		return sq_throwerror(v, "failed to get dist");
-	Math::Vector2d dir;
-	switch (actor->getFacing()) {
-	case Facing::FACE_FRONT:
-		dir = Math::Vector2d(0, -dist);
-		break;
-	case Facing::FACE_BACK:
-		dir = Math::Vector2d(0, dist);
-		break;
-	case Facing::FACE_LEFT:
-		dir = Math::Vector2d(-dist, 0);
-		break;
-	case Facing::FACE_RIGHT:
-		dir = Math::Vector2d(dist, 0);
-		break;
-	}
-	Object::walk(actor, (actor->_node->getAbsPos() + dir));
-	return 0;
-}
-
-// Returns true if the specified actor is currently walking.
-// If no actor is specified, then returns true if the current player character is walking.
-//
-// . code-block:: Squirrel
-// script _startWriting() {
-//    if (!actorWalking(this)) {
-//        if (notebookOpen == NO) {
-//            actorPlayAnimation(reyes, "start_writing", NO)
-//            breaktime(0.30)
-//        }
-//        ...
-//    }
-//}
-static SQInteger actorWalking(HSQUIRRELVM v) {
-	SQInteger nArgs = sq_gettop(v);
-	Common::SharedPtr<Object> actor;
-	if (nArgs == 1) {
-		actor = g_twp->_actor;
-	} else if (nArgs == 2) {
-		actor = sqactor(v, 2);
-	}
-	sqpush(v, actor && actor->isWalking());
-	return 1;
-}
-
-// Sets the walk speed of an actor.
-//
-// The numbers are in pixel's per second.
-// The vertical movement is typically half (or more) than the horizontal movement to simulate depth in the 2D world.
-static SQInteger actorWalkSpeed(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	SQInteger x, y;
-	if (SQ_FAILED(sqget(v, 3, x)))
-		return sq_throwerror(v, "failed to get x");
-	if (SQ_FAILED(sqget(v, 4, y)))
-		return sq_throwerror(v, "failed to get y");
-	actor->_walkSpeed = Math::Vector2d(x, y);
-	return 0;
-}
-
-// Tells the specified actor to walk to an x/y position or to an actor position or to an object position.
-static SQInteger actorWalkTo(HSQUIRRELVM v) {
-	SQInteger nArgs = sq_gettop(v);
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	if (nArgs == 3) {
-		Common::SharedPtr<Object> obj = sqobj(v, 3);
-		if (!obj)
-			return sq_throwerror(v, "failed to get actor or object");
-		else
-			Object::walk(actor, obj);
-	} else if ((nArgs == 4) || (nArgs == 5)) {
-		SQInteger x, y;
-		if (SQ_FAILED(sqget(v, 3, x)))
-			return sq_throwerror(v, "failed to get x");
-		if (SQ_FAILED(sqget(v, 4, y)))
-			return sq_throwerror(v, "failed to get y");
-		SQInteger facing = 0;
-		if (nArgs == 5) {
-			if (SQ_FAILED(sqget(v, 5, facing)))
-				return sq_throwerror(v, "failed to get dir");
-		}
-		Object::walk(actor, Math::Vector2d(x, y), facing);
-	} else {
-		return sq_throwerror(v, "invalid number of arguments in actorWalkTo");
-	}
-	return 0;
-}
-
-static SQInteger addSelectableActor(HSQUIRRELVM v) {
-	SQInteger slot;
-	if (SQ_FAILED(sqget(v, 2, slot)))
-		return sq_throwerror(v, "failed to get slot");
-	Common::SharedPtr<Object> actor = sqactor(v, 3);
-	g_twp->_hud->_actorSlots[slot - 1].actor = actor;
-	return 0;
-}
-
-// Creates a new actor from a table.
-//
-// An actor is defined in the DefineActors.nut file.
-static SQInteger createActor(HSQUIRRELVM v) {
-	if (sq_gettype(v, 2) != OT_TABLE)
-		return sq_throwerror(v, "failed to get a table");
-
-	HSQUIRRELVM vm = g_twp->getVm();
-	Common::SharedPtr<Object> actor = Object::createActor();
-	sq_resetobject(&actor->_table);
-	sq_getstackobj(v, 2, &actor->_table);
-	sq_addref(vm, &actor->_table);
-	setId(actor->_table, g_twp->_resManager->newActorId());
-
-	Common::String key;
-	sqgetf(actor->_table, "_key", key);
-	actor->_key = key;
-
-	debugC(kDebugActScript, "Create actor %s %d", key.c_str(), actor->getId());
-	actor->_nodeAnim->remove();
-	actor->_node->remove();
-	actor->_node = Common::SharedPtr<Node>(new ActorNode(actor));
-	actor->_nodeAnim = Common::SharedPtr<Anim>(new Anim(actor.get()));
-	actor->_node->addChild(actor->_nodeAnim.get());
-	g_twp->_actors.push_back(actor);
-
-	sq_pushobject(v, actor->_table);
-	return 1;
-}
-
-static SQInteger flashSelectableActor(HSQUIRRELVM v) {
-	SQInteger time = 0;
-	if (SQ_FAILED(sqget(v, 2, time)))
-		return sq_throwerror(v, "failed to get time");
-	g_twp->flashSelectableActor(time);
-	return 0;
-}
-
-struct GetStrings {
-	explicit GetStrings(Common::StringArray &texts) : _texts(texts) {}
-
-	void operator()(HSQOBJECT item) {
-		_texts.push_back(sq_objtostring(&item));
-	}
-
-private:
-	Common::StringArray &_texts;
-};
-
-static SQInteger sayOrMumbleLine(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> obj;
-	int index;
-	Common::StringArray texts;
-	if (sq_gettype(v, 2) == OT_TABLE) {
-		obj = sqobj(v, 2);
-		index = 3;
-	} else {
-		index = 2;
-		obj = g_twp->_actor;
-	}
-
-	if (sq_gettype(v, index) == OT_ARRAY) {
-		HSQOBJECT arr;
-		sq_getstackobj(v, index, &arr);
-		sqgetitems(arr, GetStrings(texts));
-	} else {
-		int numIds = sq_gettop(v) - index + 1;
-		for (int i = 0; i < numIds; i++) {
-			if (sq_gettype(v, index + i) != OT_NULL) {
-				Common::String text;
-				if (SQ_FAILED(sqget(v, index + i, text)))
-					return sq_throwerror(v, "failed to get text");
-				texts.push_back(text);
-			}
-		}
-	}
-	debugC(kDebugActScript, "sayline: %s, %s", obj->_key.c_str(), join(texts, "|").c_str());
-	Object::say(obj, texts, obj->_talkColor);
-	return 0;
-}
-
-// Causes an actor to say a line of dialog and play the appropriate talking animations.
-// In the first example, the actor ray will say the line.
-// In the second, the selected actor will say the line.
-// In the third example, the first line is displayed, then the second one.
-// See also:
-// - `mumbleLine method`
-static SQInteger sayLine(HSQUIRRELVM v) {
-	g_twp->stopTalking();
-	return sayOrMumbleLine(v);
-}
-
-// Say a line of dialog and play the appropriate talking animations.
-// In the first example, the actor ray will say the line.
-// In the second, the selected actor will say the line.
-// In the third example, the first line is displayed, then the second one.
-// See also:
-// - `mumbleLine method`
-static SQInteger sayLineAt(HSQUIRRELVM v) {
-	SQInteger x, y;
-	Common::String text;
-	float duration = -1.0f;
-	if (SQ_FAILED(sqget(v, 2, x)))
-		return sq_throwerror(v, "failed to get x");
-	if (SQ_FAILED(sqget(v, 3, y)))
-		return sq_throwerror(v, "failed to get y");
-	Color color;
-	if (sq_gettype(v, 4) == OT_INTEGER) {
-		SQInteger c;
-		if (SQ_FAILED(sqget(v, 4, c)))
-			return sq_throwerror(v, "failed to get color");
-		color = Color::rgb(c);
-		if (SQ_FAILED(sqget(v, 5, duration)))
-			return sq_throwerror(v, "failed to get duration");
-		if (SQ_FAILED(sqget(v, 6, text)))
-			return sq_throwerror(v, "failed to get text");
-	} else {
-		Common::SharedPtr<Object> actor = sqactor(v, 4);
-		if (!actor)
-			return sq_throwerror(v, "failed to get actor");
-		Math::Vector2d pos = g_twp->roomToScreen(actor->_node->getAbsPos());
-		x = pos.getX();
-		y = pos.getY();
-		color = actor->_talkColor;
-		if (SQ_FAILED(sqget(v, 6, text)))
-			return sq_throwerror(v, "failed to get text");
-	}
-
-	warning("TODO: saylineAt: (%lld,%lld) text=%s color=%s duration=%f", x, y, text.c_str(), color.toStr().c_str(), duration);
-	return 0;
-}
-
-// returns true if the specified actor is currently in the screen.
-static SQInteger isActorOnScreen(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> obj = sqobj(v, 2);
-	if (!obj)
-		return sq_throwerror(v, "failed to get actor/object");
-
-	if (obj->_room != g_twp->_room) {
-		sqpush(v, false);
-	} else {
-		Math::Vector2d pos = obj->_node->getPos() - g_twp->getGfx().cameraPos();
-		Math::Vector2d size = g_twp->getGfx().camera();
-		bool isOnScreen = Common::Rect(0.0f, 0.0f, size.getX(), size.getY()).contains(pos.getX(), pos.getY());
-		sqpush(v, isOnScreen);
-	}
-	return 1;
-}
-
-static SQInteger isActorSelectable(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	if (!actor)
-		return sq_throwerror(v, "failed to get actor");
-	ActorSlot *slot = g_twp->_hud->actorSlot(actor);
-	bool selectable = slot && slot->selectable;
-	sqpush(v, selectable);
-	return 1;
-}
-
-// If an actor is specified, returns true otherwise returns false.
-static SQInteger is_actor(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor(sqactor(v, 2));
-	sqpush(v, actor != nullptr);
-	return 1;
-}
-
-// Returns an array with every single actor that has been defined in the game so far, including non-player characters.
-// See also masterRoomArray.
-static SQInteger masterActorArray(HSQUIRRELVM v) {
-	sq_newarray(v, 0);
-	for (auto actor : g_twp->_actors) {
-		sqpush(v, actor->_table);
-		sq_arrayappend(v, -2);
-	}
-	return 1;
-}
-
-// Makes actor say a line or multiple lines.
-// Unlike sayLine this line will not interrupt any other talking on the screen.
-// Cannot be interrupted by normal sayLines.
-// See also:
-// - `sayLine method`.
-static SQInteger mumbleLine(HSQUIRRELVM v) {
-	return sayOrMumbleLine(v);
-}
-
-// Stops all the current sayLines or mumbleLines that the actor is currently saying or are queued to be said.
-// Passing ALL will stop anyone who is talking to stop.
-// If no parameter is passed, it will stop the currentActor talking.
-static SQInteger stopTalking(HSQUIRRELVM v) {
-	SQInteger nArgs = sq_gettop(v);
-	if (nArgs == 2) {
-		if (sq_gettype(v, 2) == OT_INTEGER) {
-			g_twp->stopTalking();
-		} else {
-			Common::SharedPtr<Object> actor = sqobj(v, 2);
-			if (!actor)
-				return sq_throwerror(v, "failed to get actor/object");
-			actor->stopTalking();
-		}
-	} else if (nArgs == 1) {
-		g_twp->_actor->stopTalking();
-	}
-	return 0;
-}
-
-// Causes the actor to become the selected actor.
-// If they are in the same room as the last selected actor the camera will pan over to them.
-// If they are in a different room, the camera will cut to the new room.
-// The UI will change to reflect the new actor and their inventory.
-static SQInteger selectActor(HSQUIRRELVM v) {
-	g_twp->setActor(sqobj(v, 2));
-	return 0;
-}
-
-// Returns an array of all the actors that are currently within a specified trigger box.
-//
-// . code-block:: Squirrel
-// local stepsArray = triggerActors(AStreet.bookStoreLampTrigger)
-// if (stepsArray.len()) {    // someone's on the steps
-// }
-static SQInteger triggerActors(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> obj = sqobj(v, 2);
-	if (!obj)
-		return sq_throwerror(v, "failed to get object");
-	sq_newarray(v, 0);
-	for (auto actor : g_twp->_actors) {
-		if (obj->contains(actor->_node->getPos())) {
-			sq_pushobject(v, actor->_table);
-			sq_arrayappend(v, -2);
-		}
-	}
-	return 1;
-}
-
-static SQInteger verbUIColors(HSQUIRRELVM v) {
-	SQInteger actorSlot;
-	if (SQ_FAILED(sqget(v, 2, actorSlot)))
-		return sq_throwerror(v, "failed to get actorSlot");
-	HSQOBJECT table;
-	if (SQ_FAILED(sqget(v, 3, table)))
-		return sq_throwerror(v, "failed to get table");
-	if (!sq_istable(table))
-		return sq_throwerror(v, "failed to get verb definitionTable");
-
-	// get mandatory colors
-	SQInteger
-		sentence = 0,
-		verbNormal = 0,
-		verbNormalTint = 0,
-		verbHighlight = 0,
-		verbHighlightTint = 0,
-		inventoryFrame = 0,
-		inventoryBackground = 0;
-	sqgetf(table, "sentence", sentence);
-	sqgetf(table, "verbNormal", verbNormal);
-	sqgetf(table, "verbNormalTint", verbNormalTint);
-	sqgetf(table, "verbHighlight", verbHighlight);
-	sqgetf(table, "verbHighlightTint", verbHighlightTint);
-	sqgetf(table, "inventoryFrame", inventoryFrame);
-	sqgetf(table, "inventoryBackground", inventoryBackground);
-
-	// get optional colors
-	SQInteger retroNormal = verbNormal;
-	SQInteger retroHighlight = verbNormalTint;
-	SQInteger dialogNormal = verbNormal;
-	SQInteger dialogHighlight = verbHighlight;
-	sqgetf(table, "retroNormal", retroNormal);
-	sqgetf(table, "retroHighlight", retroHighlight);
-	sqgetf(table, "dialogNormal", dialogNormal);
-	sqgetf(table, "dialogHighlight", dialogHighlight);
-
-	g_twp->_hud->_actorSlots[actorSlot - 1].verbUiColors =
-		VerbUiColors(
-			Color::rgb(sentence),
-			Color::rgb(verbNormal),
-			Color::rgb(verbNormalTint),
-			Color::rgb(verbHighlight),
-			Color::rgb(verbHighlightTint),
-			Color::rgb(dialogNormal),
-			Color::rgb(dialogHighlight),
-			Color::rgb(inventoryFrame),
-			Color::rgb(inventoryBackground),
-			Color::rgb(retroNormal),
-			Color::rgb(retroHighlight));
-	return 0;
-}
-
-void sqgame_register_actorlib(HSQUIRRELVM v) {
-	regFunc(v, actorAnimationFlags, "actorAnimationFlags");
-	regFunc(v, actorAnimationNames, "actorAnimationNames");
-	regFunc(v, actorAlpha, "actorAlpha");
-	regFunc(v, actorAt, "actorAt");
-	regFunc(v, actorBlinkRate, "actorBlinkRate");
-	regFunc(v, actorColor, "actorColor");
-	regFunc(v, actorCostume, "actorCostume");
-	regFunc(v, actorDistanceTo, "actorDistanceTo");
-	regFunc(v, actorDistanceWithin, "actorDistanceWithin");
-	regFunc(v, actorFace, "actorFace");
-	regFunc(v, actorHidden, "actorHidden");
-	regFunc(v, actorHideLayer, "actorHideLayer");
-	regFunc(v, actorInTrigger, "actorInTrigger");
-	regFunc(v, actorInWalkbox, "actorInWalkbox");
-	regFunc(v, actorLockFacing, "actorLockFacing");
-	regFunc(v, actorPlayAnimation, "actorPlayAnimation");
-	regFunc(v, actorPosX, "actorPosX");
-	regFunc(v, actorPosY, "actorPosY");
-	regFunc(v, actorRenderOffset, "actorRenderOffset");
-	regFunc(v, actorRoom, "actorRoom");
-	regFunc(v, actorShowLayer, "actorShowLayer");
-	regFunc(v, actorSlotSelectable, "actorSlotSelectable");
-	regFunc(v, actorStand, "actorStand");
-	regFunc(v, actorStopWalking, "actorStopWalking");
-	regFunc(v, actorTalkColors, "actorTalkColors");
-	regFunc(v, actorTalking, "actorTalking");
-	regFunc(v, actorTalkOffset, "actorTalkOffset");
-	regFunc(v, actorTurnTo, "actorTurnTo");
-	regFunc(v, actorUsePos, "actorUsePos");
-	regFunc(v, actorUseWalkboxes, "actorUseWalkboxes");
-	regFunc(v, actorVolume, "actorVolume");
-	regFunc(v, actorWalking, "actorWalking");
-	regFunc(v, actorWalkForward, "actorWalkForward");
-	regFunc(v, actorWalkSpeed, "actorWalkSpeed");
-	regFunc(v, actorWalkTo, "actorWalkTo");
-	regFunc(v, addSelectableActor, "addSelectableActor");
-	regFunc(v, createActor, "createActor");
-	regFunc(v, flashSelectableActor, "flashSelectableActor");
-	regFunc(v, is_actor, "is_actor");
-	regFunc(v, isActorOnScreen, "isActorOnScreen");
-	regFunc(v, isActorSelectable, "isActorSelectable");
-	regFunc(v, mumbleLine, "mumbleLine");
-	regFunc(v, masterActorArray, "masterActorArray");
-	regFunc(v, sayLine, "sayLine");
-	regFunc(v, sayLineAt, "sayLineAt");
-	regFunc(v, selectActor, "selectActor");
-	regFunc(v, stopTalking, "stopTalking");
-	regFunc(v, triggerActors, "triggerActors");
-	regFunc(v, verbUIColors, "verbUIColors");
-}
-} // namespace Twp
diff --git a/engines/twp/actorswitcher.cpp b/engines/twp/actorswitcher.cpp
deleted file mode 100644
index 1d142e6db71..00000000000
--- a/engines/twp/actorswitcher.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "twp/twp.h"
-#include "twp/actorswitcher.h"
-#include "twp/resmanager.h"
-#include "twp/util.h"
-
-#define DISABLE_ALPHA 0.f
-#define ENABLE_ALPHA 1.f
-#define INACTIVE_ALPHA 0.5f
-#define ACTOR_SEP 60.f
-#define MARGIN 30.f
-#define ANIM_DURATION 0.120f
-
-namespace Twp {
-
-ActorSwitcherSlot::ActorSwitcherSlot(const Common::String &icon_, Color back_, Color frame_, SelectFunc *selectFunc_, int id_) {
-	icon = icon_;
-	back = back_;
-	frame = frame_;
-	selectFunc = selectFunc_;
-	id = id_;
-}
-
-void ActorSwitcherSlot::select() {
-	if (selectFunc) {
-		selectFunc(id);
-	}
-}
-
-ActorSwitcher::ActorSwitcher() : Node("ActorSwitcher") {
-	_alpha = ENABLE_ALPHA;
-}
-
-Math::Matrix4 ActorSwitcher::transform(Math::Matrix4 trsf, int index) {
-	float animPos = _mouseOver ? _animPos : 1.f;
-	Math::Vector3d pos(SCREEN_WIDTH - MARGIN, SCREEN_HEIGHT - MARGIN - animPos * ACTOR_SEP * index, 0.f);
-	Math::Vector2d s(2.f, 2.f);
-	trsf.translate(pos);
-	Twp::scale(trsf, s);
-	return trsf;
-}
-
-float ActorSwitcher::getAlpha(size_t index) const {
-	if (index == (_slots.size() - 1))
-		return ENABLE_ALPHA;
-	if (_mode & asTemporaryUnselectable)
-		return INACTIVE_ALPHA;
-	if (_mode & asOn)
-		return _mouseOver ? ENABLE_ALPHA : _alpha;
-	return _mouseOver ? INACTIVE_ALPHA : DISABLE_ALPHA;
-}
-
-void ActorSwitcher::drawIcon(const Common::String &icon, Color backColor, Color frameColor, Math::Matrix4 trsf, int index) {
-	SpriteSheet *gameSheet = g_twp->_resManager->spriteSheet("GameSheet");
-	Texture *texture = g_twp->_resManager->texture(gameSheet->meta.image);
-	const SpriteSheetFrame &iconBackFrame = gameSheet->getFrame("icon_background");
-	const SpriteSheetFrame &iconActorFrame = gameSheet->getFrame(icon);
-	const SpriteSheetFrame &iconFrame = gameSheet->getFrame("icon_frame");
-	Math::Matrix4 t = transform(trsf, index);
-	float alpha = getAlpha(index);
-
-	drawSprite(iconBackFrame, texture, Color::withAlpha(backColor, alpha), t);
-	drawSprite(iconActorFrame, texture, Color::withAlpha(Color(), alpha), t);
-	drawSprite(iconFrame, texture, Color::withAlpha(frameColor, alpha), t);
-}
-
-void ActorSwitcher::drawCore(Math::Matrix4 trsf) {
-	if (_mouseOver) {
-		for (size_t i = 0; i < _slots.size(); i++) {
-			ActorSwitcherSlot &slot = _slots[i];
-			drawIcon(slot.icon, slot.back, slot.frame, trsf, i);
-		}
-	} else if (!_slots.empty()) {
-		ActorSwitcherSlot &slot = _slots[0];
-		drawIcon(slot.icon, slot.back, slot.frame, trsf, 0);
-	}
-}
-
-void ActorSwitcher::drawSprite(const SpriteSheetFrame &sf, Texture *texture, Color color, Math::Matrix4 trsf) {
-	Math::Vector3d pos(sf.spriteSourceSize.left - sf.sourceSize.getX() / 2.f, -sf.spriteSourceSize.height() - sf.spriteSourceSize.top + sf.sourceSize.getY() / 2.f, 0.f);
-	trsf.translate(pos);
-	g_twp->getGfx().drawSprite(sf.frame, *texture, color, trsf);
-}
-
-float ActorSwitcher::height() const {
-	float n = _mouseOver ? _slots.size() : 1.0f;
-	return n * ACTOR_SEP;
-}
-
-int ActorSwitcher::iconIndex(Math::Vector2d pos) const {
-	float y = SCREEN_HEIGHT - pos.getY();
-	return _slots.size() - 1 - (int)((height() - y) / ACTOR_SEP);
-}
-
-Common::Rect ActorSwitcher::rect() const {
-	float h = height();
-	return Common::Rect(Common::Point(SCREEN_WIDTH - ACTOR_SEP, SCREEN_HEIGHT - h), ACTOR_SEP, h);
-}
-
-void ActorSwitcher::update(const Common::Array<ActorSwitcherSlot> &slots, float elapsed) {
-	if (!_visible)
-		return;
-
-	_slots = slots;
-
-	// update flash icon
-	if ((_flash != 0) && ((_flash == -1) || (_flashElapsed < _flash))) {
-		_flashElapsed = _flashElapsed + elapsed;
-		_alpha = 0.6f + 0.4f * sin(M_PI * 2.f * _flashElapsed);
-	} else {
-		_flash = 0;
-		_flashElapsed = 0.f;
-		_alpha = INACTIVE_ALPHA;
-	}
-
-	// check if mouse is over actor icons or gear icon
-	Math::Vector2d scrPos = g_twp->winToScreen(g_twp->_cursor.pos);
-	bool oldMouseOver = _mouseOver;
-	_mouseOver = !_down && rect().contains(scrPos.getX(), scrPos.getY());
-
-	// update anim
-	_animElapsed = _animElapsed + elapsed;
-
-	// stop anim or flash if necessary
-	if (oldMouseOver != _mouseOver) {
-		_animElapsed = 0.f;
-		if (_mouseOver)
-			_flash = 0;
-	}
-
-	// update anim pos
-	_animPos = MIN(1.f, _animElapsed / ANIM_DURATION);
-
-	// check if we select an actor or gear icon
-	if (_mouseOver && (g_twp->_cursor.leftDown) && !_down) {
-		_down = true;
-		// check if we allow to select an actor
-		size_t iconIdx = iconIndex(scrPos);
-		if ((_mode == asOn) || (iconIdx == (_slots.size() - 1))) {
-			if (_slots[iconIdx].selectFunc != nullptr)
-				_slots[iconIdx].select();
-		}
-	}
-	if (!g_twp->_cursor.leftDown)
-		_down = false;
-}
-
-} // namespace Twp
diff --git a/engines/twp/actorswitcher.h b/engines/twp/actorswitcher.h
deleted file mode 100644
index cf5f28cd1c4..00000000000
--- a/engines/twp/actorswitcher.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_ACTORSWITCHER_H
-#define TWP_ACTORSWITCHER_H
-
-#include "common/func.h"
-#include "twp/scenegraph.h"
-
-namespace Twp {
-
-#define asNone 0
-#define asOn 0x1
-#define asTemporaryUnselectable 0x2
-
-typedef void SelectFunc(int id);
-
-// This is where all the information about the actor icon stands
-struct ActorSwitcherSlot {
-	ActorSwitcherSlot(const Common::String &icon_, Color back_, Color frame_, SelectFunc *selectFunc_, int id_ = 0);
-
-	void select();
-
-	Common::String icon;
-	Color back, frame;
-	SelectFunc *selectFunc;
-	int id;
-};
-
-// This allows to change the selected actors or to display the options (gear icon)
-class ActorSwitcher : public Node {
-public:
-	ActorSwitcher();
-
-	void update(const Common::Array<ActorSwitcherSlot> &slots, float elapsed);
-	bool isMouseOver() const { return _mouseOver; }
-	void setFlash(int flash) { _flash = flash; }
-
-protected:
-	void drawCore(Math::Matrix4 trsf) override final;
-	void drawSprite(const SpriteSheetFrame &sf, Texture *texture, Color color, Math::Matrix4 trsf);
-	void drawIcon(const Common::String &icon, Color backColor, Color frameColor, Math::Matrix4 trsf, int index);
-	Math::Matrix4 transform(Math::Matrix4 trsf, int index);
-	float getAlpha(size_t index) const;
-	float height() const;
-	int iconIndex(Math::Vector2d pos) const;
-	Common::Rect rect() const;
-
-public:
-	int _mode = asNone; // current mode
-
-private:
-	bool _mouseOver = false;                  // true when mouse is over the icons
-	bool _down = false;                       // true when mouse button is down
-	float _alpha = 0.f;                       // alpha value for the icon when flash is ON (flash != 0)
-	int _flash = 0;                           // flash = 0: disable, flash = -1: enable, other values: time to flash
-	float _flashElapsed = 0.f;                // flash time elapsed in seconds
-	float _animElapsed = 0.f, _animPos = 0.f; // animation time elapsed in seconds and current position in the animation [0f-1f]
-	Common::Array<ActorSwitcherSlot> _slots;  // list of slots containing icon, colors and select function
-};
-
-} // namespace Twp
-
-#endif
diff --git a/engines/twp/audio.cpp b/engines/twp/audio.cpp
deleted file mode 100644
index 3ced868cae3..00000000000
--- a/engines/twp/audio.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "common/debug.h"
-#include "audio/mixer.h"
-#include "audio/mixer_intern.h"
-#include "audio/audiostream.h"
-#include "audio/decoders/vorbis.h"
-#include "audio/decoders/wave.h"
-#include "twp/twp.h"
-#include "twp/audio.h"
-#include "twp/object.h"
-#include "twp/resmanager.h"
-#include "twp/room.h"
-#include "twp/squtil.h"
-
-namespace Twp {
-
-void SoundStream::open(Common::SharedPtr<SoundDefinition> sndDef) {
-	sndDef->load();
-	_stream.open(sndDef->_buffer.data(), sndDef->_buffer.size());
-}
-
-uint32 SoundStream::read(void *dataPtr, uint32 dataSize) {
-	return _stream.read(dataPtr, dataSize);
-}
-
-bool SoundStream::eos() const {
-	return _stream.eos();
-}
-
-int64 SoundStream::pos() const {
-	return _stream.pos();
-}
-
-int64 SoundStream::size() const {
-	return _stream.size();
-}
-
-bool SoundStream::seek(int64 offset, int whence) {
-	return _stream.seek(offset, whence);
-}
-
-SoundDefinition::SoundDefinition(const Common::String &name) : _name(name), _id(g_twp->_resManager->newSoundDefId()) {
-}
-
-void SoundDefinition::load() {
-	if (!_loaded) {
-		GGPackEntryReader entry;
-		entry.open(*g_twp->_pack, _name);
-		_buffer.resize(entry.size());
-		entry.read(_buffer.data(), entry.size());
-	}
-}
-
-bool AudioSystem::playing(int id) const {
-	// channel ID ?
-	if (id >= 1 && id <= NUM_AUDIO_SLOTS) {
-		if (!_slots[id].busy)
-			return false;
-		id = g_twp->_mixer->getSoundID(_slots[id].handle);
-	}
-	// sound definition ID ?
-	for (const auto &_slot : _slots) {
-		if (_slot.busy && _slot.sndDef->getId() == id) {
-			return g_twp->_mixer->isSoundHandleActive(_slot.handle);
-		}
-	}
-	// sound ID ?
-	return g_twp->_mixer->isSoundIDActive(id);
-}
-
-bool AudioSystem::playing(Common::SharedPtr<SoundDefinition> soundDef) const {
-	for (const auto &_slot : _slots) {
-		if (_slot.busy && _slot.sndDef == soundDef) {
-			return g_twp->_mixer->isSoundHandleActive(_slot.handle);
-		}
-	}
-	return false;
-}
-
-void AudioSystem::fadeOut(int id, float fadeTime) {
-	if (fadeTime < 0.01f) {
-		stop(id);
-	} else {
-		for (int i = 0; i < NUM_AUDIO_SLOTS; i++) {
-			if (_slots[i].busy && _slots[i].id == id) {
-				_slots[i].fadeOutTimeMs = fadeTime;
-			}
-		}
-	}
-}
-
-void AudioSystem::stop(int id) {
-	// channel ID ?
-	if (id >= 1 && id <= NUM_AUDIO_SLOTS) {
-		if (!_slots[id].busy)
-			return;
-		id = g_twp->_mixer->getSoundID(_slots[id].handle);
-	}
-	// sound definition ID ?
-	for (auto &_slot : _slots) {
-		if (_slot.busy && _slot.sndDef->getId() == id) {
-			_slot.loopTimes = 0;
-			g_twp->_mixer->stopHandle(_slot.handle);
-		}
-	}
-	// sound ID ?
-	g_twp->_mixer->stopID(id);
-}
-
-void AudioSystem::setMasterVolume(float vol) {
-	_masterVolume = CLIP(vol, 0.f, 1.f);
-
-	// update sounds
-	for (auto &_slot : _slots) {
-		if (_slot.busy && g_twp->_mixer->isSoundHandleActive(_slot.handle)) {
-			g_twp->_mixer->setChannelVolume(_slot.handle, _slot.volume * _masterVolume);
-		}
-	}
-}
-
-float AudioSystem::getMasterVolume() const {
-	return _masterVolume;
-}
-
-void AudioSystem::updateVolume(AudioSlot *slot) {
-	float vol = _masterVolume * slot->volume;
-	if (slot->fadeInTimeMs) {
-		vol *= (g_twp->_mixer->getElapsedTime(slot->handle).msecs() / slot->total);
-	}
-	if (slot->fadeOutTimeMs) {
-		float startFade = slot->total - slot->fadeOutTimeMs;
-		float progress = (g_twp->_mixer->getElapsedTime(slot->handle).msecs() - startFade) / slot->fadeOutTimeMs;
-		if ((progress >= 0) && (progress <= 1.f)) {
-			vol *= (1.f - progress);
-		}
-		if (progress > 1.0f) {
-			slot->loopTimes = 0;
-			g_twp->_mixer->stopHandle(slot->handle);
-			return;
-		}
-	}
-	if (slot->objId) {
-		Common::SharedPtr<Object> obj = sqobj(slot->objId);
-		if (obj) {
-			float volObj = 0.f;
-			if (obj->_room == g_twp->_room) {
-				float width = g_twp->_room->getScreenSize().getX();
-				float x = g_twp->cameraPos().getX();
-				float diff = abs(x - obj->_node->getAbsPos().getX());
-				if (diff > (1.5f * width)) {
-					volObj = 0.f;
-				} else if (diff < (0.25f * width)) {
-					volObj = 1.f;
-				} else {
-					volObj = (width - (diff - (0.25f * width))) / width;
-				}
-
-				float pan = CLIP((obj->_node->getAbsPos().getX() - x) / (width / 2), -1.0f, 1.0f);
-				g_twp->_mixer->setChannelBalance(slot->handle, (int8)(pan * 127));
-			}
-			vol *= volObj;
-		}
-	}
-	g_twp->_mixer->setChannelVolume(slot->handle, vol * Audio::Mixer::kMaxChannelVolume);
-}
-
-void AudioSystem::setVolume(int id, float vol) {
-	// channel ID ?
-	if (id >= 1 && id <= NUM_AUDIO_SLOTS) {
-		if (!_slots[id].busy)
-			return;
-		id = g_twp->_mixer->getSoundID(_slots[id].handle);
-	}
-	// sound definition ID or sound ID ?
-	for (auto &_slot : _slots) {
-		if (_slot.busy && ((_slot.sndDef->getId() == id) || (g_twp->_mixer->getSoundID(_slot.handle) == id))) {
-			_slot.volume = vol;
-			updateVolume(&_slot);
-		}
-	}
-}
-
-void AudioSystem::update(float) {
-	for (auto &_slot : _slots) {
-		if (_slot.busy && !g_twp->_mixer->isSoundHandleActive(_slot.handle)) {
-			if ((_slot.loopTimes == -1) || _slot.loopTimes > 0) {
-				if (_slot.loopTimes != -1) {
-					_slot.loopTimes--;
-				}
-				Audio::SeekableAudioStream *audioStream;
-				Common::String name = _slot.sndDef->getName();
-				_slot.stream.seek(0);
-				if (name.hasSuffixIgnoreCase(".ogg")) {
-					audioStream = Audio::makeVorbisStream(&_slot.stream, DisposeAfterUse::NO);
-				} else if (name.hasSuffixIgnoreCase(".wav")) {
-					audioStream = Audio::makeWAVStream(&_slot.stream, DisposeAfterUse::NO);
-				} else {
-					error("AudioSystem::update(): Unexpected audio format: %s", name.c_str());
-				}
-				g_twp->_mixer->playStream(_slot.soundType, &_slot.handle, audioStream, _slot.id, _slot.volume);
-			} else {
-				_slot.busy = false;
-			}
-		}
-	}
-	// sound definition ID or sound ID ?
-	for (auto &_slot : _slots) {
-		if (_slot.busy) {
-			updateVolume(&_slot);
-		}
-	}
-}
-
-AudioSlot *AudioSystem::getFreeSlot() {
-	for (auto &_slot : _slots) {
-		AudioSlot *slot = &_slot;
-		if (!slot->busy || !g_twp->_mixer->isSoundHandleActive(slot->handle)) {
-			slot->busy = false;
-			return slot;
-		}
-	}
-	return nullptr;
-}
-
-int AudioSystem::play(Common::SharedPtr<SoundDefinition> sndDef, Audio::Mixer::SoundType cat, int loopTimes, float fadeInTimeMs, float volume, int objId) {
-	AudioSlot *slot = getFreeSlot();
-	if (!slot)
-		return 0;
-
-	const Common::String &name = sndDef->getName();
-	Audio::SeekableAudioStream *audioStream = nullptr;
-	if (name.hasSuffixIgnoreCase(".ogg")) {
-		slot->stream.open(sndDef);
-		audioStream = Audio::makeVorbisStream(&slot->stream, DisposeAfterUse::NO);
-	} else if (name.hasSuffixIgnoreCase(".wav")) {
-		slot->stream.open(sndDef);
-		audioStream = Audio::makeWAVStream(&slot->stream, DisposeAfterUse::NO);
-	} else {
-		error("Unexpected audio format: %s", name.c_str());
-	}
-	if (!audioStream)
-		error("Failed to load audio: %s", name.c_str());
-
-	int id = g_twp->_resManager->newSoundId();
-	if (fadeInTimeMs > 0.f) {
-		volume = 0;
-	}
-	g_twp->_mixer->playStream(cat, &slot->handle, audioStream, id, volume * _masterVolume);
-	slot->id = id;
-	slot->objId = objId;
-	slot->sndDef = sndDef;
-	slot->busy = true;
-	slot->volume = volume;
-	slot->fadeInTimeMs = fadeInTimeMs;
-	slot->fadeOutTimeMs = 0;
-	slot->total = audioStream->getLength().msecs();
-	slot->loopTimes = loopTimes;
-	slot->soundType = cat;
-	return id;
-}
-
-int AudioSystem::getElapsed(int id) const {
-	for (const auto &slot : _slots) {
-		if (slot.id == id) {
-			Audio::Timestamp t = g_twp->_mixer->getElapsedTime(slot.handle);
-			return t.msecs();
-		}
-	}
-	return 0;
-}
-
-int AudioSystem::getDuration(int id) const {
-	for (const auto &_slot : _slots) {
-		if (_slot.id == id) {
-			return _slot.total;
-		}
-	}
-	return 0;
-}
-
-} // namespace Twp
diff --git a/engines/twp/audio.h b/engines/twp/audio.h
deleted file mode 100644
index a9bc14f00be..00000000000
--- a/engines/twp/audio.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_AUDIO_H
-#define TWP_AUDIO_H
-
-#include "common/str.h"
-#include "common/array.h"
-#include "common/stream.h"
-#include "audio/mixer.h"
-#include "twp/ggpack.h"
-
-namespace Audio {
-
-class SeekableAudioStream;
-}
-
-namespace Twp {
-
-enum {
-	NUM_AUDIO_SLOTS = 32
-};
-
-class AudioChannel;
-class SoundDefinition;
-
-class SoundDefinition;
-class SoundStream : public Common::SeekableReadStream {
-public:
-	void open(Common::SharedPtr<SoundDefinition> sndDef);
-
-	virtual uint32 read(void *dataPtr, uint32 dataSize) override;
-	virtual bool eos() const override;
-
-	virtual int64 pos() const override;
-	virtual int64 size() const override;
-	virtual bool seek(int64 offset, int whence = SEEK_SET) override;
-
-private:
-	MemStream _stream;
-};
-
-class SoundDefinition {
-public:
-	friend class SoundStream;
-
-public:
-	SoundDefinition(const Common::String &name);
-
-	void load();
-	int getId() const { return _id; }
-	Common::String getName() const { return _name; }
-
-private:
-	int _id;                     // identifier for this sound
-	Common::String _name;        // name of the sound to load
-	Common::Array<byte> _buffer; // buffer containing the sound data
-	bool _loaded = false;        // indicates whether or not the sound buffer has been loaded
-};
-
-struct AudioSlot {
-	Audio::SoundHandle handle;                 // handle returned when this sound has been played
-	Common::SharedPtr<SoundDefinition> sndDef; // sound definition associated to this slot
-	SoundStream stream;                        // audio stream
-	bool busy = false;                         // is sound active
-	float volume = 1.f;                        // actual volume for this slot
-	float fadeInTimeMs = 0.f;                  // fade-in time in milliseconds
-	float fadeOutTimeMs = 0.f;                 // fade-out time in milliseconds
-	int total = 0;
-	int id = 0;                        // unique sound ID
-	int objId = 0;                     // object ID or 0 if none
-	int loopTimes = 0;                 //
-	Audio::Mixer::SoundType soundType; //
-};
-
-class AudioSystem {
-public:
-	int play(Common::SharedPtr<SoundDefinition> sndDef, Audio::Mixer::SoundType cat, int loopTimes = 0, float fadeInTimeMs = 0.f, float volume = 1.f, int objId = 0);
-
-	bool playing(int id) const;
-	bool playing(Common::SharedPtr<SoundDefinition> soundDef) const;
-
-	void fadeOut(int id, float fadeTime);
-	void stop(int id);
-
-	void setMasterVolume(float vol);
-	float getMasterVolume() const;
-	void setVolume(int id, float vol);
-
-	int getElapsed(int id) const;
-	int getDuration(int id) const;
-
-	void update(float elapsed);
-
-	Common::Array<Common::SharedPtr<SoundDefinition> > _soundDefs;
-	AudioSlot _slots[NUM_AUDIO_SLOTS];
-	Common::SharedPtr<SoundDefinition> _soundHover; // not used yet, should be used in the GUI
-
-private:
-	void updateVolume(AudioSlot *slot);
-	AudioSlot *getFreeSlot();
-
-private:
-	float _masterVolume = 1.f;
-};
-
-} // End of namespace Twp
-
-#endif // TWP_H
diff --git a/engines/twp/callback.cpp b/engines/twp/callback.cpp
deleted file mode 100644
index db57698c6ed..00000000000
--- a/engines/twp/callback.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "twp/callback.h"
-#include "twp/squtil.h"
-
-namespace Twp {
-
-Callback::Callback(int id, float duration, const Common::String &name, const Common::Array<HSQOBJECT> &args)
-	: _id(id), _duration(duration), _name(name), _args(args) {
-}
-
-void Callback::remove() {
-	_dead = true;
-}
-
-void Callback::call() {
-	sqcall(_name.c_str(), _args);
-}
-
-bool Callback::update(float elapsed) {
-	if (_dead)
-		return true;
-	_elapsed += elapsed;
-	bool result = _elapsed > _duration;
-	if (result)
-		call();
-	return result;
-}
-
-} // namespace Twp
diff --git a/engines/twp/callback.h b/engines/twp/callback.h
deleted file mode 100644
index e2869da31e0..00000000000
--- a/engines/twp/callback.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_CALLBACK_H
-#define TWP_CALLBACK_H
-
-#include "common/array.h"
-#include "common/str.h"
-#include "twp/squirrel/squirrel.h"
-
-namespace Twp {
-
-class Callback {
-public:
-	Callback(int id, float duration, const Common::String &name, const Common::Array<HSQOBJECT> &args);
-
-	bool update(float elapsed);
-	void remove();
-
-	Common::String getName() const { return _name; }
-	int getId() const { return _id; }
-	float getDuration() const { return _duration; }
-	float getElapsed() const { return _elapsed; }
-	const Common::Array<HSQOBJECT> &getArgs() const { return _args; }
-
-private:
-	int _id = 0;
-	Common::String _name;
-	Common::Array<HSQOBJECT> _args;
-	float _duration = 0.f;
-	float _elapsed = 0.f;
-	bool _dead = false;
-
-public:
-	void call();
-};
-
-} // namespace Twp
-
-#endif
diff --git a/engines/twp/camera.cpp b/engines/twp/camera.cpp
deleted file mode 100644
index d2dc1aa7c32..00000000000
--- a/engines/twp/camera.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "twp/twp.h"
-#include "twp/object.h"
-#include "twp/room.h"
-
-namespace Twp {
-
-void Camera::clamp(Math::Vector2d at) {
-	if (_room) {
-		Math::Vector2d roomSize = _room->_roomSize;
-		Math::Vector2d screenSize = _room->getScreenSize();
-		// fix assertion when screen size is greater than room height
-		if(screenSize.getY() > roomSize.getY()) {
-			screenSize.setY(roomSize.getY());
-		}
-
-		_pos.setX(CLIP(at.getX(), screenSize.getX() / 2.f + _bounds.left(), screenSize.getX() / 2 + _bounds.right()));
-		_pos.setY(CLIP(at.getY(), _bounds.bottom(), _bounds.top() - screenSize.getY() / 2));
-		_pos.setX(CLIP(_pos.getX(), screenSize.getX() / 2.f, MAX(roomSize.getX() - screenSize.getX() / 2.f, 0.f)));
-		_pos.setY(CLIP(_pos.getY(), screenSize.getY() / 2, MAX(roomSize.getY() - screenSize.getY() / 2, 0.f)));
-	}
-}
-
-void Camera::setAtCore(Math::Vector2d at) {
-	Math::Vector2d screenSize = _room->getScreenSize();
-	_pos = at;
-	clamp(_pos);
-	g_twp->getGfx().cameraPos(_pos - screenSize / 2.f);
-}
-
-void Camera::setAt(Math::Vector2d at) {
-	setAtCore(at);
-	_target = _pos;
-	_time = 0;
-	_moving = false;
-}
-
-void Camera::panTo(Math::Vector2d target, float time, InterpolationKind interpolation) {
-	if (!_moving) {
-		_moving = true;
-		_init = _pos;
-		_elapsed = 0.f;
-	}
-	_function = easing(interpolation);
-	_target = target;
-	_time = time;
-}
-
-void Camera::update(Common::SharedPtr<Room> room, Common::SharedPtr<Object> follow, float elapsed) {
-	_room = room;
-	_elapsed += elapsed;
-	bool isMoving = _elapsed < _time;
-
-	if (_moving && !isMoving) {
-		_moving = false;
-		_time = 0.f;
-		setAt(_target);
-	}
-
-	if (isMoving) {
-		float t = _elapsed / _time;
-		Math::Vector2d d = _target - _init;
-		Math::Vector2d pos = _init + (d * _function.func(t));
-		setAtCore(pos);
-		return;
-	}
-
-	if (follow && follow->_node->isVisible() && follow->_room == room) {
-		Math::Vector2d screen = room->getScreenSize();
-		Math::Vector2d pos = follow->_node->getPos();
-		Math::Vector2d margin(screen.getX() / 6.f, screen.getY() / 6.f);
-		Math::Vector2d cameraPos = getAt();
-
-		Math::Vector2d d = pos - cameraPos;
-		Math::Vector2d delta = d * elapsed;
-		bool sameActor = _follow == follow;
-
-		float x, y;
-		if (sameActor && (pos.getX() > (cameraPos.getX() + margin.getX())))
-			x = pos.getX() - margin.getX();
-		else if (sameActor && (pos.getX() < (cameraPos.getX() - margin.getX())))
-			x = pos.getX() + margin.getX();
-		else
-			x = cameraPos.getX() + (d.getX() > 0 ? MIN(delta.getX(), d.getX()) : MAX(delta.getX(), d.getX()));
-		if (sameActor && (pos.getY() > (cameraPos.getY() + margin.getY())))
-			y = pos.getY() - margin.getY();
-		else if (sameActor && (pos.getY() < (cameraPos.getY() - margin.getY())))
-			y = pos.getY() + margin.getY();
-		else
-			y = cameraPos.getY() + (d.getY() > 0 ? MIN(delta.getY(), d.getY()) : MAX(delta.getY(), d.getY()));
-		setAtCore(Math::Vector2d(x, y));
-		if (!sameActor && (fabs(pos.getX() - x) < 1.f) && (fabs(pos.getY() - y) < 1.f))
-			_follow = follow;
-	}
-}
-
-InterpolationMethod intToInterpolationMethod(int value) {
-	bool loop = (value & 0x10);
-	bool swing = (value & 0x20);
-	bool stopLooping = (value & 0x40);
-	InterpolationKind kind = (InterpolationKind)(value & 0x0F);
-	InterpolationMethod im;
-	im.kind = kind;
-	im.loop = loop && !stopLooping;
-	im.swing = swing;
-	return im;
-}
-
-} // namespace Twp
diff --git a/engines/twp/camera.h b/engines/twp/camera.h
deleted file mode 100644
index bb80bd44053..00000000000
--- a/engines/twp/camera.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_CAMERA_H
-#define TWP_CAMERA_H
-
-#include "common/func.h"
-#include "math/vector2d.h"
-#include "twp/rectf.h"
-
-namespace Twp {
-
-class Object;
-class Room;
-
-typedef float EasingFunc(float t);
-
-typedef struct EasingFunc_t {
-	EasingFunc *func;
-} EasingFunc_t;
-
-enum InterpolationKind {
-	IK_LINEAR = 0,
-	IK_EASEIN = 1,
-	IK_EASEINOUT = 2,
-	IK_EASEOUT = 3,
-	IK_SLOWEASEIN = 4,
-	IK_SLOWEASEOUT = 5
-};
-
-struct InterpolationMethod {
-	InterpolationKind kind = IK_LINEAR;
-	bool loop = false;
-	bool swing = false;
-};
-
-InterpolationMethod intToInterpolationMethod(int value);
-
-static float linear(float t) { return t; }
-
-static float easeIn(float t) {
-	return t * t * t * t;
-}
-
-static float easeOut(float t) {
-	float f = (t - 1.0f);
-	return f * f * f * (1.0f - t) + 1.0f;
-}
-
-static float easeInOut(float t) {
-	if (t < 0.5f)
-		return 8.0f * t * t * t * t;
-	float f = (t - 1.0f);
-	return -8.f * f * f * f * f + 1.f;
-}
-
-inline EasingFunc_t easing(InterpolationKind kind) {
-	switch (kind) {
-	case IK_LINEAR:
-		return {&linear};
-	case IK_EASEIN:
-		return {&easeIn};
-	case IK_EASEINOUT:
-		return {&easeInOut};
-	case IK_EASEOUT:
-		return {&easeOut};
-	case IK_SLOWEASEIN:
-		return {&easeIn};
-	case IK_SLOWEASEOUT:
-		return {&easeOut};
-	}
-	error("Invalid interpolation kind: %d", kind);
-	return {&linear};
-}
-
-class Camera {
-public:
-	void setAt(Math::Vector2d at);
-	inline Math::Vector2d getAt() const { return _pos; }
-
-	inline void setBounds(const Rectf &bounds) { _bounds = bounds; }
-	inline Rectf getBounds() const { return _bounds; }
-
-	inline void setRoom(Common::SharedPtr<Room> room) { _room = room; }
-	inline Common::SharedPtr<Room> getRoom() const { return _room; }
-
-	inline bool isMoving() const { return _moving; }
-	void panTo(Math::Vector2d target, float time, InterpolationKind interpolation);
-
-	void update(Common::SharedPtr<Room> room, Common::SharedPtr<Object> follow, float elapsed);
-
-private:
-	void clamp(Math::Vector2d at);
-	void setAtCore(Math::Vector2d at);
-
-private:
-	Math::Vector2d _pos;
-	Rectf _bounds = Rectf::fromMinMax(Math::Vector2d(-10000, -10000), Math::Vector2d(10000, 10000));
-	bool _moving = false;
-	Math::Vector2d _init, _target;
-	float _elapsed = 0.f;
-	float _time = 0.f;
-	Common::SharedPtr<Room> _room;
-	Common::SharedPtr<Object> _follow;
-	EasingFunc_t _function = {&linear};
-};
-} // namespace Twp
-
-#endif
diff --git a/engines/twp/clipper/clipper.cpp b/engines/twp/clipper/clipper.cpp
deleted file mode 100644
index 1c52b148750..00000000000
--- a/engines/twp/clipper/clipper.cpp
+++ /dev/null
@@ -1,4319 +0,0 @@
-/*******************************************************************************
- *                                                                              *
- * Author    :  Angus Johnson                                                   *
- * Version   :  6.4.2                                                           *
- * Date      :  27 February 2017                                                *
- * Website   :  http://www.angusj.com                                           *
- * Copyright :  Angus Johnson 2010-2017                                         *
- *                                                                              *
- * License:                                                                     *
- * Use, modification & distribution is subject to Boost Software License Ver 1. *
- * http://www.boost.org/LICENSE_1_0.txt                                         *
- *                                                                              *
- * Attributions:                                                                *
- * The code in this library is an extension of Bala Vatti's clipping algorithm: *
- * "A generic solution to polygon clipping"                                     *
- * Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63.             *
- * http://portal.acm.org/citation.cfm?id=129906                                 *
- *                                                                              *
- * Computer graphics and geometric modeling: implementation and algorithms      *
- * By Max K. Agoston                                                            *
- * Springer; 1 edition (January 4, 2005)                                        *
- * http://books.google.com/books?q=vatti+clipping+agoston                       *
- *                                                                              *
- * See also:                                                                    *
- * "Polygon Offsetting by Computing Winding Numbers"                            *
- * Paper no. DETC2005-85513 pp. 565-575                                         *
- * ASME 2005 International Design Engineering Technical Conferences             *
- * and Computers and Information in Engineering Conference (IDETC/CIE2005)      *
- * September 24-28, 2005 , Long Beach, California, USA                          *
- * http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf              *
- *                                                                              *
- *******************************************************************************/
-
-/*******************************************************************************
- *                                                                              *
- * This is a translation of the Delphi Clipper library and the naming style     *
- * used has retained a Delphi flavour.                                          *
- *                                                                              *
- *******************************************************************************/
-
-#include "twp/clipper/clipper.hpp"
-#include "common/debug.h"
-
-namespace ClipperLib {
-
-static double const pi = 3.141592653589793238;
-static double const two_pi = pi * 2;
-static double const def_arc_tolerance = 0.25;
-
-enum Direction { dRightToLeft,
-				 dLeftToRight };
-
-static int const Unassigned = -1; // edge not currently 'owning' a solution
-static int const Skip = -2;       // edge that would otherwise close a path
-
-#define HORIZONTAL (-1.0E+40)
-#define TOLERANCE (1.0e-20)
-#define NEAR_ZERO(val) (((val) > -TOLERANCE) && ((val) < TOLERANCE))
-
-struct TEdge {
-	IntPoint Bot;
-	IntPoint Curr; // current (updated for every new scanbeam)
-	IntPoint Top;
-	double Dx;
-	PolyType PolyTyp;
-	EdgeSide Side; // side only refers to current side of solution poly
-	int WindDelta; // 1 or -1 depending on winding direction
-	int WindCnt;
-	int WindCnt2; // winding count of the opposite polytype
-	int OutIdx;
-	TEdge *Next;
-	TEdge *Prev;
-	TEdge *NextInLML;
-	TEdge *NextInAEL;
-	TEdge *PrevInAEL;
-	TEdge *NextInSEL;
-	TEdge *PrevInSEL;
-};
-
-struct IntersectNode {
-	TEdge *Edge1;
-	TEdge *Edge2;
-	IntPoint Pt;
-};
-
-struct LocalMinimum {
-	cInt Y;
-	TEdge *LeftBound;
-	TEdge *RightBound;
-};
-
-struct OutPt;
-
-// OutRec: contains a path in the clipping solution. Edges in the AEL will
-// carry a pointer to an OutRec when they are part of the clipping solution.
-struct OutRec {
-	int Idx;
-	bool IsHole;
-	bool IsOpen;
-	OutRec *FirstLeft; // see comments in clipper.pas
-	PolyNode *PolyNd;
-	OutPt *Pts;
-	OutPt *BottomPt;
-};
-
-struct OutPt {
-	int Idx;
-	IntPoint Pt;
-	OutPt *Next;
-	OutPt *Prev;
-};
-
-struct Join {
-	OutPt *OutPt1;
-	OutPt *OutPt2;
-	IntPoint OffPt;
-};
-
-struct LocMinSorter {
-	inline bool operator()(const LocalMinimum &locMin1, const LocalMinimum &locMin2) {
-		return locMin2.Y < locMin1.Y;
-	}
-};
-
-//------------------------------------------------------------------------------
-//------------------------------------------------------------------------------
-
-inline cInt Round(double val) {
-	if ((val < 0))
-		return static_cast<cInt>(val - 0.5);
-	else
-		return static_cast<cInt>(val + 0.5);
-}
-//------------------------------------------------------------------------------
-
-inline cInt Abs(cInt val) {
-	return val < 0 ? -val : val;
-}
-
-//------------------------------------------------------------------------------
-// PolyTree methods ...
-//------------------------------------------------------------------------------
-
-void PolyTree::Clear() {
-	for (PolyNodes::size_type i = 0; i < AllNodes.size(); ++i)
-		delete AllNodes[i];
-	AllNodes.resize(0);
-	Childs.resize(0);
-}
-//------------------------------------------------------------------------------
-
-PolyNode *PolyTree::GetFirst() const {
-	if (!Childs.empty())
-		return Childs[0];
-	else
-		return 0;
-}
-//------------------------------------------------------------------------------
-
-int PolyTree::Total() const {
-	int result = (int)AllNodes.size();
-	// with negative offsets, ignore the hidden outer polygon ...
-	if (result > 0 && Childs[0] != AllNodes[0])
-		result--;
-	return result;
-}
-
-//------------------------------------------------------------------------------
-// PolyNode methods ...
-//------------------------------------------------------------------------------
-
-PolyNode::PolyNode() : Parent(0), Index(0), m_IsOpen(false) {
-}
-//------------------------------------------------------------------------------
-
-int PolyNode::ChildCount() const {
-	return (int)Childs.size();
-}
-//------------------------------------------------------------------------------
-
-void PolyNode::AddChild(PolyNode &child) {
-	unsigned cnt = (unsigned)Childs.size();
-	Childs.push_back(&child);
-	child.Parent = this;
-	child.Index = cnt;
-}
-//------------------------------------------------------------------------------
-
-PolyNode *PolyNode::GetNext() const {
-	if (!Childs.empty())
-		return Childs[0];
-	else
-		return GetNextSiblingUp();
-}
-//------------------------------------------------------------------------------
-
-PolyNode *PolyNode::GetNextSiblingUp() const {
-	if (!Parent) // protects against PolyTree.GetNextSiblingUp()
-		return 0;
-	else if (Index == Parent->Childs.size() - 1)
-		return Parent->GetNextSiblingUp();
-	else
-		return Parent->Childs[Index + 1];
-}
-//------------------------------------------------------------------------------
-
-bool PolyNode::IsHole() const {
-	bool result = true;
-	PolyNode *node = Parent;
-	while (node) {
-		result = !result;
-		node = node->Parent;
-	}
-	return result;
-}
-//------------------------------------------------------------------------------
-
-bool PolyNode::IsOpen() const {
-	return m_IsOpen;
-}
-//------------------------------------------------------------------------------
-
-#ifndef use_int32
-
-//------------------------------------------------------------------------------
-// Int128 class (enables safe math on signed 64bit integers)
-// eg Int128 val1((long64)9223372036854775807); //ie 2^63 -1
-//    Int128 val2((long64)9223372036854775807);
-//    Int128 val3 = val1 * val2;
-//    val3.AsString => "85070591730234615847396907784232501249" (8.5e+37)
-//------------------------------------------------------------------------------
-
-class Int128 {
-public:
-	ulong64 lo;
-	long64 hi;
-
-	Int128(long64 _lo = 0) {
-		lo = (ulong64)_lo;
-		if (_lo < 0)
-			hi = -1;
-		else
-			hi = 0;
-	}
-
-	Int128(const Int128 &val) : lo(val.lo), hi(val.hi) {}
-
-	Int128(const long64 &_hi, const ulong64 &_lo) : lo(_lo), hi(_hi) {}
-
-	Int128 &operator=(const long64 &val) {
-		lo = (ulong64)val;
-		if (val < 0)
-			hi = -1;
-		else
-			hi = 0;
-		return *this;
-	}
-
-	bool operator==(const Int128 &val) const { return (hi == val.hi && lo == val.lo); }
-
-	bool operator!=(const Int128 &val) const { return !(*this == val); }
-
-	bool operator>(const Int128 &val) const {
-		if (hi != val.hi)
-			return hi > val.hi;
-		else
-			return lo > val.lo;
-	}
-
-	bool operator<(const Int128 &val) const {
-		if (hi != val.hi)
-			return hi < val.hi;
-		else
-			return lo < val.lo;
-	}
-
-	bool operator>=(const Int128 &val) const { return !(*this < val); }
-
-	bool operator<=(const Int128 &val) const { return !(*this > val); }
-
-	Int128 &operator+=(const Int128 &rhs) {
-		hi += rhs.hi;
-		lo += rhs.lo;
-		if (lo < rhs.lo)
-			hi++;
-		return *this;
-	}
-
-	Int128 operator+(const Int128 &rhs) const {
-		Int128 result(*this);
-		result += rhs;
-		return result;
-	}
-
-	Int128 &operator-=(const Int128 &rhs) {
-		*this += -rhs;
-		return *this;
-	}
-
-	Int128 operator-(const Int128 &rhs) const {
-		Int128 result(*this);
-		result -= rhs;
-		return result;
-	}
-
-	Int128 operator-() const // unary negation
-	{
-		if (lo == 0)
-			return Int128(-hi, 0);
-		else
-			return Int128(~hi, ~lo + 1);
-	}
-
-	operator double() const {
-		const double shift64 = 18446744073709551616.0; // 2^64
-		if (hi < 0) {
-			if (lo == 0)
-				return (double)hi * shift64;
-			else
-				return -(double)(~lo + ~hi * shift64);
-		} else
-			return (double)(lo + hi * shift64);
-	}
-};
-//------------------------------------------------------------------------------
-
-Int128 Int128Mul(long64 lhs, long64 rhs) {
-	bool negate = (lhs < 0) != (rhs < 0);
-
-	if (lhs < 0)
-		lhs = -lhs;
-	ulong64 int1Hi = ulong64(lhs) >> 32;
-	ulong64 int1Lo = ulong64(lhs & 0xFFFFFFFF);
-
-	if (rhs < 0)
-		rhs = -rhs;
-	ulong64 int2Hi = ulong64(rhs) >> 32;
-	ulong64 int2Lo = ulong64(rhs & 0xFFFFFFFF);
-
-	// nb: see comments in clipper.pas
-	ulong64 a = int1Hi * int2Hi;
-	ulong64 b = int1Lo * int2Lo;
-	ulong64 c = int1Hi * int2Lo + int1Lo * int2Hi;
-
-	Int128 tmp;
-	tmp.hi = long64(a + (c >> 32));
-	tmp.lo = long64(c << 32);
-	tmp.lo += long64(b);
-	if (tmp.lo < b)
-		tmp.hi++;
-	if (negate)
-		tmp = -tmp;
-	return tmp;
-}
-#endif
-
-//------------------------------------------------------------------------------
-// Miscellaneous global functions
-//------------------------------------------------------------------------------
-
-bool Orientation(const Path &poly) {
-	return Area(poly) >= 0;
-}
-//------------------------------------------------------------------------------
-
-double Area(const Path &poly) {
-	int size = (int)poly.size();
-	if (size < 3)
-		return 0;
-
-	double a = 0;
-	for (int i = 0, j = size - 1; i < size; ++i) {
-		a += ((double)poly[j].X + poly[i].X) * ((double)poly[j].Y - poly[i].Y);
-		j = i;
-	}
-	return -a * 0.5;
-}
-//------------------------------------------------------------------------------
-
-double Area(const OutPt *op) {
-	const OutPt *startOp = op;
-	if (!op)
-		return 0;
-	double a = 0;
-	do {
-		a += (double)(op->Prev->Pt.X + op->Pt.X) * (double)(op->Prev->Pt.Y - op->Pt.Y);
-		op = op->Next;
-	} while (op != startOp);
-	return a * 0.5;
-}
-//------------------------------------------------------------------------------
-
-double Area(const OutRec &outRec) {
-	return Area(outRec.Pts);
-}
-//------------------------------------------------------------------------------
-
-bool PointIsVertex(const IntPoint &Pt, OutPt *pp) {
-	OutPt *pp2 = pp;
-	do {
-		if (pp2->Pt == Pt)
-			return true;
-		pp2 = pp2->Next;
-	} while (pp2 != pp);
-	return false;
-}
-//------------------------------------------------------------------------------
-
-// See "The Point in Polygon Problem for Arbitrary Polygons" by Hormann & Agathos
-// http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.88.5498&rep=rep1&type=pdf
-int PointInPolygon(const IntPoint &pt, const Path &path) {
-	// returns 0 if false, +1 if true, -1 if pt ON polygon boundary
-	int result = 0;
-	size_t cnt = path.size();
-	if (cnt < 3)
-		return 0;
-	IntPoint ip = path[0];
-	for (size_t i = 1; i <= cnt; ++i) {
-		IntPoint ipNext = (i == cnt ? path[0] : path[i]);
-		if (ipNext.Y == pt.Y) {
-			if ((ipNext.X == pt.X) || (ip.Y == pt.Y &&
-									   ((ipNext.X > pt.X) == (ip.X < pt.X))))
-				return -1;
-		}
-		if ((ip.Y < pt.Y) != (ipNext.Y < pt.Y)) {
-			if (ip.X >= pt.X) {
-				if (ipNext.X > pt.X)
-					result = 1 - result;
-				else {
-					double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) -
-							   (double)(ipNext.X - pt.X) * (ip.Y - pt.Y);
-					if (!d)
-						return -1;
-					if ((d > 0) == (ipNext.Y > ip.Y))
-						result = 1 - result;
-				}
-			} else {
-				if (ipNext.X > pt.X) {
-					double d = (double)(ip.X - pt.X) * (ipNext.Y - pt.Y) -
-							   (double)(ipNext.X - pt.X) * (ip.Y - pt.Y);
-					if (!d)
-						return -1;
-					if ((d > 0) == (ipNext.Y > ip.Y))
-						result = 1 - result;
-				}
-			}
-		}
-		ip = ipNext;
-	}
-	return result;
-}
-//------------------------------------------------------------------------------
-
-int PointInPolygon(const IntPoint &pt, OutPt *op) {
-	// returns 0 if false, +1 if true, -1 if pt ON polygon boundary
-	int result = 0;
-	OutPt *startOp = op;
-	for (;;) {
-		if (op->Next->Pt.Y == pt.Y) {
-			if ((op->Next->Pt.X == pt.X) || (op->Pt.Y == pt.Y &&
-											 ((op->Next->Pt.X > pt.X) == (op->Pt.X < pt.X))))
-				return -1;
-		}
-		if ((op->Pt.Y < pt.Y) != (op->Next->Pt.Y < pt.Y)) {
-			if (op->Pt.X >= pt.X) {
-				if (op->Next->Pt.X > pt.X)
-					result = 1 - result;
-				else {
-					double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) -
-							   (double)(op->Next->Pt.X - pt.X) * (op->Pt.Y - pt.Y);
-					if (!d)
-						return -1;
-					if ((d > 0) == (op->Next->Pt.Y > op->Pt.Y))
-						result = 1 - result;
-				}
-			} else {
-				if (op->Next->Pt.X > pt.X) {
-					double d = (double)(op->Pt.X - pt.X) * (op->Next->Pt.Y - pt.Y) -
-							   (double)(op->Next->Pt.X - pt.X) * (op->Pt.Y - pt.Y);
-					if (!d)
-						return -1;
-					if ((d > 0) == (op->Next->Pt.Y > op->Pt.Y))
-						result = 1 - result;
-				}
-			}
-		}
-		op = op->Next;
-		if (startOp == op)
-			break;
-	}
-	return result;
-}
-//------------------------------------------------------------------------------
-
-bool Poly2ContainsPoly1(OutPt *OutPt1, OutPt *OutPt2) {
-	OutPt *op = OutPt1;
-	do {
-		// nb: PointInPolygon returns 0 if false, +1 if true, -1 if pt on polygon
-		int res = PointInPolygon(op->Pt, OutPt2);
-		if (res >= 0)
-			return res > 0;
-		op = op->Next;
-	} while (op != OutPt1);
-	return true;
-}
-//----------------------------------------------------------------------
-
-bool SlopesEqual(const TEdge &e1, const TEdge &e2, bool UseFullInt64Range) {
-#ifndef use_int32
-	if (UseFullInt64Range)
-		return Int128Mul(e1.Top.Y - e1.Bot.Y, e2.Top.X - e2.Bot.X) ==
-			   Int128Mul(e1.Top.X - e1.Bot.X, e2.Top.Y - e2.Bot.Y);
-	else
-#endif
-		return (e1.Top.Y - e1.Bot.Y) * (e2.Top.X - e2.Bot.X) ==
-			   (e1.Top.X - e1.Bot.X) * (e2.Top.Y - e2.Bot.Y);
-}
-//------------------------------------------------------------------------------
-
-bool SlopesEqual(const IntPoint pt1, const IntPoint pt2,
-				 const IntPoint pt3, bool UseFullInt64Range) {
-#ifndef use_int32
-	if (UseFullInt64Range)
-		return Int128Mul(pt1.Y - pt2.Y, pt2.X - pt3.X) == Int128Mul(pt1.X - pt2.X, pt2.Y - pt3.Y);
-	else
-#endif
-		return (pt1.Y - pt2.Y) * (pt2.X - pt3.X) == (pt1.X - pt2.X) * (pt2.Y - pt3.Y);
-}
-//------------------------------------------------------------------------------
-
-bool SlopesEqual(const IntPoint pt1, const IntPoint pt2,
-				 const IntPoint pt3, const IntPoint pt4, bool UseFullInt64Range) {
-#ifndef use_int32
-	if (UseFullInt64Range)
-		return Int128Mul(pt1.Y - pt2.Y, pt3.X - pt4.X) == Int128Mul(pt1.X - pt2.X, pt3.Y - pt4.Y);
-	else
-#endif
-		return (pt1.Y - pt2.Y) * (pt3.X - pt4.X) == (pt1.X - pt2.X) * (pt3.Y - pt4.Y);
-}
-//------------------------------------------------------------------------------
-
-inline bool IsHorizontal(TEdge &e) {
-	return e.Dx == HORIZONTAL;
-}
-//------------------------------------------------------------------------------
-
-inline double GetDx(const IntPoint pt1, const IntPoint pt2) {
-	return (pt1.Y == pt2.Y) ? HORIZONTAL : (double)(pt2.X - pt1.X) / (pt2.Y - pt1.Y);
-}
-//---------------------------------------------------------------------------
-
-inline void SetDx(TEdge &e) {
-	cInt dy = (e.Top.Y - e.Bot.Y);
-	if (dy == 0)
-		e.Dx = HORIZONTAL;
-	else
-		e.Dx = (double)(e.Top.X - e.Bot.X) / dy;
-}
-//---------------------------------------------------------------------------
-
-inline void SwapSides(TEdge &Edge1, TEdge &Edge2) {
-	EdgeSide Side = Edge1.Side;
-	Edge1.Side = Edge2.Side;
-	Edge2.Side = Side;
-}
-//------------------------------------------------------------------------------
-
-inline void SwapPolyIndexes(TEdge &Edge1, TEdge &Edge2) {
-	int OutIdx = Edge1.OutIdx;
-	Edge1.OutIdx = Edge2.OutIdx;
-	Edge2.OutIdx = OutIdx;
-}
-//------------------------------------------------------------------------------
-
-inline cInt TopX(TEdge &edge, const cInt currentY) {
-	return (currentY == edge.Top.Y) ? edge.Top.X : edge.Bot.X + Round(edge.Dx * (currentY - edge.Bot.Y));
-}
-//------------------------------------------------------------------------------
-
-void IntersectPoint(TEdge &Edge1, TEdge &Edge2, IntPoint &ip) {
-#ifdef use_xyz
-	ip.Z = 0;
-#endif
-
-	double b1, b2;
-	if (Edge1.Dx == Edge2.Dx) {
-		ip.Y = Edge1.Curr.Y;
-		ip.X = TopX(Edge1, ip.Y);
-		return;
-	} else if (Edge1.Dx == 0) {
-		ip.X = Edge1.Bot.X;
-		if (IsHorizontal(Edge2))
-			ip.Y = Edge2.Bot.Y;
-		else {
-			b2 = Edge2.Bot.Y - (Edge2.Bot.X / Edge2.Dx);
-			ip.Y = Round(ip.X / Edge2.Dx + b2);
-		}
-	} else if (Edge2.Dx == 0) {
-		ip.X = Edge2.Bot.X;
-		if (IsHorizontal(Edge1))
-			ip.Y = Edge1.Bot.Y;
-		else {
-			b1 = Edge1.Bot.Y - (Edge1.Bot.X / Edge1.Dx);
-			ip.Y = Round(ip.X / Edge1.Dx + b1);
-		}
-	} else {
-		b1 = Edge1.Bot.X - Edge1.Bot.Y * Edge1.Dx;
-		b2 = Edge2.Bot.X - Edge2.Bot.Y * Edge2.Dx;
-		double q = (b2 - b1) / (Edge1.Dx - Edge2.Dx);
-		ip.Y = Round(q);
-		if (fabs(Edge1.Dx) < fabs(Edge2.Dx))
-			ip.X = Round(Edge1.Dx * q + b1);
-		else
-			ip.X = Round(Edge2.Dx * q + b2);
-	}
-
-	if (ip.Y < Edge1.Top.Y || ip.Y < Edge2.Top.Y) {
-		if (Edge1.Top.Y > Edge2.Top.Y)
-			ip.Y = Edge1.Top.Y;
-		else
-			ip.Y = Edge2.Top.Y;
-		if (fabs(Edge1.Dx) < fabs(Edge2.Dx))
-			ip.X = TopX(Edge1, ip.Y);
-		else
-			ip.X = TopX(Edge2, ip.Y);
-	}
-	// finally, don't allow 'ip' to be BELOW curr.Y (ie bottom of scanbeam) ...
-	if (ip.Y > Edge1.Curr.Y) {
-		ip.Y = Edge1.Curr.Y;
-		// use the more vertical edge to derive X ...
-		if (fabs(Edge1.Dx) > fabs(Edge2.Dx))
-			ip.X = TopX(Edge2, ip.Y);
-		else
-			ip.X = TopX(Edge1, ip.Y);
-	}
-}
-//------------------------------------------------------------------------------
-
-void ReversePolyPtLinks(OutPt *pp) {
-	if (!pp)
-		return;
-	OutPt *pp1, *pp2;
-	pp1 = pp;
-	do {
-		pp2 = pp1->Next;
-		pp1->Next = pp1->Prev;
-		pp1->Prev = pp2;
-		pp1 = pp2;
-	} while (pp1 != pp);
-}
-//------------------------------------------------------------------------------
-
-void DisposeOutPts(OutPt *&pp) {
-	if (pp == 0)
-		return;
-	pp->Prev->Next = 0;
-	while (pp) {
-		OutPt *tmpPp = pp;
-		pp = pp->Next;
-		delete tmpPp;
-	}
-}
-//------------------------------------------------------------------------------
-
-inline void InitEdge(TEdge *e, TEdge *eNext, TEdge *ePrev, const IntPoint &Pt) {
-	memset(e, 0, sizeof(TEdge));
-	e->Next = eNext;
-	e->Prev = ePrev;
-	e->Curr = Pt;
-	e->OutIdx = Unassigned;
-}
-//------------------------------------------------------------------------------
-
-void InitEdge2(TEdge &e, PolyType Pt) {
-	if (e.Curr.Y >= e.Next->Curr.Y) {
-		e.Bot = e.Curr;
-		e.Top = e.Next->Curr;
-	} else {
-		e.Top = e.Curr;
-		e.Bot = e.Next->Curr;
-	}
-	SetDx(e);
-	e.PolyTyp = Pt;
-}
-//------------------------------------------------------------------------------
-
-TEdge *RemoveEdge(TEdge *e) {
-	// removes e from double_linked_list (but without removing from memory)
-	e->Prev->Next = e->Next;
-	e->Next->Prev = e->Prev;
-	TEdge *result = e->Next;
-	e->Prev = 0; // flag as removed (see ClipperBase.Clear)
-	return result;
-}
-//------------------------------------------------------------------------------
-
-inline void ReverseHorizontal(TEdge &e) {
-	// swap horizontal edges' Top and Bottom x's so they follow the natural
-	// progression of the bounds - ie so their xbots will align with the
-	// adjoining lower edge. [Helpful in the ProcessHorizontal() method.]
-	SWAP(e.Top.X, e.Bot.X);
-#ifdef use_xyz
-	SWAP(e.Top.Z, e.Bot.Z);
-#endif
-}
-//------------------------------------------------------------------------------
-
-void SwapPoints(IntPoint &pt1, IntPoint &pt2) {
-	IntPoint tmp = pt1;
-	pt1 = pt2;
-	pt2 = tmp;
-}
-//------------------------------------------------------------------------------
-
-bool GetOverlapSegment(IntPoint pt1a, IntPoint pt1b, IntPoint pt2a,
-					   IntPoint pt2b, IntPoint &pt1, IntPoint &pt2) {
-	// precondition: segments are Collinear.
-	if (Abs(pt1a.X - pt1b.X) > Abs(pt1a.Y - pt1b.Y)) {
-		if (pt1a.X > pt1b.X)
-			SwapPoints(pt1a, pt1b);
-		if (pt2a.X > pt2b.X)
-			SwapPoints(pt2a, pt2b);
-		if (pt1a.X > pt2a.X)
-			pt1 = pt1a;
-		else
-			pt1 = pt2a;
-		if (pt1b.X < pt2b.X)
-			pt2 = pt1b;
-		else
-			pt2 = pt2b;
-		return pt1.X < pt2.X;
-	} else {
-		if (pt1a.Y < pt1b.Y)
-			SwapPoints(pt1a, pt1b);
-		if (pt2a.Y < pt2b.Y)
-			SwapPoints(pt2a, pt2b);
-		if (pt1a.Y < pt2a.Y)
-			pt1 = pt1a;
-		else
-			pt1 = pt2a;
-		if (pt1b.Y > pt2b.Y)
-			pt2 = pt1b;
-		else
-			pt2 = pt2b;
-		return pt1.Y > pt2.Y;
-	}
-}
-//------------------------------------------------------------------------------
-
-bool FirstIsBottomPt(const OutPt *btmPt1, const OutPt *btmPt2) {
-	OutPt *p = btmPt1->Prev;
-	while ((p->Pt == btmPt1->Pt) && (p != btmPt1))
-		p = p->Prev;
-	double dx1p = fabs(GetDx(btmPt1->Pt, p->Pt));
-	p = btmPt1->Next;
-	while ((p->Pt == btmPt1->Pt) && (p != btmPt1))
-		p = p->Next;
-	double dx1n = fabs(GetDx(btmPt1->Pt, p->Pt));
-
-	p = btmPt2->Prev;
-	while ((p->Pt == btmPt2->Pt) && (p != btmPt2))
-		p = p->Prev;
-	double dx2p = fabs(GetDx(btmPt2->Pt, p->Pt));
-	p = btmPt2->Next;
-	while ((p->Pt == btmPt2->Pt) && (p != btmPt2))
-		p = p->Next;
-	double dx2n = fabs(GetDx(btmPt2->Pt, p->Pt));
-
-	if (MAX(dx1p, dx1n) == MAX(dx2p, dx2n) &&
-		MIN(dx1p, dx1n) == MIN(dx2p, dx2n))
-		return Area(btmPt1) > 0; // if otherwise identical use orientation
-	else
-		return (dx1p >= dx2p && dx1p >= dx2n) || (dx1n >= dx2p && dx1n >= dx2n);
-}
-//------------------------------------------------------------------------------
-
-OutPt *GetBottomPt(OutPt *pp) {
-	OutPt *dups = 0;
-	OutPt *p = pp->Next;
-	while (p != pp) {
-		if (p->Pt.Y > pp->Pt.Y) {
-			pp = p;
-			dups = 0;
-		} else if (p->Pt.Y == pp->Pt.Y && p->Pt.X <= pp->Pt.X) {
-			if (p->Pt.X < pp->Pt.X) {
-				dups = 0;
-				pp = p;
-			} else {
-				if (p->Next != pp && p->Prev != pp)
-					dups = p;
-			}
-		}
-		p = p->Next;
-	}
-	if (dups) {
-		// there appears to be at least 2 vertices at BottomPt so ...
-		while (dups != p) {
-			if (!FirstIsBottomPt(p, dups))
-				pp = dups;
-			dups = dups->Next;
-			while (dups->Pt != pp->Pt)
-				dups = dups->Next;
-		}
-	}
-	return pp;
-}
-//------------------------------------------------------------------------------
-
-bool Pt2IsBetweenPt1AndPt3(const IntPoint pt1,
-						   const IntPoint pt2, const IntPoint pt3) {
-	if ((pt1 == pt3) || (pt1 == pt2) || (pt3 == pt2))
-		return false;
-	else if (pt1.X != pt3.X)
-		return (pt2.X > pt1.X) == (pt2.X < pt3.X);
-	else
-		return (pt2.Y > pt1.Y) == (pt2.Y < pt3.Y);
-}
-//------------------------------------------------------------------------------
-
-bool HorzSegmentsOverlap(cInt seg1a, cInt seg1b, cInt seg2a, cInt seg2b) {
-	if (seg1a > seg1b)
-		SWAP(seg1a, seg1b);
-	if (seg2a > seg2b)
-		SWAP(seg2a, seg2b);
-	return (seg1a < seg2b) && (seg2a < seg1b);
-}
-
-//------------------------------------------------------------------------------
-// ClipperBase class methods ...
-//------------------------------------------------------------------------------
-
-ClipperBase::ClipperBase() // constructor
-{
-	m_CurrentLM = m_MinimaList.begin(); // begin() == end() here
-	m_UseFullRange = false;
-}
-//------------------------------------------------------------------------------
-
-ClipperBase::~ClipperBase() // destructor
-{
-	Clear();
-}
-//------------------------------------------------------------------------------
-
-void RangeTest(const IntPoint &Pt, bool &useFullRange) {
-	if (useFullRange) {
-		if (Pt.X > hiRange || Pt.Y > hiRange || -Pt.X > hiRange || -Pt.Y > hiRange)
-			error("Coordinate outside allowed range");
-	} else if (Pt.X > loRange || Pt.Y > loRange || -Pt.X > loRange || -Pt.Y > loRange) {
-		useFullRange = true;
-		RangeTest(Pt, useFullRange);
-	}
-}
-//------------------------------------------------------------------------------
-
-TEdge *FindNextLocMin(TEdge *E) {
-	for (;;) {
-		while (E->Bot != E->Prev->Bot || E->Curr == E->Top)
-			E = E->Next;
-		if (!IsHorizontal(*E) && !IsHorizontal(*E->Prev))
-			break;
-		while (IsHorizontal(*E->Prev))
-			E = E->Prev;
-		TEdge *E2 = E;
-		while (IsHorizontal(*E))
-			E = E->Next;
-		if (E->Top.Y == E->Prev->Bot.Y)
-			continue; // ie just an intermediate horz.
-		if (E2->Prev->Bot.X < E->Bot.X)
-			E = E2;
-		break;
-	}
-	return E;
-}
-//------------------------------------------------------------------------------
-
-TEdge *ClipperBase::ProcessBound(TEdge *E, bool NextIsForward) {
-	TEdge *Result = E;
-	TEdge *Horz = 0;
-
-	if (E->OutIdx == Skip) {
-		// if edges still remain in the current bound beyond the skip edge then
-		// create another LocMin and call ProcessBound once more
-		if (NextIsForward) {
-			while (E->Top.Y == E->Next->Bot.Y)
-				E = E->Next;
-			// don't include top horizontals when parsing a bound a second time,
-			// they will be contained in the opposite bound ...
-			while (E != Result && IsHorizontal(*E))
-				E = E->Prev;
-		} else {
-			while (E->Top.Y == E->Prev->Bot.Y)
-				E = E->Prev;
-			while (E != Result && IsHorizontal(*E))
-				E = E->Next;
-		}
-
-		if (E == Result) {
-			if (NextIsForward)
-				Result = E->Next;
-			else
-				Result = E->Prev;
-		} else {
-			// there are more edges in the bound beyond result starting with E
-			if (NextIsForward)
-				E = Result->Next;
-			else
-				E = Result->Prev;
-			MinimaList::value_type locMin;
-			locMin.Y = E->Bot.Y;
-			locMin.LeftBound = 0;
-			locMin.RightBound = E;
-			E->WindDelta = 0;
-			Result = ProcessBound(E, NextIsForward);
-			m_MinimaList.push_back(locMin);
-		}
-		return Result;
-	}
-
-	TEdge *EStart;
-
-	if (IsHorizontal(*E)) {
-		// We need to be careful with open paths because this may not be a
-		// true local minima (ie E may be following a skip edge).
-		// Also, consecutive horz. edges may start heading left before going right.
-		if (NextIsForward)
-			EStart = E->Prev;
-		else
-			EStart = E->Next;
-		if (IsHorizontal(*EStart)) // ie an adjoining horizontal skip edge
-		{
-			if (EStart->Bot.X != E->Bot.X && EStart->Top.X != E->Bot.X)
-				ReverseHorizontal(*E);
-		} else if (EStart->Bot.X != E->Bot.X)
-			ReverseHorizontal(*E);
-	}
-
-	EStart = E;
-	if (NextIsForward) {
-		while (Result->Top.Y == Result->Next->Bot.Y && Result->Next->OutIdx != Skip)
-			Result = Result->Next;
-		if (IsHorizontal(*Result) && Result->Next->OutIdx != Skip) {
-			// nb: at the top of a bound, horizontals are added to the bound
-			// only when the preceding edge attaches to the horizontal's left vertex
-			// unless a Skip edge is encountered when that becomes the top divide
-			Horz = Result;
-			while (IsHorizontal(*Horz->Prev))
-				Horz = Horz->Prev;
-			if (Horz->Prev->Top.X > Result->Next->Top.X)
-				Result = Horz->Prev;
-		}
-		while (E != Result) {
-			E->NextInLML = E->Next;
-			if (IsHorizontal(*E) && E != EStart &&
-				E->Bot.X != E->Prev->Top.X)
-				ReverseHorizontal(*E);
-			E = E->Next;
-		}
-		if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Prev->Top.X)
-			ReverseHorizontal(*E);
-		Result = Result->Next; // move to the edge just beyond current bound
-	} else {
-		while (Result->Top.Y == Result->Prev->Bot.Y && Result->Prev->OutIdx != Skip)
-			Result = Result->Prev;
-		if (IsHorizontal(*Result) && Result->Prev->OutIdx != Skip) {
-			Horz = Result;
-			while (IsHorizontal(*Horz->Next))
-				Horz = Horz->Next;
-			if (Horz->Next->Top.X == Result->Prev->Top.X ||
-				Horz->Next->Top.X > Result->Prev->Top.X)
-				Result = Horz->Next;
-		}
-
-		while (E != Result) {
-			E->NextInLML = E->Prev;
-			if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X)
-				ReverseHorizontal(*E);
-			E = E->Prev;
-		}
-		if (IsHorizontal(*E) && E != EStart && E->Bot.X != E->Next->Top.X)
-			ReverseHorizontal(*E);
-		Result = Result->Prev; // move to the edge just beyond current bound
-	}
-
-	return Result;
-}
-//------------------------------------------------------------------------------
-
-bool ClipperBase::AddPath(const Path &pg, PolyType PolyTyp, bool Closed) {
-#ifdef use_lines
-	if (!Closed && PolyTyp == ptClip)
-		error("AddPath: Open paths must be subject.");
-#else
-	if (!Closed)
-		error("AddPath: Open paths have been disabled.");
-#endif
-
-	int highI = (int)pg.size() - 1;
-	if (Closed)
-		while (highI > 0 && (pg[highI] == pg[0]))
-			--highI;
-	while (highI > 0 && (pg[highI] == pg[highI - 1]))
-		--highI;
-	if ((Closed && highI < 2) || (!Closed && highI < 1))
-		return false;
-
-	// create a new edge array ...
-	TEdge *edges = new TEdge[highI + 1];
-
-	bool IsFlat = true;
-	// 1. Basic (first) edge initialization ...
-	edges[1].Curr = pg[1];
-	RangeTest(pg[0], m_UseFullRange);
-	RangeTest(pg[highI], m_UseFullRange);
-	InitEdge(&edges[0], &edges[1], &edges[highI], pg[0]);
-	InitEdge(&edges[highI], &edges[0], &edges[highI - 1], pg[highI]);
-	for (int i = highI - 1; i >= 1; --i) {
-		RangeTest(pg[i], m_UseFullRange);
-		InitEdge(&edges[i], &edges[i + 1], &edges[i - 1], pg[i]);
-	}
-
-	TEdge *eStart = &edges[0];
-
-	// 2. Remove duplicate vertices, and (when closed) collinear edges ...
-	TEdge *E = eStart, *eLoopStop = eStart;
-	for (;;) {
-		// nb: allows matching start and end points when not Closed ...
-		if (E->Curr == E->Next->Curr && (Closed || E->Next != eStart)) {
-			if (E == E->Next)
-				break;
-			if (E == eStart)
-				eStart = E->Next;
-			E = RemoveEdge(E);
-			eLoopStop = E;
-			continue;
-		}
-		if (E->Prev == E->Next)
-			break; // only two vertices
-		else if (Closed &&
-				 SlopesEqual(E->Prev->Curr, E->Curr, E->Next->Curr, m_UseFullRange) &&
-				 (!m_PreserveCollinear ||
-				  !Pt2IsBetweenPt1AndPt3(E->Prev->Curr, E->Curr, E->Next->Curr))) {
-			// Collinear edges are allowed for open paths but in closed paths
-			// the default is to merge adjacent collinear edges into a single edge.
-			// However, if the PreserveCollinear property is enabled, only overlapping
-			// collinear edges (ie spikes) will be removed from closed paths.
-			if (E == eStart)
-				eStart = E->Next;
-			E = RemoveEdge(E);
-			E = E->Prev;
-			eLoopStop = E;
-			continue;
-		}
-		E = E->Next;
-		if ((E == eLoopStop) || (!Closed && E->Next == eStart))
-			break;
-	}
-
-	if ((!Closed && (E == E->Next)) || (Closed && (E->Prev == E->Next))) {
-		delete[] edges;
-		return false;
-	}
-
-	if (!Closed) {
-		m_HasOpenPaths = true;
-		eStart->Prev->OutIdx = Skip;
-	}
-
-	// 3. Do second stage of edge initialization ...
-	E = eStart;
-	do {
-		InitEdge2(*E, PolyTyp);
-		E = E->Next;
-		if (IsFlat && E->Curr.Y != eStart->Curr.Y)
-			IsFlat = false;
-	} while (E != eStart);
-
-	// 4. Finally, add edge bounds to LocalMinima list ...
-
-	// Totally flat paths must be handled differently when adding them
-	// to LocalMinima list to avoid endless loops etc ...
-	if (IsFlat) {
-		if (Closed) {
-			delete[] edges;
-			return false;
-		}
-		E->Prev->OutIdx = Skip;
-		MinimaList::value_type locMin;
-		locMin.Y = E->Bot.Y;
-		locMin.LeftBound = 0;
-		locMin.RightBound = E;
-		locMin.RightBound->Side = esRight;
-		locMin.RightBound->WindDelta = 0;
-		for (;;) {
-			if (E->Bot.X != E->Prev->Top.X)
-				ReverseHorizontal(*E);
-			if (E->Next->OutIdx == Skip)
-				break;
-			E->NextInLML = E->Next;
-			E = E->Next;
-		}
-		m_MinimaList.push_back(locMin);
-		m_edges.push_back(edges);
-		return true;
-	}
-
-	m_edges.push_back(edges);
-	bool leftBoundIsForward;
-	TEdge *EMin = 0;
-
-	// workaround to avoid an endless loop in the while loop below when
-	// open paths have matching start and end points ...
-	if (E->Prev->Bot == E->Prev->Top)
-		E = E->Next;
-
-	for (;;) {
-		E = FindNextLocMin(E);
-		if (E == EMin)
-			break;
-		else if (!EMin)
-			EMin = E;
-
-		// E and E.Prev now share a local minima (left aligned if horizontal).
-		// Compare their slopes to find which starts which bound ...
-		MinimaList::value_type locMin;
-		locMin.Y = E->Bot.Y;
-		if (E->Dx < E->Prev->Dx) {
-			locMin.LeftBound = E->Prev;
-			locMin.RightBound = E;
-			leftBoundIsForward = false; // Q.nextInLML = Q.prev
-		} else {
-			locMin.LeftBound = E;
-			locMin.RightBound = E->Prev;
-			leftBoundIsForward = true; // Q.nextInLML = Q.next
-		}
-
-		if (!Closed)
-			locMin.LeftBound->WindDelta = 0;
-		else if (locMin.LeftBound->Next == locMin.RightBound)
-			locMin.LeftBound->WindDelta = -1;
-		else
-			locMin.LeftBound->WindDelta = 1;
-		locMin.RightBound->WindDelta = -locMin.LeftBound->WindDelta;
-
-		E = ProcessBound(locMin.LeftBound, leftBoundIsForward);
-		if (E->OutIdx == Skip)
-			E = ProcessBound(E, leftBoundIsForward);
-
-		TEdge *E2 = ProcessBound(locMin.RightBound, !leftBoundIsForward);
-		if (E2->OutIdx == Skip)
-			E2 = ProcessBound(E2, !leftBoundIsForward);
-
-		if (locMin.LeftBound->OutIdx == Skip)
-			locMin.LeftBound = 0;
-		else if (locMin.RightBound->OutIdx == Skip)
-			locMin.RightBound = 0;
-		m_MinimaList.push_back(locMin);
-		if (!leftBoundIsForward)
-			E = E2;
-	}
-	return true;
-}
-//------------------------------------------------------------------------------
-
-bool ClipperBase::AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed) {
-	bool result = false;
-	for (Paths::size_type i = 0; i < ppg.size(); ++i)
-		if (AddPath(ppg[i], PolyTyp, Closed))
-			result = true;
-	return result;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::Clear() {
-	DisposeLocalMinimaList();
-	for (EdgeList::size_type i = 0; i < m_edges.size(); ++i) {
-		TEdge *edges = m_edges[i];
-		delete[] edges;
-	}
-	m_edges.clear();
-	m_UseFullRange = false;
-	m_HasOpenPaths = false;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::Reset() {
-	m_CurrentLM = m_MinimaList.begin();
-	if (m_CurrentLM == m_MinimaList.end())
-		return; // ie nothing to process
-	Common::sort(m_MinimaList.begin(), m_MinimaList.end(), LocMinSorter());
-
-	m_Scanbeam = ScanbeamList(); // clears/resets priority_queue
-	// reset all edges ...
-	for (MinimaList::iterator lm = m_MinimaList.begin(); lm != m_MinimaList.end(); ++lm) {
-		InsertScanbeam(lm->Y);
-		TEdge *e = lm->LeftBound;
-		if (e) {
-			e->Curr = e->Bot;
-			e->Side = esLeft;
-			e->OutIdx = Unassigned;
-		}
-
-		e = lm->RightBound;
-		if (e) {
-			e->Curr = e->Bot;
-			e->Side = esRight;
-			e->OutIdx = Unassigned;
-		}
-	}
-	m_ActiveEdges = 0;
-	m_CurrentLM = m_MinimaList.begin();
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::DisposeLocalMinimaList() {
-	m_MinimaList.clear();
-	m_CurrentLM = m_MinimaList.begin();
-}
-//------------------------------------------------------------------------------
-
-bool ClipperBase::PopLocalMinima(cInt Y, const LocalMinimum *&locMin) {
-	if (m_CurrentLM == m_MinimaList.end() || (*m_CurrentLM).Y != Y)
-		return false;
-	locMin = &(*m_CurrentLM);
-	++m_CurrentLM;
-	return true;
-}
-//------------------------------------------------------------------------------
-
-IntRect ClipperBase::GetBounds() {
-	IntRect result;
-	MinimaList::iterator lm = m_MinimaList.begin();
-	if (lm == m_MinimaList.end()) {
-		result.left = result.top = result.right = result.bottom = 0;
-		return result;
-	}
-	result.left = lm->LeftBound->Bot.X;
-	result.top = lm->LeftBound->Bot.Y;
-	result.right = lm->LeftBound->Bot.X;
-	result.bottom = lm->LeftBound->Bot.Y;
-	while (lm != m_MinimaList.end()) {
-		// todo - needs fixing for open paths
-		result.bottom = MAX(result.bottom, lm->LeftBound->Bot.Y);
-		TEdge *e = lm->LeftBound;
-		for (;;) {
-			TEdge *bottomE = e;
-			while (e->NextInLML) {
-				if (e->Bot.X < result.left)
-					result.left = e->Bot.X;
-				if (e->Bot.X > result.right)
-					result.right = e->Bot.X;
-				e = e->NextInLML;
-			}
-			result.left = MIN(result.left, e->Bot.X);
-			result.right = MAX(result.right, e->Bot.X);
-			result.left = MIN(result.left, e->Top.X);
-			result.right = MAX(result.right, e->Top.X);
-			result.top = MIN(result.top, e->Top.Y);
-			if (bottomE == lm->LeftBound)
-				e = lm->RightBound;
-			else
-				break;
-		}
-		++lm;
-	}
-	return result;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::InsertScanbeam(const cInt Y) {
-	m_Scanbeam.push(Y);
-}
-//------------------------------------------------------------------------------
-
-bool ClipperBase::PopScanbeam(cInt &Y) {
-	if (m_Scanbeam.empty())
-		return false;
-	Y = m_Scanbeam.top();
-	m_Scanbeam.pop();
-	while (!m_Scanbeam.empty() && Y == m_Scanbeam.top()) {
-		m_Scanbeam.pop();
-	} // Pop duplicates.
-	return true;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::DisposeAllOutRecs() {
-	for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i)
-		DisposeOutRec(i);
-	m_PolyOuts.clear();
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::DisposeOutRec(PolyOutList::size_type index) {
-	OutRec *outRec = m_PolyOuts[index];
-	if (outRec->Pts)
-		DisposeOutPts(outRec->Pts);
-	delete outRec;
-	m_PolyOuts[index] = 0;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::DeleteFromAEL(TEdge *e) {
-	TEdge *AelPrev = e->PrevInAEL;
-	TEdge *AelNext = e->NextInAEL;
-	if (!AelPrev && !AelNext && (e != m_ActiveEdges))
-		return; // already deleted
-	if (AelPrev)
-		AelPrev->NextInAEL = AelNext;
-	else
-		m_ActiveEdges = AelNext;
-	if (AelNext)
-		AelNext->PrevInAEL = AelPrev;
-	e->NextInAEL = 0;
-	e->PrevInAEL = 0;
-}
-//------------------------------------------------------------------------------
-
-OutRec *ClipperBase::CreateOutRec() {
-	OutRec *result = new OutRec;
-	result->IsHole = false;
-	result->IsOpen = false;
-	result->FirstLeft = 0;
-	result->Pts = 0;
-	result->BottomPt = 0;
-	result->PolyNd = 0;
-	m_PolyOuts.push_back(result);
-	result->Idx = (int)m_PolyOuts.size() - 1;
-	return result;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::SwapPositionsInAEL(TEdge *Edge1, TEdge *Edge2) {
-	// check that one or other edge hasn't already been removed from AEL ...
-	if (Edge1->NextInAEL == Edge1->PrevInAEL ||
-		Edge2->NextInAEL == Edge2->PrevInAEL)
-		return;
-
-	if (Edge1->NextInAEL == Edge2) {
-		TEdge *Next = Edge2->NextInAEL;
-		if (Next)
-			Next->PrevInAEL = Edge1;
-		TEdge *Prev = Edge1->PrevInAEL;
-		if (Prev)
-			Prev->NextInAEL = Edge2;
-		Edge2->PrevInAEL = Prev;
-		Edge2->NextInAEL = Edge1;
-		Edge1->PrevInAEL = Edge2;
-		Edge1->NextInAEL = Next;
-	} else if (Edge2->NextInAEL == Edge1) {
-		TEdge *Next = Edge1->NextInAEL;
-		if (Next)
-			Next->PrevInAEL = Edge2;
-		TEdge *Prev = Edge2->PrevInAEL;
-		if (Prev)
-			Prev->NextInAEL = Edge1;
-		Edge1->PrevInAEL = Prev;
-		Edge1->NextInAEL = Edge2;
-		Edge2->PrevInAEL = Edge1;
-		Edge2->NextInAEL = Next;
-	} else {
-		TEdge *Next = Edge1->NextInAEL;
-		TEdge *Prev = Edge1->PrevInAEL;
-		Edge1->NextInAEL = Edge2->NextInAEL;
-		if (Edge1->NextInAEL)
-			Edge1->NextInAEL->PrevInAEL = Edge1;
-		Edge1->PrevInAEL = Edge2->PrevInAEL;
-		if (Edge1->PrevInAEL)
-			Edge1->PrevInAEL->NextInAEL = Edge1;
-		Edge2->NextInAEL = Next;
-		if (Edge2->NextInAEL)
-			Edge2->NextInAEL->PrevInAEL = Edge2;
-		Edge2->PrevInAEL = Prev;
-		if (Edge2->PrevInAEL)
-			Edge2->PrevInAEL->NextInAEL = Edge2;
-	}
-
-	if (!Edge1->PrevInAEL)
-		m_ActiveEdges = Edge1;
-	else if (!Edge2->PrevInAEL)
-		m_ActiveEdges = Edge2;
-}
-//------------------------------------------------------------------------------
-
-void ClipperBase::UpdateEdgeIntoAEL(TEdge *&e) {
-	if (!e->NextInLML)
-		error("UpdateEdgeIntoAEL: invalid call");
-
-	e->NextInLML->OutIdx = e->OutIdx;
-	TEdge *AelPrev = e->PrevInAEL;
-	TEdge *AelNext = e->NextInAEL;
-	if (AelPrev)
-		AelPrev->NextInAEL = e->NextInLML;
-	else
-		m_ActiveEdges = e->NextInLML;
-	if (AelNext)
-		AelNext->PrevInAEL = e->NextInLML;
-	e->NextInLML->Side = e->Side;
-	e->NextInLML->WindDelta = e->WindDelta;
-	e->NextInLML->WindCnt = e->WindCnt;
-	e->NextInLML->WindCnt2 = e->WindCnt2;
-	e = e->NextInLML;
-	e->Curr = e->Bot;
-	e->PrevInAEL = AelPrev;
-	e->NextInAEL = AelNext;
-	if (!IsHorizontal(*e))
-		InsertScanbeam(e->Top.Y);
-}
-//------------------------------------------------------------------------------
-
-bool ClipperBase::LocalMinimaPending() {
-	return (m_CurrentLM != m_MinimaList.end());
-}
-
-//------------------------------------------------------------------------------
-// TClipper methods ...
-//------------------------------------------------------------------------------
-
-Clipper::Clipper(int initOptions) : ClipperBase() // constructor
-{
-	m_ExecuteLocked = false;
-	m_UseFullRange = false;
-	m_ReverseOutput = ((initOptions & ioReverseSolution) != 0);
-	m_StrictSimple = ((initOptions & ioStrictlySimple) != 0);
-	m_PreserveCollinear = ((initOptions & ioPreserveCollinear) != 0);
-	m_HasOpenPaths = false;
-#ifdef use_xyz
-	m_ZFill = 0;
-#endif
-}
-//------------------------------------------------------------------------------
-
-#ifdef use_xyz
-void Clipper::ZFillFunction(ZFillCallback zFillFunc) {
-	m_ZFill = zFillFunc;
-}
-//------------------------------------------------------------------------------
-#endif
-
-bool Clipper::Execute(ClipType clipType, Paths &solution, PolyFillType fillType) {
-	return Execute(clipType, solution, fillType, fillType);
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::Execute(ClipType clipType, PolyTree &polytree, PolyFillType fillType) {
-	return Execute(clipType, polytree, fillType, fillType);
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::Execute(ClipType clipType, Paths &solution,
-					  PolyFillType subjFillType, PolyFillType clipFillType) {
-	if (m_ExecuteLocked)
-		return false;
-	if (m_HasOpenPaths)
-		error("Error: PolyTree struct is needed for open path clipping.");
-	m_ExecuteLocked = true;
-	solution.resize(0);
-	m_SubjFillType = subjFillType;
-	m_ClipFillType = clipFillType;
-	m_ClipType = clipType;
-	m_UsingPolyTree = false;
-	bool succeeded = ExecuteInternal();
-	if (succeeded)
-		BuildResult(solution);
-	DisposeAllOutRecs();
-	m_ExecuteLocked = false;
-	return succeeded;
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::Execute(ClipType clipType, PolyTree &polytree,
-					  PolyFillType subjFillType, PolyFillType clipFillType) {
-	if (m_ExecuteLocked)
-		return false;
-	m_ExecuteLocked = true;
-	m_SubjFillType = subjFillType;
-	m_ClipFillType = clipFillType;
-	m_ClipType = clipType;
-	m_UsingPolyTree = true;
-	bool succeeded = ExecuteInternal();
-	if (succeeded)
-		BuildResult2(polytree);
-	DisposeAllOutRecs();
-	m_ExecuteLocked = false;
-	return succeeded;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::FixHoleLinkage(OutRec &outrec) {
-	// skip OutRecs that (a) contain outermost polygons or
-	//(b) already have the correct owner/child linkage ...
-	if (!outrec.FirstLeft ||
-		(outrec.IsHole != outrec.FirstLeft->IsHole &&
-		 outrec.FirstLeft->Pts))
-		return;
-
-	OutRec *orfl = outrec.FirstLeft;
-	while (orfl && ((orfl->IsHole == outrec.IsHole) || !orfl->Pts))
-		orfl = orfl->FirstLeft;
-	outrec.FirstLeft = orfl;
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::ExecuteInternal() {
-	bool succeeded = true;
-	{
-		Reset();
-		m_Maxima = MaximaList();
-		m_SortedEdges = 0;
-
-		succeeded = true;
-		cInt botY, topY;
-		if (!PopScanbeam(botY))
-			return false;
-		InsertLocalMinimaIntoAEL(botY);
-		while (PopScanbeam(topY) || LocalMinimaPending()) {
-			ProcessHorizontals();
-			ClearGhostJoins();
-			if (!ProcessIntersections(topY)) {
-				succeeded = false;
-				break;
-			}
-			ProcessEdgesAtTopOfScanbeam(topY);
-			botY = topY;
-			InsertLocalMinimaIntoAEL(botY);
-		}
-	}
-
-	if (succeeded) {
-		// fix orientations ...
-		for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i) {
-			OutRec *outRec = m_PolyOuts[i];
-			if (!outRec->Pts || outRec->IsOpen)
-				continue;
-			if ((outRec->IsHole ^ m_ReverseOutput) == (Area(*outRec) > 0))
-				ReversePolyPtLinks(outRec->Pts);
-		}
-
-		if (!m_Joins.empty())
-			JoinCommonEdges();
-
-		// unfortunately FixupOutPolygon() must be done after JoinCommonEdges()
-		for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i) {
-			OutRec *outRec = m_PolyOuts[i];
-			if (!outRec->Pts)
-				continue;
-			if (outRec->IsOpen)
-				FixupOutPolyline(*outRec);
-			else
-				FixupOutPolygon(*outRec);
-		}
-
-		if (m_StrictSimple)
-			DoSimplePolygons();
-	}
-
-	ClearJoins();
-	ClearGhostJoins();
-	return succeeded;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::SetWindingCount(TEdge &edge) {
-	TEdge *e = edge.PrevInAEL;
-	// find the edge of the same polytype that immediately preceeds 'edge' in AEL
-	while (e && ((e->PolyTyp != edge.PolyTyp) || (e->WindDelta == 0)))
-		e = e->PrevInAEL;
-	if (!e) {
-		if (edge.WindDelta == 0) {
-			PolyFillType pft = (edge.PolyTyp == ptSubject ? m_SubjFillType : m_ClipFillType);
-			edge.WindCnt = (pft == pftNegative ? -1 : 1);
-		} else
-			edge.WindCnt = edge.WindDelta;
-		edge.WindCnt2 = 0;
-		e = m_ActiveEdges; // ie get ready to calc WindCnt2
-	} else if (edge.WindDelta == 0 && m_ClipType != ctUnion) {
-		edge.WindCnt = 1;
-		edge.WindCnt2 = e->WindCnt2;
-		e = e->NextInAEL; // ie get ready to calc WindCnt2
-	} else if (IsEvenOddFillType(edge)) {
-		// EvenOdd filling ...
-		if (edge.WindDelta == 0) {
-			// are we inside a subj polygon ...
-			bool Inside = true;
-			TEdge *e2 = e->PrevInAEL;
-			while (e2) {
-				if (e2->PolyTyp == e->PolyTyp && e2->WindDelta != 0)
-					Inside = !Inside;
-				e2 = e2->PrevInAEL;
-			}
-			edge.WindCnt = (Inside ? 0 : 1);
-		} else {
-			edge.WindCnt = edge.WindDelta;
-		}
-		edge.WindCnt2 = e->WindCnt2;
-		e = e->NextInAEL; // ie get ready to calc WindCnt2
-	} else {
-		// nonZero, Positive or Negative filling ...
-		if (e->WindCnt * e->WindDelta < 0) {
-			// prev edge is 'decreasing' WindCount (WC) toward zero
-			// so we're outside the previous polygon ...
-			if (Abs(e->WindCnt) > 1) {
-				// outside prev poly but still inside another.
-				// when reversing direction of prev poly use the same WC
-				if (e->WindDelta * edge.WindDelta < 0)
-					edge.WindCnt = e->WindCnt;
-				// otherwise continue to 'decrease' WC ...
-				else
-					edge.WindCnt = e->WindCnt + edge.WindDelta;
-			} else
-				// now outside all polys of same polytype so set own WC ...
-				edge.WindCnt = (edge.WindDelta == 0 ? 1 : edge.WindDelta);
-		} else {
-			// prev edge is 'increasing' WindCount (WC) away from zero
-			// so we're inside the previous polygon ...
-			if (edge.WindDelta == 0)
-				edge.WindCnt = (e->WindCnt < 0 ? e->WindCnt - 1 : e->WindCnt + 1);
-			// if wind direction is reversing prev then use same WC
-			else if (e->WindDelta * edge.WindDelta < 0)
-				edge.WindCnt = e->WindCnt;
-			// otherwise add to WC ...
-			else
-				edge.WindCnt = e->WindCnt + edge.WindDelta;
-		}
-		edge.WindCnt2 = e->WindCnt2;
-		e = e->NextInAEL; // ie get ready to calc WindCnt2
-	}
-
-	// update WindCnt2 ...
-	if (IsEvenOddAltFillType(edge)) {
-		// EvenOdd filling ...
-		while (e != &edge) {
-			if (e->WindDelta != 0)
-				edge.WindCnt2 = (edge.WindCnt2 == 0 ? 1 : 0);
-			e = e->NextInAEL;
-		}
-	} else {
-		// nonZero, Positive or Negative filling ...
-		while (e != &edge) {
-			edge.WindCnt2 += e->WindDelta;
-			e = e->NextInAEL;
-		}
-	}
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::IsEvenOddFillType(const TEdge &edge) const {
-	if (edge.PolyTyp == ptSubject)
-		return m_SubjFillType == pftEvenOdd;
-	else
-		return m_ClipFillType == pftEvenOdd;
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::IsEvenOddAltFillType(const TEdge &edge) const {
-	if (edge.PolyTyp == ptSubject)
-		return m_ClipFillType == pftEvenOdd;
-	else
-		return m_SubjFillType == pftEvenOdd;
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::IsContributing(const TEdge &edge) const {
-	PolyFillType pft, pft2;
-	if (edge.PolyTyp == ptSubject) {
-		pft = m_SubjFillType;
-		pft2 = m_ClipFillType;
-	} else {
-		pft = m_ClipFillType;
-		pft2 = m_SubjFillType;
-	}
-
-	switch (pft) {
-	case pftEvenOdd:
-		// return false if a subj line has been flagged as inside a subj polygon
-		if (edge.WindDelta == 0 && edge.WindCnt != 1)
-			return false;
-		break;
-	case pftNonZero:
-		if (Abs(edge.WindCnt) != 1)
-			return false;
-		break;
-	case pftPositive:
-		if (edge.WindCnt != 1)
-			return false;
-		break;
-	default: // pftNegative
-		if (edge.WindCnt != -1)
-			return false;
-	}
-
-	switch (m_ClipType) {
-	case ctIntersection:
-		switch (pft2) {
-		case pftEvenOdd:
-		case pftNonZero:
-			return (edge.WindCnt2 != 0);
-		case pftPositive:
-			return (edge.WindCnt2 > 0);
-		default:
-			return (edge.WindCnt2 < 0);
-		}
-		break;
-	case ctUnion:
-		switch (pft2) {
-		case pftEvenOdd:
-		case pftNonZero:
-			return (edge.WindCnt2 == 0);
-		case pftPositive:
-			return (edge.WindCnt2 <= 0);
-		default:
-			return (edge.WindCnt2 >= 0);
-		}
-		break;
-	case ctDifference:
-		if (edge.PolyTyp == ptSubject)
-			switch (pft2) {
-			case pftEvenOdd:
-			case pftNonZero:
-				return (edge.WindCnt2 == 0);
-			case pftPositive:
-				return (edge.WindCnt2 <= 0);
-			default:
-				return (edge.WindCnt2 >= 0);
-			}
-		else
-			switch (pft2) {
-			case pftEvenOdd:
-			case pftNonZero:
-				return (edge.WindCnt2 != 0);
-			case pftPositive:
-				return (edge.WindCnt2 > 0);
-			default:
-				return (edge.WindCnt2 < 0);
-			}
-		break;
-	case ctXor:
-		if (edge.WindDelta == 0) // XOr always contributing unless open
-			switch (pft2) {
-			case pftEvenOdd:
-			case pftNonZero:
-				return (edge.WindCnt2 == 0);
-			case pftPositive:
-				return (edge.WindCnt2 <= 0);
-			default:
-				return (edge.WindCnt2 >= 0);
-			}
-		else
-			return true;
-		break;
-	default:
-		return true;
-	}
-}
-//------------------------------------------------------------------------------
-
-OutPt *Clipper::AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt) {
-	OutPt *result;
-	TEdge *e, *prevE;
-	if (IsHorizontal(*e2) || (e1->Dx > e2->Dx)) {
-		result = AddOutPt(e1, Pt);
-		e2->OutIdx = e1->OutIdx;
-		e1->Side = esLeft;
-		e2->Side = esRight;
-		e = e1;
-		if (e->PrevInAEL == e2)
-			prevE = e2->PrevInAEL;
-		else
-			prevE = e->PrevInAEL;
-	} else {
-		result = AddOutPt(e2, Pt);
-		e1->OutIdx = e2->OutIdx;
-		e1->Side = esRight;
-		e2->Side = esLeft;
-		e = e2;
-		if (e->PrevInAEL == e1)
-			prevE = e1->PrevInAEL;
-		else
-			prevE = e->PrevInAEL;
-	}
-
-	if (prevE && prevE->OutIdx >= 0 && prevE->Top.Y < Pt.Y && e->Top.Y < Pt.Y) {
-		cInt xPrev = TopX(*prevE, Pt.Y);
-		cInt xE = TopX(*e, Pt.Y);
-		if (xPrev == xE && (e->WindDelta != 0) && (prevE->WindDelta != 0) &&
-			SlopesEqual(IntPoint(xPrev, Pt.Y), prevE->Top, IntPoint(xE, Pt.Y), e->Top, m_UseFullRange)) {
-			OutPt *outPt = AddOutPt(prevE, Pt);
-			AddJoin(result, outPt, e->Top);
-		}
-	}
-	return result;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &Pt) {
-	AddOutPt(e1, Pt);
-	if (e2->WindDelta == 0)
-		AddOutPt(e2, Pt);
-	if (e1->OutIdx == e2->OutIdx) {
-		e1->OutIdx = Unassigned;
-		e2->OutIdx = Unassigned;
-	} else if (e1->OutIdx < e2->OutIdx)
-		AppendPolygon(e1, e2);
-	else
-		AppendPolygon(e2, e1);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::AddEdgeToSEL(TEdge *edge) {
-	// SEL pointers in PEdge are reused to build a list of horizontal edges.
-	// However, we don't need to worry about order with horizontal edge processing.
-	if (!m_SortedEdges) {
-		m_SortedEdges = edge;
-		edge->PrevInSEL = 0;
-		edge->NextInSEL = 0;
-	} else {
-		edge->NextInSEL = m_SortedEdges;
-		edge->PrevInSEL = 0;
-		m_SortedEdges->PrevInSEL = edge;
-		m_SortedEdges = edge;
-	}
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::PopEdgeFromSEL(TEdge *&edge) {
-	if (!m_SortedEdges)
-		return false;
-	edge = m_SortedEdges;
-	DeleteFromSEL(m_SortedEdges);
-	return true;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::CopyAELToSEL() {
-	TEdge *e = m_ActiveEdges;
-	m_SortedEdges = e;
-	while (e) {
-		e->PrevInSEL = e->PrevInAEL;
-		e->NextInSEL = e->NextInAEL;
-		e = e->NextInAEL;
-	}
-}
-//------------------------------------------------------------------------------
-
-void Clipper::AddJoin(OutPt *op1, OutPt *op2, const IntPoint OffPt) {
-	Join *j = new Join;
-	j->OutPt1 = op1;
-	j->OutPt2 = op2;
-	j->OffPt = OffPt;
-	m_Joins.push_back(j);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::ClearJoins() {
-	for (JoinList::size_type i = 0; i < m_Joins.size(); i++)
-		delete m_Joins[i];
-	m_Joins.resize(0);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::ClearGhostJoins() {
-	for (JoinList::size_type i = 0; i < m_GhostJoins.size(); i++)
-		delete m_GhostJoins[i];
-	m_GhostJoins.resize(0);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::AddGhostJoin(OutPt *op, const IntPoint OffPt) {
-	Join *j = new Join;
-	j->OutPt1 = op;
-	j->OutPt2 = 0;
-	j->OffPt = OffPt;
-	m_GhostJoins.push_back(j);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::InsertLocalMinimaIntoAEL(const cInt botY) {
-	const LocalMinimum *lm;
-	while (PopLocalMinima(botY, lm)) {
-		TEdge *lb = lm->LeftBound;
-		TEdge *rb = lm->RightBound;
-
-		OutPt *Op1 = 0;
-		if (!lb) {
-			// nb: don't insert LB into either AEL or SEL
-			InsertEdgeIntoAEL(rb, 0);
-			SetWindingCount(*rb);
-			if (IsContributing(*rb))
-				Op1 = AddOutPt(rb, rb->Bot);
-		} else if (!rb) {
-			InsertEdgeIntoAEL(lb, 0);
-			SetWindingCount(*lb);
-			if (IsContributing(*lb))
-				Op1 = AddOutPt(lb, lb->Bot);
-			InsertScanbeam(lb->Top.Y);
-		} else {
-			InsertEdgeIntoAEL(lb, 0);
-			InsertEdgeIntoAEL(rb, lb);
-			SetWindingCount(*lb);
-			rb->WindCnt = lb->WindCnt;
-			rb->WindCnt2 = lb->WindCnt2;
-			if (IsContributing(*lb))
-				Op1 = AddLocalMinPoly(lb, rb, lb->Bot);
-			InsertScanbeam(lb->Top.Y);
-		}
-
-		if (rb) {
-			if (IsHorizontal(*rb)) {
-				AddEdgeToSEL(rb);
-				if (rb->NextInLML)
-					InsertScanbeam(rb->NextInLML->Top.Y);
-			} else
-				InsertScanbeam(rb->Top.Y);
-		}
-
-		if (!lb || !rb)
-			continue;
-
-		// if any output polygons share an edge, they'll need joining later ...
-		if (Op1 && IsHorizontal(*rb) &&
-			m_GhostJoins.size() > 0 && (rb->WindDelta != 0)) {
-			for (JoinList::size_type i = 0; i < m_GhostJoins.size(); ++i) {
-				Join *jr = m_GhostJoins[i];
-				// if the horizontal Rb and a 'ghost' horizontal overlap, then convert
-				// the 'ghost' join to a real join ready for later ...
-				if (HorzSegmentsOverlap(jr->OutPt1->Pt.X, jr->OffPt.X, rb->Bot.X, rb->Top.X))
-					AddJoin(jr->OutPt1, Op1, jr->OffPt);
-			}
-		}
-
-		if (lb->OutIdx >= 0 && lb->PrevInAEL &&
-			lb->PrevInAEL->Curr.X == lb->Bot.X &&
-			lb->PrevInAEL->OutIdx >= 0 &&
-			SlopesEqual(lb->PrevInAEL->Bot, lb->PrevInAEL->Top, lb->Curr, lb->Top, m_UseFullRange) &&
-			(lb->WindDelta != 0) && (lb->PrevInAEL->WindDelta != 0)) {
-			OutPt *Op2 = AddOutPt(lb->PrevInAEL, lb->Bot);
-			AddJoin(Op1, Op2, lb->Top);
-		}
-
-		if (lb->NextInAEL != rb) {
-
-			if (rb->OutIdx >= 0 && rb->PrevInAEL->OutIdx >= 0 &&
-				SlopesEqual(rb->PrevInAEL->Curr, rb->PrevInAEL->Top, rb->Curr, rb->Top, m_UseFullRange) &&
-				(rb->WindDelta != 0) && (rb->PrevInAEL->WindDelta != 0)) {
-				OutPt *Op2 = AddOutPt(rb->PrevInAEL, rb->Bot);
-				AddJoin(Op1, Op2, rb->Top);
-			}
-
-			TEdge *e = lb->NextInAEL;
-			if (e) {
-				while (e != rb) {
-					// nb: For calculating winding counts etc, IntersectEdges() assumes
-					// that param1 will be to the Right of param2 ABOVE the intersection ...
-					IntersectEdges(rb, e, lb->Curr); // order important here
-					e = e->NextInAEL;
-				}
-			}
-		}
-	}
-}
-//------------------------------------------------------------------------------
-
-void Clipper::DeleteFromSEL(TEdge *e) {
-	TEdge *SelPrev = e->PrevInSEL;
-	TEdge *SelNext = e->NextInSEL;
-	if (!SelPrev && !SelNext && (e != m_SortedEdges))
-		return; // already deleted
-	if (SelPrev)
-		SelPrev->NextInSEL = SelNext;
-	else
-		m_SortedEdges = SelNext;
-	if (SelNext)
-		SelNext->PrevInSEL = SelPrev;
-	e->NextInSEL = 0;
-	e->PrevInSEL = 0;
-}
-//------------------------------------------------------------------------------
-
-#ifdef use_xyz
-void Clipper::SetZ(IntPoint &pt, TEdge &e1, TEdge &e2) {
-	if (pt.Z != 0 || !m_ZFill)
-		return;
-	else if (pt == e1.Bot)
-		pt.Z = e1.Bot.Z;
-	else if (pt == e1.Top)
-		pt.Z = e1.Top.Z;
-	else if (pt == e2.Bot)
-		pt.Z = e2.Bot.Z;
-	else if (pt == e2.Top)
-		pt.Z = e2.Top.Z;
-	else
-		(*m_ZFill)(e1.Bot, e1.Top, e2.Bot, e2.Top, pt);
-}
-//------------------------------------------------------------------------------
-#endif
-
-void Clipper::IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &Pt) {
-	bool e1Contributing = (e1->OutIdx >= 0);
-	bool e2Contributing = (e2->OutIdx >= 0);
-
-#ifdef use_xyz
-	SetZ(Pt, *e1, *e2);
-#endif
-
-#ifdef use_lines
-	// if either edge is on an OPEN path ...
-	if (e1->WindDelta == 0 || e2->WindDelta == 0) {
-		// ignore subject-subject open path intersections UNLESS they
-		// are both open paths, AND they are both 'contributing maximas' ...
-		if (e1->WindDelta == 0 && e2->WindDelta == 0)
-			return;
-
-		// if intersecting a subj line with a subj poly ...
-		else if (e1->PolyTyp == e2->PolyTyp &&
-				 e1->WindDelta != e2->WindDelta && m_ClipType == ctUnion) {
-			if (e1->WindDelta == 0) {
-				if (e2Contributing) {
-					AddOutPt(e1, Pt);
-					if (e1Contributing)
-						e1->OutIdx = Unassigned;
-				}
-			} else {
-				if (e1Contributing) {
-					AddOutPt(e2, Pt);
-					if (e2Contributing)
-						e2->OutIdx = Unassigned;
-				}
-			}
-		} else if (e1->PolyTyp != e2->PolyTyp) {
-			// toggle subj open path OutIdx on/off when Abs(clip.WndCnt) == 1 ...
-			if ((e1->WindDelta == 0) && abs(e2->WindCnt) == 1 &&
-				(m_ClipType != ctUnion || e2->WindCnt2 == 0)) {
-				AddOutPt(e1, Pt);
-				if (e1Contributing)
-					e1->OutIdx = Unassigned;
-			} else if ((e2->WindDelta == 0) && (abs(e1->WindCnt) == 1) &&
-					   (m_ClipType != ctUnion || e1->WindCnt2 == 0)) {
-				AddOutPt(e2, Pt);
-				if (e2Contributing)
-					e2->OutIdx = Unassigned;
-			}
-		}
-		return;
-	}
-#endif
-
-	// update winding counts...
-	// assumes that e1 will be to the Right of e2 ABOVE the intersection
-	if (e1->PolyTyp == e2->PolyTyp) {
-		if (IsEvenOddFillType(*e1)) {
-			int oldE1WindCnt = e1->WindCnt;
-			e1->WindCnt = e2->WindCnt;
-			e2->WindCnt = oldE1WindCnt;
-		} else {
-			if (e1->WindCnt + e2->WindDelta == 0)
-				e1->WindCnt = -e1->WindCnt;
-			else
-				e1->WindCnt += e2->WindDelta;
-			if (e2->WindCnt - e1->WindDelta == 0)
-				e2->WindCnt = -e2->WindCnt;
-			else
-				e2->WindCnt -= e1->WindDelta;
-		}
-	} else {
-		if (!IsEvenOddFillType(*e2))
-			e1->WindCnt2 += e2->WindDelta;
-		else
-			e1->WindCnt2 = (e1->WindCnt2 == 0) ? 1 : 0;
-		if (!IsEvenOddFillType(*e1))
-			e2->WindCnt2 -= e1->WindDelta;
-		else
-			e2->WindCnt2 = (e2->WindCnt2 == 0) ? 1 : 0;
-	}
-
-	PolyFillType e1FillType, e2FillType, e1FillType2, e2FillType2;
-	if (e1->PolyTyp == ptSubject) {
-		e1FillType = m_SubjFillType;
-		e1FillType2 = m_ClipFillType;
-	} else {
-		e1FillType = m_ClipFillType;
-		e1FillType2 = m_SubjFillType;
-	}
-	if (e2->PolyTyp == ptSubject) {
-		e2FillType = m_SubjFillType;
-		e2FillType2 = m_ClipFillType;
-	} else {
-		e2FillType = m_ClipFillType;
-		e2FillType2 = m_SubjFillType;
-	}
-
-	cInt e1Wc, e2Wc;
-	switch (e1FillType) {
-	case pftPositive:
-		e1Wc = e1->WindCnt;
-		break;
-	case pftNegative:
-		e1Wc = -e1->WindCnt;
-		break;
-	default:
-		e1Wc = Abs(e1->WindCnt);
-	}
-	switch (e2FillType) {
-	case pftPositive:
-		e2Wc = e2->WindCnt;
-		break;
-	case pftNegative:
-		e2Wc = -e2->WindCnt;
-		break;
-	default:
-		e2Wc = Abs(e2->WindCnt);
-	}
-
-	if (e1Contributing && e2Contributing) {
-		if ((e1Wc != 0 && e1Wc != 1) || (e2Wc != 0 && e2Wc != 1) ||
-			(e1->PolyTyp != e2->PolyTyp && m_ClipType != ctXor)) {
-			AddLocalMaxPoly(e1, e2, Pt);
-		} else {
-			AddOutPt(e1, Pt);
-			AddOutPt(e2, Pt);
-			SwapSides(*e1, *e2);
-			SwapPolyIndexes(*e1, *e2);
-		}
-	} else if (e1Contributing) {
-		if (e2Wc == 0 || e2Wc == 1) {
-			AddOutPt(e1, Pt);
-			SwapSides(*e1, *e2);
-			SwapPolyIndexes(*e1, *e2);
-		}
-	} else if (e2Contributing) {
-		if (e1Wc == 0 || e1Wc == 1) {
-			AddOutPt(e2, Pt);
-			SwapSides(*e1, *e2);
-			SwapPolyIndexes(*e1, *e2);
-		}
-	} else if ((e1Wc == 0 || e1Wc == 1) && (e2Wc == 0 || e2Wc == 1)) {
-		// neither edge is currently contributing ...
-
-		cInt e1Wc2, e2Wc2;
-		switch (e1FillType2) {
-		case pftPositive:
-			e1Wc2 = e1->WindCnt2;
-			break;
-		case pftNegative:
-			e1Wc2 = -e1->WindCnt2;
-			break;
-		default:
-			e1Wc2 = Abs(e1->WindCnt2);
-		}
-		switch (e2FillType2) {
-		case pftPositive:
-			e2Wc2 = e2->WindCnt2;
-			break;
-		case pftNegative:
-			e2Wc2 = -e2->WindCnt2;
-			break;
-		default:
-			e2Wc2 = Abs(e2->WindCnt2);
-		}
-
-		if (e1->PolyTyp != e2->PolyTyp) {
-			AddLocalMinPoly(e1, e2, Pt);
-		} else if (e1Wc == 1 && e2Wc == 1)
-			switch (m_ClipType) {
-			case ctIntersection:
-				if (e1Wc2 > 0 && e2Wc2 > 0)
-					AddLocalMinPoly(e1, e2, Pt);
-				break;
-			case ctUnion:
-				if (e1Wc2 <= 0 && e2Wc2 <= 0)
-					AddLocalMinPoly(e1, e2, Pt);
-				break;
-			case ctDifference:
-				if (((e1->PolyTyp == ptClip) && (e1Wc2 > 0) && (e2Wc2 > 0)) ||
-					((e1->PolyTyp == ptSubject) && (e1Wc2 <= 0) && (e2Wc2 <= 0)))
-					AddLocalMinPoly(e1, e2, Pt);
-				break;
-			case ctXor:
-				AddLocalMinPoly(e1, e2, Pt);
-			}
-		else
-			SwapSides(*e1, *e2);
-	}
-}
-//------------------------------------------------------------------------------
-
-void Clipper::SetHoleState(TEdge *e, OutRec *outrec) {
-	TEdge *e2 = e->PrevInAEL;
-	TEdge *eTmp = 0;
-	while (e2) {
-		if (e2->OutIdx >= 0 && e2->WindDelta != 0) {
-			if (!eTmp)
-				eTmp = e2;
-			else if (eTmp->OutIdx == e2->OutIdx)
-				eTmp = 0;
-		}
-		e2 = e2->PrevInAEL;
-	}
-	if (!eTmp) {
-		outrec->FirstLeft = 0;
-		outrec->IsHole = false;
-	} else {
-		outrec->FirstLeft = m_PolyOuts[eTmp->OutIdx];
-		outrec->IsHole = !outrec->FirstLeft->IsHole;
-	}
-}
-//------------------------------------------------------------------------------
-
-OutRec *GetLowermostRec(OutRec *outRec1, OutRec *outRec2) {
-	// work out which polygon fragment has the correct hole state ...
-	if (!outRec1->BottomPt)
-		outRec1->BottomPt = GetBottomPt(outRec1->Pts);
-	if (!outRec2->BottomPt)
-		outRec2->BottomPt = GetBottomPt(outRec2->Pts);
-	OutPt *OutPt1 = outRec1->BottomPt;
-	OutPt *OutPt2 = outRec2->BottomPt;
-	if (OutPt1->Pt.Y > OutPt2->Pt.Y)
-		return outRec1;
-	else if (OutPt1->Pt.Y < OutPt2->Pt.Y)
-		return outRec2;
-	else if (OutPt1->Pt.X < OutPt2->Pt.X)
-		return outRec1;
-	else if (OutPt1->Pt.X > OutPt2->Pt.X)
-		return outRec2;
-	else if (OutPt1->Next == OutPt1)
-		return outRec2;
-	else if (OutPt2->Next == OutPt2)
-		return outRec1;
-	else if (FirstIsBottomPt(OutPt1, OutPt2))
-		return outRec1;
-	else
-		return outRec2;
-}
-//------------------------------------------------------------------------------
-
-bool OutRec1RightOfOutRec2(OutRec *outRec1, OutRec *outRec2) {
-	do {
-		outRec1 = outRec1->FirstLeft;
-		if (outRec1 == outRec2)
-			return true;
-	} while (outRec1);
-	return false;
-}
-//------------------------------------------------------------------------------
-
-OutRec *Clipper::GetOutRec(int Idx) {
-	OutRec *outrec = m_PolyOuts[Idx];
-	while (outrec != m_PolyOuts[outrec->Idx])
-		outrec = m_PolyOuts[outrec->Idx];
-	return outrec;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::AppendPolygon(TEdge *e1, TEdge *e2) {
-	// get the start and ends of both output polygons ...
-	OutRec *outRec1 = m_PolyOuts[e1->OutIdx];
-	OutRec *outRec2 = m_PolyOuts[e2->OutIdx];
-
-	OutRec *holeStateRec;
-	if (OutRec1RightOfOutRec2(outRec1, outRec2))
-		holeStateRec = outRec2;
-	else if (OutRec1RightOfOutRec2(outRec2, outRec1))
-		holeStateRec = outRec1;
-	else
-		holeStateRec = GetLowermostRec(outRec1, outRec2);
-
-	// get the start and ends of both output polygons and
-	// join e2 poly onto e1 poly and delete pointers to e2 ...
-
-	OutPt *p1_lft = outRec1->Pts;
-	OutPt *p1_rt = p1_lft->Prev;
-	OutPt *p2_lft = outRec2->Pts;
-	OutPt *p2_rt = p2_lft->Prev;
-
-	// join e2 poly onto e1 poly and delete pointers to e2 ...
-	if (e1->Side == esLeft) {
-		if (e2->Side == esLeft) {
-			// z y x a b c
-			ReversePolyPtLinks(p2_lft);
-			p2_lft->Next = p1_lft;
-			p1_lft->Prev = p2_lft;
-			p1_rt->Next = p2_rt;
-			p2_rt->Prev = p1_rt;
-			outRec1->Pts = p2_rt;
-		} else {
-			// x y z a b c
-			p2_rt->Next = p1_lft;
-			p1_lft->Prev = p2_rt;
-			p2_lft->Prev = p1_rt;
-			p1_rt->Next = p2_lft;
-			outRec1->Pts = p2_lft;
-		}
-	} else {
-		if (e2->Side == esRight) {
-			// a b c z y x
-			ReversePolyPtLinks(p2_lft);
-			p1_rt->Next = p2_rt;
-			p2_rt->Prev = p1_rt;
-			p2_lft->Next = p1_lft;
-			p1_lft->Prev = p2_lft;
-		} else {
-			// a b c x y z
-			p1_rt->Next = p2_lft;
-			p2_lft->Prev = p1_rt;
-			p1_lft->Prev = p2_rt;
-			p2_rt->Next = p1_lft;
-		}
-	}
-
-	outRec1->BottomPt = 0;
-	if (holeStateRec == outRec2) {
-		if (outRec2->FirstLeft != outRec1)
-			outRec1->FirstLeft = outRec2->FirstLeft;
-		outRec1->IsHole = outRec2->IsHole;
-	}
-	outRec2->Pts = 0;
-	outRec2->BottomPt = 0;
-	outRec2->FirstLeft = outRec1;
-
-	int OKIdx = e1->OutIdx;
-	int ObsoleteIdx = e2->OutIdx;
-
-	e1->OutIdx = Unassigned; // nb: safe because we only get here via AddLocalMaxPoly
-	e2->OutIdx = Unassigned;
-
-	TEdge *e = m_ActiveEdges;
-	while (e) {
-		if (e->OutIdx == ObsoleteIdx) {
-			e->OutIdx = OKIdx;
-			e->Side = e1->Side;
-			break;
-		}
-		e = e->NextInAEL;
-	}
-
-	outRec2->Idx = outRec1->Idx;
-}
-//------------------------------------------------------------------------------
-
-OutPt *Clipper::AddOutPt(TEdge *e, const IntPoint &pt) {
-	if (e->OutIdx < 0) {
-		OutRec *outRec = CreateOutRec();
-		outRec->IsOpen = (e->WindDelta == 0);
-		OutPt *newOp = new OutPt;
-		outRec->Pts = newOp;
-		newOp->Idx = outRec->Idx;
-		newOp->Pt = pt;
-		newOp->Next = newOp;
-		newOp->Prev = newOp;
-		if (!outRec->IsOpen)
-			SetHoleState(e, outRec);
-		e->OutIdx = outRec->Idx;
-		return newOp;
-	} else {
-		OutRec *outRec = m_PolyOuts[e->OutIdx];
-		// OutRec.Pts is the 'Left-most' point & OutRec.Pts.Prev is the 'Right-most'
-		OutPt *op = outRec->Pts;
-
-		bool ToFront = (e->Side == esLeft);
-		if (ToFront && (pt == op->Pt))
-			return op;
-		else if (!ToFront && (pt == op->Prev->Pt))
-			return op->Prev;
-
-		OutPt *newOp = new OutPt;
-		newOp->Idx = outRec->Idx;
-		newOp->Pt = pt;
-		newOp->Next = op;
-		newOp->Prev = op->Prev;
-		newOp->Prev->Next = newOp;
-		op->Prev = newOp;
-		if (ToFront)
-			outRec->Pts = newOp;
-		return newOp;
-	}
-}
-//------------------------------------------------------------------------------
-
-OutPt *Clipper::GetLastOutPt(TEdge *e) {
-	OutRec *outRec = m_PolyOuts[e->OutIdx];
-	if (e->Side == esLeft)
-		return outRec->Pts;
-	else
-		return outRec->Pts->Prev;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::ProcessHorizontals() {
-	TEdge *horzEdge;
-	while (PopEdgeFromSEL(horzEdge))
-		ProcessHorizontal(horzEdge);
-}
-//------------------------------------------------------------------------------
-
-inline bool IsMinima(TEdge *e) {
-	return e && (e->Prev->NextInLML != e) && (e->Next->NextInLML != e);
-}
-//------------------------------------------------------------------------------
-
-inline bool IsMaxima(TEdge *e, const cInt Y) {
-	return e && e->Top.Y == Y && !e->NextInLML;
-}
-//------------------------------------------------------------------------------
-
-inline bool IsIntermediate(TEdge *e, const cInt Y) {
-	return e->Top.Y == Y && e->NextInLML;
-}
-//------------------------------------------------------------------------------
-
-TEdge *GetMaximaPair(TEdge *e) {
-	if ((e->Next->Top == e->Top) && !e->Next->NextInLML)
-		return e->Next;
-	else if ((e->Prev->Top == e->Top) && !e->Prev->NextInLML)
-		return e->Prev;
-	else
-		return 0;
-}
-//------------------------------------------------------------------------------
-
-TEdge *GetMaximaPairEx(TEdge *e) {
-	// as GetMaximaPair() but returns 0 if MaxPair isn't in AEL (unless it's horizontal)
-	TEdge *result = GetMaximaPair(e);
-	if (result && (result->OutIdx == Skip ||
-				   (result->NextInAEL == result->PrevInAEL && !IsHorizontal(*result))))
-		return 0;
-	return result;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::SwapPositionsInSEL(TEdge *Edge1, TEdge *Edge2) {
-	if (!(Edge1->NextInSEL) && !(Edge1->PrevInSEL))
-		return;
-	if (!(Edge2->NextInSEL) && !(Edge2->PrevInSEL))
-		return;
-
-	if (Edge1->NextInSEL == Edge2) {
-		TEdge *Next = Edge2->NextInSEL;
-		if (Next)
-			Next->PrevInSEL = Edge1;
-		TEdge *Prev = Edge1->PrevInSEL;
-		if (Prev)
-			Prev->NextInSEL = Edge2;
-		Edge2->PrevInSEL = Prev;
-		Edge2->NextInSEL = Edge1;
-		Edge1->PrevInSEL = Edge2;
-		Edge1->NextInSEL = Next;
-	} else if (Edge2->NextInSEL == Edge1) {
-		TEdge *Next = Edge1->NextInSEL;
-		if (Next)
-			Next->PrevInSEL = Edge2;
-		TEdge *Prev = Edge2->PrevInSEL;
-		if (Prev)
-			Prev->NextInSEL = Edge1;
-		Edge1->PrevInSEL = Prev;
-		Edge1->NextInSEL = Edge2;
-		Edge2->PrevInSEL = Edge1;
-		Edge2->NextInSEL = Next;
-	} else {
-		TEdge *Next = Edge1->NextInSEL;
-		TEdge *Prev = Edge1->PrevInSEL;
-		Edge1->NextInSEL = Edge2->NextInSEL;
-		if (Edge1->NextInSEL)
-			Edge1->NextInSEL->PrevInSEL = Edge1;
-		Edge1->PrevInSEL = Edge2->PrevInSEL;
-		if (Edge1->PrevInSEL)
-			Edge1->PrevInSEL->NextInSEL = Edge1;
-		Edge2->NextInSEL = Next;
-		if (Edge2->NextInSEL)
-			Edge2->NextInSEL->PrevInSEL = Edge2;
-		Edge2->PrevInSEL = Prev;
-		if (Edge2->PrevInSEL)
-			Edge2->PrevInSEL->NextInSEL = Edge2;
-	}
-
-	if (!Edge1->PrevInSEL)
-		m_SortedEdges = Edge1;
-	else if (!Edge2->PrevInSEL)
-		m_SortedEdges = Edge2;
-}
-//------------------------------------------------------------------------------
-
-TEdge *GetNextInAEL(TEdge *e, Direction dir) {
-	return dir == dLeftToRight ? e->NextInAEL : e->PrevInAEL;
-}
-//------------------------------------------------------------------------------
-
-void GetHorzDirection(TEdge &HorzEdge, Direction &Dir, cInt &Left, cInt &Right) {
-	if (HorzEdge.Bot.X < HorzEdge.Top.X) {
-		Left = HorzEdge.Bot.X;
-		Right = HorzEdge.Top.X;
-		Dir = dLeftToRight;
-	} else {
-		Left = HorzEdge.Top.X;
-		Right = HorzEdge.Bot.X;
-		Dir = dRightToLeft;
-	}
-}
-//------------------------------------------------------------------------
-
-/*******************************************************************************
- * Notes: Horizontal edges (HEs) at scanline intersections (ie at the Top or    *
- * Bottom of a scanbeam) are processed as if layered. The order in which HEs    *
- * are processed doesn't matter. HEs intersect with other HE Bot.Xs only [#]    *
- * (or they could intersect with Top.Xs only, ie EITHER Bot.Xs OR Top.Xs),      *
- * and with other non-horizontal edges [*]. Once these intersections are        *
- * processed, intermediate HEs then 'promote' the Edge above (NextInLML) into   *
- * the AEL. These 'promoted' edges may in turn intersect [%] with other HEs.    *
- *******************************************************************************/
-
-void Clipper::ProcessHorizontal(TEdge *horzEdge) {
-	Direction dir;
-	cInt horzLeft, horzRight;
-	bool IsOpen = (horzEdge->WindDelta == 0);
-
-	GetHorzDirection(*horzEdge, dir, horzLeft, horzRight);
-
-	TEdge *eLastHorz = horzEdge, *eMaxPair = 0;
-	while (eLastHorz->NextInLML && IsHorizontal(*eLastHorz->NextInLML))
-		eLastHorz = eLastHorz->NextInLML;
-	if (!eLastHorz->NextInLML)
-		eMaxPair = GetMaximaPair(eLastHorz);
-
-	MaximaList::const_iterator maxIt = nullptr;
-	MaximaList::const_iterator maxRit = nullptr;
-	if (m_Maxima.size() > 0) {
-		// get the first maxima in range (X) ...
-		if (dir == dLeftToRight) {
-			maxIt = m_Maxima.begin();
-			while (maxIt != m_Maxima.end() && *maxIt <= horzEdge->Bot.X)
-				maxIt++;
-			if (maxIt != m_Maxima.end() && *maxIt >= eLastHorz->Top.X)
-				maxIt = m_Maxima.end();
-		} else {
-			maxRit = m_Maxima.end();
-			while (maxRit != m_Maxima.begin() && *maxRit > horzEdge->Bot.X)
-				maxRit++;
-			if (maxRit != m_Maxima.begin() && *maxRit <= eLastHorz->Top.X)
-				maxRit = m_Maxima.begin();
-		}
-	}
-
-	OutPt *op1 = 0;
-
-	for (;;) // loop through consec. horizontal edges
-	{
-
-		bool IsLastHorz = (horzEdge == eLastHorz);
-		TEdge *e = GetNextInAEL(horzEdge, dir);
-		while (e) {
-
-			// this code block inserts extra coords into horizontal edges (in output
-			// polygons) whereever maxima touch these horizontal edges. This helps
-			//'simplifying' polygons (ie if the Simplify property is set).
-			if (m_Maxima.size() > 0) {
-				if (dir == dLeftToRight) {
-					while (maxIt != m_Maxima.end() && *maxIt < e->Curr.X) {
-						if (horzEdge->OutIdx >= 0 && !IsOpen)
-							AddOutPt(horzEdge, IntPoint(*maxIt, horzEdge->Bot.Y));
-						maxIt++;
-					}
-				} else {
-					while (maxRit != m_Maxima.begin() && *maxRit > e->Curr.X) {
-						if (horzEdge->OutIdx >= 0 && !IsOpen)
-							AddOutPt(horzEdge, IntPoint(*maxRit, horzEdge->Bot.Y));
-						maxRit++;
-					}
-				}
-			}
-
-			if ((dir == dLeftToRight && e->Curr.X > horzRight) ||
-				(dir == dRightToLeft && e->Curr.X < horzLeft))
-				break;
-
-			// Also break if we've got to the end of an intermediate horizontal edge ...
-			// nb: Smaller Dx's are to the right of larger Dx's ABOVE the horizontal.
-			if (e->Curr.X == horzEdge->Top.X && horzEdge->NextInLML &&
-				e->Dx < horzEdge->NextInLML->Dx)
-				break;
-
-			if (horzEdge->OutIdx >= 0 && !IsOpen) // note: may be done multiple times
-			{
-#ifdef use_xyz
-				if (dir == dLeftToRight)
-					SetZ(e->Curr, *horzEdge, *e);
-				else
-					SetZ(e->Curr, *e, *horzEdge);
-#endif
-				op1 = AddOutPt(horzEdge, e->Curr);
-				TEdge *eNextHorz = m_SortedEdges;
-				while (eNextHorz) {
-					if (eNextHorz->OutIdx >= 0 &&
-						HorzSegmentsOverlap(horzEdge->Bot.X,
-											horzEdge->Top.X, eNextHorz->Bot.X, eNextHorz->Top.X)) {
-						OutPt *op2 = GetLastOutPt(eNextHorz);
-						AddJoin(op2, op1, eNextHorz->Top);
-					}
-					eNextHorz = eNextHorz->NextInSEL;
-				}
-				AddGhostJoin(op1, horzEdge->Bot);
-			}
-
-			// OK, so far we're still in range of the horizontal Edge  but make sure
-			// we're at the last of consec. horizontals when matching with eMaxPair
-			if (e == eMaxPair && IsLastHorz) {
-				if (horzEdge->OutIdx >= 0)
-					AddLocalMaxPoly(horzEdge, eMaxPair, horzEdge->Top);
-				DeleteFromAEL(horzEdge);
-				DeleteFromAEL(eMaxPair);
-				return;
-			}
-
-			if (dir == dLeftToRight) {
-				IntPoint Pt = IntPoint(e->Curr.X, horzEdge->Curr.Y);
-				IntersectEdges(horzEdge, e, Pt);
-			} else {
-				IntPoint Pt = IntPoint(e->Curr.X, horzEdge->Curr.Y);
-				IntersectEdges(e, horzEdge, Pt);
-			}
-			TEdge *eNext = GetNextInAEL(e, dir);
-			SwapPositionsInAEL(horzEdge, e);
-			e = eNext;
-		} // end while(e)
-
-		// Break out of loop if HorzEdge.NextInLML is not also horizontal ...
-		if (!horzEdge->NextInLML || !IsHorizontal(*horzEdge->NextInLML))
-			break;
-
-		UpdateEdgeIntoAEL(horzEdge);
-		if (horzEdge->OutIdx >= 0)
-			AddOutPt(horzEdge, horzEdge->Bot);
-		GetHorzDirection(*horzEdge, dir, horzLeft, horzRight);
-
-	} // end for (;;)
-
-	if (horzEdge->OutIdx >= 0 && !op1) {
-		op1 = GetLastOutPt(horzEdge);
-		TEdge *eNextHorz = m_SortedEdges;
-		while (eNextHorz) {
-			if (eNextHorz->OutIdx >= 0 &&
-				HorzSegmentsOverlap(horzEdge->Bot.X,
-									horzEdge->Top.X, eNextHorz->Bot.X, eNextHorz->Top.X)) {
-				OutPt *op2 = GetLastOutPt(eNextHorz);
-				AddJoin(op2, op1, eNextHorz->Top);
-			}
-			eNextHorz = eNextHorz->NextInSEL;
-		}
-		AddGhostJoin(op1, horzEdge->Top);
-	}
-
-	if (horzEdge->NextInLML) {
-		if (horzEdge->OutIdx >= 0) {
-			op1 = AddOutPt(horzEdge, horzEdge->Top);
-			UpdateEdgeIntoAEL(horzEdge);
-			if (horzEdge->WindDelta == 0)
-				return;
-			// nb: HorzEdge is no longer horizontal here
-			TEdge *ePrev = horzEdge->PrevInAEL;
-			TEdge *eNext = horzEdge->NextInAEL;
-			if (ePrev && ePrev->Curr.X == horzEdge->Bot.X &&
-				ePrev->Curr.Y == horzEdge->Bot.Y && ePrev->WindDelta != 0 &&
-				(ePrev->OutIdx >= 0 && ePrev->Curr.Y > ePrev->Top.Y &&
-				 SlopesEqual(*horzEdge, *ePrev, m_UseFullRange))) {
-				OutPt *op2 = AddOutPt(ePrev, horzEdge->Bot);
-				AddJoin(op1, op2, horzEdge->Top);
-			} else if (eNext && eNext->Curr.X == horzEdge->Bot.X &&
-					   eNext->Curr.Y == horzEdge->Bot.Y && eNext->WindDelta != 0 &&
-					   eNext->OutIdx >= 0 && eNext->Curr.Y > eNext->Top.Y &&
-					   SlopesEqual(*horzEdge, *eNext, m_UseFullRange)) {
-				OutPt *op2 = AddOutPt(eNext, horzEdge->Bot);
-				AddJoin(op1, op2, horzEdge->Top);
-			}
-		} else
-			UpdateEdgeIntoAEL(horzEdge);
-	} else {
-		if (horzEdge->OutIdx >= 0)
-			AddOutPt(horzEdge, horzEdge->Top);
-		DeleteFromAEL(horzEdge);
-	}
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::ProcessIntersections(const cInt topY) {
-	if (!m_ActiveEdges)
-		return true;
-	{
-		BuildIntersectList(topY);
-		size_t IlSize = m_IntersectList.size();
-		if (IlSize == 0)
-			return true;
-		if (IlSize == 1 || FixupIntersectionOrder())
-			ProcessIntersectList();
-		else
-			return false;
-	}
-
-	m_SortedEdges = 0;
-	return true;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::DisposeIntersectNodes() {
-	for (size_t i = 0; i < m_IntersectList.size(); ++i)
-		delete m_IntersectList[i];
-	m_IntersectList.clear();
-}
-//------------------------------------------------------------------------------
-
-void Clipper::BuildIntersectList(const cInt topY) {
-	if (!m_ActiveEdges)
-		return;
-
-	// prepare for sorting ...
-	TEdge *e = m_ActiveEdges;
-	m_SortedEdges = e;
-	while (e) {
-		e->PrevInSEL = e->PrevInAEL;
-		e->NextInSEL = e->NextInAEL;
-		e->Curr.X = TopX(*e, topY);
-		e = e->NextInAEL;
-	}
-
-	// bubblesort ...
-	bool isModified;
-	do {
-		isModified = false;
-		e = m_SortedEdges;
-		while (e->NextInSEL) {
-			TEdge *eNext = e->NextInSEL;
-			IntPoint Pt;
-			if (e->Curr.X > eNext->Curr.X) {
-				IntersectPoint(*e, *eNext, Pt);
-				if (Pt.Y < topY)
-					Pt = IntPoint(TopX(*e, topY), topY);
-				IntersectNode *newNode = new IntersectNode;
-				newNode->Edge1 = e;
-				newNode->Edge2 = eNext;
-				newNode->Pt = Pt;
-				m_IntersectList.push_back(newNode);
-
-				SwapPositionsInSEL(e, eNext);
-				isModified = true;
-			} else
-				e = eNext;
-		}
-		if (e->PrevInSEL)
-			e->PrevInSEL->NextInSEL = 0;
-		else
-			break;
-	} while (isModified);
-	m_SortedEdges = 0; // important
-}
-//------------------------------------------------------------------------------
-
-void Clipper::ProcessIntersectList() {
-	for (size_t i = 0; i < m_IntersectList.size(); ++i) {
-		IntersectNode *iNode = m_IntersectList[i];
-		{
-			IntersectEdges(iNode->Edge1, iNode->Edge2, iNode->Pt);
-			SwapPositionsInAEL(iNode->Edge1, iNode->Edge2);
-		}
-		delete iNode;
-	}
-	m_IntersectList.clear();
-}
-//------------------------------------------------------------------------------
-
-bool IntersectListSort(IntersectNode *node1, IntersectNode *node2) {
-	return node2->Pt.Y < node1->Pt.Y;
-}
-//------------------------------------------------------------------------------
-
-inline bool EdgesAdjacent(const IntersectNode &inode) {
-	return (inode.Edge1->NextInSEL == inode.Edge2) ||
-		   (inode.Edge1->PrevInSEL == inode.Edge2);
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::FixupIntersectionOrder() {
-	// pre-condition: intersections are sorted Bottom-most first.
-	// Now it's crucial that intersections are made only between adjacent edges,
-	// so to ensure this the order of intersections may need adjusting ...
-	CopyAELToSEL();
-	Common::sort(m_IntersectList.begin(), m_IntersectList.end(), IntersectListSort);
-	size_t cnt = m_IntersectList.size();
-	for (size_t i = 0; i < cnt; ++i) {
-		if (!EdgesAdjacent(*m_IntersectList[i])) {
-			size_t j = i + 1;
-			while (j < cnt && !EdgesAdjacent(*m_IntersectList[j]))
-				j++;
-			if (j == cnt)
-				return false;
-			SWAP(m_IntersectList[i], m_IntersectList[j]);
-		}
-		SwapPositionsInSEL(m_IntersectList[i]->Edge1, m_IntersectList[i]->Edge2);
-	}
-	return true;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::DoMaxima(TEdge *e) {
-	TEdge *eMaxPair = GetMaximaPairEx(e);
-	if (!eMaxPair) {
-		if (e->OutIdx >= 0)
-			AddOutPt(e, e->Top);
-		DeleteFromAEL(e);
-		return;
-	}
-
-	TEdge *eNext = e->NextInAEL;
-	while (eNext && eNext != eMaxPair) {
-		IntersectEdges(e, eNext, e->Top);
-		SwapPositionsInAEL(e, eNext);
-		eNext = e->NextInAEL;
-	}
-
-	if (e->OutIdx == Unassigned && eMaxPair->OutIdx == Unassigned) {
-		DeleteFromAEL(e);
-		DeleteFromAEL(eMaxPair);
-	} else if (e->OutIdx >= 0 && eMaxPair->OutIdx >= 0) {
-		if (e->OutIdx >= 0)
-			AddLocalMaxPoly(e, eMaxPair, e->Top);
-		DeleteFromAEL(e);
-		DeleteFromAEL(eMaxPair);
-	}
-#ifdef use_lines
-	else if (e->WindDelta == 0) {
-		if (e->OutIdx >= 0) {
-			AddOutPt(e, e->Top);
-			e->OutIdx = Unassigned;
-		}
-		DeleteFromAEL(e);
-
-		if (eMaxPair->OutIdx >= 0) {
-			AddOutPt(eMaxPair, e->Top);
-			eMaxPair->OutIdx = Unassigned;
-		}
-		DeleteFromAEL(eMaxPair);
-	}
-#endif
-	else
-		error("DoMaxima error");
-}
-//------------------------------------------------------------------------------
-
-void Clipper::ProcessEdgesAtTopOfScanbeam(const cInt topY) {
-	TEdge *e = m_ActiveEdges;
-	while (e) {
-		// 1. process maxima, treating them as if they're 'bent' horizontal edges,
-		//    but exclude maxima with horizontal edges. nb: e can't be a horizontal.
-		bool IsMaximaEdge = IsMaxima(e, topY);
-
-		if (IsMaximaEdge) {
-			TEdge *eMaxPair = GetMaximaPairEx(e);
-			IsMaximaEdge = (!eMaxPair || !IsHorizontal(*eMaxPair));
-		}
-
-		if (IsMaximaEdge) {
-			if (m_StrictSimple)
-				m_Maxima.push_back(e->Top.X);
-			TEdge *ePrev = e->PrevInAEL;
-			DoMaxima(e);
-			if (!ePrev)
-				e = m_ActiveEdges;
-			else
-				e = ePrev->NextInAEL;
-		} else {
-			// 2. promote horizontal edges, otherwise update Curr.X and Curr.Y ...
-			if (IsIntermediate(e, topY) && IsHorizontal(*e->NextInLML)) {
-				UpdateEdgeIntoAEL(e);
-				if (e->OutIdx >= 0)
-					AddOutPt(e, e->Bot);
-				AddEdgeToSEL(e);
-			} else {
-				e->Curr.X = TopX(*e, topY);
-				e->Curr.Y = topY;
-#ifdef use_xyz
-				e->Curr.Z = topY == e->Top.Y ? e->Top.Z : (topY == e->Bot.Y ? e->Bot.Z : 0);
-#endif
-			}
-
-			// When StrictlySimple and 'e' is being touched by another edge, then
-			// make sure both edges have a vertex here ...
-			if (m_StrictSimple) {
-				TEdge *ePrev = e->PrevInAEL;
-				if ((e->OutIdx >= 0) && (e->WindDelta != 0) && ePrev && (ePrev->OutIdx >= 0) &&
-					(ePrev->Curr.X == e->Curr.X) && (ePrev->WindDelta != 0)) {
-					IntPoint pt = e->Curr;
-#ifdef use_xyz
-					SetZ(pt, *ePrev, *e);
-#endif
-					OutPt *op = AddOutPt(ePrev, pt);
-					OutPt *op2 = AddOutPt(e, pt);
-					AddJoin(op, op2, pt); // StrictlySimple (type-3) join
-				}
-			}
-
-			e = e->NextInAEL;
-		}
-	}
-
-	// 3. Process horizontals at the Top of the scanbeam ...
-	Common::sort(m_Maxima.begin(), m_Maxima.end());
-	ProcessHorizontals();
-	m_Maxima.clear();
-
-	// 4. Promote intermediate vertices ...
-	e = m_ActiveEdges;
-	while (e) {
-		if (IsIntermediate(e, topY)) {
-			OutPt *op = 0;
-			if (e->OutIdx >= 0)
-				op = AddOutPt(e, e->Top);
-			UpdateEdgeIntoAEL(e);
-
-			// if output polygons share an edge, they'll need joining later ...
-			TEdge *ePrev = e->PrevInAEL;
-			TEdge *eNext = e->NextInAEL;
-			if (ePrev && ePrev->Curr.X == e->Bot.X &&
-				ePrev->Curr.Y == e->Bot.Y && op &&
-				ePrev->OutIdx >= 0 && ePrev->Curr.Y > ePrev->Top.Y &&
-				SlopesEqual(e->Curr, e->Top, ePrev->Curr, ePrev->Top, m_UseFullRange) &&
-				(e->WindDelta != 0) && (ePrev->WindDelta != 0)) {
-				OutPt *op2 = AddOutPt(ePrev, e->Bot);
-				AddJoin(op, op2, e->Top);
-			} else if (eNext && eNext->Curr.X == e->Bot.X &&
-					   eNext->Curr.Y == e->Bot.Y && op &&
-					   eNext->OutIdx >= 0 && eNext->Curr.Y > eNext->Top.Y &&
-					   SlopesEqual(e->Curr, e->Top, eNext->Curr, eNext->Top, m_UseFullRange) &&
-					   (e->WindDelta != 0) && (eNext->WindDelta != 0)) {
-				OutPt *op2 = AddOutPt(eNext, e->Bot);
-				AddJoin(op, op2, e->Top);
-			}
-		}
-		e = e->NextInAEL;
-	}
-}
-//------------------------------------------------------------------------------
-
-void Clipper::FixupOutPolyline(OutRec &outrec) {
-	OutPt *pp = outrec.Pts;
-	OutPt *lastPP = pp->Prev;
-	while (pp != lastPP) {
-		pp = pp->Next;
-		if (pp->Pt == pp->Prev->Pt) {
-			if (pp == lastPP)
-				lastPP = pp->Prev;
-			OutPt *tmpPP = pp->Prev;
-			tmpPP->Next = pp->Next;
-			pp->Next->Prev = tmpPP;
-			delete pp;
-			pp = tmpPP;
-		}
-	}
-
-	if (pp == pp->Prev) {
-		DisposeOutPts(pp);
-		outrec.Pts = 0;
-		return;
-	}
-}
-//------------------------------------------------------------------------------
-
-void Clipper::FixupOutPolygon(OutRec &outrec) {
-	// FixupOutPolygon() - removes duplicate points and simplifies consecutive
-	// parallel edges by removing the middle vertex.
-	OutPt *lastOK = 0;
-	outrec.BottomPt = 0;
-	OutPt *pp = outrec.Pts;
-	bool preserveCol = m_PreserveCollinear || m_StrictSimple;
-
-	for (;;) {
-		if (pp->Prev == pp || pp->Prev == pp->Next) {
-			DisposeOutPts(pp);
-			outrec.Pts = 0;
-			return;
-		}
-
-		// test for duplicate points and collinear edges ...
-		if ((pp->Pt == pp->Next->Pt) || (pp->Pt == pp->Prev->Pt) ||
-			(SlopesEqual(pp->Prev->Pt, pp->Pt, pp->Next->Pt, m_UseFullRange) &&
-			 (!preserveCol || !Pt2IsBetweenPt1AndPt3(pp->Prev->Pt, pp->Pt, pp->Next->Pt)))) {
-			lastOK = 0;
-			OutPt *tmp = pp;
-			pp->Prev->Next = pp->Next;
-			pp->Next->Prev = pp->Prev;
-			pp = pp->Prev;
-			delete tmp;
-		} else if (pp == lastOK)
-			break;
-		else {
-			if (!lastOK)
-				lastOK = pp;
-			pp = pp->Next;
-		}
-	}
-	outrec.Pts = pp;
-}
-//------------------------------------------------------------------------------
-
-int PointCount(OutPt *Pts) {
-	if (!Pts)
-		return 0;
-	int result = 0;
-	OutPt *p = Pts;
-	do {
-		result++;
-		p = p->Next;
-	} while (p != Pts);
-	return result;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::BuildResult(Paths &polys) {
-	polys.reserve(m_PolyOuts.size());
-	for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i) {
-		if (!m_PolyOuts[i]->Pts)
-			continue;
-		Path pg;
-		OutPt *p = m_PolyOuts[i]->Pts->Prev;
-		int cnt = PointCount(p);
-		if (cnt < 2)
-			continue;
-		pg.reserve(cnt);
-		for (int j = 0; j < cnt; ++j) {
-			pg.push_back(p->Pt);
-			p = p->Prev;
-		}
-		polys.push_back(pg);
-	}
-}
-//------------------------------------------------------------------------------
-
-void Clipper::BuildResult2(PolyTree &polytree) {
-	polytree.Clear();
-	polytree.AllNodes.reserve(m_PolyOuts.size());
-	// add each output polygon/contour to polytree ...
-	for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); i++) {
-		OutRec *outRec = m_PolyOuts[i];
-		int cnt = PointCount(outRec->Pts);
-		if ((outRec->IsOpen && cnt < 2) || (!outRec->IsOpen && cnt < 3))
-			continue;
-		FixHoleLinkage(*outRec);
-		PolyNode *pn = new PolyNode();
-		// nb: polytree takes ownership of all the PolyNodes
-		polytree.AllNodes.push_back(pn);
-		outRec->PolyNd = pn;
-		pn->Parent = 0;
-		pn->Index = 0;
-		pn->Contour.reserve(cnt);
-		OutPt *op = outRec->Pts->Prev;
-		for (int j = 0; j < cnt; j++) {
-			pn->Contour.push_back(op->Pt);
-			op = op->Prev;
-		}
-	}
-
-	// fixup PolyNode links etc ...
-	polytree.Childs.reserve(m_PolyOuts.size());
-	for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); i++) {
-		OutRec *outRec = m_PolyOuts[i];
-		if (!outRec->PolyNd)
-			continue;
-		if (outRec->IsOpen) {
-			outRec->PolyNd->m_IsOpen = true;
-			polytree.AddChild(*outRec->PolyNd);
-		} else if (outRec->FirstLeft && outRec->FirstLeft->PolyNd)
-			outRec->FirstLeft->PolyNd->AddChild(*outRec->PolyNd);
-		else
-			polytree.AddChild(*outRec->PolyNd);
-	}
-}
-//------------------------------------------------------------------------------
-
-void SwapIntersectNodes(IntersectNode &int1, IntersectNode &int2) {
-	// just swap the contents (because fIntersectNodes is a single-linked-list)
-	IntersectNode inode = int1; // gets a copy of Int1
-	int1.Edge1 = int2.Edge1;
-	int1.Edge2 = int2.Edge2;
-	int1.Pt = int2.Pt;
-	int2.Edge1 = inode.Edge1;
-	int2.Edge2 = inode.Edge2;
-	int2.Pt = inode.Pt;
-}
-//------------------------------------------------------------------------------
-
-inline bool E2InsertsBeforeE1(TEdge &e1, TEdge &e2) {
-	if (e2.Curr.X == e1.Curr.X) {
-		if (e2.Top.Y > e1.Top.Y)
-			return e2.Top.X < TopX(e1, e2.Top.Y);
-		else
-			return e1.Top.X > TopX(e2, e1.Top.Y);
-	} else
-		return e2.Curr.X < e1.Curr.X;
-}
-//------------------------------------------------------------------------------
-
-bool GetOverlap(const cInt a1, const cInt a2, const cInt b1, const cInt b2,
-				cInt &Left, cInt &Right) {
-	if (a1 < a2) {
-		if (b1 < b2) {
-			Left = MAX(a1, b1);
-			Right = MIN(a2, b2);
-		} else {
-			Left = MAX(a1, b2);
-			Right = MIN(a2, b1);
-		}
-	} else {
-		if (b1 < b2) {
-			Left = MAX(a2, b1);
-			Right = MIN(a1, b2);
-		} else {
-			Left = MAX(a2, b2);
-			Right = MIN(a1, b1);
-		}
-	}
-	return Left < Right;
-}
-//------------------------------------------------------------------------------
-
-inline void UpdateOutPtIdxs(OutRec &outrec) {
-	OutPt *op = outrec.Pts;
-	do {
-		op->Idx = outrec.Idx;
-		op = op->Prev;
-	} while (op != outrec.Pts);
-}
-//------------------------------------------------------------------------------
-
-void Clipper::InsertEdgeIntoAEL(TEdge *edge, TEdge *startEdge) {
-	if (!m_ActiveEdges) {
-		edge->PrevInAEL = 0;
-		edge->NextInAEL = 0;
-		m_ActiveEdges = edge;
-	} else if (!startEdge && E2InsertsBeforeE1(*m_ActiveEdges, *edge)) {
-		edge->PrevInAEL = 0;
-		edge->NextInAEL = m_ActiveEdges;
-		m_ActiveEdges->PrevInAEL = edge;
-		m_ActiveEdges = edge;
-	} else {
-		if (!startEdge)
-			startEdge = m_ActiveEdges;
-		while (startEdge->NextInAEL &&
-			   !E2InsertsBeforeE1(*startEdge->NextInAEL, *edge))
-			startEdge = startEdge->NextInAEL;
-		edge->NextInAEL = startEdge->NextInAEL;
-		if (startEdge->NextInAEL)
-			startEdge->NextInAEL->PrevInAEL = edge;
-		edge->PrevInAEL = startEdge;
-		startEdge->NextInAEL = edge;
-	}
-}
-//----------------------------------------------------------------------
-
-OutPt *DupOutPt(OutPt *outPt, bool InsertAfter) {
-	OutPt *result = new OutPt;
-	result->Pt = outPt->Pt;
-	result->Idx = outPt->Idx;
-	if (InsertAfter) {
-		result->Next = outPt->Next;
-		result->Prev = outPt;
-		outPt->Next->Prev = result;
-		outPt->Next = result;
-	} else {
-		result->Prev = outPt->Prev;
-		result->Next = outPt;
-		outPt->Prev->Next = result;
-		outPt->Prev = result;
-	}
-	return result;
-}
-//------------------------------------------------------------------------------
-
-bool JoinHorz(OutPt *op1, OutPt *op1b, OutPt *op2, OutPt *op2b,
-			  const IntPoint Pt, bool DiscardLeft) {
-	Direction Dir1 = (op1->Pt.X > op1b->Pt.X ? dRightToLeft : dLeftToRight);
-	Direction Dir2 = (op2->Pt.X > op2b->Pt.X ? dRightToLeft : dLeftToRight);
-	if (Dir1 == Dir2)
-		return false;
-
-	// When DiscardLeft, we want Op1b to be on the Left of Op1, otherwise we
-	// want Op1b to be on the Right. (And likewise with Op2 and Op2b.)
-	// So, to facilitate this while inserting Op1b and Op2b ...
-	// when DiscardLeft, make sure we're AT or RIGHT of Pt before adding Op1b,
-	// otherwise make sure we're AT or LEFT of Pt. (Likewise with Op2b.)
-	if (Dir1 == dLeftToRight) {
-		while (op1->Next->Pt.X <= Pt.X &&
-			   op1->Next->Pt.X >= op1->Pt.X && op1->Next->Pt.Y == Pt.Y)
-			op1 = op1->Next;
-		if (DiscardLeft && (op1->Pt.X != Pt.X))
-			op1 = op1->Next;
-		op1b = DupOutPt(op1, !DiscardLeft);
-		if (op1b->Pt != Pt) {
-			op1 = op1b;
-			op1->Pt = Pt;
-			op1b = DupOutPt(op1, !DiscardLeft);
-		}
-	} else {
-		while (op1->Next->Pt.X >= Pt.X &&
-			   op1->Next->Pt.X <= op1->Pt.X && op1->Next->Pt.Y == Pt.Y)
-			op1 = op1->Next;
-		if (!DiscardLeft && (op1->Pt.X != Pt.X))
-			op1 = op1->Next;
-		op1b = DupOutPt(op1, DiscardLeft);
-		if (op1b->Pt != Pt) {
-			op1 = op1b;
-			op1->Pt = Pt;
-			op1b = DupOutPt(op1, DiscardLeft);
-		}
-	}
-
-	if (Dir2 == dLeftToRight) {
-		while (op2->Next->Pt.X <= Pt.X &&
-			   op2->Next->Pt.X >= op2->Pt.X && op2->Next->Pt.Y == Pt.Y)
-			op2 = op2->Next;
-		if (DiscardLeft && (op2->Pt.X != Pt.X))
-			op2 = op2->Next;
-		op2b = DupOutPt(op2, !DiscardLeft);
-		if (op2b->Pt != Pt) {
-			op2 = op2b;
-			op2->Pt = Pt;
-			op2b = DupOutPt(op2, !DiscardLeft);
-		}
-	} else {
-		while (op2->Next->Pt.X >= Pt.X &&
-			   op2->Next->Pt.X <= op2->Pt.X && op2->Next->Pt.Y == Pt.Y)
-			op2 = op2->Next;
-		if (!DiscardLeft && (op2->Pt.X != Pt.X))
-			op2 = op2->Next;
-		op2b = DupOutPt(op2, DiscardLeft);
-		if (op2b->Pt != Pt) {
-			op2 = op2b;
-			op2->Pt = Pt;
-			op2b = DupOutPt(op2, DiscardLeft);
-		}
-	}
-
-	if ((Dir1 == dLeftToRight) == DiscardLeft) {
-		op1->Prev = op2;
-		op2->Next = op1;
-		op1b->Next = op2b;
-		op2b->Prev = op1b;
-	} else {
-		op1->Next = op2;
-		op2->Prev = op1;
-		op1b->Prev = op2b;
-		op2b->Next = op1b;
-	}
-	return true;
-}
-//------------------------------------------------------------------------------
-
-bool Clipper::JoinPoints(Join *j, OutRec *outRec1, OutRec *outRec2) {
-	OutPt *op1 = j->OutPt1, *op1b;
-	OutPt *op2 = j->OutPt2, *op2b;
-
-	// There are 3 kinds of joins for output polygons ...
-	// 1. Horizontal joins where Join.OutPt1 & Join.OutPt2 are vertices anywhere
-	// along (horizontal) collinear edges (& Join.OffPt is on the same horizontal).
-	// 2. Non-horizontal joins where Join.OutPt1 & Join.OutPt2 are at the same
-	// location at the Bottom of the overlapping segment (& Join.OffPt is above).
-	// 3. StrictSimple joins where edges touch but are not collinear and where
-	// Join.OutPt1, Join.OutPt2 & Join.OffPt all share the same point.
-	bool isHorizontal = (j->OutPt1->Pt.Y == j->OffPt.Y);
-
-	if (isHorizontal && (j->OffPt == j->OutPt1->Pt) &&
-		(j->OffPt == j->OutPt2->Pt)) {
-		// Strictly Simple join ...
-		if (outRec1 != outRec2)
-			return false;
-		op1b = j->OutPt1->Next;
-		while (op1b != op1 && (op1b->Pt == j->OffPt))
-			op1b = op1b->Next;
-		bool reverse1 = (op1b->Pt.Y > j->OffPt.Y);
-		op2b = j->OutPt2->Next;
-		while (op2b != op2 && (op2b->Pt == j->OffPt))
-			op2b = op2b->Next;
-		bool reverse2 = (op2b->Pt.Y > j->OffPt.Y);
-		if (reverse1 == reverse2)
-			return false;
-		if (reverse1) {
-			op1b = DupOutPt(op1, false);
-			op2b = DupOutPt(op2, true);
-			op1->Prev = op2;
-			op2->Next = op1;
-			op1b->Next = op2b;
-			op2b->Prev = op1b;
-			j->OutPt1 = op1;
-			j->OutPt2 = op1b;
-			return true;
-		} else {
-			op1b = DupOutPt(op1, true);
-			op2b = DupOutPt(op2, false);
-			op1->Next = op2;
-			op2->Prev = op1;
-			op1b->Prev = op2b;
-			op2b->Next = op1b;
-			j->OutPt1 = op1;
-			j->OutPt2 = op1b;
-			return true;
-		}
-	} else if (isHorizontal) {
-		// treat horizontal joins differently to non-horizontal joins since with
-		// them we're not yet sure where the overlapping is. OutPt1.Pt & OutPt2.Pt
-		// may be anywhere along the horizontal edge.
-		op1b = op1;
-		while (op1->Prev->Pt.Y == op1->Pt.Y && op1->Prev != op1b && op1->Prev != op2)
-			op1 = op1->Prev;
-		while (op1b->Next->Pt.Y == op1b->Pt.Y && op1b->Next != op1 && op1b->Next != op2)
-			op1b = op1b->Next;
-		if (op1b->Next == op1 || op1b->Next == op2)
-			return false; // a flat 'polygon'
-
-		op2b = op2;
-		while (op2->Prev->Pt.Y == op2->Pt.Y && op2->Prev != op2b && op2->Prev != op1b)
-			op2 = op2->Prev;
-		while (op2b->Next->Pt.Y == op2b->Pt.Y && op2b->Next != op2 && op2b->Next != op1)
-			op2b = op2b->Next;
-		if (op2b->Next == op2 || op2b->Next == op1)
-			return false; // a flat 'polygon'
-
-		cInt Left, Right;
-		// Op1 --> Op1b & Op2 --> Op2b are the extremites of the horizontal edges
-		if (!GetOverlap(op1->Pt.X, op1b->Pt.X, op2->Pt.X, op2b->Pt.X, Left, Right))
-			return false;
-
-		// DiscardLeftSide: when overlapping edges are joined, a spike will created
-		// which needs to be cleaned up. However, we don't want Op1 or Op2 caught up
-		// on the discard Side as either may still be needed for other joins ...
-		IntPoint Pt;
-		bool DiscardLeftSide;
-		if (op1->Pt.X >= Left && op1->Pt.X <= Right) {
-			Pt = op1->Pt;
-			DiscardLeftSide = (op1->Pt.X > op1b->Pt.X);
-		} else if (op2->Pt.X >= Left && op2->Pt.X <= Right) {
-			Pt = op2->Pt;
-			DiscardLeftSide = (op2->Pt.X > op2b->Pt.X);
-		} else if (op1b->Pt.X >= Left && op1b->Pt.X <= Right) {
-			Pt = op1b->Pt;
-			DiscardLeftSide = op1b->Pt.X > op1->Pt.X;
-		} else {
-			Pt = op2b->Pt;
-			DiscardLeftSide = (op2b->Pt.X > op2->Pt.X);
-		}
-		j->OutPt1 = op1;
-		j->OutPt2 = op2;
-		return JoinHorz(op1, op1b, op2, op2b, Pt, DiscardLeftSide);
-	} else {
-		// nb: For non-horizontal joins ...
-		//     1. Jr.OutPt1.Pt.Y == Jr.OutPt2.Pt.Y
-		//     2. Jr.OutPt1.Pt > Jr.OffPt.Y
-
-		// make sure the polygons are correctly oriented ...
-		op1b = op1->Next;
-		while ((op1b->Pt == op1->Pt) && (op1b != op1))
-			op1b = op1b->Next;
-		bool Reverse1 = ((op1b->Pt.Y > op1->Pt.Y) ||
-						 !SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange));
-		if (Reverse1) {
-			op1b = op1->Prev;
-			while ((op1b->Pt == op1->Pt) && (op1b != op1))
-				op1b = op1b->Prev;
-			if ((op1b->Pt.Y > op1->Pt.Y) ||
-				!SlopesEqual(op1->Pt, op1b->Pt, j->OffPt, m_UseFullRange))
-				return false;
-		}
-		op2b = op2->Next;
-		while ((op2b->Pt == op2->Pt) && (op2b != op2))
-			op2b = op2b->Next;
-		bool Reverse2 = ((op2b->Pt.Y > op2->Pt.Y) ||
-						 !SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange));
-		if (Reverse2) {
-			op2b = op2->Prev;
-			while ((op2b->Pt == op2->Pt) && (op2b != op2))
-				op2b = op2b->Prev;
-			if ((op2b->Pt.Y > op2->Pt.Y) ||
-				!SlopesEqual(op2->Pt, op2b->Pt, j->OffPt, m_UseFullRange))
-				return false;
-		}
-
-		if ((op1b == op1) || (op2b == op2) || (op1b == op2b) ||
-			((outRec1 == outRec2) && (Reverse1 == Reverse2)))
-			return false;
-
-		if (Reverse1) {
-			op1b = DupOutPt(op1, false);
-			op2b = DupOutPt(op2, true);
-			op1->Prev = op2;
-			op2->Next = op1;
-			op1b->Next = op2b;
-			op2b->Prev = op1b;
-			j->OutPt1 = op1;
-			j->OutPt2 = op1b;
-			return true;
-		} else {
-			op1b = DupOutPt(op1, true);
-			op2b = DupOutPt(op2, false);
-			op1->Next = op2;
-			op2->Prev = op1;
-			op1b->Prev = op2b;
-			op2b->Next = op1b;
-			j->OutPt1 = op1;
-			j->OutPt2 = op1b;
-			return true;
-		}
-	}
-}
-//----------------------------------------------------------------------
-
-static OutRec *ParseFirstLeft(OutRec *FirstLeft) {
-	while (FirstLeft && !FirstLeft->Pts)
-		FirstLeft = FirstLeft->FirstLeft;
-	return FirstLeft;
-}
-//------------------------------------------------------------------------------
-
-void Clipper::FixupFirstLefts1(OutRec *OldOutRec, OutRec *NewOutRec) {
-	// tests if NewOutRec contains the polygon before reassigning FirstLeft
-	for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i) {
-		OutRec *outRec = m_PolyOuts[i];
-		OutRec *firstLeft = ParseFirstLeft(outRec->FirstLeft);
-		if (outRec->Pts && firstLeft == OldOutRec) {
-			if (Poly2ContainsPoly1(outRec->Pts, NewOutRec->Pts))
-				outRec->FirstLeft = NewOutRec;
-		}
-	}
-}
-//----------------------------------------------------------------------
-
-void Clipper::FixupFirstLefts2(OutRec *InnerOutRec, OutRec *OuterOutRec) {
-	// A polygon has split into two such that one is now the inner of the other.
-	// It's possible that these polygons now wrap around other polygons, so check
-	// every polygon that's also contained by OuterOutRec's FirstLeft container
-	//(including 0) to see if they've become inner to the new inner polygon ...
-	OutRec *orfl = OuterOutRec->FirstLeft;
-	for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i) {
-		OutRec *outRec = m_PolyOuts[i];
-
-		if (!outRec->Pts || outRec == OuterOutRec || outRec == InnerOutRec)
-			continue;
-		OutRec *firstLeft = ParseFirstLeft(outRec->FirstLeft);
-		if (firstLeft != orfl && firstLeft != InnerOutRec && firstLeft != OuterOutRec)
-			continue;
-		if (Poly2ContainsPoly1(outRec->Pts, InnerOutRec->Pts))
-			outRec->FirstLeft = InnerOutRec;
-		else if (Poly2ContainsPoly1(outRec->Pts, OuterOutRec->Pts))
-			outRec->FirstLeft = OuterOutRec;
-		else if (outRec->FirstLeft == InnerOutRec || outRec->FirstLeft == OuterOutRec)
-			outRec->FirstLeft = orfl;
-	}
-}
-//----------------------------------------------------------------------
-void Clipper::FixupFirstLefts3(OutRec *OldOutRec, OutRec *NewOutRec) {
-	// reassigns FirstLeft WITHOUT testing if NewOutRec contains the polygon
-	for (PolyOutList::size_type i = 0; i < m_PolyOuts.size(); ++i) {
-		OutRec *outRec = m_PolyOuts[i];
-		OutRec *firstLeft = ParseFirstLeft(outRec->FirstLeft);
-		if (outRec->Pts && firstLeft == OldOutRec)
-			outRec->FirstLeft = NewOutRec;
-	}
-}
-//----------------------------------------------------------------------
-
-void Clipper::JoinCommonEdges() {
-	for (JoinList::size_type i = 0; i < m_Joins.size(); i++) {
-		Join *join = m_Joins[i];
-
-		OutRec *outRec1 = GetOutRec(join->OutPt1->Idx);
-		OutRec *outRec2 = GetOutRec(join->OutPt2->Idx);
-
-		if (!outRec1->Pts || !outRec2->Pts)
-			continue;
-		if (outRec1->IsOpen || outRec2->IsOpen)
-			continue;
-
-		// get the polygon fragment with the correct hole state (FirstLeft)
-		// before calling JoinPoints() ...
-		OutRec *holeStateRec;
-		if (outRec1 == outRec2)
-			holeStateRec = outRec1;
-		else if (OutRec1RightOfOutRec2(outRec1, outRec2))
-			holeStateRec = outRec2;
-		else if (OutRec1RightOfOutRec2(outRec2, outRec1))
-			holeStateRec = outRec1;
-		else
-			holeStateRec = GetLowermostRec(outRec1, outRec2);
-
-		if (!JoinPoints(join, outRec1, outRec2))
-			continue;
-
-		if (outRec1 == outRec2) {
-			// instead of joining two polygons, we've just created a new one by
-			// splitting one polygon into two.
-			outRec1->Pts = join->OutPt1;
-			outRec1->BottomPt = 0;
-			outRec2 = CreateOutRec();
-			outRec2->Pts = join->OutPt2;
-
-			// update all OutRec2.Pts Idx's ...
-			UpdateOutPtIdxs(*outRec2);
-
-			if (Poly2ContainsPoly1(outRec2->Pts, outRec1->Pts)) {
-				// outRec1 contains outRec2 ...
-				outRec2->IsHole = !outRec1->IsHole;
-				outRec2->FirstLeft = outRec1;
-
-				if (m_UsingPolyTree)
-					FixupFirstLefts2(outRec2, outRec1);
-
-				if ((outRec2->IsHole ^ m_ReverseOutput) == (Area(*outRec2) > 0))
-					ReversePolyPtLinks(outRec2->Pts);
-
-			} else if (Poly2ContainsPoly1(outRec1->Pts, outRec2->Pts)) {
-				// outRec2 contains outRec1 ...
-				outRec2->IsHole = outRec1->IsHole;
-				outRec1->IsHole = !outRec2->IsHole;
-				outRec2->FirstLeft = outRec1->FirstLeft;
-				outRec1->FirstLeft = outRec2;
-
-				if (m_UsingPolyTree)
-					FixupFirstLefts2(outRec1, outRec2);
-
-				if ((outRec1->IsHole ^ m_ReverseOutput) == (Area(*outRec1) > 0))
-					ReversePolyPtLinks(outRec1->Pts);
-			} else {
-				// the 2 polygons are completely separate ...
-				outRec2->IsHole = outRec1->IsHole;
-				outRec2->FirstLeft = outRec1->FirstLeft;
-
-				// fixup FirstLeft pointers that may need reassigning to OutRec2
-				if (m_UsingPolyTree)
-					FixupFirstLefts1(outRec1, outRec2);
-			}
-
-		} else {
-			// joined 2 polygons together ...
-
-			outRec2->Pts = 0;
-			outRec2->BottomPt = 0;
-			outRec2->Idx = outRec1->Idx;
-
-			outRec1->IsHole = holeStateRec->IsHole;
-			if (holeStateRec == outRec2)
-				outRec1->FirstLeft = outRec2->FirstLeft;
-			outRec2->FirstLeft = outRec1;
-
-			if (m_UsingPolyTree)
-				FixupFirstLefts3(outRec2, outRec1);
-		}
-	}
-}
-
-//------------------------------------------------------------------------------
-// ClipperOffset support functions ...
-//------------------------------------------------------------------------------
-
-DoublePoint GetUnitNormal(const IntPoint &pt1, const IntPoint &pt2) {
-	if (pt2.X == pt1.X && pt2.Y == pt1.Y)
-		return DoublePoint(0, 0);
-
-	double Dx = (double)(pt2.X - pt1.X);
-	double dy = (double)(pt2.Y - pt1.Y);
-	double f = 1 * 1.0 / sqrt(Dx * Dx + dy * dy);
-	Dx *= f;
-	dy *= f;
-	return DoublePoint(dy, -Dx);
-}
-
-//------------------------------------------------------------------------------
-// ClipperOffset class
-//------------------------------------------------------------------------------
-
-ClipperOffset::ClipperOffset(double miterLimit, double arcTolerance) {
-	MiterLimit = miterLimit;
-	ArcTolerance = arcTolerance;
-	m_lowest.X = -1;
-}
-//------------------------------------------------------------------------------
-
-ClipperOffset::~ClipperOffset() {
-	Clear();
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::Clear() {
-	for (int i = 0; i < m_polyNodes.ChildCount(); ++i)
-		delete m_polyNodes.Childs[i];
-	m_polyNodes.Childs.clear();
-	m_lowest.X = -1;
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::AddPath(const Path &path, JoinType joinType, EndType endType) {
-	int highI = (int)path.size() - 1;
-	if (highI < 0)
-		return;
-	PolyNode *newNode = new PolyNode();
-	newNode->m_jointype = joinType;
-	newNode->m_endtype = endType;
-
-	// strip duplicate points from path and also get index to the lowest point ...
-	if (endType == etClosedLine || endType == etClosedPolygon)
-		while (highI > 0 && path[0] == path[highI])
-			highI--;
-	newNode->Contour.reserve(highI + 1);
-	newNode->Contour.push_back(path[0]);
-	int j = 0, k = 0;
-	for (int i = 1; i <= highI; i++)
-		if (newNode->Contour[j] != path[i]) {
-			j++;
-			newNode->Contour.push_back(path[i]);
-			if (path[i].Y > newNode->Contour[k].Y ||
-				(path[i].Y == newNode->Contour[k].Y &&
-				 path[i].X < newNode->Contour[k].X))
-				k = j;
-		}
-	if (endType == etClosedPolygon && j < 2) {
-		delete newNode;
-		return;
-	}
-	m_polyNodes.AddChild(*newNode);
-
-	// if this path's lowest pt is lower than all the others then update m_lowest
-	if (endType != etClosedPolygon)
-		return;
-	if (m_lowest.X < 0)
-		m_lowest = IntPoint(m_polyNodes.ChildCount() - 1, k);
-	else {
-		IntPoint ip = m_polyNodes.Childs[(int)m_lowest.X]->Contour[(int)m_lowest.Y];
-		if (newNode->Contour[k].Y > ip.Y ||
-			(newNode->Contour[k].Y == ip.Y &&
-			 newNode->Contour[k].X < ip.X))
-			m_lowest = IntPoint(m_polyNodes.ChildCount() - 1, k);
-	}
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::AddPaths(const Paths &paths, JoinType joinType, EndType endType) {
-	for (Paths::size_type i = 0; i < paths.size(); ++i)
-		AddPath(paths[i], joinType, endType);
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::FixOrientations() {
-	// fixup orientations of all closed paths if the orientation of the
-	// closed path with the lowermost vertex is wrong ...
-	if (m_lowest.X >= 0 &&
-		!Orientation(m_polyNodes.Childs[(int)m_lowest.X]->Contour)) {
-		for (int i = 0; i < m_polyNodes.ChildCount(); ++i) {
-			PolyNode &node = *m_polyNodes.Childs[i];
-			if (node.m_endtype == etClosedPolygon ||
-				(node.m_endtype == etClosedLine && Orientation(node.Contour)))
-				ReversePath(node.Contour);
-		}
-	} else {
-		for (int i = 0; i < m_polyNodes.ChildCount(); ++i) {
-			PolyNode &node = *m_polyNodes.Childs[i];
-			if (node.m_endtype == etClosedLine && !Orientation(node.Contour))
-				ReversePath(node.Contour);
-		}
-	}
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::Execute(Paths &solution, double delta) {
-	solution.clear();
-	FixOrientations();
-	DoOffset(delta);
-
-	// now clean up 'corners' ...
-	Clipper clpr;
-	clpr.AddPaths(m_destPolys, ptSubject, true);
-	if (delta > 0) {
-		clpr.Execute(ctUnion, solution, pftPositive, pftPositive);
-	} else {
-		IntRect r = clpr.GetBounds();
-		Path outer(4);
-		outer[0] = IntPoint(r.left - 10, r.bottom + 10);
-		outer[1] = IntPoint(r.right + 10, r.bottom + 10);
-		outer[2] = IntPoint(r.right + 10, r.top - 10);
-		outer[3] = IntPoint(r.left - 10, r.top - 10);
-
-		clpr.AddPath(outer, ptSubject, true);
-		clpr.ReverseSolution(true);
-		clpr.Execute(ctUnion, solution, pftNegative, pftNegative);
-		if (solution.size() > 0)
-			solution.erase(solution.begin());
-	}
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::Execute(PolyTree &solution, double delta) {
-	solution.Clear();
-	FixOrientations();
-	DoOffset(delta);
-
-	// now clean up 'corners' ...
-	Clipper clpr;
-	clpr.AddPaths(m_destPolys, ptSubject, true);
-	if (delta > 0) {
-		clpr.Execute(ctUnion, solution, pftPositive, pftPositive);
-	} else {
-		IntRect r = clpr.GetBounds();
-		Path outer(4);
-		outer[0] = IntPoint(r.left - 10, r.bottom + 10);
-		outer[1] = IntPoint(r.right + 10, r.bottom + 10);
-		outer[2] = IntPoint(r.right + 10, r.top - 10);
-		outer[3] = IntPoint(r.left - 10, r.top - 10);
-
-		clpr.AddPath(outer, ptSubject, true);
-		clpr.ReverseSolution(true);
-		clpr.Execute(ctUnion, solution, pftNegative, pftNegative);
-		// remove the outer PolyNode rectangle ...
-		if (solution.ChildCount() == 1 && solution.Childs[0]->ChildCount() > 0) {
-			PolyNode *outerNode = solution.Childs[0];
-			solution.Childs.reserve(outerNode->ChildCount());
-			solution.Childs[0] = outerNode->Childs[0];
-			solution.Childs[0]->Parent = outerNode->Parent;
-			for (int i = 1; i < outerNode->ChildCount(); ++i)
-				solution.AddChild(*outerNode->Childs[i]);
-		} else
-			solution.Clear();
-	}
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::DoOffset(double delta) {
-	m_destPolys.clear();
-	m_delta = delta;
-
-	// if Zero offset, just copy any CLOSED polygons to m_p and return ...
-	if (NEAR_ZERO(delta)) {
-		m_destPolys.reserve(m_polyNodes.ChildCount());
-		for (int i = 0; i < m_polyNodes.ChildCount(); i++) {
-			PolyNode &node = *m_polyNodes.Childs[i];
-			if (node.m_endtype == etClosedPolygon)
-				m_destPolys.push_back(node.Contour);
-		}
-		return;
-	}
-
-	// see offset_triginometry3.svg in the documentation folder ...
-	if (MiterLimit > 2)
-		m_miterLim = 2 / (MiterLimit * MiterLimit);
-	else
-		m_miterLim = 0.5;
-
-	double y;
-	if (ArcTolerance <= 0.0)
-		y = def_arc_tolerance;
-	else if (ArcTolerance > fabs(delta) * def_arc_tolerance)
-		y = fabs(delta) * def_arc_tolerance;
-	else
-		y = ArcTolerance;
-	// see offset_triginometry2.svg in the documentation folder ...
-	double steps = pi / acos(1 - y / fabs(delta));
-	if (steps > fabs(delta) * pi)
-		steps = fabs(delta) * pi; // ie excessive precision check
-	m_sin = sin(two_pi / steps);
-	m_cos = cos(two_pi / steps);
-	m_StepsPerRad = steps / two_pi;
-	if (delta < 0.0)
-		m_sin = -m_sin;
-
-	m_destPolys.reserve(m_polyNodes.ChildCount() * 2);
-	for (int i = 0; i < m_polyNodes.ChildCount(); i++) {
-		PolyNode &node = *m_polyNodes.Childs[i];
-		m_srcPoly = node.Contour;
-
-		int len = (int)m_srcPoly.size();
-		if (len == 0 || (delta <= 0 && (len < 3 || node.m_endtype != etClosedPolygon)))
-			continue;
-
-		m_destPoly.clear();
-		if (len == 1) {
-			if (node.m_jointype == jtRound) {
-				double X = 1.0, Y = 0.0;
-				for (cInt j = 1; j <= steps; j++) {
-					m_destPoly.push_back(IntPoint(
-						Round(m_srcPoly[0].X + X * delta),
-						Round(m_srcPoly[0].Y + Y * delta)));
-					double X2 = X;
-					X = X * m_cos - m_sin * Y;
-					Y = X2 * m_sin + Y * m_cos;
-				}
-			} else {
-				double X = -1.0, Y = -1.0;
-				for (int j = 0; j < 4; ++j) {
-					m_destPoly.push_back(IntPoint(
-						Round(m_srcPoly[0].X + X * delta),
-						Round(m_srcPoly[0].Y + Y * delta)));
-					if (X < 0)
-						X = 1;
-					else if (Y < 0)
-						Y = 1;
-					else
-						X = -1;
-				}
-			}
-			m_destPolys.push_back(m_destPoly);
-			continue;
-		}
-		// build m_normals ...
-		m_normals.clear();
-		m_normals.reserve(len);
-		for (int j = 0; j < len - 1; ++j)
-			m_normals.push_back(GetUnitNormal(m_srcPoly[j], m_srcPoly[j + 1]));
-		if (node.m_endtype == etClosedLine || node.m_endtype == etClosedPolygon)
-			m_normals.push_back(GetUnitNormal(m_srcPoly[len - 1], m_srcPoly[0]));
-		else
-			m_normals.push_back(DoublePoint(m_normals[len - 2]));
-
-		if (node.m_endtype == etClosedPolygon) {
-			int k = len - 1;
-			for (int j = 0; j < len; ++j)
-				OffsetPoint(j, k, node.m_jointype);
-			m_destPolys.push_back(m_destPoly);
-		} else if (node.m_endtype == etClosedLine) {
-			int k = len - 1;
-			for (int j = 0; j < len; ++j)
-				OffsetPoint(j, k, node.m_jointype);
-			m_destPolys.push_back(m_destPoly);
-			m_destPoly.clear();
-			// re-build m_normals ...
-			DoublePoint n = m_normals[len - 1];
-			for (int j = len - 1; j > 0; j--)
-				m_normals[j] = DoublePoint(-m_normals[j - 1].X, -m_normals[j - 1].Y);
-			m_normals[0] = DoublePoint(-n.X, -n.Y);
-			k = 0;
-			for (int j = len - 1; j >= 0; j--)
-				OffsetPoint(j, k, node.m_jointype);
-			m_destPolys.push_back(m_destPoly);
-		} else {
-			int k = 0;
-			for (int j = 1; j < len - 1; ++j)
-				OffsetPoint(j, k, node.m_jointype);
-
-			IntPoint pt1;
-			if (node.m_endtype == etOpenButt) {
-				int j = len - 1;
-				pt1 = IntPoint((cInt)Round(m_srcPoly[j].X + m_normals[j].X *
-																delta),
-							   (cInt)Round(m_srcPoly[j].Y + m_normals[j].Y * delta));
-				m_destPoly.push_back(pt1);
-				pt1 = IntPoint((cInt)Round(m_srcPoly[j].X - m_normals[j].X *
-																delta),
-							   (cInt)Round(m_srcPoly[j].Y - m_normals[j].Y * delta));
-				m_destPoly.push_back(pt1);
-			} else {
-				int j = len - 1;
-				k = len - 2;
-				m_sinA = 0;
-				m_normals[j] = DoublePoint(-m_normals[j].X, -m_normals[j].Y);
-				if (node.m_endtype == etOpenSquare)
-					DoSquare(j, k);
-				else
-					DoRound(j, k);
-			}
-
-			// re-build m_normals ...
-			for (int j = len - 1; j > 0; j--)
-				m_normals[j] = DoublePoint(-m_normals[j - 1].X, -m_normals[j - 1].Y);
-			m_normals[0] = DoublePoint(-m_normals[1].X, -m_normals[1].Y);
-
-			k = len - 1;
-			for (int j = k - 1; j > 0; --j)
-				OffsetPoint(j, k, node.m_jointype);
-
-			if (node.m_endtype == etOpenButt) {
-				pt1 = IntPoint((cInt)Round(m_srcPoly[0].X - m_normals[0].X * delta),
-							   (cInt)Round(m_srcPoly[0].Y - m_normals[0].Y * delta));
-				m_destPoly.push_back(pt1);
-				pt1 = IntPoint((cInt)Round(m_srcPoly[0].X + m_normals[0].X * delta),
-							   (cInt)Round(m_srcPoly[0].Y + m_normals[0].Y * delta));
-				m_destPoly.push_back(pt1);
-			} else {
-				k = 1;
-				m_sinA = 0;
-				if (node.m_endtype == etOpenSquare)
-					DoSquare(0, 1);
-				else
-					DoRound(0, 1);
-			}
-			m_destPolys.push_back(m_destPoly);
-		}
-	}
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::OffsetPoint(int j, int &k, JoinType jointype) {
-	// cross product ...
-	m_sinA = (m_normals[k].X * m_normals[j].Y - m_normals[j].X * m_normals[k].Y);
-	if (fabs(m_sinA * m_delta) < 1.0) {
-		// dot product ...
-		double cosA = (m_normals[k].X * m_normals[j].X + m_normals[j].Y * m_normals[k].Y);
-		if (cosA > 0) // angle => 0 degrees
-		{
-			m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + m_normals[k].X * m_delta),
-										  Round(m_srcPoly[j].Y + m_normals[k].Y * m_delta)));
-			return;
-		}
-		// else angle => 180 degrees
-	} else if (m_sinA > 1.0)
-		m_sinA = 1.0;
-	else if (m_sinA < -1.0)
-		m_sinA = -1.0;
-
-	if (m_sinA * m_delta < 0) {
-		m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + m_normals[k].X * m_delta),
-									  Round(m_srcPoly[j].Y + m_normals[k].Y * m_delta)));
-		m_destPoly.push_back(m_srcPoly[j]);
-		m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + m_normals[j].X * m_delta),
-									  Round(m_srcPoly[j].Y + m_normals[j].Y * m_delta)));
-	} else
-		switch (jointype) {
-		case jtMiter: {
-			double r = 1 + (m_normals[j].X * m_normals[k].X +
-							m_normals[j].Y * m_normals[k].Y);
-			if (r >= m_miterLim)
-				DoMiter(j, k, r);
-			else
-				DoSquare(j, k);
-			break;
-		}
-		case jtSquare:
-			DoSquare(j, k);
-			break;
-		case jtRound:
-			DoRound(j, k);
-			break;
-		}
-	k = j;
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::DoSquare(int j, int k) {
-	double dx = tan(atan2(m_sinA,
-						  m_normals[k].X * m_normals[j].X + m_normals[k].Y * m_normals[j].Y) /
-					4);
-	m_destPoly.push_back(IntPoint(
-		Round(m_srcPoly[j].X + m_delta * (m_normals[k].X - m_normals[k].Y * dx)),
-		Round(m_srcPoly[j].Y + m_delta * (m_normals[k].Y + m_normals[k].X * dx))));
-	m_destPoly.push_back(IntPoint(
-		Round(m_srcPoly[j].X + m_delta * (m_normals[j].X + m_normals[j].Y * dx)),
-		Round(m_srcPoly[j].Y + m_delta * (m_normals[j].Y - m_normals[j].X * dx))));
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::DoMiter(int j, int k, double r) {
-	double q = m_delta / r;
-	m_destPoly.push_back(IntPoint(Round(m_srcPoly[j].X + (m_normals[k].X + m_normals[j].X) * q),
-								  Round(m_srcPoly[j].Y + (m_normals[k].Y + m_normals[j].Y) * q)));
-}
-//------------------------------------------------------------------------------
-
-void ClipperOffset::DoRound(int j, int k) {
-	double a = atan2(m_sinA,
-					 m_normals[k].X * m_normals[j].X + m_normals[k].Y * m_normals[j].Y);
-	int steps = MAX((int)Round(m_StepsPerRad * fabs(a)), 1);
-
-	double X = m_normals[k].X, Y = m_normals[k].Y, X2;
-	for (int i = 0; i < steps; ++i) {
-		m_destPoly.push_back(IntPoint(
-			Round(m_srcPoly[j].X + X * m_delta),
-			Round(m_srcPoly[j].Y + Y * m_delta)));
-		X2 = X;
-		X = X * m_cos - m_sin * Y;
-		Y = X2 * m_sin + Y * m_cos;
-	}
-	m_destPoly.push_back(IntPoint(
-		Round(m_srcPoly[j].X + m_normals[j].X * m_delta),
-		Round(m_srcPoly[j].Y + m_normals[j].Y * m_delta)));
-}
-
-//------------------------------------------------------------------------------
-// Miscellaneous public functions
-//------------------------------------------------------------------------------
-
-void Clipper::DoSimplePolygons() {
-	PolyOutList::size_type i = 0;
-	while (i < m_PolyOuts.size()) {
-		OutRec *outrec = m_PolyOuts[i++];
-		OutPt *op = outrec->Pts;
-		if (!op || outrec->IsOpen)
-			continue;
-		do // for each Pt in Polygon until duplicate found do ...
-		{
-			OutPt *op2 = op->Next;
-			while (op2 != outrec->Pts) {
-				if ((op->Pt == op2->Pt) && op2->Next != op && op2->Prev != op) {
-					// split the polygon into two ...
-					OutPt *op3 = op->Prev;
-					OutPt *op4 = op2->Prev;
-					op->Prev = op4;
-					op4->Next = op;
-					op2->Prev = op3;
-					op3->Next = op2;
-
-					outrec->Pts = op;
-					OutRec *outrec2 = CreateOutRec();
-					outrec2->Pts = op2;
-					UpdateOutPtIdxs(*outrec2);
-					if (Poly2ContainsPoly1(outrec2->Pts, outrec->Pts)) {
-						// OutRec2 is contained by OutRec1 ...
-						outrec2->IsHole = !outrec->IsHole;
-						outrec2->FirstLeft = outrec;
-						if (m_UsingPolyTree)
-							FixupFirstLefts2(outrec2, outrec);
-					} else if (Poly2ContainsPoly1(outrec->Pts, outrec2->Pts)) {
-						// OutRec1 is contained by OutRec2 ...
-						outrec2->IsHole = outrec->IsHole;
-						outrec->IsHole = !outrec2->IsHole;
-						outrec2->FirstLeft = outrec->FirstLeft;
-						outrec->FirstLeft = outrec2;
-						if (m_UsingPolyTree)
-							FixupFirstLefts2(outrec, outrec2);
-					} else {
-						// the 2 polygons are separate ...
-						outrec2->IsHole = outrec->IsHole;
-						outrec2->FirstLeft = outrec->FirstLeft;
-						if (m_UsingPolyTree)
-							FixupFirstLefts1(outrec, outrec2);
-					}
-					op2 = op; // ie get ready for the Next iteration
-				}
-				op2 = op2->Next;
-			}
-			op = op->Next;
-		} while (op != outrec->Pts);
-	}
-}
-//------------------------------------------------------------------------------
-
-void ReversePath(Path &p) {
-	Path reversed(p.size());
-	for (uint i = 0; i < p.size(); i++) {
-		reversed[p.size() - 1 - i] = p[i];
-	}
-	p = reversed;
-}
-//------------------------------------------------------------------------------
-
-void ReversePaths(Paths &p) {
-	for (Paths::size_type i = 0; i < p.size(); ++i)
-		ReversePath(p[i]);
-}
-//------------------------------------------------------------------------------
-
-void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType) {
-	Clipper c;
-	c.StrictlySimple(true);
-	c.AddPath(in_poly, ptSubject, true);
-	c.Execute(ctUnion, out_polys, fillType, fillType);
-}
-//------------------------------------------------------------------------------
-
-void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType) {
-	Clipper c;
-	c.StrictlySimple(true);
-	c.AddPaths(in_polys, ptSubject, true);
-	c.Execute(ctUnion, out_polys, fillType, fillType);
-}
-//------------------------------------------------------------------------------
-
-void SimplifyPolygons(Paths &polys, PolyFillType fillType) {
-	SimplifyPolygons(polys, polys, fillType);
-}
-//------------------------------------------------------------------------------
-
-inline double DistanceSqrd(const IntPoint &pt1, const IntPoint &pt2) {
-	double Dx = ((double)pt1.X - pt2.X);
-	double dy = ((double)pt1.Y - pt2.Y);
-	return (Dx * Dx + dy * dy);
-}
-//------------------------------------------------------------------------------
-
-double DistanceFromLineSqrd(
-	const IntPoint &pt, const IntPoint &ln1, const IntPoint &ln2) {
-	// The equation of a line in general form (Ax + By + C = 0)
-	// given 2 points (x�,y�) & (x�,y�) is ...
-	//(y� - y�)x + (x� - x�)y + (y� - y�)x� - (x� - x�)y� = 0
-	// A = (y� - y�); B = (x� - x�); C = (y� - y�)x� - (x� - x�)y�
-	// perpendicular distance of point (x�,y�) = (Ax� + By� + C)/Sqrt(A� + B�)
-	// see http://en.wikipedia.org/wiki/Perpendicular_distance
-	double A = double(ln1.Y - ln2.Y);
-	double B = double(ln2.X - ln1.X);
-	double C = A * ln1.X + B * ln1.Y;
-	C = A * pt.X + B * pt.Y - C;
-	return (C * C) / (A * A + B * B);
-}
-//---------------------------------------------------------------------------
-
-bool SlopesNearCollinear(const IntPoint &pt1,
-						 const IntPoint &pt2, const IntPoint &pt3, double distSqrd) {
-	// this function is more accurate when the point that's geometrically
-	// between the other 2 points is the one that's tested for distance.
-	// ie makes it more likely to pick up 'spikes' ...
-	if (Abs(pt1.X - pt2.X) > Abs(pt1.Y - pt2.Y)) {
-		if ((pt1.X > pt2.X) == (pt1.X < pt3.X))
-			return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd;
-		else if ((pt2.X > pt1.X) == (pt2.X < pt3.X))
-			return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd;
-		else
-			return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd;
-	} else {
-		if ((pt1.Y > pt2.Y) == (pt1.Y < pt3.Y))
-			return DistanceFromLineSqrd(pt1, pt2, pt3) < distSqrd;
-		else if ((pt2.Y > pt1.Y) == (pt2.Y < pt3.Y))
-			return DistanceFromLineSqrd(pt2, pt1, pt3) < distSqrd;
-		else
-			return DistanceFromLineSqrd(pt3, pt1, pt2) < distSqrd;
-	}
-}
-//------------------------------------------------------------------------------
-
-bool PointsAreClose(IntPoint pt1, IntPoint pt2, double distSqrd) {
-	double Dx = (double)pt1.X - pt2.X;
-	double dy = (double)pt1.Y - pt2.Y;
-	return ((Dx * Dx) + (dy * dy) <= distSqrd);
-}
-//------------------------------------------------------------------------------
-
-OutPt *ExcludeOp(OutPt *op) {
-	OutPt *result = op->Prev;
-	result->Next = op->Next;
-	op->Next->Prev = result;
-	result->Idx = 0;
-	return result;
-}
-//------------------------------------------------------------------------------
-
-void CleanPolygon(const Path &in_poly, Path &out_poly, double distance) {
-	// distance = proximity in units/pixels below which vertices
-	// will be stripped. Default ~= sqrt(2).
-
-	size_t size = in_poly.size();
-
-	if (size == 0) {
-		out_poly.clear();
-		return;
-	}
-
-	OutPt *outPts = new OutPt[size];
-	for (size_t i = 0; i < size; ++i) {
-		outPts[i].Pt = in_poly[i];
-		outPts[i].Next = &outPts[(i + 1) % size];
-		outPts[i].Next->Prev = &outPts[i];
-		outPts[i].Idx = 0;
-	}
-
-	double distSqrd = distance * distance;
-	OutPt *op = &outPts[0];
-	while (op->Idx == 0 && op->Next != op->Prev) {
-		if (PointsAreClose(op->Pt, op->Prev->Pt, distSqrd)) {
-			op = ExcludeOp(op);
-			size--;
-		} else if (PointsAreClose(op->Prev->Pt, op->Next->Pt, distSqrd)) {
-			ExcludeOp(op->Next);
-			op = ExcludeOp(op);
-			size -= 2;
-		} else if (SlopesNearCollinear(op->Prev->Pt, op->Pt, op->Next->Pt, distSqrd)) {
-			op = ExcludeOp(op);
-			size--;
-		} else {
-			op->Idx = 1;
-			op = op->Next;
-		}
-	}
-
-	if (size < 3)
-		size = 0;
-	out_poly.resize(size);
-	for (size_t i = 0; i < size; ++i) {
-		out_poly[i] = op->Pt;
-		op = op->Next;
-	}
-	delete[] outPts;
-}
-//------------------------------------------------------------------------------
-
-void CleanPolygon(Path &poly, double distance) {
-	CleanPolygon(poly, poly, distance);
-}
-//------------------------------------------------------------------------------
-
-void CleanPolygons(const Paths &in_polys, Paths &out_polys, double distance) {
-	out_polys.resize(in_polys.size());
-	for (Paths::size_type i = 0; i < in_polys.size(); ++i)
-		CleanPolygon(in_polys[i], out_polys[i], distance);
-}
-//------------------------------------------------------------------------------
-
-void CleanPolygons(Paths &polys, double distance) {
-	CleanPolygons(polys, polys, distance);
-}
-//------------------------------------------------------------------------------
-
-void Minkowski(const Path &poly, const Path &path,
-			   Paths &solution, bool isSum, bool isClosed) {
-	int delta = (isClosed ? 1 : 0);
-	size_t polyCnt = poly.size();
-	size_t pathCnt = path.size();
-	Paths pp;
-	pp.reserve(pathCnt);
-	if (isSum)
-		for (size_t i = 0; i < pathCnt; ++i) {
-			Path p;
-			p.reserve(polyCnt);
-			for (size_t j = 0; j < poly.size(); ++j)
-				p.push_back(IntPoint(path[i].X + poly[j].X, path[i].Y + poly[j].Y));
-			pp.push_back(p);
-		}
-	else
-		for (size_t i = 0; i < pathCnt; ++i) {
-			Path p;
-			p.reserve(polyCnt);
-			for (size_t j = 0; j < poly.size(); ++j)
-				p.push_back(IntPoint(path[i].X - poly[j].X, path[i].Y - poly[j].Y));
-			pp.push_back(p);
-		}
-
-	solution.clear();
-	solution.reserve((pathCnt + delta) * (polyCnt + 1));
-	for (size_t i = 0; i < pathCnt - 1 + delta; ++i)
-		for (size_t j = 0; j < polyCnt; ++j) {
-			Path quad;
-			quad.reserve(4);
-			quad.push_back(pp[i % pathCnt][j % polyCnt]);
-			quad.push_back(pp[(i + 1) % pathCnt][j % polyCnt]);
-			quad.push_back(pp[(i + 1) % pathCnt][(j + 1) % polyCnt]);
-			quad.push_back(pp[i % pathCnt][(j + 1) % polyCnt]);
-			if (!Orientation(quad))
-				ReversePath(quad);
-			solution.push_back(quad);
-		}
-}
-//------------------------------------------------------------------------------
-
-void MinkowskiSum(const Path &pattern, const Path &path, Paths &solution, bool pathIsClosed) {
-	Minkowski(pattern, path, solution, true, pathIsClosed);
-	Clipper c;
-	c.AddPaths(solution, ptSubject, true);
-	c.Execute(ctUnion, solution, pftNonZero, pftNonZero);
-}
-//------------------------------------------------------------------------------
-
-void TranslatePath(const Path &input, Path &output, const IntPoint delta) {
-	// precondition: input != output
-	output.resize(input.size());
-	for (size_t i = 0; i < input.size(); ++i)
-		output[i] = IntPoint(input[i].X + delta.X, input[i].Y + delta.Y);
-}
-//------------------------------------------------------------------------------
-
-void MinkowskiSum(const Path &pattern, const Paths &paths, Paths &solution, bool pathIsClosed) {
-	Clipper c;
-	for (size_t i = 0; i < paths.size(); ++i) {
-		Paths tmp;
-		Minkowski(pattern, paths[i], tmp, true, pathIsClosed);
-		c.AddPaths(tmp, ptSubject, true);
-		if (pathIsClosed) {
-			Path tmp2;
-			TranslatePath(paths[i], tmp2, pattern[0]);
-			c.AddPath(tmp2, ptClip, true);
-		}
-	}
-	c.Execute(ctUnion, solution, pftNonZero, pftNonZero);
-}
-//------------------------------------------------------------------------------
-
-void MinkowskiDiff(const Path &poly1, const Path &poly2, Paths &solution) {
-	Minkowski(poly1, poly2, solution, false, true);
-	Clipper c;
-	c.AddPaths(solution, ptSubject, true);
-	c.Execute(ctUnion, solution, pftNonZero, pftNonZero);
-}
-//------------------------------------------------------------------------------
-
-enum NodeType { ntAny,
-				ntOpen,
-				ntClosed };
-
-void AddPolyNodeToPaths(const PolyNode &polynode, NodeType nodetype, Paths &paths) {
-	bool match = true;
-	if (nodetype == ntClosed)
-		match = !polynode.IsOpen();
-	else if (nodetype == ntOpen)
-		return;
-
-	if (!polynode.Contour.empty() && match)
-		paths.push_back(polynode.Contour);
-	for (int i = 0; i < polynode.ChildCount(); ++i)
-		AddPolyNodeToPaths(*polynode.Childs[i], nodetype, paths);
-}
-//------------------------------------------------------------------------------
-
-void PolyTreeToPaths(const PolyTree &polytree, Paths &paths) {
-	paths.resize(0);
-	paths.reserve(polytree.Total());
-	AddPolyNodeToPaths(polytree, ntAny, paths);
-}
-//------------------------------------------------------------------------------
-
-void ClosedPathsFromPolyTree(const PolyTree &polytree, Paths &paths) {
-	paths.resize(0);
-	paths.reserve(polytree.Total());
-	AddPolyNodeToPaths(polytree, ntClosed, paths);
-}
-//------------------------------------------------------------------------------
-
-void OpenPathsFromPolyTree(PolyTree &polytree, Paths &paths) {
-	paths.resize(0);
-	paths.reserve(polytree.Total());
-	// Open paths are top level only, so ...
-	for (int i = 0; i < polytree.ChildCount(); ++i)
-		if (polytree.Childs[i]->IsOpen())
-			paths.push_back(polytree.Childs[i]->Contour);
-}
-//------------------------------------------------------------------------------
-
-} // namespace ClipperLib
diff --git a/engines/twp/clipper/clipper.hpp b/engines/twp/clipper/clipper.hpp
deleted file mode 100644
index 8598a9eccc4..00000000000
--- a/engines/twp/clipper/clipper.hpp
+++ /dev/null
@@ -1,447 +0,0 @@
-/*******************************************************************************
-*                                                                              *
-* Author    :  Angus Johnson                                                   *
-* Version   :  6.4.2                                                           *
-* Date      :  27 February 2017                                                *
-* Website   :  http://www.angusj.com                                           *
-* Copyright :  Angus Johnson 2010-2017                                         *
-*                                                                              *
-* License:                                                                     *
-* Use, modification & distribution is subject to Boost Software License Ver 1. *
-* http://www.boost.org/LICENSE_1_0.txt                                         *
-*                                                                              *
-* Attributions:                                                                *
-* The code in this library is an extension of Bala Vatti's clipping algorithm: *
-* "A generic solution to polygon clipping"                                     *
-* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63.             *
-* http://portal.acm.org/citation.cfm?id=129906                                 *
-*                                                                              *
-* Computer graphics and geometric modeling: implementation and algorithms      *
-* By Max K. Agoston                                                            *
-* Springer; 1 edition (January 4, 2005)                                        *
-* http://books.google.com/books?q=vatti+clipping+agoston                       *
-*                                                                              *
-* See also:                                                                    *
-* "Polygon Offsetting by Computing Winding Numbers"                            *
-* Paper no. DETC2005-85513 pp. 565-575                                         *
-* ASME 2005 International Design Engineering Technical Conferences             *
-* and Computers and Information in Engineering Conference (IDETC/CIE2005)      *
-* September 24-28, 2005 , Long Beach, California, USA                          *
-* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf              *
-*                                                                              *
-*******************************************************************************/
-
-#ifndef clipper_hpp
-#define clipper_hpp
-
-#define CLIPPER_VERSION "6.4.2"
-
-//use_int32: When enabled 32bit ints are used instead of 64bit ints. This
-//improve performance but coordinate values are limited to the range +/- 46340
-#define use_int32
-
-//use_xyz: adds a Z member to IntPoint. Adds a minor cost to perfomance.
-//#define use_xyz
-
-//use_lines: Enables line clipping. Adds a very minor cost to performance.
-#define use_lines
-
-//use_deprecated: Enables temporary support for the obsolete functions
-//#define use_deprecated
-
-#include "common/array.h"
-
-namespace ClipperLib {
-
-enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor };
-enum PolyType { ptSubject, ptClip };
-//By far the most widely used winding rules for polygon filling are
-//EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG, Gr32)
-//Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in OpenGL)
-//see http://glprogramming.com/red/chapter11.html
-enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative };
-
-#ifdef use_int32
-typedef int32 cInt;
-static cInt const loRange = 0x7FFF;
-static cInt const hiRange = 0x7FFF;
-#else
-typedef int64 cInt;
-static cInt const loRange = 0x3FFFFFFF;
-static cInt const hiRange = 0x3FFFFFFFFFFFFFFFLL;
-typedef int64 long64;     //used by Int128 class
-typedef uint64 ulong64;
-
-#endif
-
-/**
- * Queue ordered by a provided priority function
- * NOTE: Unlike in the C std library, we have to provde a comparitor that sorts
- * the array so that the smallest priority comes last
- */
-template <class _Ty, class _Container = Common::Array<_Ty>, class _Pr = Common::Less<_Ty>>
-class priority_queue {
-public:
-	typedef const _Ty& const_reference;
-
-public:
-	priority_queue() : c(), comp() {}
-
-	explicit priority_queue(const _Pr &_Pred) : c(), comp(_Pred) {}
-
-	priority_queue(const _Pr &_Pred, const _Container &_Cont) : c(_Cont), comp(_Pred) {
-		make_heap(c.begin(), c.end(), comp);
-	}
-
-	template <class _InIt>
-	priority_queue(_InIt _First, _InIt _Last, const _Pr &_Pred, const _Container &_Cont) : c(_Cont), comp(_Pred) {
-		c.insert(c.end(), _First, _Last);
-		make_heap(c.begin(), c.end(), comp);
-	}
-
-	template <class _InIt>
-	priority_queue(_InIt _First, _InIt _Last) : c(_First, _Last), comp() {
-		make_heap(c.begin(), c.end(), comp);
-	}
-
-	template <class _InIt>
-	priority_queue(_InIt _First, _InIt _Last, const _Pr &_Pred) : c(_First, _Last), comp(_Pred) {
-		make_heap(c.begin(), c.end(), comp);
-	}
-
-	bool empty() const {
-		return c.empty();
-	}
-
-	size_t size() const {
-		return c.size();
-	}
-
-	const_reference top() const {
-		return c.back();
-	}
-
-	void push(const typename _Container::value_type &_Val) {
-		c.push_back(_Val);
-		Common::sort(c.begin(), c.end(), comp);
-	}
-
-	void pop() {
-		c.pop_back();
-	}
-
-	void swap(priority_queue &_Right) {
-		SWAP(c, _Right.c);
-		SWAP(comp, _Right.comp);
-	}
-
-protected:
-	_Container c;
-	_Pr comp;
-};
-
-struct IntPoint {
-  cInt X;
-  cInt Y;
-#ifdef use_xyz
-  cInt Z;
-  IntPoint(cInt x = 0, cInt y = 0, cInt z = 0): X(x), Y(y), Z(z) {};
-#else
-  IntPoint(cInt x = 0, cInt y = 0) : X(x), Y(y) {};
-#endif
-
-  friend inline bool operator==(const IntPoint &a, const IntPoint &b) {
-    return a.X == b.X && a.Y == b.Y;
-  }
-  friend inline bool operator!=(const IntPoint &a, const IntPoint &b) {
-    return a.X != b.X || a.Y != b.Y;
-  }
-};
-//------------------------------------------------------------------------------
-
-typedef Common::Array<IntPoint> Path;
-typedef Common::Array<Path> Paths;
-
-inline Path &operator<<(Path &poly, const IntPoint &p) {
-  poly.push_back(p);
-  return poly;
-}
-inline Paths &operator<<(Paths &polys, const Path &p) {
-  polys.push_back(p);
-  return polys;
-}
-
-struct DoublePoint {
-  double X;
-  double Y;
-  DoublePoint(double x = 0, double y = 0) : X(x), Y(y) {}
-  DoublePoint(IntPoint ip) : X((double) ip.X), Y((double) ip.Y) {}
-};
-//------------------------------------------------------------------------------
-
-#ifdef use_xyz
-typedef void (*ZFillCallback)(IntPoint& e1bot, IntPoint& e1top, IntPoint& e2bot, IntPoint& e2top, IntPoint& pt);
-#endif
-
-enum InitOptions { ioReverseSolution = 1, ioStrictlySimple = 2, ioPreserveCollinear = 4 };
-enum JoinType { jtSquare, jtRound, jtMiter };
-enum EndType { etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRound };
-
-class PolyNode;
-typedef Common::Array<PolyNode *> PolyNodes;
-
-class PolyNode {
-public:
-  PolyNode();
-  virtual ~PolyNode() {};
-  Path Contour;
-  PolyNodes Childs;
-  PolyNode *Parent;
-  PolyNode *GetNext() const;
-  bool IsHole() const;
-  bool IsOpen() const;
-  int ChildCount() const;
-private:
-  //PolyNode& operator =(PolyNode& other);
-  unsigned Index; //node index in Parent.Childs
-  bool m_IsOpen;
-  JoinType m_jointype;
-  EndType m_endtype;
-  PolyNode *GetNextSiblingUp() const;
-  void AddChild(PolyNode &child);
-  friend class Clipper; //to access Index
-  friend class ClipperOffset;
-};
-
-class PolyTree : public PolyNode {
-public:
-  ~PolyTree() { Clear(); };
-  PolyNode *GetFirst() const;
-  void Clear();
-  int Total() const;
-private:
-  //PolyTree& operator =(PolyTree& other);
-  PolyNodes AllNodes;
-  friend class Clipper; //to access AllNodes
-};
-
-bool Orientation(const Path &poly);
-double Area(const Path &poly);
-int PointInPolygon(const IntPoint &pt, const Path &path);
-
-void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
-void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd);
-void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd);
-
-void CleanPolygon(const Path &in_poly, Path &out_poly, double distance = 1.415);
-void CleanPolygon(Path &poly, double distance = 1.415);
-void CleanPolygons(const Paths &in_polys, Paths &out_polys, double distance = 1.415);
-void CleanPolygons(Paths &polys, double distance = 1.415);
-
-void MinkowskiSum(const Path &pattern, const Path &path, Paths &solution, bool pathIsClosed);
-void MinkowskiSum(const Path &pattern, const Paths &paths, Paths &solution, bool pathIsClosed);
-void MinkowskiDiff(const Path &poly1, const Path &poly2, Paths &solution);
-
-void PolyTreeToPaths(const PolyTree &polytree, Paths &paths);
-void ClosedPathsFromPolyTree(const PolyTree &polytree, Paths &paths);
-void OpenPathsFromPolyTree(PolyTree &polytree, Paths &paths);
-
-void ReversePath(Path &p);
-void ReversePaths(Paths &p);
-
-struct IntRect { cInt left; cInt top; cInt right; cInt bottom; };
-
-//enums that are used internally ...
-enum EdgeSide { esLeft = 1, esRight = 2 };
-
-//forward declarations (for stuff used internally) ...
-struct TEdge;
-struct IntersectNode;
-struct LocalMinimum;
-struct OutPt;
-struct OutRec;
-struct Join;
-
-typedef Common::Array<OutRec *> PolyOutList;
-typedef Common::Array<TEdge *> EdgeList;
-typedef Common::Array<Join *> JoinList;
-typedef Common::Array<IntersectNode *> IntersectList;
-
-//------------------------------------------------------------------------------
-
-//ClipperBase is the ancestor to the Clipper class. It should not be
-//instantiated directly. This class simply abstracts the conversion of sets of
-//polygon coordinates into edge objects that are stored in a LocalMinima list.
-class ClipperBase {
-public:
-  ClipperBase();
-  virtual ~ClipperBase();
-  virtual bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed);
-  bool AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed);
-  virtual void Clear();
-  IntRect GetBounds();
-  bool PreserveCollinear() { return m_PreserveCollinear; };
-  void PreserveCollinear(bool value) { m_PreserveCollinear = value; };
-protected:
-  void DisposeLocalMinimaList();
-  TEdge *AddBoundsToLML(TEdge *e, bool IsClosed);
-  virtual void Reset();
-  TEdge *ProcessBound(TEdge *E, bool IsClockwise);
-  void InsertScanbeam(const cInt Y);
-  bool PopScanbeam(cInt &Y);
-  bool LocalMinimaPending();
-  bool PopLocalMinima(cInt Y, const LocalMinimum *&locMin);
-  OutRec *CreateOutRec();
-  void DisposeAllOutRecs();
-  void DisposeOutRec(PolyOutList::size_type index);
-  void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2);
-  void DeleteFromAEL(TEdge *e);
-  void UpdateEdgeIntoAEL(TEdge *&e);
-
-  typedef Common::Array<LocalMinimum> MinimaList;
-  MinimaList::iterator m_CurrentLM;
-  MinimaList m_MinimaList;
-
-  bool m_UseFullRange;
-  EdgeList m_edges;
-  bool m_PreserveCollinear;
-  bool m_HasOpenPaths;
-  PolyOutList m_PolyOuts;
-  TEdge *m_ActiveEdges;
-
-  typedef priority_queue<cInt> ScanbeamList;
-  ScanbeamList m_Scanbeam;
-};
-//------------------------------------------------------------------------------
-
-class Clipper : public virtual ClipperBase {
-public:
-  Clipper(int initOptions = 0);
-  bool Execute(ClipType clipType,
-               Paths &solution,
-               PolyFillType fillType = pftEvenOdd);
-  bool Execute(ClipType clipType,
-               Paths &solution,
-               PolyFillType subjFillType,
-               PolyFillType clipFillType);
-  bool Execute(ClipType clipType,
-               PolyTree &polytree,
-               PolyFillType fillType = pftEvenOdd);
-  bool Execute(ClipType clipType,
-               PolyTree &polytree,
-               PolyFillType subjFillType,
-               PolyFillType clipFillType);
-  bool ReverseSolution() { return m_ReverseOutput; };
-  void ReverseSolution(bool value) { m_ReverseOutput = value; };
-  bool StrictlySimple() { return m_StrictSimple; };
-  void StrictlySimple(bool value) { m_StrictSimple = value; };
-  //set the callback function for z value filling on intersections (otherwise Z is 0)
-#ifdef use_xyz
-  void ZFillFunction(ZFillCallback zFillFunc);
-#endif
-protected:
-  virtual bool ExecuteInternal();
-private:
-  JoinList m_Joins;
-  JoinList m_GhostJoins;
-  IntersectList m_IntersectList;
-  ClipType m_ClipType;
-  typedef Common::Array<cInt> MaximaList;
-  MaximaList m_Maxima;
-  TEdge *m_SortedEdges;
-  bool m_ExecuteLocked;
-  PolyFillType m_ClipFillType;
-  PolyFillType m_SubjFillType;
-  bool m_ReverseOutput;
-  bool m_UsingPolyTree;
-  bool m_StrictSimple;
-#ifdef use_xyz
-  ZFillCallback   m_ZFill; //custom callback
-#endif
-  void SetWindingCount(TEdge &edge);
-  bool IsEvenOddFillType(const TEdge &edge) const;
-  bool IsEvenOddAltFillType(const TEdge &edge) const;
-  void InsertLocalMinimaIntoAEL(const cInt botY);
-  void InsertEdgeIntoAEL(TEdge *edge, TEdge *startEdge);
-  void AddEdgeToSEL(TEdge *edge);
-  bool PopEdgeFromSEL(TEdge *&edge);
-  void CopyAELToSEL();
-  void DeleteFromSEL(TEdge *e);
-  void SwapPositionsInSEL(TEdge *edge1, TEdge *edge2);
-  bool IsContributing(const TEdge &edge) const;
-  bool IsTopHorz(const cInt XPos);
-  void DoMaxima(TEdge *e);
-  void ProcessHorizontals();
-  void ProcessHorizontal(TEdge *horzEdge);
-  void AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &pt);
-  OutPt *AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &pt);
-  OutRec *GetOutRec(int idx);
-  void AppendPolygon(TEdge *e1, TEdge *e2);
-  void IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &pt);
-  OutPt *AddOutPt(TEdge *e, const IntPoint &pt);
-  OutPt *GetLastOutPt(TEdge *e);
-  bool ProcessIntersections(const cInt topY);
-  void BuildIntersectList(const cInt topY);
-  void ProcessIntersectList();
-  void ProcessEdgesAtTopOfScanbeam(const cInt topY);
-  void BuildResult(Paths &polys);
-  void BuildResult2(PolyTree &polytree);
-  void SetHoleState(TEdge *e, OutRec *outrec);
-  void DisposeIntersectNodes();
-  bool FixupIntersectionOrder();
-  void FixupOutPolygon(OutRec &outrec);
-  void FixupOutPolyline(OutRec &outrec);
-  bool IsHole(TEdge *e);
-  bool FindOwnerFromSplitRecs(OutRec &outRec, OutRec *&currOrfl);
-  void FixHoleLinkage(OutRec &outrec);
-  void AddJoin(OutPt *op1, OutPt *op2, const IntPoint offPt);
-  void ClearJoins();
-  void ClearGhostJoins();
-  void AddGhostJoin(OutPt *op, const IntPoint offPt);
-  bool JoinPoints(Join *j, OutRec *outRec1, OutRec *outRec2);
-  void JoinCommonEdges();
-  void DoSimplePolygons();
-  void FixupFirstLefts1(OutRec *OldOutRec, OutRec *NewOutRec);
-  void FixupFirstLefts2(OutRec *InnerOutRec, OutRec *OuterOutRec);
-  void FixupFirstLefts3(OutRec *OldOutRec, OutRec *NewOutRec);
-#ifdef use_xyz
-  void SetZ(IntPoint& pt, TEdge& e1, TEdge& e2);
-#endif
-};
-//------------------------------------------------------------------------------
-
-class ClipperOffset {
-public:
-  ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25);
-  ~ClipperOffset();
-  void AddPath(const Path &path, JoinType joinType, EndType endType);
-  void AddPaths(const Paths &paths, JoinType joinType, EndType endType);
-  void Execute(Paths &solution, double delta);
-  void Execute(PolyTree &solution, double delta);
-  void Clear();
-  double MiterLimit;
-  double ArcTolerance;
-private:
-  Paths m_destPolys;
-  Path m_srcPoly;
-  Path m_destPoly;
-  Common::Array<DoublePoint> m_normals;
-  double m_delta, m_sinA, m_sin, m_cos;
-  double m_miterLim, m_StepsPerRad;
-  IntPoint m_lowest;
-  PolyNode m_polyNodes;
-
-  void FixOrientations();
-  void DoOffset(double delta);
-  void OffsetPoint(int j, int &k, JoinType jointype);
-  void DoSquare(int j, int k);
-  void DoMiter(int j, int k, double r);
-  void DoRound(int j, int k);
-};
-//------------------------------------------------------------------------------
-
-} //ClipperLib namespace
-
-#endif //clipper_hpp
-
-
diff --git a/engines/twp/configure.engine b/engines/twp/configure.engine
deleted file mode 100644
index 78d5384d468..00000000000
--- a/engines/twp/configure.engine
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is included from the main "configure" script
-# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine twp "Thimbleweed Park" yes "" "" "16bit highres vorbis png opengl_game_shaders"
diff --git a/engines/twp/console.cpp b/engines/twp/console.cpp
deleted file mode 100644
index 3faa503989c..00000000000
--- a/engines/twp/console.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "twp/twp.h"
-#include "twp/console.h"
-#include "twp/squtil.h"
-
-namespace Twp {
-
-Console::Console() : GUI::Debugger() {
-	registerCmd("!", WRAP_METHOD(Console, Cmd_exec));
-}
-
-Console::~Console() = default;
-
-bool Console::Cmd_exec(int argc, const char **argv) {
-	Common::String s;
-	if (argc > 0) {
-		s += argv[0];
-		for (int i = 1; i < argc; i++) {
-			s += ' ';
-			s += argv[i];
-		}
-	}
-	sqexec(g_twp->getVm(), s.c_str(), "console");
-	return true;
-}
-
-} // End of namespace Twp
diff --git a/engines/twp/console.h b/engines/twp/console.h
deleted file mode 100644
index 9b6d2bda4ae..00000000000
--- a/engines/twp/console.h
+++ /dev/null
@@ -1,41 +0,0 @@
-
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_CONSOLE_H
-#define TWP_CONSOLE_H
-
-#include "gui/debugger.h"
-
-namespace Twp {
-
-class Console : public GUI::Debugger {
-private:
-	bool Cmd_exec(int argc, const char **argv);
-
-public:
-	Console();
-	~Console() override;
-};
-
-} // End of namespace Twp
-
-#endif // TWP_CONSOLE_H
diff --git a/engines/twp/credits.pl b/engines/twp/credits.pl
deleted file mode 100644
index f0cd477b9dd..00000000000
--- a/engines/twp/credits.pl
+++ /dev/null
@@ -1,3 +0,0 @@
-begin_section("Thimbleweed Park");
-	add_person("Valéry Sablonnière", "Scemino", "");
-end_section();
diff --git a/engines/twp/debugtools.cpp b/engines/twp/debugtools.cpp
deleted file mode 100644
index 2a035551153..00000000000
--- a/engines/twp/debugtools.cpp
+++ /dev/null
@@ -1,634 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "backends/imgui/imgui.h"
-#include "common/debug-channels.h"
-#include "twp/twp.h"
-#include "twp/debugtools.h"
-#include "twp/detection.h"
-#include "twp/dialog.h"
-#include "twp/hud.h"
-#include "twp/lighting.h"
-#include "twp/object.h"
-#include "twp/resmanager.h"
-#include "twp/room.h"
-#include "twp/savegame.h"
-#include "twp/shaders.h"
-#include "twp/squtil.h"
-#include "twp/thread.h"
-#include "twp/tsv.h"
-
-namespace Twp {
-
-static struct {
-	bool _showThreads = false;
-	bool _showObjects = false;
-	bool _showObject = false;
-	bool _showStack = false;
-	bool _showAudio = false;
-	bool _showResources = false;
-	bool _showScenegraph = false;
-	bool _showActor = false;
-	Node *_node = nullptr;
-	ImGuiTextFilter _objFilter;
-	ImGuiTextFilter _actorFilter;
-	int _fadeEffect = 0;
-	float _fadeDuration = 0.f;
-	bool _fadeToSepia = false;
-	Common::String _textureSelected;
-	int _selectedActor = 0;
-	int _selectedObject = 0;
-} state;
-
-ImVec4 gray(0.6f, 0.6f, 0.6f, 1.f);
-
-static void drawThreads() {
-	if (!state._showThreads)
-		return;
-
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	const auto &threads = g_twp->_threads;
-	if (ImGui::Begin("Threads", &state._showThreads)) {
-		ImGui::Text("# threads: %u", threads.size());
-		ImGui::Separator();
-
-		if (ImGui::BeginTable("Threads", 6, ImGuiTableFlags_Borders | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable | ImGuiTableFlags_RowBg)) {
-			ImGui::TableSetupColumn("Id");
-			ImGui::TableSetupColumn("Name");
-			ImGui::TableSetupColumn("Type");
-			ImGui::TableSetupColumn("Func");
-			ImGui::TableSetupColumn("Src");
-			ImGui::TableSetupColumn("Line");
-			ImGui::TableHeadersRow();
-
-			if (g_twp->_cutscene) {
-				Common::SharedPtr<ThreadBase> thread(g_twp->_cutscene);
-				SQStackInfos infos;
-				sq_stackinfos(thread->getThread(), 0, &infos);
-
-				ImGui::TableNextRow();
-				ImGui::TableNextColumn();
-				ImGui::Text("%5d", thread->getId());
-				ImGui::TableNextColumn();
-				ImGui::Text("%-56s", thread->getName().c_str());
-				ImGui::TableNextColumn();
-				ImGui::Text("%-6s", "cutscene");
-				ImGui::TableNextColumn();
-				ImGui::Text("%-9s", infos.funcname);
-				ImGui::TableNextColumn();
-				ImGui::Text("%-9s", infos.source);
-				ImGui::TableNextColumn();
-				ImGui::Text("%5lld", infos.line);
-			}
-
-			for (const auto &thread : threads) {
-				SQStackInfos infos;
-				sq_stackinfos(thread->getThread(), 0, &infos);
-
-				ImGui::TableNextRow();
-				ImGui::TableNextColumn();
-				ImGui::Text("%5d", thread->getId());
-				ImGui::TableNextColumn();
-				ImGui::Text("%-56s", thread->getName().c_str());
-				ImGui::TableNextColumn();
-				ImGui::Text("%-6s", thread->isGlobal() ? "global" : "local");
-				ImGui::TableNextColumn();
-				ImGui::Text("%-9s", infos.funcname);
-				ImGui::TableNextColumn();
-				ImGui::Text("%-9s", infos.source);
-				ImGui::TableNextColumn();
-				ImGui::Text("%5lld", infos.line);
-			}
-			ImGui::EndTable();
-		}
-	}
-	ImGui::End();
-}
-
-static void drawObjects() {
-	if (!state._showObjects)
-		return;
-
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	ImGui::Begin("Objects", &state._showObjects);
-	state._objFilter.Draw();
-
-	// show object list
-	for (const auto &layer : g_twp->_room->_layers) {
-		for (auto &obj : layer->_objects) {
-			if (state._objFilter.PassFilter(obj->_key.c_str())) {
-				ImGui::PushID(obj->getId());
-				bool visible = obj->_node->isVisible();
-				if (ImGui::Checkbox("", &visible)) {
-					obj->_node->setVisible(visible);
-				}
-				ImGui::SameLine();
-				Common::String name = obj->_key.empty() ? obj->getName() : Common::String::format("%s(%s) %d", obj->getName().c_str(), obj->_key.c_str(), obj->getId());
-				bool selected = false;
-				if (ImGui::Selectable(name.c_str(), &selected)) {
-					state._selectedObject = obj->getId();
-				}
-				ImGui::PopID();
-			}
-		}
-	}
-
-	ImGui::End();
-}
-
-static void drawObject() {
-	if (!state._showObject)
-		return;
-
-	Common::SharedPtr<Object> obj(sqobj(state._selectedObject));
-	if (!obj)
-		return;
-
-	Common::String name = obj->_key.empty() ? obj->getName() : Common::String::format("%s(%s) %d", obj->getName().c_str(), obj->_key.c_str(), obj->getId());
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	ImGui::Begin("Object", &state._showObject);
-	ImGui::Text("Name: %s", name.c_str());
-	ImGui::End();
-}
-
-static Common::String toString(Audio::Mixer::SoundType type) {
-	switch (type) {
-	case Audio::Mixer::kPlainSoundType:
-		return "sound";
-	case Audio::Mixer::kMusicSoundType:
-		return "music";
-	case Audio::Mixer::kSFXSoundType:
-		return "sfx";
-	case Audio::Mixer::kSpeechSoundType:
-		return "speech";
-	}
-	return "?";
-}
-
-static ImVec4 getCategoryColor(Audio::Mixer::SoundType type) {
-	switch (type) {
-	case Audio::Mixer::kPlainSoundType:
-		return ImVec4(0.f, 1.f, 0.f, 1.f);
-	case Audio::Mixer::kMusicSoundType:
-		return ImVec4(1.f, 0.f, 0.f, 1.f);
-	case Audio::Mixer::kSFXSoundType:
-		return ImVec4(1.f, 0.f, 1.f, 1.f);
-	case Audio::Mixer::kSpeechSoundType:
-		return ImVec4(1.f, 1.f, 0.f, 1.f);
-	}
-	return ImVec4(1.f, 1.f, 1.f, 1.f);
-}
-
-static void drawActors() {
-	if (!state._showActor)
-		return;
-
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	ImGui::Begin("Actors", &state._showActor);
-	state._actorFilter.Draw();
-	ImGui::BeginChild("Actor_List");
-	for (auto &actor : g_twp->_actors) {
-		bool selected = actor->getId() == state._selectedActor;
-		Common::String key(actor->_key);
-		if (state._actorFilter.PassFilter(actor->_key.c_str())) {
-			if (key.empty()) {
-				key = "??";
-			}
-			if (ImGui::Selectable(key.c_str(), &selected)) {
-				state._selectedActor = actor->getId();
-			}
-		}
-	}
-	ImGui::EndChild();
-	ImGui::End();
-}
-
-static void drawActor() {
-	if (!state._showActor)
-		return;
-
-	Common::SharedPtr<Object> actor(sqobj(state._selectedActor));
-	if (!actor)
-		return;
-
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	ImGui::Begin("Actor", &state._showStack);
-	ImGui::Text("Name: %s", actor->_key.c_str());
-	ImGui::Text("Costume: %s (%s)", actor->_costumeName.c_str(), actor->_costumeSheet.c_str());
-	ImGui::Text("Animation: %s", actor->_animName.c_str());
-	Common::String hiddenLayers(Twp::join(actor->_hiddenLayers, ", "));
-	ImGui::Text("Hidden Layers: %s", hiddenLayers.c_str());
-	ImGui::Text("Facing: %d", actor->_facing);
-	ImGui::Text("Facing Lock: %d", actor->_facingLockValue);
-	ImGui::ColorEdit3("Talk color", actor->_talkColor.v);
-	ImGui::DragFloat2("Talk offset", actor->_talkOffset.getData());
-	ImGui::End();
-}
-
-static void drawStack() {
-	if (!state._showStack)
-		return;
-
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	ImGui::Begin("Stack", &state._showStack);
-	ImGui::BeginChild("ScrollingRegion");
-	SQInteger size = sq_gettop(g_twp->getVm());
-	ImGui::Text("size: %lld", size);
-	HSQOBJECT obj;
-	for (SQInteger i = 1; i < size; i++) {
-		sq_getstackobj(g_twp->getVm(), -i, &obj);
-		ImGui::Text("obj type: 0x%X", obj._type);
-	}
-	ImGui::EndChild();
-	ImGui::End();
-}
-
-static void drawResources() {
-	if (!state._showResources)
-		return;
-
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	ImGui::Begin("Resources", &state._showResources);
-
-	if (ImGui::BeginTable("Resources", 2, ImGuiTableFlags_Borders | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable | ImGuiTableFlags_RowBg)) {
-		ImGui::TableSetupColumn("Name");
-		ImGui::TableSetupColumn("Resolution");
-		ImGui::TableHeadersRow();
-
-		for (auto &res : g_twp->_resManager->_textures) {
-			ImGui::TableNextRow();
-			ImGui::TableNextColumn();
-			bool selected = state._textureSelected == res._key;
-			if (ImGui::Selectable(res._key.c_str(), selected)) {
-				state._textureSelected = res._key;
-			}
-			ImGui::TableNextColumn();
-			ImGui::Text("%s", Common::String::format("%d x %d", res._value.width, res._value.height).c_str());
-		}
-
-		ImGui::EndTable();
-	}
-	ImGui::Separator();
-
-	ImVec2 cursor = ImGui::GetCursorPos();
-	ImGui::SetCursorPos(ImVec2(cursor.x, cursor.y + 10.f));
-	ImGui::Text("Preview:");
-	ImGui::BeginChild("TexturePreview", ImVec2(0, 0), ImGuiChildFlags_Border | ImGuiChildFlags_ResizeX | ImGuiChildFlags_ResizeY);
-	for (auto &res : g_twp->_resManager->_textures) {
-		if (state._textureSelected == res._key) {
-			ImGui::Image((ImTextureID)(intptr_t)res._value.id, ImVec2(res._value.width, res._value.height));
-			break;
-		}
-	}
-	ImGui::EndChild();
-
-	ImGui::End();
-}
-
-static void drawAudio() {
-	if (!state._showAudio)
-		return;
-
-	// count the number of active sounds
-	int count = 0;
-	for (const auto &s : g_twp->_audio->_slots) {
-		if (s.busy)
-			count++;
-	}
-
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	ImGui::Begin("Sounds", &state._showAudio);
-	ImGui::Text("# sounds: %d/%d", count, NUM_AUDIO_SLOTS);
-	ImGui::Separator();
-
-	if (ImGui::BeginTable("Threads", 7, ImGuiTableFlags_Borders | ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_Resizable | ImGuiTableFlags_RowBg)) {
-		ImGui::TableSetupColumn("");
-		ImGui::TableSetupColumn("Id");
-		ImGui::TableSetupColumn("Category");
-		ImGui::TableSetupColumn("Name");
-		ImGui::TableSetupColumn("Loops");
-		ImGui::TableSetupColumn("Volume");
-		ImGui::TableSetupColumn("Pan");
-		ImGui::TableHeadersRow();
-
-		for (int i = 0; i < NUM_AUDIO_SLOTS; i++) {
-			auto &sound = g_twp->_audio->_slots[i];
-			ImGui::TableNextRow();
-			ImGui::TableNextColumn();
-			ImGui::Text("#%d", i);
-			if (sound.busy) {
-				float pan = g_twp->_mixer->getChannelBalance(sound.handle) / 128.f;
-				float vol = g_twp->_mixer->getChannelVolume(sound.handle) / 255.f;
-				ImGui::TableNextColumn();
-				ImGui::Text("%d", sound.id);
-				ImGui::TableNextColumn();
-				ImGui::TextColored(getCategoryColor(sound.soundType), "%s", toString(sound.soundType).c_str());
-				ImGui::TableNextColumn();
-				ImGui::Text("%s", sound.sndDef->getName().c_str());
-				ImGui::TableNextColumn();
-				ImGui::Text("%d", sound.loopTimes);
-				ImGui::TableNextColumn();
-				ImGui::Text("%0.1f", vol);
-				ImGui::TableNextColumn();
-				ImGui::Text("%0.1f", pan);
-				ImGui::SameLine();
-				if (ImGui::SmallButton("STOP")) {
-					g_twp->_audio->stop(sound.id);
-				}
-			}
-		}
-
-		ImGui::EndTable();
-	}
-
-	ImGui::End();
-}
-
-static void drawGeneral() {
-	ImGuiIO &io = ImGui::GetIO();
-
-	ImGui::Begin("General");
-
-	SQInteger size = sq_gettop(g_twp->getVm());
-	ImGui::TextColored(gray, "Stack:");
-	ImGui::SameLine();
-	ImGui::Text("%lld", size);
-	ImGui::TextColored(gray, "Cutscene:");
-	ImGui::SameLine();
-	ImGui::Text("%s", g_twp->_cutscene ? g_twp->_cutscene->getName().c_str() : "no");
-	DialogState dialogState = g_twp->_dialog->getState();
-	ImGui::TextColored(gray, "In dialog:");
-	ImGui::SameLine();
-	ImGui::Text("%s", ((dialogState == Active) ? "yes" : (dialogState == WaitingForChoice ? "waiting for choice" : "no")));
-	ImGui::TextColored(gray, "Verb:");
-	ImGui::SameLine();
-	Common::String verb = g_twp->getTextDb().getText(g_twp->_hud->_verb.text);
-	ImGui::Text("%s %d", verb.c_str(), g_twp->_hud->_verb.id.id);
-
-	auto mousePos = g_twp->_cursor.pos;
-	ImGui::TextColored(gray, "Pos (screen):");
-	ImGui::SameLine();
-	ImGui::Text("(%.0f, %0.f)", mousePos.getX(), mousePos.getY());
-	if (g_twp->_room) {
-		auto pos = g_twp->screenToRoom(mousePos);
-		ImGui::TextColored(gray, "Pos (room):");
-		ImGui::SameLine();
-		ImGui::Text("(%.0f, %0.f)", pos.getX(), pos.getY());
-	}
-	ImGui::Separator();
-	ImGui::Checkbox("HUD", &g_twp->_inputState._inputHUD);
-	ImGui::SameLine();
-	ImGui::Checkbox("Input", &g_twp->_inputState._inputActive);
-	ImGui::SameLine();
-	ImGui::Checkbox("Cursor", &g_twp->_inputState._showCursor);
-	ImGui::SameLine();
-	ImGui::Checkbox("Verbs", &g_twp->_inputState._inputVerbsActive);
-	ImGui::SameLine();
-	ImGui::Checkbox("Allow SaveGame", &g_twp->_saveGameManager->_allowSaveGame);
-
-	ImGui::Separator();
-	bool isSwitcherOn = g_twp->_actorSwitcher._mode == asOn;
-	if (ImGui::Checkbox("Switcher ON", &isSwitcherOn)) {
-		if (isSwitcherOn) {
-			g_twp->_actorSwitcher._mode |= asOn;
-		} else {
-			g_twp->_actorSwitcher._mode &= ~asOn;
-		}
-	}
-	bool isTemporaryUnselectable = g_twp->_actorSwitcher._mode & asTemporaryUnselectable;
-	if (ImGui::Checkbox("Switcher Temp. Unselectable", &isTemporaryUnselectable)) {
-		if (isTemporaryUnselectable) {
-			g_twp->_actorSwitcher._mode |= asTemporaryUnselectable;
-		} else {
-			g_twp->_actorSwitcher._mode &= ~asTemporaryUnselectable;
-		}
-	}
-	ImGui::Separator();
-
-	if (ImGui::CollapsingHeader("Debug")) {
-		bool allEnabled = true;
-		auto channels = DebugMan.getDebugChannels();
-		for (auto &channel : channels) {
-			bool enabled = DebugMan.isDebugChannelEnabled(channel.channel);
-			allEnabled &= enabled;
-			if (ImGui::Checkbox(channel.name.c_str(), &enabled)) {
-				if (enabled) {
-					DebugMan.enableDebugChannel(channel.channel);
-				} else {
-					DebugMan.disableDebugChannel(channel.channel);
-				}
-			}
-		}
-		ImGui::Separator();
-		if (ImGui::Checkbox("All", &allEnabled)) {
-			if (allEnabled) {
-				DebugMan.enableAllDebugChannels();
-			} else {
-				DebugMan.disableAllDebugChannels();
-			}
-		}
-	}
-
-	// Camera
-	if (ImGui::CollapsingHeader("Camera")) {
-		ImGui::TextColored(gray, "follow:");
-		ImGui::SameLine();
-		ImGui::Text("%s", !g_twp->_followActor ? "(none)" : g_twp->_followActor->_key.c_str());
-		ImGui::TextColored(gray, "moving:");
-		ImGui::SameLine();
-		ImGui::Text("%s", g_twp->_camera->isMoving() ? "yes" : "no");
-		auto halfScreenSize = g_twp->_room->getScreenSize() / 2.0f;
-		auto camPos = g_twp->cameraPos() - halfScreenSize;
-		if (ImGui::DragFloat2("Camera pos", camPos.getData())) {
-			g_twp->follow(nullptr);
-			g_twp->cameraAt(camPos);
-		}
-		auto bounds = g_twp->_camera->getBounds();
-		if (ImGui::DragFloat4("Bounds", bounds.v)) {
-			g_twp->_camera->setBounds(bounds);
-		}
-	}
-
-	// Room
-	Common::SharedPtr<Room> room = g_twp->_room;
-	if (room) {
-		if (ImGui::CollapsingHeader("Room")) {
-			ImGui::TextColored(gray, "Sheet:");
-			ImGui::SameLine();
-			ImGui::Text("%s", room->_sheet.c_str());
-			ImGui::TextColored(gray, "Size:");
-			ImGui::SameLine();
-			ImGui::Text("%0.f x %0.f", room->_roomSize.getX(), room->_roomSize.getY());
-			ImGui::TextColored(gray, "Fullscreen:");
-			ImGui::SameLine();
-			ImGui::Text("%d", room->_fullscreen);
-			ImGui::TextColored(gray, "Height:");
-			ImGui::SameLine();
-			ImGui::Text("%d", room->_height);
-			Color overlay = room->_overlayNode.getOverlayColor();
-			if (ImGui::ColorEdit4("Overlay", overlay.v))
-				room->_overlayNode.setOverlayColor(overlay);
-			ImGui::Checkbox("Debug Lights", &g_twp->_lighting->_debug);
-			ImGui::ColorEdit4("Ambient Light", room->_lights._ambientLight.v);
-			for (int i = 0; i < room->_lights._numLights; ++i) {
-				Common::String ss = Common::String::format("Light %d", i + 1);
-				if (ImGui::TreeNode(ss.c_str())) {
-					auto &light = room->_lights._lights[i];
-					ImGui::DragFloat2("Position", light.pos.getData());
-					ImGui::ColorEdit4("Color", light.color.v);
-					ImGui::DragFloat("Direction angle", &light.coneDirection, 1.0f, 0.0f, 360.f);
-					ImGui::DragFloat("Angle", &light.coneAngle, 1.0f, 0.0f, 360.f);
-					ImGui::DragFloat("Cutoff", &light.cutOffRadius, 1.0f);
-					ImGui::DragFloat("Falloff", &light.coneFalloff, 0.1f, 0.f, 1.0f);
-					ImGui::DragFloat("Brightness", &light.brightness, 1.0f, 1.0f, 100.f);
-					ImGui::DragFloat("Half Radius", &light.halfRadius, 1.0f, 0.01f, 0.99f);
-					ImGui::TreePop();
-				}
-			}
-		}
-	}
-	ImGui::Separator();
-
-	// Windows
-	if (ImGui::CollapsingHeader("Windows")) {
-		ImGui::Checkbox("Threads", &state._showThreads);
-		ImGui::Checkbox("Objects", &state._showObjects);
-		ImGui::Checkbox("Object", &state._showObject);
-		ImGui::Checkbox("Actor", &state._showActor);
-		ImGui::Checkbox("Stack", &state._showStack);
-		ImGui::Checkbox("Audio", &state._showAudio);
-		ImGui::Checkbox("Resources", &state._showResources);
-		ImGui::Checkbox("Scene graph", &state._showScenegraph);
-	}
-	ImGui::Separator();
-
-	// Room shader
-	if (ImGui::CollapsingHeader("Room Shader")) {
-		int effect = static_cast<int>(room->_effect);
-		const char *RoomEffects = "None\0Sepia\0EGA\0VHS\0Ghost\0Black & White\0\0";
-		if (ImGui::Combo("effect", &effect, RoomEffects))
-			room->_effect = (RoomEffect)effect;
-		ImGui::DragFloat("iFade", &g_twp->_shaderParams->iFade, 0.01f, 0.f, 1.f);
-		ImGui::DragFloat("wobbleIntensity", &g_twp->_shaderParams->wobbleIntensity, 0.01f, 0.f, 1.f);
-		ImGui::DragFloat3("shadows", g_twp->_shaderParams->shadows.v, 0.01f, -1.f, 1.f);
-		ImGui::DragFloat3("midtones", g_twp->_shaderParams->midtones.v, 0.01f, -1.f, 1.f);
-		ImGui::DragFloat3("highlights", g_twp->_shaderParams->highlights.v, 0.01f, -1.f, 1.f);
-	}
-
-	// Fade Effects
-	if (ImGui::CollapsingHeader("Fade Shader")) {
-		ImGui::Separator();
-		const char *FadeEffects = "None\0In\0Out\0Wobble\0\0";
-		ImGui::Combo("Fade effect", &state._fadeEffect, FadeEffects);
-		ImGui::DragFloat("Duration", &state._fadeDuration, 0.1f, 0.f, 10.f);
-		ImGui::Checkbox("Fade to sepia", &state._fadeToSepia);
-		ImGui::Text("Elapsed %f", g_twp->_fadeShader->_elapsed);
-		ImGui::Text("Fade %f", g_twp->_fadeShader->_fade);
-		if (ImGui::Button("GO")) {
-			g_twp->fadeTo((FadeEffect)state._fadeEffect, state._fadeDuration, state._fadeToSepia);
-		}
-	}
-	ImGui::Separator();
-
-	ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
-	ImGui::End();
-}
-
-static void drawNode(Node *node) {
-	auto children = node->getChildren();
-	bool selected = state._node == node;
-	if (children.empty()) {
-		if (ImGui::Selectable(node->getName().c_str(), &selected)) {
-			state._node = node;
-		}
-	} else {
-		ImGui::PushID(node->getName().c_str());
-		if (ImGui::TreeNode("")) {
-			ImGui::SameLine();
-			if (ImGui::Selectable(node->getName().c_str(), &selected)) {
-				state._node = node;
-			}
-			for (const auto &child : children) {
-				drawNode(child);
-			}
-			ImGui::TreePop();
-		} else {
-			ImGui::SameLine();
-			if (ImGui::Selectable(node->getName().c_str(), &selected)) {
-				state._node = node;
-			}
-		}
-		ImGui::PopID();
-	}
-}
-
-static void drawScenegraph() {
-	if (!state._showScenegraph)
-		return;
-
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	ImGui::Begin("Scenegraph", &state._showScenegraph);
-	drawNode(g_twp->_scene.get());
-	ImGui::End();
-
-	ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-	if (state._node != nullptr) {
-		ImGui::Begin("Node");
-		bool visible = state._node->isVisible();
-		if (ImGui::Checkbox(state._node->getName().c_str(), &visible)) {
-			state._node->setVisible(visible);
-		}
-		int zsort = state._node->getZSort();
-		if (ImGui::DragInt("Z-Sort", &zsort)) {
-			state._node->setZSort(zsort);
-		}
-		Math::Vector2d pos = state._node->getPos();
-		if (ImGui::DragFloat2("Pos", pos.getData())) {
-			state._node->setPos(pos);
-		}
-		Math::Vector2d offset = state._node->getOffset();
-		if (ImGui::DragFloat2("Offset", offset.getData())) {
-			state._node->setOffset(offset);
-		}
-		ImGui::End();
-	}
-}
-
-void onImGuiRender() {
-	if (!debugChannelSet(-1, kDebugConsole)) {
-		ImGui::GetIO().ConfigFlags |= ImGuiConfigFlags_NoMouseCursorChange | ImGuiConfigFlags_NoMouse;
-		return;
-	}
-
-	ImGui::GetIO().ConfigFlags &= ~(ImGuiConfigFlags_NoMouseCursorChange | ImGuiConfigFlags_NoMouse);
-	drawGeneral();
-	drawThreads();
-	drawObjects();
-	drawObject();
-	drawStack();
-	drawAudio();
-	drawResources();
-	drawScenegraph();
-	drawActors();
-	drawActor();
-}
-
-} // namespace Twp
diff --git a/engines/twp/debugtools.h b/engines/twp/debugtools.h
deleted file mode 100644
index 2cb5cdc647f..00000000000
--- a/engines/twp/debugtools.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_DEBUGTOOLS_H
-#define TWP_DEBUGTOOLS_H
-
-namespace Twp {
-void onImGuiRender();
-}
-
-#endif
diff --git a/engines/twp/detection.cpp b/engines/twp/detection.cpp
deleted file mode 100644
index 54b24c09aed..00000000000
--- a/engines/twp/detection.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "base/plugins.h"
-#include "common/file.h"
-#include "common/translation.h"
-#include "twp/detection.h"
-#include "twp/detection_tables.h"
-
-const DebugChannelDef TwpMetaEngineDetection::debugFlagList[] = {
-	{Twp::kDebugText, "Text", "Text debug level"},
-	{Twp::kDebugGGPack, "GGPack", "GGPack debug level"},
-	{Twp::kDebugRes, "Res", "Resource debug level"},
-	{Twp::kDebugDialog, "Dialog", "Dialog debug level"},
-	{Twp::kDebugGenScript, "General", "Enable debug general script dump"},
-	{Twp::kDebugObjScript, "Object", "Enable debug object script dump"},
-	{Twp::kDebugSysScript, "System", "Enable debug system script dump"},
-	{Twp::kDebugRoomScript, "Room", "Enable debug room script dump"},
-	{Twp::kDebugActScript, "Actor", "Enable debug actor script dump"},
-	{Twp::kDebugSndScript, "Sound", "Enable debug sound script dump"},
-	{Twp::kDebugGame, "Game", "Game debug level"},
-	{Twp::kDebugConsole, "imgui", "Show ImGui debug window (if available)"},
-	DEBUG_CHANNEL_END};
-
-TwpMetaEngineDetection::TwpMetaEngineDetection()
-	: AdvancedMetaEngineDetection(Twp::gameDescriptions,
-								  sizeof(Twp::TwpGameDescription), Twp::twpGames) {
-}
-
-DetectedGame TwpMetaEngineDetection::toDetectedGame(const ADDetectedGame &adGame, ADDetectedGameExtraInfo *extraInfo) const {
-	DetectedGame game = AdvancedMetaEngineDetection::toDetectedGame(adGame, extraInfo);
-	Twp::LanguageSupported languageSupported = reinterpret_cast<const Twp::TwpGameDescription *>(adGame.desc)->languageSupported;
-	game.appendGUIOptions(Common::getGameGUIOptionsDescriptionLanguage(Common::EN_ANY));
-	game.appendGUIOptions(Common::getGameGUIOptionsDescriptionLanguage(Common::FR_FRA));
-	game.appendGUIOptions(Common::getGameGUIOptionsDescriptionLanguage(Common::IT_ITA));
-	game.appendGUIOptions(Common::getGameGUIOptionsDescriptionLanguage(Common::DE_DEU));
-	game.appendGUIOptions(Common::getGameGUIOptionsDescriptionLanguage(Common::ES_ESP));
-	if (languageSupported == Twp::LS_WITH_RUSSIAN) {
-		game.appendGUIOptions(Common::getGameGUIOptionsDescriptionLanguage(Common::RU_RUS));
-	}
-	return game;
-}
-
-REGISTER_PLUGIN_STATIC(TWP_DETECTION, PLUGIN_TYPE_ENGINE_DETECTION, TwpMetaEngineDetection);
diff --git a/engines/twp/detection.h b/engines/twp/detection.h
deleted file mode 100644
index d7db69c40dc..00000000000
--- a/engines/twp/detection.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_DETECTION_H
-#define TWP_DETECTION_H
-
-#include "engines/advancedDetector.h"
-
-namespace Twp {
-
-enum TwpDebugChannels {
-	kDebugText = 1,
-	kDebugGGPack,
-	kDebugRes,
-	kDebugDialog,
-	kDebugGenScript,
-	kDebugObjScript,
-	kDebugSysScript,
-	kDebugRoomScript,
-	kDebugActScript,
-	kDebugSndScript,
-	kDebugGame,
-	kDebugConsole
-};
-
-enum GameXorKey {
-	GAME_XORKEY_56AD,
-	GAME_XORKEY_566D,
-	GAME_XORKEY_5B6D,
-	GAME_XORKEY_5BAD,
-};
-
-enum LanguageSupported {
-	LS_WITH_RUSSIAN,
-	LS_WITHOUT_RUSSIAN
-};
-
-extern const PlainGameDescriptor twpGames[];
-struct TwpGameDescription {
-	ADGameDescription desc;
-	GameXorKey xorKey;
-	LanguageSupported languageSupported;
-};
-
-extern const TwpGameDescription gameDescriptions[];
-
-} // End of namespace Twp
-
-class TwpMetaEngineDetection : public AdvancedMetaEngineDetection {
-	static const DebugChannelDef debugFlagList[];
-
-public:
-	TwpMetaEngineDetection();
-	~TwpMetaEngineDetection() override = default;
-
-	const char *getName() const override {
-		return "twp";
-	}
-
-	const char *getEngineName() const override {
-		return "Thimbleweed Park";
-	}
-
-	const char *getOriginalCopyright() const override {
-		return "Thimbleweed Park (C) Terrible Toybox";
-	}
-
-	const DebugChannelDef *getDebugChannels() const override {
-		return debugFlagList;
-	}
-
-	/** Convert an AD game description into the shared game description format. */
-	DetectedGame toDetectedGame(const ADDetectedGame &adGame, ADDetectedGameExtraInfo *extraInfo) const override;
-};
-
-#endif // TWP_DETECTION_H
diff --git a/engines/twp/detection_tables.h b/engines/twp/detection_tables.h
deleted file mode 100644
index bab4be4abea..00000000000
--- a/engines/twp/detection_tables.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace Twp {
-
-const PlainGameDescriptor twpGames[] = {
-	{"twp", "Thimbleweed Park"},
-	{0, 0}};
-
-const TwpGameDescription gameDescriptions[] = {
-	// Thimbleweed Park - STEAM/1.0.859
-	{
-		{
-			"twp",
-			"",
-			AD_ENTRY1s("ThimbleweedPark.ggpack1", "b1c35b7a6b5b0c2e6f466ea384f22558", 435353845),
-			Common::UNK_LANG,
-			Common::kPlatformUnknown,
-			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOMIDI)
-		},
-		GAME_XORKEY_5B6D,
-		LS_WITHOUT_RUSSIAN
-	},
-	// Thimbleweed Park - EPIC Games/1.0.955
-	{
-		{
-			"twp",
-			"",
-			AD_ENTRY1s("ThimbleweedPark.ggpack1", "a97546ee2d9e19aab59714a267009a31", 502540584),
-			Common::UNK_LANG,
-			Common::kPlatformUnknown,
-			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOMIDI)
-		},
-		GAME_XORKEY_566D,
-		LS_WITH_RUSSIAN
-	},
-	// Thimbleweed Park - GOG/1.0.938
-	{
-		{
-			"twp",
-			"",
-			AD_ENTRY1s("ThimbleweedPark.ggpack1", "5532019821c077dda5cf86b619e4b173", 502495748),
-			Common::UNK_LANG,
-			Common::kPlatformUnknown,
-			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOMIDI)
-		},
-		GAME_XORKEY_566D,
-		LS_WITH_RUSSIAN
-	},
-	// Thimbleweed Park - GOG/1.0.951
-  	{
-		{
-			"twp",
-			"",
-			AD_ENTRY1s("ThimbleweedPark.ggpack1", "f0bd29df9fcaba3d4047eac1046e0abf", 502503739),
-			Common::UNK_LANG,
-			Common::kPlatformUnknown,
-			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOMIDI)
-		},
-		GAME_XORKEY_566D,
-		LS_WITH_RUSSIAN
-	},
-	// Thimbleweed Park - GOG/1.0.957
-  	{
-		{
-			"twp",
-			"",
-			AD_ENTRY1s("ThimbleweedPark.ggpack1", "5631cf51cb7afc4babf7f2d5a8bdfc21", 502661437),
-			Common::UNK_LANG,
-			Common::kPlatformUnknown,
-			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOMIDI)
-		},
-		GAME_XORKEY_56AD,
-		LS_WITH_RUSSIAN
-	},
-  	// Thimbleweed Park - GOG/1.0.958
-	{
-		{
-			"twp",
-			"",
-			AD_ENTRY1s("ThimbleweedPark.ggpack1", "6180145221d18e9e9caac6459e840579", 502661439),
-			Common::UNK_LANG,
-			Common::kPlatformUnknown,
-			ADGF_UNSTABLE,
-			GUIO1(GUIO_NOMIDI)
-		},
-		GAME_XORKEY_56AD,
-		LS_WITH_RUSSIAN
-	},
-	{AD_TABLE_END_MARKER,(GameXorKey)0, (LanguageSupported)0}};
-
-} // End of namespace Twp
diff --git a/engines/twp/dialog.cpp b/engines/twp/dialog.cpp
deleted file mode 100644
index a730c8c3bbf..00000000000
--- a/engines/twp/dialog.cpp
+++ /dev/null
@@ -1,476 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "twp/twp.h"
-#include "twp/detection.h"
-#include "twp/dialog.h"
-#include "twp/motor.h"
-#include "twp/squtil.h"
-#include "twp/tsv.h"
-
-namespace Twp {
-
-class SerialMotors : public Motor {
-public:
-	SerialMotors(const std::initializer_list<Common::SharedPtr<Motor> > &motors) : _motors(motors) {}
-	explicit SerialMotors(const Common::Array<Common::SharedPtr<Motor> > &motors) : _motors(motors) {}
-
-	void update(float elapsed) override {
-		if (!_motors.empty()) {
-			_motors[0]->update(elapsed);
-			if (!_motors[0]->isEnabled()) {
-				debugC(kDebugDialog, "SerialMotors next");
-				_motors.remove_at(0);
-			}
-		} else {
-			debugC(kDebugDialog, "SerialMotors is over");
-			disable();
-		}
-	}
-
-private:
-	Common::Array<Common::SharedPtr<Motor> > _motors;
-};
-
-class SelectLabelMotor : public Motor {
-public:
-	SelectLabelMotor(Dialog *dlg, int line, const Common::String &name)
-		: _dlg(dlg), _line(line), _name(name) {
-	}
-
-	void update(float elapsed) override {
-		_dlg->selectLabel(_line, _name);
-		disable();
-	}
-
-private:
-	Dialog *_dlg;
-	int _line;
-	Common::String _name;
-};
-
-CondStateVisitor::CondStateVisitor(Dialog *dlg, DialogSelMode mode) : _dlg(dlg), _mode(mode) {
-}
-
-DialogConditionState CondStateVisitor::createState(int line, DialogConditionMode mode) {
-	return DialogConditionState(mode, _dlg->_context.actor, _dlg->_context.dialogName, line);
-}
-
-DialogConditionState::DialogConditionState() = default;
-
-DialogConditionState::DialogConditionState(DialogConditionMode m, const Common::String &k, const Common::String &dlg, int ln)
-	: mode(m), actorKey(k), dialog(dlg), line(ln) {
-}
-
-void CondStateVisitor::visit(const YOnce &node) {
-	if (_mode == DialogSelMode::Choose)
-		_dlg->_states.push_back(createState(node._line, DialogConditionMode::Once));
-}
-
-void CondStateVisitor::visit(const YShowOnce &node) {
-	if (_mode == DialogSelMode::Show)
-		_dlg->_states.push_back(createState(node._line, DialogConditionMode::ShowOnce));
-}
-
-void CondStateVisitor::visit(const YOnceEver &node) {
-	if (_mode == DialogSelMode::Choose)
-		_dlg->_states.push_back(createState(node._line, DialogConditionMode::OnceEver));
-}
-
-void CondStateVisitor::visit(const YTempOnce &node) {
-	if (_mode == DialogSelMode::Show)
-		_dlg->_states.push_back(createState(node._line, DialogConditionMode::TempOnce));
-}
-
-ExpVisitor::ExpVisitor(Dialog *dialog) : _dialog(dialog) {}
-ExpVisitor::~ExpVisitor() = default;
-
-void ExpVisitor::visit(const YCodeExp &node) {
-	debugC(kDebugDialog, "execute code %s", node._code.c_str());
-	sqexec(g_twp->getVm(), node._code.c_str(), "dialog");
-}
-
-void ExpVisitor::visit(const YGoto &node) {
-	debugC(kDebugDialog, "execute goto %s", node._name.c_str());
-	_dialog->selectLabel(node._line, node._name);
-}
-
-void ExpVisitor::visit(const YShutup &node) {
-	debugC(kDebugDialog, "shutup");
-	_dialog->_tgt->shutup();
-}
-
-void ExpVisitor::visit(const YPause &node) {
-	debugC(kDebugDialog, "pause %d", node._time);
-	_dialog->_action = _dialog->_tgt->pause(node._time);
-}
-
-void ExpVisitor::visit(const YWaitFor &node) {
-	debugC(kDebugDialog, "TODO: waitFor {%s}", node._actor.c_str());
-}
-
-void ExpVisitor::visit(const YParrot &node) {
-	_dialog->_context.parrot = node._active;
-}
-
-void ExpVisitor::visit(const YDialog &node) {
-	_dialog->_context.actor = node._actor;
-}
-
-void ExpVisitor::visit(const YOverride &node) {
-	warning("TODO: override %s", node._node.c_str());
-}
-
-void ExpVisitor::visit(const YAllowObjects &node) {
-	warning("TODO: allowObjects");
-}
-
-void ExpVisitor::visit(const YWaitWhile &node) {
-	debugC(kDebugDialog, "wait while");
-	_dialog->_action = _dialog->_tgt->waitWhile(node._cond);
-}
-
-void ExpVisitor::visit(const YLimit &node) {
-	debugC(kDebugDialog, "limit");
-	_dialog->_context.limit = node._max;
-}
-
-void ExpVisitor::visit(const YSay &node) {
-	_dialog->_action = _dialog->_tgt->say(node._actor, node._text);
-}
-
-CondVisitor::CondVisitor(Dialog *dialog) : _dialog(dialog) {}
-CondVisitor::~CondVisitor() = default;
-
-void CondVisitor::visit(const YCodeCond &node) {
-	_accepted = _dialog->isCond(node._code);
-}
-
-void CondVisitor::visit(const YOnce &node) {
-	_accepted = _dialog->isOnce(node._line);
-}
-
-void CondVisitor::visit(const YShowOnce &node) {
-	_accepted = _dialog->isShowOnce(node._line);
-}
-
-void CondVisitor::visit(const YOnceEver &node) {
-	_accepted = _dialog->isOnceEver(node._line);
-}
-
-void CondVisitor::visit(const YTempOnce &node) {
-	_accepted = _dialog->isTempOnce(node._line);
-}
-
-DialogSlot::DialogSlot() : Node("DialogSlot") {}
-
-Dialog::Dialog() : Node("Dialog") {}
-Dialog::~Dialog() = default;
-
-static YChoice *getChoice(DialogSlot *slot) {
-	return (YChoice *)(slot->_stmt->_exp.get());
-}
-
-void Dialog::choose(int choice) {
-	if (_state == WaitingForChoice) {
-		choose(&_slots[choice]);
-	}
-}
-
-void Dialog::choose(DialogSlot *slot) {
-	if (slot && slot->_isValid) {
-		sqcall("onChoiceClick");
-		for (size_t i = 0; i < slot->_stmt->_conds.size(); i++) {
-			Common::SharedPtr<YCond> cond = slot->_stmt->_conds[i];
-			CondStateVisitor v(slot->_dlg, DialogSelMode::Choose);
-			cond->accept(v);
-		}
-		YChoice *choice = getChoice(slot);
-		if (slot->_dlg->_context.parrot) {
-			slot->_dlg->_state = DialogState::Active;
-			slot->_dlg->_action = Common::SharedPtr<SerialMotors>(new SerialMotors(
-				{slot->_dlg->_tgt->say(slot->_dlg->_context.actor, choice->_text),
-				 Common::SharedPtr<SelectLabelMotor>(new SelectLabelMotor(slot->_dlg, choice->_goto->_line, choice->_goto->_name))}));
-			slot->_dlg->clearSlots();
-		} else {
-			slot->_dlg->selectLabel(choice->_goto->_line, choice->_goto->_name);
-		}
-	}
-}
-
-void Dialog::start(const Common::String &actor, const Common::String &name, const Common::String &node) {
-	_context.actor = actor;
-	_context.dialogName = name;
-	_context.parrot = true;
-	_context.limit = MAXCHOICES;
-	// keepIf(self.states, proc(x: DialogConditionState): bool = x.mode != TempOnce);
-	Common::String path = name + ".byack";
-	debugC(kDebugDialog, "start dialog %s", path.c_str());
-	GGPackEntryReader reader;
-	reader.open(*g_twp->_pack, path);
-	YackParser parser;
-	_cu.reset(parser.parse(&reader));
-	selectLabel(0, node);
-	update(0);
-}
-
-void Dialog::update(float dt) {
-	switch (_state) {
-	case DialogState::None:
-		break;
-	case DialogState::Active:
-		running(dt);
-		break;
-	case DialogState::WaitingForChoice: {
-		Color color = _tgt->actorColor(_context.actor);
-		Color colorHover = _tgt->actorColorHover(_context.actor);
-		for (size_t i = 0; i < MAXDIALOGSLOTS; i++) {
-			DialogSlot *slot = &_slots[i];
-			if (slot->_isValid) {
-				Rectf rect = Rectf::fromPosAndSize(slot->getPos() - Math::Vector2d(0.f, slot->_text.getBounds().getY()), slot->_text.getBounds());
-				bool over = slot && rect.contains(_mousePos);
-				if (rect.r.w > (SCREEN_WIDTH - SLOTMARGIN)) {
-					if (over) {
-						if ((rect.r.w + slot->getPos().getX()) > (SCREEN_WIDTH - SLOTMARGIN)) {
-							slot->setPos(Math::Vector2d(slot->getPos().getX() - SLIDINGSPEED * dt, slot->getPos().getY()));
-							if ((rect.r.w + slot->getPos().getX()) < (SCREEN_WIDTH - SLOTMARGIN)) {
-								slot->setPos(Math::Vector2d((SCREEN_WIDTH - SLOTMARGIN) - rect.r.w, slot->getPos().getY()));
-							}
-						}
-					} else if (slot->getPos().getX() < SLOTMARGIN) {
-						slot->setPos(Math::Vector2d(slot->getPos().getX() + SLIDINGSPEED * dt, slot->getPos().getY()));
-						if (slot->getPos().getX() > SLOTMARGIN) {
-							slot->setPos(Math::Vector2d(SLOTMARGIN, slot->getPos().getY()));
-						}
-					}
-				}
-				slot->_text.setColor(over ? colorHover : color);
-				if (over && g_twp->_cursor.isLeftDown())
-					choose(i);
-			}
-		}
-	} break;
-	}
-}
-
-bool Dialog::isOnce(int line) const {
-	for (const auto &state : _states) {
-		if (state.mode == Once && state.actorKey == _context.actor && state.dialog == _context.dialogName && state.line == line) {
-			debugC(kDebugDialog, "isOnce %d: false", line);
-			return false;
-		}
-	}
-	debugC(kDebugDialog, "isOnce %d: true", line);
-	return true;
-}
-
-bool Dialog::isShowOnce(int line) const {
-	for (const auto &state : _states) {
-		if (state.mode == ShowOnce && state.actorKey == _context.actor && state.dialog == _context.dialogName && state.line == line) {
-			debugC(kDebugDialog, "isShowOnce %d: false", line);
-			return false;
-		}
-	}
-	debugC(kDebugDialog, "isShowOnce %d: true", line);
-	return true;
-}
-
-bool Dialog::isOnceEver(int line) const {
-	for (const auto &state : _states) {
-		if (state.mode == OnceEver && state.dialog == _context.dialogName && state.line == line) {
-			debugC(kDebugDialog, "isOnceEver %d: false", line);
-			return false;
-		}
-	}
-	debugC(kDebugDialog, "isOnceEver %d: true", line);
-	return true;
-}
-
-bool Dialog::isTempOnce(int line) const {
-	for (const auto &state : _states) {
-		if (state.mode == TempOnce && state.actorKey == _context.actor && state.dialog == _context.dialogName && state.line == line) {
-			debugC(kDebugDialog, "isTempOnce %d: false", line);
-			return false;
-		}
-	}
-	debugC(kDebugDialog, "isTempOnce %d: true", line);
-	return true;
-}
-
-bool Dialog::isCond(const Common::String &cond) const {
-	bool result = _tgt->execCond(cond);
-	debugC(kDebugDialog, "isCond '%s': %s", cond.c_str(), result ? "TRUE" : "FALSE");
-	return result;
-}
-
-Common::SharedPtr<YLabel> Dialog::label(int line, const Common::String &name) const {
-	for (auto label : _cu->_labels) {
-		if ((label->_name == name) && (label->_line >= line)) {
-			return label;
-		}
-	}
-	line = 0;
-	for (auto label : _cu->_labels) {
-		if ((label->_name == name) && (label->_line >= line)) {
-			return label;
-		}
-	}
-	return nullptr;
-}
-
-void Dialog::selectLabel(int line, const Common::String &name) {
-	debugC(kDebugDialog, "select label %s", name.c_str());
-	_lbl = label(line, name);
-	_currentStatement = 0;
-	clearSlots();
-	_state = _lbl ? Active : None;
-}
-
-void Dialog::gotoNextLabel() {
-	if (_lbl) {
-		size_t i = Twp::find(_cu->_labels, _lbl);
-		if ((i != (size_t)-1) && (i != _cu->_labels.size() - 1)) {
-			Common::SharedPtr<YLabel> label = _cu->_labels[i + 1];
-			selectLabel(label->_line, label->_name);
-		} else {
-			_state = None;
-		}
-	}
-}
-
-void Dialog::updateChoiceStates() {
-	_state = WaitingForChoice;
-	for (auto &_slot : _slots) {
-		DialogSlot *slot = &_slot;
-		if (slot->_isValid) {
-			for (auto cond : slot->_stmt->_conds) {
-				CondStateVisitor v(this, DialogSelMode::Show);
-				cond->accept(v);
-			}
-		}
-	}
-}
-
-void Dialog::run(Common::SharedPtr<YStatement> stmt) {
-	if (acceptConditions(stmt)) {
-		ExpVisitor visitor(this);
-		stmt->_exp->accept(visitor);
-		IsGoto isGoto;
-		stmt->_exp->accept(isGoto);
-		if (isGoto._isGoto)
-			return;
-	}
-	_currentStatement++;
-}
-
-bool Dialog::acceptConditions(Common::SharedPtr<YStatement> stmt) {
-	CondVisitor vis(this);
-	for (auto cond : stmt->_conds) {
-		cond->accept(vis);
-		if (!vis._accepted) {
-			return false;
-		}
-	}
-	return true;
-}
-void Dialog::running(float dt) {
-	if (_action && _action->isEnabled())
-		_action->update(dt);
-	else if (!_lbl)
-		_state = None;
-	else if (_currentStatement == _lbl->_stmts.size())
-		gotoNextLabel();
-	else {
-		_state = Active;
-		while (_lbl && (_currentStatement < _lbl->_stmts.size()) && (_state == Active)) {
-			Common::SharedPtr<YStatement> statmt = _lbl->_stmts[_currentStatement];
-			IsChoice isChoice;
-			statmt->_exp->accept(isChoice);
-			if (!acceptConditions(statmt))
-				_currentStatement++;
-			else if (isChoice._isChoice) {
-				addSlot(statmt);
-				_currentStatement++;
-			} else if (choicesReady())
-				updateChoiceStates();
-			else if (_action && _action->isEnabled()) {
-				_action->update(dt);
-				return;
-			} else {
-				run(statmt);
-				if (_lbl && (_currentStatement == _lbl->_stmts.size()))
-					gotoNextLabel();
-			}
-		}
-		if (choicesReady())
-			updateChoiceStates();
-		else if (!_action || !_action->isEnabled())
-			_state = None;
-	}
-}
-
-static Common::String text(const Common::String &txt) {
-	Common::String result(g_twp->getTextDb().getText(txt));
-	result = remove(result, '(', ')');
-	result = remove(result, '{', '}');
-	return result;
-}
-
-void Dialog::addSlot(Common::SharedPtr<YStatement> stmt) {
-	YChoice *choice = (YChoice *)stmt->_exp.get();
-	if ((!_slots[choice->_number - 1]._isValid) && (numSlots() < _context.limit)) {
-		DialogSlot *slot = &_slots[choice->_number - 1];
-		slot->_text.setFont("sayline");
-		slot->_text.setText(Common::String::format("● %s", text(choice->_text).c_str()));
-		slot->_stmt = stmt;
-		slot->_dlg = this;
-		slot->setPos(Math::Vector2d(SLOTMARGIN, SLOTMARGIN + slot->_text.getBounds().getY() * (MAXCHOICES - numSlots())));
-		slot->_isValid = true;
-	}
-}
-
-int Dialog::numSlots() const {
-	int num = 0;
-	for (const auto &_slot : _slots) {
-		if (_slot._isValid)
-			num++;
-	}
-	return num;
-}
-
-void Dialog::clearSlots() {
-	for (auto &_slot : _slots) {
-		_slot._isValid = false;
-	}
-}
-
-void Dialog::drawCore(Math::Matrix4 trsf) {
-	for (auto &_slot : _slots) {
-		DialogSlot *slot = &_slot;
-		if (slot->_isValid) {
-			Math::Matrix4 t(trsf);
-			t.translate(Math::Vector3d(slot->getPos().getX(), slot->getPos().getY(), 0.f));
-			slot->_text.draw(g_twp->getGfx(), t);
-		}
-	}
-}
-
-} // namespace Twp
diff --git a/engines/twp/dialog.h b/engines/twp/dialog.h
deleted file mode 100644
index 7a0db5a0731..00000000000
--- a/engines/twp/dialog.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_DIALOG_H
-#define TWP_DIALOG_H
-
-#include "common/array.h"
-#include "common/str.h"
-#include "twp/yack.h"
-#include "twp/scenegraph.h"
-#include "twp/font.h"
-#include "twp/motor.h"
-
-#define MAXDIALOGSLOTS 9
-#define MAXCHOICES 6
-#define SLIDINGSPEED 25.f
-#define SLOTMARGIN 8.f
-
-namespace Twp {
-
-class Dialog;
-class DialogSlot : public Node {
-public:
-	DialogSlot();
-	virtual ~DialogSlot() override {}
-
-public:
-	bool _isValid = false;
-	Text _text;
-	Common::SharedPtr<YStatement> _stmt;
-	Dialog *_dlg = nullptr;
-};
-
-struct DialogContext {
-	Common::String actor;
-	Common::String dialogName;
-	bool parrot;
-	int limit;
-};
-
-enum DialogState {
-	None,
-	Active,
-	WaitingForChoice
-};
-
-enum DialogConditionMode {
-	Once,
-	ShowOnce,
-	OnceEver,
-	ShowOnceEver,
-	TempOnce
-};
-
-enum DialogSelMode {
-	Choose,
-	Show
-};
-
-struct DialogConditionState {
-	DialogConditionMode mode;
-	Common::String actorKey, dialog;
-	int line;
-
-	DialogConditionState();
-	DialogConditionState(DialogConditionMode mode, const Common::String &actorKey, const Common::String &dialog, int line);
-};
-
-class DialogTarget {
-public:
-	virtual ~DialogTarget() {}
-
-	virtual Color actorColor(const Common::String &actor) = 0;
-	virtual Color actorColorHover(const Common::String &actor) = 0;
-	virtual Common::SharedPtr<Motor> say(const Common::String &actor, const Common::String &text) = 0;
-	virtual Common::SharedPtr<Motor> waitWhile(const Common::String &cond) = 0;
-	virtual void shutup() = 0;
-	virtual Common::SharedPtr<Motor> pause(float time) = 0;
-	virtual bool execCond(const Common::String &cond) = 0;
-};
-
-class CondStateVisitor : public YackVisitor {
-public:
-	CondStateVisitor(Dialog *dlg, DialogSelMode mode);
-	DialogConditionState createState(int line, DialogConditionMode mode);
-
-private:
-	void visit(const YOnce &node) override;
-	void visit(const YShowOnce &node) override;
-	void visit(const YOnceEver &node) override;
-	void visit(const YTempOnce &node) override;
-
-private:
-	DialogSelMode _mode;
-	Dialog *_dlg = nullptr;
-};
-
-class IsGoto : public YackVisitor {
-public:
-	virtual ~IsGoto() override {}
-	void visit(const YGoto &node) override { _isGoto = true; }
-
-public:
-	bool _isGoto = false;
-};
-
-class IsChoice : public YackVisitor {
-public:
-	virtual ~IsChoice() override {}
-	void visit(const YChoice &node) override { _isChoice = true; }
-
-public:
-	bool _isChoice = false;
-};
-
-class ExpVisitor : public YackVisitor {
-public:
-	explicit ExpVisitor(Dialog *dialog);
-	virtual ~ExpVisitor() override;
-
-private:
-	void visit(const YCodeExp &node) override;
-	void visit(const YGoto &node) override;
-	void visit(const YSay &node) override;
-	void visit(const YPause &node) override;
-	void visit(const YParrot &node) override;
-	void visit(const YDialog &node) override;
-	void visit(const YOverride &node) override;
-	void visit(const YAllowObjects &node) override;
-	void visit(const YLimit &node) override;
-	void visit(const YWaitWhile &node) override;
-	void visit(const YWaitFor &node) override;
-	void visit(const YShutup &node) override;
-
-private:
-	Dialog *_dialog = nullptr;
-};
-
-class CondVisitor : public YackVisitor {
-public:
-	CondVisitor(Dialog *dialog);
-	virtual ~CondVisitor() override;
-
-private:
-	void visit(const YCodeCond &node) override;
-	void visit(const YOnce &node) override;
-	void visit(const YShowOnce &node) override;
-	void visit(const YOnceEver &node) override;
-	void visit(const YTempOnce &node) override;
-
-public:
-	bool _accepted = true;
-
-private:
-	Dialog *_dialog = nullptr;
-};
-
-class Dialog : public Node {
-public:
-	Dialog();
-	virtual ~Dialog() override;
-
-	void choose(int choice);
-	void update(float dt);
-	DialogState getState() const { return _state; }
-
-	void setMousePos(Math::Vector2d pos) { _mousePos = pos; }
-
-	void start(const Common::String &actor, const Common::String &name, const Common::String &node);
-	void selectLabel(int line, const Common::String &name);
-	bool isOnce(int line) const;
-	bool isShowOnce(int line) const;
-	bool isOnceEver(int line) const;
-	bool isTempOnce(int line) const;
-	bool isCond(const Common::String &cond) const;
-
-private:
-	void choose(DialogSlot *slot);
-	Common::SharedPtr<YLabel> label(int line, const Common::String &name) const;
-	void gotoNextLabel();
-	bool choicesReady() const { return numSlots() > 0; }
-	void updateChoiceStates();
-	void run(Common::SharedPtr<YStatement> stmt);
-	bool acceptConditions(Common::SharedPtr<YStatement> stmt);
-	void running(float dt);
-
-	void addSlot(Common::SharedPtr<YStatement> stmt);
-	int numSlots() const;
-	void clearSlots();
-
-	virtual void drawCore(Math::Matrix4 trsf) override final;
-
-public:
-	Common::Array<DialogConditionState> _states;
-	DialogContext _context;
-	unique_ptr<DialogTarget> _tgt;
-	Common::SharedPtr<Motor> _action;
-
-private:
-	DialogState _state = DialogState::None;
-	size_t _currentStatement = 0;
-	unique_ptr<YCompilationUnit> _cu;
-	Common::SharedPtr<YLabel> _lbl;
-	DialogSlot _slots[MAXDIALOGSLOTS];
-	Math::Vector2d _mousePos;
-};
-
-} // namespace Twp
-
-#endif
diff --git a/engines/twp/dialogs.cpp b/engines/twp/dialogs.cpp
deleted file mode 100644
index 056171b4678..00000000000
--- a/engines/twp/dialogs.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "common/translation.h"
-#include "gui/gui-manager.h"
-#include "gui/widgets/edittext.h"
-#include "gui/widgets/popup.h"
-#include "gui/ThemeEval.h"
-#include "twp/dialogs.h"
-
-namespace Twp {
-
-TwpOptionsContainerWidget::TwpOptionsContainerWidget(GuiObject *boss, const Common::String &name, const Common::String &domain) : OptionsContainerWidget(boss, name, "TwpGameOptionsDialog", false, domain) {
-	GUI::StaticTextWidget *text = new GUI::StaticTextWidget(widgetsBoss(), "TwpGameOptionsDialog.VideoLabel", _("Video:"));
-	text->setAlign(Graphics::TextAlign::kTextAlignStart);
-
-	_enableToiletPaperOverGUICheckbox = new GUI::CheckboxWidget(widgetsBoss(), "TwpGameOptionsDialog.VideoCheck1",
-																// I18N: Setting to switch toiled paper to be shown as "over".
-																_("Toilet paper over"),
-																_("The toilet paper in some toilets will be shown “over”.\nIt’s a joke option that has no effects on the gameplay."));
-	_enableAnnoyingInJokesGUICheckbox = new GUI::CheckboxWidget(widgetsBoss(), "TwpGameOptionsDialog.VideoCheck2",
-																// I18N: Setting to enable or disable additional jokes in the game.
-																_("Annoying in-jokes"),
-																_("The game will include in-jokes and references to past adventure games, in the form of both dialogues and objects.\nThere is a game achievement that can be obtained only if the in-jokes option is switched on."));
-
-	text = new GUI::StaticTextWidget(widgetsBoss(), "TwpGameOptionsDialog.ControlsLabel", _("Controls:"));
-	text->setAlign(Graphics::TextAlign::kTextAlignStart);
-
-	// I18N: Setting to invert verb colors or keep the original verb colors.
-	_enableInvertVerbColorsGUICheckbox = new GUI::CheckboxWidget(widgetsBoss(), "TwpGameOptionsDialog.ControlsCheck1", _("Invert verb colors"), _(""));
-	// I18N: Setting to use retro or modern fonts.
-	_enableRetroFontsGUICheckbox = new GUI::CheckboxWidget(widgetsBoss(), "TwpGameOptionsDialog.ControlsCheck2", _("Retro Fonts"), _(""));
-	// I18N: Setting to use retro or modern verbs.
-	_enableRetroVerbsGUICheckbox = new GUI::CheckboxWidget(widgetsBoss(), "TwpGameOptionsDialog.ControlsCheck3", _("Retro Verbs"), _(""));
-	// I18N: Setting to use classic sentence or modern sentence.
-	_enableClassicSentenceGUICheckbox = new GUI::CheckboxWidget(widgetsBoss(), "TwpGameOptionsDialog.ControlsCheck4", _("Classic Sentence"), _(""));
-
-	// I18N: Settings to enable or disable Ransome unbeeped DLC.
-	_enableDLC = new GUI::CheckboxWidget(widgetsBoss(), "TwpGameOptionsDialog.TextCheck1", _("Ransome *unbeeped* (DLC)"), _(""));
-}
-
-void TwpOptionsContainerWidget::defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const {
-	layouts.addDialog(layoutName, overlayedLayout);
-	layouts.addLayout(GUI::ThemeLayout::kLayoutVertical).addPadding(0, 0, 8, 8);
-
-	layouts.addPadding(0, 0, 8, 8)
-		.addSpace(10)
-		.addWidget("VideoLabel", "OptionsLabel")
-		.addWidget("VideoCheck1", "Checkbox")
-		.addWidget("VideoCheck2", "Checkbox")
-		.addWidget("ControlsLabel", "OptionsLabel")
-		.addWidget("ControlsCheck1", "Checkbox")
-		.addWidget("ControlsCheck2", "Checkbox")
-		.addWidget("ControlsCheck3", "Checkbox")
-		.addWidget("ControlsCheck4", "Checkbox")
-		.addWidget("TextCheck1", "Checkbox");
-
-	layouts.closeLayout().closeDialog();
-}
-
-void TwpOptionsContainerWidget::load() {
-	_enableToiletPaperOverGUICheckbox->setState(ConfMan.getBool("toiletPaperOver", _domain));
-	_enableAnnoyingInJokesGUICheckbox->setState(ConfMan.getBool("annoyingInJokes", _domain));
-	_enableInvertVerbColorsGUICheckbox->setState(ConfMan.getBool("invertVerbHighlight", _domain));
-	_enableRetroFontsGUICheckbox->setState(ConfMan.getBool("retroFonts", _domain));
-	_enableRetroVerbsGUICheckbox->setState(ConfMan.getBool("retroVerbs", _domain));
-	_enableClassicSentenceGUICheckbox->setState(ConfMan.getBool("hudSentence", _domain));
-	_enableDLC->setState(ConfMan.getBool("ransomeUnbeeped", _domain));
-}
-
-bool TwpOptionsContainerWidget::save() {
-	ConfMan.setBool("toiletPaperOver", _enableToiletPaperOverGUICheckbox->getState(), _domain);
-	ConfMan.setBool("annoyingInJokes", _enableAnnoyingInJokesGUICheckbox->getState(), _domain);
-	ConfMan.setBool("invertVerbHighlight", _enableInvertVerbColorsGUICheckbox->getState(), _domain);
-	ConfMan.setBool("retroFonts", _enableRetroFontsGUICheckbox->getState(), _domain);
-	ConfMan.setBool("retroVerbs", _enableRetroVerbsGUICheckbox->getState(), _domain);
-	ConfMan.setBool("hudSentence", _enableClassicSentenceGUICheckbox->getState(), _domain);
-	ConfMan.setBool("ransomeUnbeeped", _enableDLC->getState(), _domain);
-	return true;
-}
-
-} // namespace Twp
diff --git a/engines/twp/dialogs.h b/engines/twp/dialogs.h
deleted file mode 100644
index b8354aa5b0f..00000000000
--- a/engines/twp/dialogs.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_DIALOGS_H
-#define TWP_DIALOGS_H
-
-#include "gui/dialog.h"
-#include "engines/dialogs.h"
-
-namespace Twp {
-
-class TwpOptionsContainerWidget : public GUI::OptionsContainerWidget {
-public:
-	TwpOptionsContainerWidget(GuiObject *boss, const Common::String &name, const Common::String &domain);
-	~TwpOptionsContainerWidget() override = default;
-
-	void load() override;
-	bool save() override;
-
-private:
-	void defineLayout(GUI::ThemeEval &layouts, const Common::String &layoutName, const Common::String &overlayedLayout) const override;
-
-private:
-	GUI::CheckboxWidget *_enableToiletPaperOverGUICheckbox = nullptr;
-	GUI::CheckboxWidget *_enableAnnoyingInJokesGUICheckbox = nullptr;
-	GUI::CheckboxWidget *_enableInvertVerbColorsGUICheckbox = nullptr;
-	GUI::CheckboxWidget *_enableRetroFontsGUICheckbox = nullptr;
-	GUI::CheckboxWidget *_enableRetroVerbsGUICheckbox = nullptr;
-	GUI::CheckboxWidget *_enableClassicSentenceGUICheckbox = nullptr;
-	GUI::CheckboxWidget *_enableDLC = nullptr;
-};
-
-} // namespace Twp
-
-#endif
diff --git a/engines/twp/enginedialogtarget.cpp b/engines/twp/enginedialogtarget.cpp
deleted file mode 100644
index 0666abda964..00000000000
--- a/engines/twp/enginedialogtarget.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "twp/twp.h"
-#include "twp/detection.h"
-#include "twp/enginedialogtarget.h"
-#include "twp/hud.h"
-#include "twp/squtil.h"
-
-namespace Twp {
-
-class Pause : public Motor {
-public:
-	explicit Pause(float time) : _time(time) {}
-
-	void update(float elapsed) override {
-		_time -= elapsed;
-		if (_time <= 0)
-			disable();
-	}
-
-private:
-	float _time = 0.f;
-};
-
-class WaitWhile : public Motor {
-public:
-	WaitWhile(EngineDialogTarget *target, const Common::String &cond) : _target(target), _cond(cond) {}
-
-	void update(float elapsed) override {
-		if (!_target->execCond(_cond))
-			disable();
-	}
-
-private:
-	EngineDialogTarget *_target = nullptr;
-	Common::String _cond;
-};
-
-static Common::SharedPtr<Object> actor(const Common::String &name) {
-	HSQOBJECT obj;
-	sq_resetobject(&obj);
-	sqgetf(name, obj);
-	return sqactor(obj);
-}
-
-static Common::SharedPtr<Object> actorOrCurrent(const Common::String &name) {
-	Common::SharedPtr<Object> result = actor(name);
-	if (!result)
-		result = g_twp->_actor;
-	return result;
-}
-
-Color EngineDialogTarget::actorColor(const Common::String &actor) {
-	Common::SharedPtr<Object> act = actorOrCurrent(actor);
-	return g_twp->_hud->actorSlot(act)->verbUiColors.dialogNormal;
-}
-
-Color EngineDialogTarget::actorColorHover(const Common::String &actor) {
-	Common::SharedPtr<Object> act = actorOrCurrent(actor);
-	return g_twp->_hud->actorSlot(act)->verbUiColors.dialogHighlight;
-}
-
-Common::SharedPtr<Motor> EngineDialogTarget::say(const Common::String &actor, const Common::String &text) {
-	debugC(kDebugDialog, "say %s: %s", actor.c_str(), text.c_str());
-	Common::SharedPtr<Object> act = actorOrCurrent(actor);
-	Object::say(act, {text}, act->_talkColor);
-	return act->getTalking();
-}
-
-Common::SharedPtr<Motor> EngineDialogTarget::waitWhile(const Common::String &cond) {
-	return Common::SharedPtr<WaitWhile>(new WaitWhile(this, cond));
-}
-
-void EngineDialogTarget::shutup() {
-	g_twp->stopTalking();
-}
-
-Common::SharedPtr<Motor> EngineDialogTarget::pause(float time) {
-	return Common::SharedPtr<Pause>(new Pause(time));
-}
-
-bool EngineDialogTarget::execCond(const Common::String &cond) {
-	// check if the condition corresponds to an actor name
-	Common::SharedPtr<Object> act = actor(cond);
-	if (act) {
-		// yes, so we check if the current actor is the given actor name
-		Common::SharedPtr<Object> curActor = g_twp->_actor;
-		return curActor && curActor->_key == act->_key;
-	}
-
-	HSQUIRRELVM v = g_twp->getVm();
-	SQInteger top = sq_gettop(v);
-	// compile
-	sq_pushroottable(v);
-	Common::String code = Common::String::format("return %s", cond.c_str());
-	if (SQ_FAILED(sq_compilebuffer(v, code.c_str(), code.size(), "condition", SQTrue))) {
-		debugC(kDebugDialog, "Error executing code %s", code.c_str());
-		return false;
-	}
-
-	sq_push(v, -2);
-	// call
-	if (SQ_FAILED(sq_call(v, 1, SQTrue, SQTrue))) {
-		debugC(kDebugDialog, "Error calling code %s", code.c_str());
-		return false;
-	}
-
-	SQInteger condResult;
-	sq_getinteger(v, -1, &condResult);
-	bool result = condResult != 0;
-	sq_settop(v, top);
-	return result;
-}
-
-} // namespace Twp
diff --git a/engines/twp/enginedialogtarget.h b/engines/twp/enginedialogtarget.h
deleted file mode 100644
index a23c2b0866c..00000000000
--- a/engines/twp/enginedialogtarget.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_ENGINEDIALOGTARGET_H
-#define TWP_ENGINEDIALOGTARGET_H
-
-#include "twp/dialog.h"
-
-namespace Twp {
-
-class EngineDialogTarget : public DialogTarget {
-public:
-	Color actorColor(const Common::String &actor) override;
-	Color actorColorHover(const Common::String &actor) override;
-	Common::SharedPtr<Motor> say(const Common::String &actor, const Common::String &text) override;
-	Common::SharedPtr<Motor> waitWhile(const Common::String &cond) override;
-	void shutup() override;
-	Common::SharedPtr<Motor> pause(float time) override;
-	bool execCond(const Common::String &cond) override;
-};
-
-} // namespace Twp
-
-#endif
diff --git a/engines/twp/font.cpp b/engines/twp/font.cpp
deleted file mode 100644
index 790d759fcf6..00000000000
--- a/engines/twp/font.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "twp/twp.h"
-#include "twp/detection.h"
-#include "twp/font.h"
-#include "twp/ggpack.h"
-#include "twp/resmanager.h"
-
-namespace Twp {
-
-enum TokenId {
-	tiWhitespace,
-	tiString,
-	tiColor,
-	tiNewLine,
-	tiEnd
-};
-
-typedef struct Token {
-	TokenId id;
-	int startOff, endOff;
-} Token;
-
-typedef struct CharInfo {
-	CodePoint chr;
-	Math::Vector2d pos;
-	Color color;
-	Glyph glyph;
-} CharInfo;
-
-typedef struct Line {
-	Common::Array<Token> tokens;
-	Common::Array<CharInfo> charInfos;
-} Line;
-
-class TokenReader {
-public:
-	explicit TokenReader(const Common::U32String &text);
-	Common::U32String substr(Token tok);
-	bool readToken(Token &token);
-
-private:
-	CodePoint readChar();
-	TokenId readTokenId();
-
-private:
-	Common::U32String _text;
-	size_t _off;
-};
-
-static Math::Vector2d normalize(Texture *texture, Math::Vector2d v) {
-	Math::Vector2d textureSize(texture->width, texture->height);
-	return Math::Vector2d(v.getX() / textureSize.getX(), v.getY() / textureSize.getY());
-}
-
-static void addGlyphQuad(Texture *texture, Common::Array<Vertex> &vertices, CharInfo info) {
-	// Add a glyph quad to the vertex array
-
-	float left = info.glyph.bounds.left;
-	float top = info.glyph.bounds.bottom;
-	float right = info.glyph.bounds.right;
-	float bottom = info.glyph.bounds.top;
-
-	Math::Vector2d uv1 = normalize(texture, Math::Vector2d(info.glyph.textureRect.left, info.glyph.textureRect.bottom));
-	Math::Vector2d uv2 = normalize(texture, Math::Vector2d(info.glyph.textureRect.right, info.glyph.textureRect.top));
-
-	vertices.push_back(Vertex{Math::Vector2d(info.pos.getX() + left, info.pos.getY() + top), info.color, Math::Vector2d(uv1.getX(), uv2.getY())});
-	vertices.push_back(Vertex{Math::Vector2d(info.pos.getX() + right, info.pos.getY() + top), info.color, Math::Vector2d(uv2.getX(), uv2.getY())});
-	vertices.push_back(Vertex{Math::Vector2d(info.pos.getX() + left, info.pos.getY() + bottom), info.color, Math::Vector2d(uv1.getX(), uv1.getY())});
-	vertices.push_back(Vertex{Math::Vector2d(info.pos.getX() + left, info.pos.getY() + bottom), info.color, Math::Vector2d(uv1.getX(), uv1.getY())});
-	vertices.push_back(Vertex{Math::Vector2d(info.pos.getX() + right, info.pos.getY() + top), info.color, Math::Vector2d(uv2.getX(), uv2.getY())});
-	vertices.push_back(Vertex{Math::Vector2d(info.pos.getX() + right, info.pos.getY() + bottom), info.color, Math::Vector2d(uv2.getX(), uv1.getY())});
-}
-
-// Skips all characters while one char from the set `token` is found.
-// Returns number of characters skipped.
-static int skipWhile(const Common::U32String &s, const char *toSkip, int start = 0) {
-	int result = 0;
-	int len = s.size();
-	while ((start + result < len) && strchr(toSkip, s[result + start]))
-		result++;
-	return result;
-}
-
-static int skipUntil(const Common::U32String &s, const char *until, int start = 0) {
-	int result = 0;
-	int len = s.size();
-	while ((start + result < len) && !strchr(until, s[result + start]))
-		result++;
-	return result;
-}
-
-static float width(Text &text, TokenReader &reader, Token tok) {
-	float result = 0;
-	Common::String s = reader.substr(tok);
-	for (size_t i = 0; i < s.size(); i++) {
-		char c = s[i];
-		result += text.getFont()->getGlyph(c).advance;
-	}
-	return result;
-}
-
-TokenReader::TokenReader(const Common::U32String &text) : _text(text), _off(0) {
-}
-
-Common::U32String TokenReader::substr(Token tok) {
-	return _text.substr(tok.startOff, tok.endOff - tok.startOff + 1);
-}
-
-CodePoint TokenReader::readChar() {
-	char result = _text[_off];
-	_off++;
-	return result;
-}
-
-TokenId TokenReader::readTokenId() {
-	const char Whitespace[] = {' ', '\t', '\v', '\r', '\f', '\0'};
-	const char Whitespace2[] = {' ', '\t', '\v', '\r', '\f', '#', '\n', '\0'};
-	if (_off < _text.size()) {
-		char c = readChar();
-		switch (c) {
-		case '\n':
-			return tiNewLine;
-		case '\t':
-		case ' ':
-			_off += skipWhile(_text, Whitespace, _off);
-			return tiWhitespace;
-		case '#':
-			_off += 7;
-			return tiColor;
-		default:
-			_off += skipUntil(_text, Whitespace2, _off);
-			return tiString;
-		}
-	} else {
-		return tiEnd;
-	}
-}
-
-bool TokenReader::readToken(Token &token) {
-	int start = _off;
-	TokenId id = readTokenId();
-	if (id != tiEnd) {
-		token.id = id;
-		token.startOff = start;
-		token.endOff = _off - 1;
-		return true;
-	}
-	return false;
-}
-
-GGFont::~GGFont() {}
-
-void GGFont::load(const Common::String &path) {
-	SpriteSheet *spritesheet = g_twp->_resManager->spriteSheet(path);
-	int lineHeight = 0;
-	for (auto it = spritesheet->_frameTable.begin(); it != spritesheet->_frameTable.end(); it++) {
-		const SpriteSheetFrame &frame = it->_value;
-		Glyph glyph;
-		glyph.advance = MAX(frame.sourceSize.getX() - frame.spriteSourceSize.left - 4, 0.f);
-		glyph.bounds = Common::Rect(Common::Point(frame.spriteSourceSize.left, frame.sourceSize.getY() - frame.spriteSourceSize.height() - frame.spriteSourceSize.top), frame.spriteSourceSize.width(), frame.spriteSourceSize.height());
-		lineHeight = MAX(lineHeight, (int)frame.spriteSourceSize.top);
-		glyph.textureRect = frame.frame;
-		_glyphs[it->_key.asUint64()] = glyph;
-	}
-	_lineHeight = lineHeight;
-	_name = path;
-}
-
-Glyph GGFont::getGlyph(CodePoint chr) {
-	int key = (int)chr;
-	if (_glyphs.contains(key)) {
-		return _glyphs[key];
-	}
-	return _glyphs['?'];
-}
-
-BmFont::~BmFont() {}
-
-void BmFont::load(const Common::String &name) {
-	Common::String path = name + ".fnt";
-	if (!g_twp->_pack->assetExists(path.c_str())) {
-		path = name + "Font.fnt";
-	}
-	debugC(kDebugRes, "Load font %s", path.c_str());
-	GGPackEntryReader entry;
-	if (!entry.open(*g_twp->_pack, path)) {
-		error("error loading font %s", path.c_str());
-	}
-	char tmp[80];
-	while (!entry.eos()) {
-		Common::String line = entry.readLine();
-		if (line.hasPrefix("common")) {
-			sscanf(line.c_str(), "common lineHeight=%d base=%d scaleW=%d scaleH=%d pages=%d packed=%d", &_lnHeight, &_base, &_scaleW, &_scaleH, &_pages, &_packed);
-		} else if (line.hasPrefix("chars")) {
-		} else if (line.hasPrefix("char")) {
-			Char c;
-			sscanf(line.c_str(), "char id=%d\tx=%d\ty=%d\twidth=%d\theight=%d\txoffset=%d\tyoffset=%d\txadvance=%d\tpage=%d\tchnl=%d\tletter=\"%s\"", &c.id, &c.x, &c.y, &c.w, &c.h, &c.xoff, &c.yoff, &c.xadv, &c.page, &c.chnl, tmp);
-			_glyphs[c.id] = Glyph{c.xadv,
-								  Common::Rect(c.xoff, _lnHeight - c.yoff - c.h, c.xoff + c.w, _lnHeight - c.yoff),
-								  Common::Rect(c.x, c.y, c.x + c.w, c.y + c.h)};
-		} else if (line.hasPrefix("kernings")) {
-		} else if (line.hasPrefix("kerning")) {
-			KerningKey key;
-			int amount = 0;
-			sscanf(line.c_str(), "kerning\tfirst=%d\tsecond=%d\tamount=%d", &key.first, &key.second, &amount);
-			_kernings[key] = amount;
-		}
-	}
-	_name = name;
-}
-
-Glyph BmFont::getGlyph(CodePoint chr) {
-	if (_glyphs.contains(chr)) {
-		return _glyphs[chr];
-	}
-	return _glyphs['?'];
-}
-
-float BmFont::getKerning(CodePoint prev, CodePoint next) {
-	return 0.f;
-}
-
-bool operator==(const KerningKey &l, const KerningKey &r) {
-	return l.first == r.first && l.second == r.second;
-}
-
-Text::Text(const Common::String &fontName, const Common::String &text, TextHAlignment hAlign, TextVAlignment vAlign, float maxWidth, Color color)
-	: _font(NULL), _fontName(fontName), _texture(NULL), _txt(text), _col(color), _hAlign(hAlign), _vAlign(vAlign), _maxW(maxWidth), _dirty(true) {
-	update();
-}
-
-Text::Text() {}
-
-void Text::setFont(const Common::String &fontName) {
-	_fontName = fontName;
-	_dirty = true;
-}
-
-Math::Vector2d Text::getBounds() {
-	update();
-	return _bnds;
-}
-
-void Text::update() {
-	if (_dirty) {
-		_dirty = false;
-		_font = g_twp->_resManager->font(_fontName);
-		_texture = g_twp->_resManager->texture(_font->getName() + ".png");
-
-		// Reset
-		_vertices.clear();
-		_quads.clear();
-		_bnds = Math::Vector2d();
-		Color color = _col;
-
-		// split text by tokens and split tokens by lines
-		Common::Array<Line> lines;
-		Line line1;
-		TokenReader reader(_txt);
-		float x = 0;
-		Token tok;
-		while (reader.readToken(tok)) {
-			// ignore color token width
-			float w = tok.id == tiColor || tok.id == tiNewLine ? 0.f : width(*this, reader, tok);
-			// new line if width > maxWidth or newline character
-			if (tok.id == tiNewLine || ((_maxW > 0) && (line1.tokens.size() > 0) && (x + w > _maxW))) {
-				lines.push_back(line1);
-				line1.tokens.clear();
-				x = 0;
-			}
-			if (tok.id != tiNewLine) {
-				if (line1.tokens.size() != 0 || tok.id != tiWhitespace) {
-					line1.tokens.push_back(tok);
-					x += w;
-				}
-			}
-		}
-		lines.push_back(line1);
-
-		// create quads for all characters
-		float maxW = 0.f;
-		float lineHeight = _font->getLineHeight();
-		float y = -lineHeight;
-		for (size_t i = 0; i < lines.size(); i++) {
-			Line &line = lines[i];
-			CodePoint prevChar = 0;
-			x = 0;
-			for (size_t j = 0; j < line.tokens.size(); j++) {
-				tok = line.tokens[j];
-				if (tok.id == tiColor) {
-					uint iColor;
-					Common::String s = reader.substr(tok);
-					sscanf(s.c_str() + 1, "%x", &iColor);
-					color = Color::withAlpha(Color::rgb((int)(iColor & 0x00FFFFFF)), color.rgba.a);
-				} else {
-					Common::U32String s = reader.substr(tok);
-					for (size_t k = 0; k < s.size(); k++) {
-						CodePoint c = s[k];
-						Glyph glyph = _font->getGlyph(c);
-						float kern = _font->getKerning(prevChar, c);
-						prevChar = c;
-						line.charInfos.push_back(CharInfo{c, Math::Vector2d(x + kern, y), color, glyph});
-						// self.quads.add(rect(x, y, glyph.bounds.x.float32 + glyph.bounds.w.float32, lineHeight));
-						x += (float)glyph.advance;
-					}
-				}
-			}
-			_quads.push_back(Common::Rect(Common::Point(0.0f, y), x, lineHeight));
-			maxW = MAX(maxW, x);
-			y -= lineHeight;
-		}
-
-		// Align text
-		if (_hAlign == thRight) {
-			for (size_t i = 0; i < lines.size(); i++) {
-				float w = maxW - _quads[i].width();
-				for (size_t j = 0; j < lines[i].charInfos.size(); j++) {
-					CharInfo &info = lines[i].charInfos[j];
-					info.pos.setX(info.pos.getX() + w);
-				}
-			}
-		} else if (_hAlign == thCenter) {
-			for (size_t i = 0; i < lines.size(); i++) {
-				float w = maxW - _quads[i].width();
-				for (size_t j = 0; j < lines[i].charInfos.size(); j++) {
-					CharInfo &info = lines[i].charInfos[j];
-					info.pos.setX(info.pos.getX() + w / 2.f);
-				}
-			}
-		}
-
-		// Add the glyphs to the vertices
-		for (size_t i = 0; i < lines.size(); i++) {
-			for (size_t j = 0; j < lines[i].charInfos.size(); j++) {
-				const CharInfo &info = lines[i].charInfos[j];
-				addGlyphQuad(_texture, _vertices, info);
-			}
-		}
-
-		_bnds = Math::Vector2d(maxW, lines.size() * _font->getLineHeight());
-	}
-}
-
-void Text::draw(Gfx &gfx, Math::Matrix4 trsf) {
-	if (_font && _txt.size() > 0) {
-		update();
-		gfx.drawPrimitives(GL_TRIANGLES, _vertices.begin(), _vertices.size(), trsf, _texture);
-	}
-}
-
-} // namespace Twp
diff --git a/engines/twp/font.h b/engines/twp/font.h
deleted file mode 100644
index 71a3a82eee2..00000000000
--- a/engines/twp/font.h
+++ /dev/null
@@ -1,205 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef TWP_FONT_H
-#define TWP_FONT_H
-
-#include "common/rect.h"
-#include "common/hashmap.h"
-#include "common/str.h"
-#include "twp/spritesheet.h"
-#include "twp/gfx.h"
-
-namespace Common {
-template<>
-struct Hash<Common::u32char_type_t> : public UnaryFunction<Common::u32char_type_t, uint> {
-	uint operator()(Common::u32char_type_t val) const { return (uint)val; }
-};
-} // namespace Common
-
-namespace Twp {
-
-struct KerningKey {
-	int first;
-	int second;
-};
-bool operator==(const KerningKey &l, const KerningKey &r);
-
-} // namespace Twp
-
-namespace Common {
-
-template<>
-struct Hash<Twp::KerningKey> : public Common::UnaryFunction<Twp::KerningKey, uint> {
-	uint operator()(Twp::KerningKey val) const { return (uint)(val.first ^ val.second); }
-};
-
-} // namespace Common
-
-namespace Twp {
-typedef Common::u32char_type_t CodePoint;
-
-// represents a glyph: a part of an image for a specific font character
-struct Glyph {
-	int advance;              // Offset to move horizontally to the next character.
-	Common::Rect bounds;      // Bounding rectangle of the glyph, in coordinates relative to the baseline.
-	Common::Rect textureRect; // Texture coordinates of the glyph inside the font's texture.
-};
-
-class Font {
-public:
-	virtual ~Font() = default;
-
-	virtual int getLineHeight() = 0;
-	virtual float getKerning(CodePoint prev, CodePoint next) = 0;
-	virtual Glyph getGlyph(CodePoint chr) = 0;
-	virtual Common::String getName() = 0;
-};
-
-// Represents a bitmap font from a spritesheet.
-class GGFont : public Font {
-public:
-	~GGFont() override;
-	void load(const Common::String &path);
-
-	int getLineHeight() final { return _lineHeight; }
-	float getKerning(CodePoint prev, CodePoint next) final { return 0.f; }
-	Glyph getGlyph(CodePoint chr) final;
-	Common::String getName() final { return _name; }
-
-private:
-	Common::HashMap<CodePoint, Glyph> _glyphs;
-	int _lineHeight;
-	Common::String _name;
-};
-
-struct Char {
-	int id = 0;
-	int x = 0;
-	int y = 0;
-	int w = 0;
-	int h = 0;
-	int xoff = 0;
-	int yoff = 0;
-	int xadv = 0;
-	int page = 0;
-	int chnl = 0;
-	Common::String _letter;
-};
-
-class BmFont : public Font {
-public:
-	~BmFont() override;
-	void load(const Common::String &path);
-
-	int getLineHeight() final { return _lnHeight; }
-	float getKerning(CodePoint prev, CodePoint next) final;
-	Glyph getGlyph(CodePoint chr) final;
-	Common::String getName() final { return _name; }
-
-private:
-	Common::HashMap<CodePoint, Glyph> _glyphs;
-	Common::HashMap<KerningKey, float> _kernings;
-	int _lnHeight = 0;
-	int _base = 0;
-	int _scaleW = 0;
-	int _scaleH = 0;
-	int _pages = 0;
-	int _packed = 0;
-	Common::String _name;
-};
-
-enum TextHAlignment {
-	thLeft,
-	thCenter,
-	thRight
-};
-enum TextVAlignment {
-	tvTop,
-	tvCenter,
-	tvBottom
-};
-
-// This class allows to render a text.
-//
-// A text can contains color in hexadecimal with this format: #RRGGBB
-class Text {
-public:
-	Text();
-	Text(const Common::String &fontName, const Common::String &text, TextHAlignment hAlign = thCenter, TextVAlignment vAlign = tvCenter, float maxWidth = 0.0f, Color color = Color());
-
-	void setText(const Common::String &text) {
-		_txt = text;
-		_dirty = true;
-	}
-	Common::String getText() { return _txt; }
-
-	void setColor(Color c) {
-		_col = c;
-		_dirty = true;
-	}
-	Color getColor() { return _col; }
-
-	void setMaxWidth(float maxW) {
-		_maxW = maxW;
-		_dirty = true;
-	}
-	float getMaxWidth() { return _maxW; }
-
-	void setHAlign(TextHAlignment align) {
-		_hAlign = align;
-		_dirty = true;
-	}
-	TextHAlignment getHAlign() { return _hAlign; }
-
-	void setVAlign(TextVAlignment align) {
-		_vAlign = align;
-		_dirty = true;
-	}
-	TextVAlignment getVAlign() { return _vAlign; }
-
-	void setFont(const Common::String &fontName);
-	Common::SharedPtr<Font> getFont() { return _font; }
-	Math::Vector2d getBounds();
-
-	void draw(Gfx &gfx, Math::Matrix4 trsf = Math::Matrix4());
-
-private:
-	void update();
-
-private:
-	Common::SharedPtr<Font> _font;
-	Common::String _fontName;
-	Texture *_texture = nullptr;
-	Common::String _txt;
-	Color _col;
-	TextHAlignment _hAlign = TextHAlignment::thLeft;
-	TextVAlignment _vAlign = TextVAlignment::tvCenter;
-	Common::Array<Vertex> _vertices;
-	Math::Vector2d _bnds;
-	float _maxW = 0.f;
-	Common::Array<Common::Rect> _quads;
-	bool _dirty = false;
-};
-
-} // namespace Twp
-
-#endif
diff --git a/engines/twp/genlib.cpp b/engines/twp/genlib.cpp
deleted file mode 100644
index 5e4a66ac5f9..00000000000
--- a/engines/twp/genlib.cpp
+++ /dev/null
@@ -1,964 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "common/crc.h"
-#include "twp/twp.h"
-#include "twp/detection.h"
-#include "twp/dialog.h"
-#include "twp/hud.h"
-#include "twp/resmanager.h"
-#include "twp/room.h"
-#include "twp/sqgame.h"
-#include "twp/squtil.h"
-#include "twp/squirrel/sqvm.h"
-#include "twp/squirrel/sqstring.h"
-#include "twp/squirrel/sqstate.h"
-#include "twp/squirrel/sqtable.h"
-#include "twp/squirrel/sqfuncproto.h"
-#include "twp/squirrel/sqclosure.h"
-#include "twp/tsv.h"
-
-namespace Twp {
-
-struct GetArray {
-	explicit GetArray(Common::Array<HSQOBJECT> &objs) : _objs(objs) {}
-
-	void operator()(HSQOBJECT &o) {
-		_objs.push_back(o);
-	}
-
-private:
-	Common::Array<HSQOBJECT> &_objs;
-};
-
-template<typename T>
-static void shuffle(Common::Array<T> &array) {
-	if (array.size() > 1) {
-		for (size_t i = 0; i < array.size(); i++) {
-			size_t j = g_twp->getRandomSource().getRandomNumberRng(0, array.size() - 1);
-			SWAP(array[j], array[i]);
-		}
-	}
-}
-
-static SQInteger activeVerb(HSQUIRRELVM v) {
-	sqpush(v, g_twp->_hud->_verb.id.id);
-	return 1;
-}
-
-static SQInteger adhocalytics(HSQUIRRELVM v) {
-	warning("adhocalytics not implemented");
-	return 0;
-}
-
-static SQInteger arrayShuffle(HSQUIRRELVM v) {
-	if (sq_gettype(v, 2) != OT_ARRAY)
-		return sq_throwerror(v, "An array is expected");
-	HSQOBJECT obj;
-	sq_getstackobj(v, 2, &obj);
-	Common::Array<HSQOBJECT> arr;
-	GetArray g(arr);
-	sqgetitems(obj, g);
-	shuffle(arr);
-
-	sq_newarray(v, 0);
-	for (auto &it : arr) {
-		sqpush(v, it);
-		sq_arrayappend(v, -2);
-	}
-	return 1;
-}
-
-// Returns TRUE if the specified entry exists in the assets.
-static SQInteger assetExists(HSQUIRRELVM v) {
-	const SQChar *filename;
-	if (SQ_FAILED(sq_getstring(v, 2, &filename)))
-		return sq_throwerror(v, "failed to get filename");
-	sqpush(v, g_twp->_pack->assetExists(filename));
-	return 1;
-}
-
-// Moves the camera to the specified x, y location.
-// If a spot is specified, will move to the x, y specified by that spot.
-// .. code-block:: Squirrel
-// cameraAt(450, 128)
-//
-// enterRoomFromDoor(Bridge.startRight)
-// actorAt(ray, Bridge.startLeft)
-// actorAt(reyes, Bridge.startRight)
-// cameraAt(Bridge.bridgeBody)
-static SQInteger cameraAt(HSQUIRRELVM v) {
-	SQInteger numArgs = sq_gettop(v);
-	Math::Vector2d pos;
-	if (numArgs == 3) {
-		SQInteger x, y;
-		if (SQ_FAILED(sqget(v, 2, x)))
-			return sq_throwerror(v, "failed to get x");
-		if (SQ_FAILED(sqget(v, 3, y)))
-			return sq_throwerror(v, "failed to get y");
-		pos = Math::Vector2d(x, y);
-	} else if (numArgs == 2) {
-		Common::SharedPtr<Object> obj = sqobj(v, 2);
-		if (!obj)
-			return sq_throwerror(v, "failed to get spot or actor");
-		g_twp->follow(nullptr);
-		g_twp->setRoom(obj->_room);
-		pos = obj->getUsePos();
-	} else {
-		return sq_throwerror(v, Common::String::format("invalid argument number: %lld", numArgs).c_str());
-	}
-	g_twp->follow(nullptr);
-	g_twp->cameraAt(pos);
-	return 0;
-}
-
-// Sets how far the camera can pan.
-static SQInteger cameraBounds(HSQUIRRELVM v) {
-	SQInteger xMin, xMax, yMin, yMax;
-	if (SQ_FAILED(sqget(v, 2, xMin)))
-		return sq_throwerror(v, "failed to get xMin");
-	if (SQ_FAILED(sqget(v, 3, xMax)))
-		return sq_throwerror(v, "failed to get xMax");
-	if (SQ_FAILED(sqget(v, 4, yMin)))
-		return sq_throwerror(v, "failed to get yMin");
-	if (SQ_FAILED(sqget(v, 5, yMax)))
-		return sq_throwerror(v, "failed to get yMax");
-	g_twp->_camera->setBounds(Rectf::fromMinMax(Math::Vector2d(xMin, yMin), Math::Vector2d(xMax, yMax)));
-	return 0;
-}
-
-static SQInteger cameraFollow(HSQUIRRELVM v) {
-	Common::SharedPtr<Object> actor = sqactor(v, 2);
-	g_twp->follow(actor);
-	Math::Vector2d pos = actor->_node->getPos();
-	Common::SharedPtr<Room> oldRoom = g_twp->_room;
-	if (actor->_room)
-		g_twp->setRoom(actor->_room);
-	if (oldRoom != actor->_room)
-		g_twp->cameraAt(pos);
-	return 0;
-}
-
-// Moves the camera to the specified room.
-//
-// Does not move any of the actors.
-//
-// .. code-block:: Squirrel
-// aStreetPhoneBook =
-// {
-//     name = "phone book"
-//     verbLookAt = function()
-//     {
-//         cameraInRoom(PhoneBook)
-//      }
-// }
-static SQInteger cameraInRoom(HSQUIRRELVM v) {
-	Common::SharedPtr<Room> room = sqroom(v, 2);
-	if (room) {
-		g_twp->setRoom(room);
-	} else {
-		Common::SharedPtr<Object> obj = sqobj(v, 2);
-		if (!obj || !obj->_room) {
-			return sq_throwerror(v, "failed to get room");
-		}
-		g_twp->setRoom(obj->_room);
-	}
-	return 0;
-}
-
-// Pans the camera to the specified x, y location over the duration using the transition method.
-// Transition methods are: EASE_IN, EASE_INOUT, EASE_OUT, LINEAR, SLOW_EASE_IN, SLOW_EASE_OUT.
-//
-// .. code-block:: Squirrel
-// cameraPanTo(450, 128, pan_time, EASE_INOUT)
-// inputOff()
-// actorWalkTo(currentActor, Highway.detectiveSpot1)
-// breakwhilewalking(currentActor)
-// cameraPanTo(currentActor, 2.0)
-static SQInteger cameraPanTo(HSQUIRRELVM v) {
-	SQInteger numArgs = sq_gettop(v);
-	Math::Vector2d pos;
-	float duration = 0.f;




More information about the Scummvm-git-logs mailing list