Merged the tinsel 2 engine with tinsel 1. Both Discworld 1 and Discworld 2 should be completable

svn-id: r35196

1 files changed, 29 insertions, 2 deletions

diff --git a/engines/tinsel/tinlib.h b/engines/tinsel/tinlib.h
index 001de70896..06562c541d 100644
--- a/engines/tinsel/tinlib.h
+++ b/engines/tinsel/tinlib.h
@@ -28,13 +28,40 @@
 #define TINSEL_TINLIB_H
 
 #include "tinsel/dw.h"
+#include "tinsel/object.h"
+#include "tinsel/palette.h"
 
 namespace Tinsel {
 
+enum EXTREME {
+	EX_USEXY, EX_BOTTOM, EX_BOTTOMLEFT,
+	EX_BOTTOMRIGHT, EX_LEFT, EX_RIGHT,
+	EX_TOP, EX_TOPLEFT, EX_TOPRIGHT
+};
+
+enum WHICH_VER {VER_GLITTER, VER_COMPILE};
+#define VER_LEN 10
+
+// Support functions
+void TinGetVersion(WHICH_VER which, char *buffer, int length);
+
 // Library functions in TINLIB.C
 
-void control(int param);
-void stand(int actor, int x, int y, SCNHANDLE film);
+void ActorBrightness(int actor, int brightness);
+void ActorPalette(int actor, int startColour, int length);
+void Control(int param);
+void HookScene(SCNHANDLE scene, int entrance, int transition);
+void NewScene(CORO_PARAM, SCNHANDLE scene, int entrance, int transition);
+void Offset(EXTREME extreme, int x, int y);
+void RestoreScene(void);
+void ResumeLastGame(void);
+void SaveScene(CORO_PARAM);
+void Stand(CORO_PARAM, int actor, int x, int y, SCNHANDLE film);
+void SetTextPal(COLORREF col);
+
+void KeepOnScreen(OBJECT *pText, int *pTextX, int *pTextY);
+
+enum SPEECH_TYPE { IS_SAY, IS_SAYAT, IS_TALK, IS_TALKAT };
 
 } // end of namespace Tinsel