[Scummvm-cvs-logs] SF.net SVN: scummvm: [28302] scummvm/trunk/engines/parallaction

peres001 at users.sourceforge.net peres001 at users.sourceforge.net
Sun Jul 29 19:02:08 CEST 2007


Revision: 28302
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28302&view=rev
Author:   peres001
Date:     2007-07-29 10:02:08 -0700 (Sun, 29 Jul 2007)

Log Message:
-----------
Made current callable routines members of Parallaction_ns, and moved them to callables_ns.cpp.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/module.mk
    scummvm/trunk/engines/parallaction/parallaction.h
    scummvm/trunk/engines/parallaction/parallaction_ns.cpp
    scummvm/trunk/engines/parallaction/staticres.cpp

Added Paths:
-----------
    scummvm/trunk/engines/parallaction/callables_ns.cpp

Removed Paths:
-------------
    scummvm/trunk/engines/parallaction/callables.cpp

Deleted: scummvm/trunk/engines/parallaction/callables.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/callables.cpp	2007-07-29 16:58:52 UTC (rev 28301)
+++ scummvm/trunk/engines/parallaction/callables.cpp	2007-07-29 17:02:08 UTC (rev 28302)
@@ -1,782 +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 2
- * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-
-#include "common/stdafx.h"
-#include "common/system.h"
-
-#include "common/file.h"
-
-#include "graphics/primitives.h"			// for Graphics::drawLine
-
-#include "parallaction/parallaction.h"
-#include "parallaction/menu.h"
-#include "parallaction/sound.h"
-
-
-namespace Parallaction {
-
-/*
-	game callables data members
-*/
-
-// there three guys are extern'd somewhere
-Zone *_moveSarcZone0 = NULL;
-int16 _introSarcData1 = 0;
-Zone *_moveSarcZone1 = NULL;
-
-// part completion messages
-static const char *endMsg0[] = {"COMPLIMENTI!", "BRAVO!", "CONGRATULATIONS!", "PRIMA!"};
-static const char *endMsg1[] = {"HAI FINITO QUESTA PARTE", "TU AS COMPLETE' CETTE AVENTURE", "YOU HAVE COMPLETED THIS PART", "DU HAST EIN ABENTEUER ERFOLGREICH"};
-static const char *endMsg2[] = {"ORA COMPLETA IL RESTO ", "AVEC SUCCES.",  "NOW GO ON WITH THE REST OF", "ZU ENDE GEFUHRT"};
-static const char *endMsg3[] = {"DELL' AVVENTURA",  "CONTINUE AVEC LES AUTRES", "THIS ADVENTURE", "MACH' MIT DEN ANDEREN WEITER"};
-// game completion messages
-static const char *endMsg4[] = {"COMPLIMENTI!", "BRAVO!", "CONGRATULATIONS!", "PRIMA!"};
-static const char *endMsg5[] = {"HAI FINITO LE TRE PARTI", "TU AS COMPLETE' LES TROIS PARTIES", "YOU HAVE COMPLETED THE THREE PARTS", "DU HAST DREI ABENTEURE ERFOLGREICH"};
-static const char *endMsg6[] = {"DELL' AVVENTURA", "DE L'AVENTURE", "OF THIS ADVENTURE", "ZU ENDE GEFUHRT"};
-static const char *endMsg7[] = {"ED ORA IL GRAN FINALE ", "ET MAINTENANT LE GRAND FINAL", "NOW THE GREAT FINAL", "UND YETZT DER GROSSE SCHLUSS!"};
-
-static uint16 num_foglie = 0;
-static Zone *_moveSarcZones[5];
-static Zone *_moveSarcExaZones[5];
-
-/*
-	intro callables data members
-*/
-
-static Animation *_rightHandAnim;
-
-static uint16 _rightHandPositions[684] = {
-	0x0064, 0x0046, 0x006c, 0x0046, 0x0074, 0x0046, 0x007c, 0x0046,
-	0x0084, 0x0046, 0x008c, 0x0046, 0x0094, 0x0046, 0x009c, 0x0046,
-	0x00a4, 0x0046, 0x00ac, 0x0046, 0x00b4, 0x0046, 0x00bc, 0x0046,
-	0x00c4, 0x0046, 0x00cc, 0x0046, 0x00d4, 0x0046, 0x00dc, 0x0046,
-	0x00e4, 0x0046, 0x00ec, 0x0046, 0x00f4, 0x0046, 0x00fc, 0x0046,
-	0x0104, 0x0046, 0x00ff, 0x0042, 0x00ff, 0x004a, 0x00ff, 0x0052,
-	0x00ff, 0x005a, 0x00ff, 0x0062, 0x00ff, 0x006a, 0x00ff, 0x0072,
-	0x00ff, 0x007a, 0x00ff, 0x0082, 0x00ff, 0x008a, 0x00ff, 0x0092,
-	0x00ff, 0x009a, 0x00ff, 0x00a2, 0x0104, 0x0097, 0x00fc, 0x0097,
-	0x00f4, 0x0097, 0x00ec, 0x0097, 0x00e4, 0x0097, 0x00dc, 0x0097,
-	0x00d4, 0x0097, 0x00cc, 0x0097, 0x00c4, 0x0097, 0x00bc, 0x0097,
-	0x00b4, 0x0097, 0x00ac, 0x0097, 0x00a4, 0x0097, 0x009c, 0x0097,
-	0x0094, 0x0097, 0x008c, 0x0097, 0x0084, 0x0097, 0x007c, 0x0097,
-	0x0074, 0x0097, 0x006c, 0x0097, 0x0064, 0x0097, 0x0066, 0x0042,
-	0x0066, 0x004a, 0x0066, 0x0052, 0x0066, 0x005a, 0x0066, 0x0062,
-	0x0066, 0x006a, 0x0066, 0x0072, 0x0066, 0x007a, 0x0066, 0x0082,
-	0x0066, 0x008a, 0x0066, 0x0092, 0x0066, 0x009a, 0x0066, 0x00a2,
-	0x008c, 0x0091, 0x0099, 0x0042, 0x0099, 0x004a, 0x0099, 0x0052,
-	0x0099, 0x005a, 0x0099, 0x0062, 0x0099, 0x006a, 0x0099, 0x0072,
-	0x0099, 0x007a, 0x0099, 0x0082, 0x0099, 0x008a, 0x0099, 0x0092,
-	0x0099, 0x009a, 0x0099, 0x00a2, 0x00a0, 0x004d, 0x00cc, 0x0042,
-	0x00cc, 0x004a, 0x00cc, 0x0052, 0x00cc, 0x005a, 0x00cc, 0x0062,
-	0x00cc, 0x006a, 0x00cc, 0x0072, 0x00cc, 0x007a, 0x00cc, 0x0082,
-	0x00cc, 0x008a, 0x00cc, 0x0092, 0x00cc, 0x009a, 0x00cc, 0x00a2,
-	0x00ca, 0x0050, 0x00b1, 0x0050, 0x0081, 0x0052, 0x007e, 0x0052,
-	0x007c, 0x0055, 0x007c, 0x005c, 0x007e, 0x005e, 0x0080, 0x005e,
-	0x0082, 0x005c, 0x0082, 0x0054, 0x0080, 0x0052, 0x0078, 0x0052,
-	0x007c, 0x005e, 0x0077, 0x0061, 0x0074, 0x006e, 0x0074, 0x0078,
-	0x0076, 0x007a, 0x0079, 0x0078, 0x0079, 0x0070, 0x0078, 0x0070,
-	0x0078, 0x006b, 0x007b, 0x0066, 0x007a, 0x006f, 0x0084, 0x006f,
-	0x0085, 0x0066, 0x0086, 0x0070, 0x0085, 0x0070, 0x0085, 0x0079,
-	0x0088, 0x0079, 0x008a, 0x0078, 0x008a, 0x006c, 0x0087, 0x0061,
-	0x0085, 0x005f, 0x0082, 0x005f, 0x0080, 0x0061, 0x007e, 0x0061,
-	0x007b, 0x005f, 0x007c, 0x006f, 0x007c, 0x0071, 0x0079, 0x0074,
-	0x0079, 0x0089, 0x0076, 0x008c, 0x0076, 0x008e, 0x007a, 0x008e,
-	0x007f, 0x0089, 0x007f, 0x0083, 0x007e, 0x0083, 0x007e, 0x0077,
-	0x0080, 0x0077, 0x0080, 0x0083, 0x0080, 0x008b, 0x0084, 0x0090,
-	0x0088, 0x0090, 0x0088, 0x008e, 0x0085, 0x008b, 0x0085, 0x0074,
-	0x0082, 0x0071, 0x00b2, 0x0052, 0x00b0, 0x0054, 0x00b0, 0x0056,
-	0x00ae, 0x0058, 0x00af, 0x0059, 0x00af, 0x005e, 0x00b2, 0x0061,
-	0x00b5, 0x0061, 0x00b8, 0x005e, 0x00b8, 0x005a, 0x00b9, 0x0059,
-	0x00b9, 0x0058, 0x00b7, 0x0056, 0x00b7, 0x0054, 0x00b5, 0x0052,
-	0x00b2, 0x0052, 0x00ae, 0x005a, 0x00ab, 0x005b, 0x00ab, 0x006d,
-	0x00ae, 0x0072, 0x00b8, 0x0072, 0x00bc, 0x006d, 0x00bc, 0x005b,
-	0x00b9, 0x005a, 0x00bc, 0x005c, 0x00be, 0x005c, 0x00c1, 0x005f,
-	0x00c4, 0x0067, 0x00c4, 0x006d, 0x00c1, 0x0076, 0x00c0, 0x0077,
-	0x00bd, 0x0077, 0x00bb, 0x0075, 0x00bd, 0x0073, 0x00bb, 0x0072,
-	0x00be, 0x0070, 0x00be, 0x006a, 0x00a9, 0x006a, 0x00a9, 0x0070,
-	0x00ac, 0x0072, 0x00aa, 0x0073, 0x00ac, 0x0075, 0x00aa, 0x0077,
-	0x00a7, 0x0077, 0x00a3, 0x006d, 0x00a3, 0x0067, 0x00a6, 0x005f,
-	0x00a9, 0x005c, 0x00ab, 0x005c, 0x00ac, 0x0077, 0x00ac, 0x007c,
-	0x00ab, 0x007c, 0x00ab, 0x0084, 0x00ac, 0x0084, 0x00ac, 0x008b,
-	0x00a9, 0x008e, 0x00a9, 0x0090, 0x00ae, 0x0090, 0x00ae, 0x008d,
-	0x00b2, 0x008c, 0x00b2, 0x0087, 0x00b1, 0x0086, 0x00b1, 0x007b,
-	0x00b2, 0x0079, 0x00b4, 0x0079, 0x00b4, 0x007d, 0x00b5, 0x007d,
-	0x00b5, 0x0087, 0x00b4, 0x0087, 0x00b4, 0x008c, 0x00b6, 0x008c,
-	0x00b9, 0x0091, 0x00b4, 0x0091, 0x00bd, 0x008f, 0x00ba, 0x008c,
-	0x00ba, 0x0083, 0x00bb, 0x0082, 0x00bb, 0x0075, 0x00cc, 0x006e,
-	0x00d4, 0x006c, 0x00db, 0x0069, 0x00d9, 0x0068, 0x00d9, 0x0064,
-	0x00dc, 0x0064, 0x00dc, 0x0060, 0x00df, 0x0056, 0x00e5, 0x0052,
-	0x00e7, 0x0052, 0x00ec, 0x0056, 0x00ef, 0x005d, 0x00f1, 0x0065,
-	0x00f3, 0x0064, 0x00f3, 0x0069, 0x00f0, 0x0069, 0x00ec, 0x0065,
-	0x00ec, 0x005e, 0x00e9, 0x005f, 0x00e9, 0x005a, 0x00e7, 0x0058,
-	0x00e4, 0x0058, 0x00e3, 0x0054, 0x00e3, 0x0058, 0x00e1, 0x005c,
-	0x00e4, 0x0061, 0x00e7, 0x0061, 0x00e9, 0x005f, 0x00eb, 0x005d,
-	0x00e4, 0x0062, 0x00e0, 0x0064, 0x00e0, 0x0069, 0x00e2, 0x006b,
-	0x00e0, 0x0072, 0x00e0, 0x0077, 0x00ec, 0x0077, 0x00ec, 0x0071,
-	0x00ea, 0x006b, 0x00ec, 0x006a, 0x00ec, 0x0063, 0x00e7, 0x0063,
-	0x00e7, 0x0065, 0x00e1, 0x0069, 0x00e3, 0x0068, 0x00e6, 0x0069,
-	0x00ec, 0x005e, 0x00ea, 0x006b, 0x00e7, 0x006b, 0x00e7, 0x006a,
-	0x00e5, 0x006a, 0x00e5, 0x006b, 0x00e2, 0x006b, 0x00df, 0x006c,
-	0x00dc, 0x006f, 0x00dc, 0x0071, 0x00da, 0x0073, 0x00d8, 0x0073,
-	0x00d8, 0x006f, 0x00dc, 0x006b, 0x00dc, 0x0069, 0x00dd, 0x0068,
-	0x00ef, 0x0068, 0x00f0, 0x0069, 0x00f0, 0x006b, 0x00f4, 0x006f,
-	0x00f4, 0x0072, 0x00f3, 0x0073, 0x00f2, 0x0073, 0x00f0, 0x0071,
-	0x00f0, 0x006f, 0x00ec, 0x006b, 0x00ec, 0x007a, 0x00eb, 0x007b,
-	0x00eb, 0x007f, 0x00ec, 0x0080, 0x00ec, 0x0084, 0x00eb, 0x0085,
-	0x00eb, 0x008b, 0x00ec, 0x008c, 0x00ec, 0x008f, 0x00ed, 0x0091,
-	0x00e9, 0x0091, 0x00e9, 0x008f, 0x00e7, 0x008d, 0x00e7, 0x0090,
-	0x00e7, 0x0089, 0x00e8, 0x0088, 0x00e8, 0x0086, 0x00e7, 0x0085,
-	0x00e7, 0x007d, 0x00e6, 0x007c, 0x00e6, 0x0078, 0x00e5, 0x007d,
-	0x00e5, 0x0085, 0x00e4, 0x0086, 0x00e4, 0x0088, 0x00e5, 0x0089,
-	0x00e5, 0x0090, 0x00e5, 0x008b, 0x00e3, 0x0091, 0x00df, 0x0091,
-	0x00e0, 0x0090, 0x00e0, 0x008c, 0x00e2, 0x008b, 0x00e1, 0x0085,
-	0x00e0, 0x0084, 0x00e0, 0x0080, 0x00e1, 0x007f, 0x00e1, 0x007c,
-	0x00e0, 0x007b, 0x00e0, 0x0077
-};
-
-struct Credit {
-	const char *_role;
-	const char *_name;
-} _credits[] = {
-	{"Music and Sound Effects", "MARCO CAPRELLI"},
-	{"PC Version", "RICCARDO BALLARINO"},
-	{"Project Manager", "LOVRANO CANEPA"},
-	{"Production", "BRUNO BOZ"},
-	{"Special Thanks to", "LUIGI BENEDICENTI - GILDA and DANILO"},
-	{"Copyright 1992 Euclidea s.r.l ITALY", "All rights reserved"}
-};
-
-/*
-	game callables
-*/
-
-void _c_null(void *parm) {
-
-	return;
-}
-
-void _c_play_boogie(void *parm) {
-
-	static uint16 flag = 1;
-
-	if (flag == 0)
-		return;
-	flag = 0;
-
-	_vm->_soundMan->setMusicFile("boogie2");
-	_vm->_soundMan->playMusic();
-
-	return;
-}
-
-
-void _c_score(void *parm) {
-	_score += 5;
-	return;
-}
-
-void _c_fade(void *parm) {
-
-	_vm->_gfx->setBlackPalette();
-
-	Gfx::Palette pal;
-	memset(pal, 0, sizeof(Gfx::Palette));
-
-	for (uint16 _di = 0; _di < 64; _di++) {
-		_vm->_gfx->fadePalette(pal);
-		_vm->_gfx->setPalette(pal);
-
-		g_system->delayMillis(20);
-		_vm->_gfx->updateScreen();
-	}
-
-	return;
-}
-
-
-
-void _c_moveSarc(void *parm) {
-
-	Animation *a;
-
-	if (_introSarcData2 != 0) {
-
-		_introSarcData2 = 0;
-		if (_moveSarcZones[0] == NULL) {
-
-			_moveSarcZones[0] = _vm->findZone("sarc1");
-			_moveSarcZones[1] = _vm->findZone("sarc2");
-			_moveSarcZones[2] = _vm->findZone("sarc3");
-			_moveSarcZones[3] = _vm->findZone("sarc4");
-			_moveSarcZones[4] = _vm->findZone("sarc5");
-
-			_moveSarcExaZones[0] = _vm->findZone("sarc1exa");
-			_moveSarcExaZones[1] = _vm->findZone("sarc2exa");
-			_moveSarcExaZones[2] = _vm->findZone("sarc3exa");
-			_moveSarcExaZones[3] = _vm->findZone("sarc4exa");
-			_moveSarcExaZones[4] = _vm->findZone("sarc5exa");
-
-		}
-
-		a = _vm->findAnimation("sposta");
-
-		_moveSarcZone1 = (Zone*)parm;
-
-		for (uint16 _si = 0; _si < 5; _si++) {
-			if (_moveSarcZones[_si] == _moveSarcZone1) {
-				_moveSarcZone0 = _moveSarcExaZones[_si];
-			}
-		}
-
-		_introSarcData1 = _introSarcData3 - _moveSarcZone1->_left;
-		a->_z = _introSarcData3;
-		a->_frame = _moveSarcZone1->_top - (_introSarcData1 / 20);
-		_introSarcData3 = _moveSarcZone1->_left;
-
-		if (_introSarcData1 > 0) {
-			a->_left = _introSarcData1 / 2;
-		} else {
-			a->_left = -_introSarcData1 / 2;
-		}
-
-		if (_introSarcData1 > 0) {
-			a->_top = 2;
-		} else {
-			a->_top = -2;
-		}
-
-		return;
-
-	}
-
-	_introSarcData2 = 1;
-	_moveSarcZone1->translate(_introSarcData1, -_introSarcData1 / 20);
-	_moveSarcZone0->translate(_introSarcData1, -_introSarcData1 / 20);
-
-	if (_moveSarcZones[0]->_left == 35 &&
-		_moveSarcZones[1]->_left == 68 &&
-		_moveSarcZones[2]->_left == 101 &&
-		_moveSarcZones[3]->_left == 134 &&
-		_moveSarcZones[4]->_left == 167) {
-
-		a = _vm->findAnimation("finito");
-
-		a->_flags |= (kFlagsActive | kFlagsActing);
-		_localFlags[_vm->_currentLocationIndex] |= 0x20;		// GROSS HACK: activates 'finito' flag in dinoit_museo.loc
-	}
-
-	return;
-
-}
-
-
-
-
-void _c_contaFoglie(void *parm) {
-
-	num_foglie++;
-	if (num_foglie != 6)
-		return;
-
-	_commandFlags |= 0x1000;
-
-	return;
-}
-
-void _c_zeroFoglie(void *parm) {
-	num_foglie = 0;
-	return;
-}
-
-void _c_trasformata(void *parm) {
-	_engineFlags ^= kEngineTransformedDonna;
-	return;
-}
-
-void _c_offMouse(void *parm) {
-	_vm->showCursor(false);
-	_engineFlags |= kEngineBlockInput;
-	return;
-}
-
-void _c_onMouse(void *parm) {
-	_engineFlags &= ~kEngineBlockInput;
-	_vm->showCursor(true);
-	return;
-}
-
-
-
-void _c_setMask(void *parm) {
-
-	_vm->_gfx->intGrottaHackMask();
-
-	return;
-}
-
-void _c_endComment(void *param) {
-
-	byte* _enginePal = _vm->_gfx->_palette;
-	Gfx::Palette pal;
-
-	uint32 si;
-	for (si = 0; si < 32; si++) {
-
-		byte al = _enginePal[si*3+1];
-		if (al > _enginePal[si*3+2]) {
-			al = _enginePal[si*3+1];
-		} else {
-			al = _enginePal[si*3+2];
-		}
-
-		if (al < _enginePal[si*3]) {
-			al = _enginePal[si*3];
-		} else {
-			al = _enginePal[si*3+1];
-		}
-
-		if (al > _enginePal[si*3+2]) {
-			al = _enginePal[si*3+1];
-		} else {
-			al = _enginePal[si*3+2];
-		}
-
-		pal[si*3] = al;
-		pal[si*3+2] = al;
-		pal[si*3+1] = al;
-
-	}
-
-	int16 w = 0, h = 0;
-	_vm->_gfx->getStringExtent(_vm->_location._endComment, 130, &w, &h);
-
-	Common::Rect r(w+5, h+5);
-	r.moveTo(5, 5);
-	_vm->_gfx->floodFill(Gfx::kBitFront, r, 0);
-
-	r.setWidth(w+3);
-	r.setHeight(h+3);
-	r.moveTo(7, 7);
-	_vm->_gfx->floodFill(Gfx::kBitFront, r, 1);
-
-	_vm->_gfx->setFont(kFontDialogue);
-	_vm->_gfx->displayWrappedString(_vm->_location._endComment, 3, 5, 0, 130);
-	_vm->_gfx->updateScreen();
-
-	uint32 di = 0;
-	for (di = 0; di < PALETTE_COLORS; di++) {
-		for (si = 0; si <= 93; si +=3) {
-
-			int8 al;
-
-			if (_enginePal[si] != pal[si]) {
-				al = _enginePal[si];
-				if (al > pal[si])
-					al = 1;
-				else
-					al = -1;
-				_enginePal[si] += al;
-			}
-
-			if (_enginePal[si+1] != pal[si+1]) {
-				al = _enginePal[si+1];
-				if (al > pal[si+1])
-					al = 1;
-				else
-					al = -1;
-				_enginePal[si+1] += al;
-			}
-
-			if (_enginePal[si+2] != pal[si+2]) {
-				al = _enginePal[si+2];
-				if (al > pal[si+2])
-					al = 1;
-				else
-					al = -1;
-				_enginePal[si+2] += al;
-			}
-
-		}
-
-		_vm->_gfx->setPalette(_enginePal);
-		g_system->delayMillis(20);
-		_vm->_gfx->updateScreen();
-
-	}
-
-	waitUntilLeftClick();
-
-	return;
-}
-
-void _c_frankenstein(void *parm) {
-
-	Gfx::Palette pal0;
-	Gfx::Palette pal1;
-
-	for (uint16 i = 0; i <= BASE_PALETTE_COLORS; i++) {
-		pal0[(i+FIRST_BASE_COLOR)] = _vm->_gfx->_palette[i];
-		pal0[(i+FIRST_BASE_COLOR)*3+1] = 0;
-		pal0[(i+FIRST_BASE_COLOR)*3+2] = 0;
-
-		pal1[(i+FIRST_BASE_COLOR)*3+1] = 0;
-		pal1[(i+FIRST_BASE_COLOR)*3+2] = 0;
-	}
-
-	for (uint16 _di = 0; _di < 30; _di++) {
-		g_system->delayMillis(20);
-		_vm->_gfx->setPalette(pal0, FIRST_BASE_COLOR, BASE_PALETTE_COLORS);
-		_vm->_gfx->updateScreen();
-		g_system->delayMillis(20);
-		_vm->_gfx->setPalette(pal1, FIRST_BASE_COLOR, BASE_PALETTE_COLORS);
-		_vm->_gfx->updateScreen();
-	}
-
-	_vm->_gfx->setPalette(_vm->_gfx->_palette);
-	_vm->_gfx->updateScreen();
-
-	return;
-}
-
-
-void _c_finito(void *parm) {
-
-	const char **v8C = endMsg0;
-	const char **v7C = endMsg1;
-	const char **v6C = endMsg2;
-	const char **v5C = endMsg3;
-	const char **v4C = endMsg4;
-	const char **v3C = endMsg5;
-	const char **v2C = endMsg6;
-	const char **v1C = endMsg7;
-
-	Common::File stream;
-
-	stream.open(_vm->_characterName, Common::File::kFileWriteMode);
-	if (stream.isOpen())
-		stream.close();
-
-	Common::File streamDino, streamDough, streamDonna;
-
-	streamDino.open("dino");
-	streamDough.open("dough");
-	streamDonna.open("donna");
-
-	bool gameCompleted = streamDino.isOpen() && streamDough.isOpen() && streamDonna.isOpen();
-
-	streamDino.close();
-	streamDough.close();
-	streamDonna.close();
-
-	cleanInventory();
-
-	_vm->_gfx->setPalette(_vm->_gfx->_palette);
-
-	if (gameCompleted) {
-		_vm->_gfx->setFont(kFontMenu);
-		_vm->_gfx->displayCenteredString(70, v4C[_language]);
-		_vm->_gfx->displayCenteredString(100, v3C[_language]);
-		_vm->_gfx->displayCenteredString(130, v2C[_language]);
-		_vm->_gfx->displayCenteredString(160, v1C[_language]);
-
-		_vm->_gfx->updateScreen();
-		waitUntilLeftClick();
-
-		strcpy(_vm->_location._name, "estgrotta.drki");
-
-		_engineFlags |= kEngineChangeLocation;
-	} else {
-		_vm->_gfx->setFont(kFontMenu);
-		_vm->_gfx->displayCenteredString(70, v8C[_language]);
-		_vm->_gfx->displayCenteredString(100, v7C[_language]);
-		_vm->_gfx->displayCenteredString(130, v6C[_language]);
-		_vm->_gfx->displayCenteredString(160, v5C[_language]);
-
-		_vm->_gfx->updateScreen();
-		waitUntilLeftClick();
-
-		_vm->_menu->selectCharacter();
-	}
-
-	// this code saves main character animation from being removed from the following code
-	_vm->_animations.remove(&_vm->_char._ani);
-	_vm->_locationNames[0][0] = '\0';
-	_vm->_numLocations = 0;
-	_commandFlags = 0;
-
-	// this flag tells freeZones to unconditionally remove *all* Zones
-	_engineFlags |= kEngineQuit;
-
-	// TODO (LIST): this sequence should be just _zones.clear()
-	_vm->freeZones();
-
-	// TODO (LIST): this sequence should be just _animations.clear()
-	_vm->freeAnimations();
-
-	// this dangerous flag can now be cleared
-	_engineFlags &= ~kEngineQuit;
-
-	// main character animation is restored
-	_vm->_animations.push_front(&_vm->_char._ani);
-	_score = 0;
-
-	return;
-}
-
-void _c_ridux(void *parm) {
-	_vm->changeCharacter(_minidinoName);
-	return;
-}
-
-void _c_testResult(void *parm) {
-	_vm->_gfx->swapBuffers();
-
-	_vm->_disk->selectArchive("disk1");
-	_vm->parseLocation("common");
-
-	_vm->_gfx->setFont(kFontMenu);
-
-	_vm->_gfx->displayCenteredString(38, _slideText[0]);
-	_vm->_gfx->displayCenteredString(58, _slideText[1]);
-
-	_vm->_gfx->copyScreen(Gfx::kBitFront, Gfx::kBitBack);
-	_vm->_gfx->copyScreen(Gfx::kBitFront, Gfx::kBit2);
-
-	return;
-}
-
-void _c_offSound(void*) {
-	_vm->_soundMan->stopSfx(0);
-	_vm->_soundMan->stopSfx(1);
-	_vm->_soundMan->stopSfx(2);
-	_vm->_soundMan->stopSfx(3);
-}
-
-void _c_startMusic(void*) {
-	_vm->_soundMan->playMusic();
-}
-
-void _c_closeMusic(void*) {
-	_vm->_soundMan->stopMusic();
-}
-
-/*
-	intro callables
-*/
-
-void _c_startIntro(void *parm) {
-	_rightHandAnim = _vm->findAnimation("righthand");
-
-	if (_vm->getPlatform() == Common::kPlatformPC) {
-		_vm->_soundMan->setMusicFile("intro");
-		_vm->_soundMan->playMusic();
-	}
-
-	_engineFlags |= kEngineBlockInput;
-
-	return;
-}
-
-void _c_endIntro(void *parm) {
-
-	_vm->_gfx->setFont(kFontMenu);
-
-	debugC(1, kDebugLocation, "endIntro()");
-
-	for (uint16 _si = 0; _si < 6; _si++) {
-		_vm->_gfx->displayCenteredString(80, _credits[_si]._role);
-		_vm->_gfx->displayCenteredString(100, _credits[_si]._name);
-
-		_vm->_gfx->updateScreen();
-
-		for (uint16 v2 = 0; v2 < 100; v2++) {
-			_mouseButtons = kMouseNone;
-			_vm->updateInput();
-			if (_mouseButtons == kMouseLeftUp)
-				break;
-
-			_vm->waitTime( 1 );
-		}
-
-		_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBitFront);
-	}
-	debugC(1, kDebugLocation, "endIntro(): done showing credits");
-
-	if ((_vm->getFeatures() & GF_DEMO) == 0) {
-		_vm->_gfx->displayCenteredString(80, "CLICK MOUSE BUTTON TO START");
-		_vm->_gfx->updateScreen();
-
-		waitUntilLeftClick();
-
-		_engineFlags &= ~kEngineBlockInput;
-		_vm->_menu->selectCharacter();
-	} else {
-		waitUntilLeftClick();
-	}
-
-	return;
-}
-
-void _c_moveSheet(void *parm) {
-
-	static uint16 x = 319;
-
-	if (x > 66)
-		x -= 16;
-
-	Common::Rect r;
-
-	r.left = x;
-	r.top = 47;
-	r.right = (x + 32 > 319) ? 319 : (x + 32);
-	r.bottom = 199;
-	_vm->_gfx->floodFill(Gfx::kBitBack, r, 1);
-	_vm->_gfx->floodFill(Gfx::kBit2, r, 1);
-
-	if (x >= 104) return;
-
-	r.left = x+215;
-	r.top = 47;
-	r.right = (x + 247 > 319) ? 319 : (x + 247);
-	r.bottom = 199;
-	_vm->_gfx->floodFill(Gfx::kBitBack, r, 12);
-	_vm->_gfx->floodFill(Gfx::kBit2, r, 12);
-
-	return;
-}
-
-void plotPixel(int x, int y, int color, void *data) {
-	_vm->_gfx->plotMaskPixel(x, y, color);
-}
-
-void _c_sketch(void *parm) {
-
-	static uint16 index = 1;
-
-	uint16 newy = _rightHandPositions[2*index+1];
-	uint16 newx = _rightHandPositions[2*index];
-
-	uint16 oldy = _rightHandPositions[2*(index-1)+1];
-	uint16 oldx = _rightHandPositions[2*(index-1)];
-
-	Graphics::drawLine(oldx, oldy, newx, newy, 0, plotPixel, NULL);
-
-	_rightHandAnim->_left = newx;
-	_rightHandAnim->_top = newy - 20;
-
-	index++;
-
-	return;
-}
-
-
-
-
-void _c_shade(void *parm) {
-
-	Common::Rect r(
-		_rightHandAnim->_left - 36,
-		_rightHandAnim->_top - 36,
-		_rightHandAnim->_left,
-		_rightHandAnim->_top
-	);
-
-	_vm->_gfx->fillMaskRect(r, 0);
-
-	return;
-
-}
-
-void _c_projector(void*) {
-#ifdef HALFBRITE
-	static int dword_16032 = 0;
-
-//	Bitmap bm;
-//	InitBitMap(&bm);
-
-	if (dword_16032 != 0) {
-/*		// keep drawing spotlight in its final place
-		_vm->_gfx->flatBlitCnv(&scnv, 110, 25, Gfx::kBitFront);
-		BltBitMap(&bm, 0, 0, &_screen._bitMap, 110, 25, a3->??, a3->??, 0x20, 0x20);
-*/		return;
-	}
-
-	_vm->_gfx->setHalfbriteMode(true);
-/*
-	// move spot light around the stage
-	int d7, d6;
-	for (d7 = 0; d7 < 150; d7++) {
-
-		if (d7 < 100) {
-			int d1 = d7;
-			if (d1 < 0)
-				d1++;
-
-			d1 >>= 1;
-			d6 = 50 - d1;
-		} else {
-			int d1 = d7 / 100;
-			if (d1 < 0)
-				d1++;
-
-			d1 >>= 1;
-			d6 = d1;
-		}
-
-		BltBitMap(&bm, 0, 0, &_screen._bitMap, d7+20, d6, a3->??, a3->??, 0x20, 0x20);
-		sub_1590C(d6 + a3->??);
-		BltBitMap(&bm, 0, 0, &_screen._bitMap, d7+20, d6, a3->??, a3->??, 0xFA, 0x20);
-	}
-
-	for (d7 = 50; d7 > -10; d7--) {
-		BltBitMap(&bm, 0, 0, &_screen._bitMap, d7+120, d6, a3->??, a3->??, 0x20, 0x20);
-		sub_1590C(d6 + a3->??);
-		BltBitMap(&bm, 0, 0, &_screen._bitMap, d7+120, d6, a3->??, a3->??, 0xFA, 0x20);
-	}
-
-	BltBitMap(&bm, 0, 0, &_screen._bitMap, d7+120, d6, a3->??, a3->??, 0x20, 0x20);
-	_vm->_gfx->flatBlitCnv(&scnv, d7+120, d6, Gfx::kBitFront);
-*/
-
-	dword_16032 = 1;
-	return;
-#endif
-}
-
-void _c_HBOff(void*) {
-#ifdef HALFBRITE
-	_vm->_gfx->setHalfbriteMode(false);
-#endif
-}
-
-void _c_HBOn(void*) {
-#ifdef HALFBRITE
-	_vm->_gfx->setHalfbriteMode(true);
-#endif
-}
-
-
-} // namespace Parallaction

Copied: scummvm/trunk/engines/parallaction/callables_ns.cpp (from rev 28299, scummvm/trunk/engines/parallaction/callables.cpp)
===================================================================
--- scummvm/trunk/engines/parallaction/callables_ns.cpp	                        (rev 0)
+++ scummvm/trunk/engines/parallaction/callables_ns.cpp	2007-07-29 17:02:08 UTC (rev 28302)
@@ -0,0 +1,782 @@
+/* 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+
+#include "common/stdafx.h"
+#include "common/system.h"
+
+#include "common/file.h"
+
+#include "graphics/primitives.h"			// for Graphics::drawLine
+
+#include "parallaction/parallaction.h"
+#include "parallaction/menu.h"
+#include "parallaction/sound.h"
+
+
+namespace Parallaction {
+
+/*
+	game callables data members
+*/
+
+// there three guys are extern'd somewhere
+Zone *_moveSarcZone0 = NULL;
+int16 _introSarcData1 = 0;
+Zone *_moveSarcZone1 = NULL;
+
+// part completion messages
+static const char *endMsg0[] = {"COMPLIMENTI!", "BRAVO!", "CONGRATULATIONS!", "PRIMA!"};
+static const char *endMsg1[] = {"HAI FINITO QUESTA PARTE", "TU AS COMPLETE' CETTE AVENTURE", "YOU HAVE COMPLETED THIS PART", "DU HAST EIN ABENTEUER ERFOLGREICH"};
+static const char *endMsg2[] = {"ORA COMPLETA IL RESTO ", "AVEC SUCCES.",  "NOW GO ON WITH THE REST OF", "ZU ENDE GEFUHRT"};
+static const char *endMsg3[] = {"DELL' AVVENTURA",  "CONTINUE AVEC LES AUTRES", "THIS ADVENTURE", "MACH' MIT DEN ANDEREN WEITER"};
+// game completion messages
+static const char *endMsg4[] = {"COMPLIMENTI!", "BRAVO!", "CONGRATULATIONS!", "PRIMA!"};
+static const char *endMsg5[] = {"HAI FINITO LE TRE PARTI", "TU AS COMPLETE' LES TROIS PARTIES", "YOU HAVE COMPLETED THE THREE PARTS", "DU HAST DREI ABENTEURE ERFOLGREICH"};
+static const char *endMsg6[] = {"DELL' AVVENTURA", "DE L'AVENTURE", "OF THIS ADVENTURE", "ZU ENDE GEFUHRT"};
+static const char *endMsg7[] = {"ED ORA IL GRAN FINALE ", "ET MAINTENANT LE GRAND FINAL", "NOW THE GREAT FINAL", "UND YETZT DER GROSSE SCHLUSS!"};
+
+static uint16 num_foglie = 0;
+static Zone *_moveSarcZones[5];
+static Zone *_moveSarcExaZones[5];
+
+/*
+	intro callables data members
+*/
+
+static Animation *_rightHandAnim;
+
+static uint16 _rightHandPositions[684] = {
+	0x0064, 0x0046, 0x006c, 0x0046, 0x0074, 0x0046, 0x007c, 0x0046,
+	0x0084, 0x0046, 0x008c, 0x0046, 0x0094, 0x0046, 0x009c, 0x0046,
+	0x00a4, 0x0046, 0x00ac, 0x0046, 0x00b4, 0x0046, 0x00bc, 0x0046,
+	0x00c4, 0x0046, 0x00cc, 0x0046, 0x00d4, 0x0046, 0x00dc, 0x0046,
+	0x00e4, 0x0046, 0x00ec, 0x0046, 0x00f4, 0x0046, 0x00fc, 0x0046,
+	0x0104, 0x0046, 0x00ff, 0x0042, 0x00ff, 0x004a, 0x00ff, 0x0052,
+	0x00ff, 0x005a, 0x00ff, 0x0062, 0x00ff, 0x006a, 0x00ff, 0x0072,
+	0x00ff, 0x007a, 0x00ff, 0x0082, 0x00ff, 0x008a, 0x00ff, 0x0092,
+	0x00ff, 0x009a, 0x00ff, 0x00a2, 0x0104, 0x0097, 0x00fc, 0x0097,
+	0x00f4, 0x0097, 0x00ec, 0x0097, 0x00e4, 0x0097, 0x00dc, 0x0097,
+	0x00d4, 0x0097, 0x00cc, 0x0097, 0x00c4, 0x0097, 0x00bc, 0x0097,
+	0x00b4, 0x0097, 0x00ac, 0x0097, 0x00a4, 0x0097, 0x009c, 0x0097,
+	0x0094, 0x0097, 0x008c, 0x0097, 0x0084, 0x0097, 0x007c, 0x0097,
+	0x0074, 0x0097, 0x006c, 0x0097, 0x0064, 0x0097, 0x0066, 0x0042,
+	0x0066, 0x004a, 0x0066, 0x0052, 0x0066, 0x005a, 0x0066, 0x0062,
+	0x0066, 0x006a, 0x0066, 0x0072, 0x0066, 0x007a, 0x0066, 0x0082,
+	0x0066, 0x008a, 0x0066, 0x0092, 0x0066, 0x009a, 0x0066, 0x00a2,
+	0x008c, 0x0091, 0x0099, 0x0042, 0x0099, 0x004a, 0x0099, 0x0052,
+	0x0099, 0x005a, 0x0099, 0x0062, 0x0099, 0x006a, 0x0099, 0x0072,
+	0x0099, 0x007a, 0x0099, 0x0082, 0x0099, 0x008a, 0x0099, 0x0092,
+	0x0099, 0x009a, 0x0099, 0x00a2, 0x00a0, 0x004d, 0x00cc, 0x0042,
+	0x00cc, 0x004a, 0x00cc, 0x0052, 0x00cc, 0x005a, 0x00cc, 0x0062,
+	0x00cc, 0x006a, 0x00cc, 0x0072, 0x00cc, 0x007a, 0x00cc, 0x0082,
+	0x00cc, 0x008a, 0x00cc, 0x0092, 0x00cc, 0x009a, 0x00cc, 0x00a2,
+	0x00ca, 0x0050, 0x00b1, 0x0050, 0x0081, 0x0052, 0x007e, 0x0052,
+	0x007c, 0x0055, 0x007c, 0x005c, 0x007e, 0x005e, 0x0080, 0x005e,
+	0x0082, 0x005c, 0x0082, 0x0054, 0x0080, 0x0052, 0x0078, 0x0052,
+	0x007c, 0x005e, 0x0077, 0x0061, 0x0074, 0x006e, 0x0074, 0x0078,
+	0x0076, 0x007a, 0x0079, 0x0078, 0x0079, 0x0070, 0x0078, 0x0070,
+	0x0078, 0x006b, 0x007b, 0x0066, 0x007a, 0x006f, 0x0084, 0x006f,
+	0x0085, 0x0066, 0x0086, 0x0070, 0x0085, 0x0070, 0x0085, 0x0079,
+	0x0088, 0x0079, 0x008a, 0x0078, 0x008a, 0x006c, 0x0087, 0x0061,
+	0x0085, 0x005f, 0x0082, 0x005f, 0x0080, 0x0061, 0x007e, 0x0061,
+	0x007b, 0x005f, 0x007c, 0x006f, 0x007c, 0x0071, 0x0079, 0x0074,
+	0x0079, 0x0089, 0x0076, 0x008c, 0x0076, 0x008e, 0x007a, 0x008e,
+	0x007f, 0x0089, 0x007f, 0x0083, 0x007e, 0x0083, 0x007e, 0x0077,
+	0x0080, 0x0077, 0x0080, 0x0083, 0x0080, 0x008b, 0x0084, 0x0090,
+	0x0088, 0x0090, 0x0088, 0x008e, 0x0085, 0x008b, 0x0085, 0x0074,
+	0x0082, 0x0071, 0x00b2, 0x0052, 0x00b0, 0x0054, 0x00b0, 0x0056,
+	0x00ae, 0x0058, 0x00af, 0x0059, 0x00af, 0x005e, 0x00b2, 0x0061,
+	0x00b5, 0x0061, 0x00b8, 0x005e, 0x00b8, 0x005a, 0x00b9, 0x0059,
+	0x00b9, 0x0058, 0x00b7, 0x0056, 0x00b7, 0x0054, 0x00b5, 0x0052,
+	0x00b2, 0x0052, 0x00ae, 0x005a, 0x00ab, 0x005b, 0x00ab, 0x006d,
+	0x00ae, 0x0072, 0x00b8, 0x0072, 0x00bc, 0x006d, 0x00bc, 0x005b,
+	0x00b9, 0x005a, 0x00bc, 0x005c, 0x00be, 0x005c, 0x00c1, 0x005f,
+	0x00c4, 0x0067, 0x00c4, 0x006d, 0x00c1, 0x0076, 0x00c0, 0x0077,
+	0x00bd, 0x0077, 0x00bb, 0x0075, 0x00bd, 0x0073, 0x00bb, 0x0072,
+	0x00be, 0x0070, 0x00be, 0x006a, 0x00a9, 0x006a, 0x00a9, 0x0070,
+	0x00ac, 0x0072, 0x00aa, 0x0073, 0x00ac, 0x0075, 0x00aa, 0x0077,
+	0x00a7, 0x0077, 0x00a3, 0x006d, 0x00a3, 0x0067, 0x00a6, 0x005f,
+	0x00a9, 0x005c, 0x00ab, 0x005c, 0x00ac, 0x0077, 0x00ac, 0x007c,
+	0x00ab, 0x007c, 0x00ab, 0x0084, 0x00ac, 0x0084, 0x00ac, 0x008b,
+	0x00a9, 0x008e, 0x00a9, 0x0090, 0x00ae, 0x0090, 0x00ae, 0x008d,
+	0x00b2, 0x008c, 0x00b2, 0x0087, 0x00b1, 0x0086, 0x00b1, 0x007b,
+	0x00b2, 0x0079, 0x00b4, 0x0079, 0x00b4, 0x007d, 0x00b5, 0x007d,
+	0x00b5, 0x0087, 0x00b4, 0x0087, 0x00b4, 0x008c, 0x00b6, 0x008c,
+	0x00b9, 0x0091, 0x00b4, 0x0091, 0x00bd, 0x008f, 0x00ba, 0x008c,
+	0x00ba, 0x0083, 0x00bb, 0x0082, 0x00bb, 0x0075, 0x00cc, 0x006e,
+	0x00d4, 0x006c, 0x00db, 0x0069, 0x00d9, 0x0068, 0x00d9, 0x0064,
+	0x00dc, 0x0064, 0x00dc, 0x0060, 0x00df, 0x0056, 0x00e5, 0x0052,
+	0x00e7, 0x0052, 0x00ec, 0x0056, 0x00ef, 0x005d, 0x00f1, 0x0065,
+	0x00f3, 0x0064, 0x00f3, 0x0069, 0x00f0, 0x0069, 0x00ec, 0x0065,
+	0x00ec, 0x005e, 0x00e9, 0x005f, 0x00e9, 0x005a, 0x00e7, 0x0058,
+	0x00e4, 0x0058, 0x00e3, 0x0054, 0x00e3, 0x0058, 0x00e1, 0x005c,
+	0x00e4, 0x0061, 0x00e7, 0x0061, 0x00e9, 0x005f, 0x00eb, 0x005d,
+	0x00e4, 0x0062, 0x00e0, 0x0064, 0x00e0, 0x0069, 0x00e2, 0x006b,
+	0x00e0, 0x0072, 0x00e0, 0x0077, 0x00ec, 0x0077, 0x00ec, 0x0071,
+	0x00ea, 0x006b, 0x00ec, 0x006a, 0x00ec, 0x0063, 0x00e7, 0x0063,
+	0x00e7, 0x0065, 0x00e1, 0x0069, 0x00e3, 0x0068, 0x00e6, 0x0069,
+	0x00ec, 0x005e, 0x00ea, 0x006b, 0x00e7, 0x006b, 0x00e7, 0x006a,
+	0x00e5, 0x006a, 0x00e5, 0x006b, 0x00e2, 0x006b, 0x00df, 0x006c,
+	0x00dc, 0x006f, 0x00dc, 0x0071, 0x00da, 0x0073, 0x00d8, 0x0073,
+	0x00d8, 0x006f, 0x00dc, 0x006b, 0x00dc, 0x0069, 0x00dd, 0x0068,
+	0x00ef, 0x0068, 0x00f0, 0x0069, 0x00f0, 0x006b, 0x00f4, 0x006f,
+	0x00f4, 0x0072, 0x00f3, 0x0073, 0x00f2, 0x0073, 0x00f0, 0x0071,
+	0x00f0, 0x006f, 0x00ec, 0x006b, 0x00ec, 0x007a, 0x00eb, 0x007b,
+	0x00eb, 0x007f, 0x00ec, 0x0080, 0x00ec, 0x0084, 0x00eb, 0x0085,
+	0x00eb, 0x008b, 0x00ec, 0x008c, 0x00ec, 0x008f, 0x00ed, 0x0091,
+	0x00e9, 0x0091, 0x00e9, 0x008f, 0x00e7, 0x008d, 0x00e7, 0x0090,
+	0x00e7, 0x0089, 0x00e8, 0x0088, 0x00e8, 0x0086, 0x00e7, 0x0085,
+	0x00e7, 0x007d, 0x00e6, 0x007c, 0x00e6, 0x0078, 0x00e5, 0x007d,
+	0x00e5, 0x0085, 0x00e4, 0x0086, 0x00e4, 0x0088, 0x00e5, 0x0089,
+	0x00e5, 0x0090, 0x00e5, 0x008b, 0x00e3, 0x0091, 0x00df, 0x0091,
+	0x00e0, 0x0090, 0x00e0, 0x008c, 0x00e2, 0x008b, 0x00e1, 0x0085,
+	0x00e0, 0x0084, 0x00e0, 0x0080, 0x00e1, 0x007f, 0x00e1, 0x007c,
+	0x00e0, 0x007b, 0x00e0, 0x0077
+};
+
+struct Credit {
+	const char *_role;
+	const char *_name;
+} _credits[] = {
+	{"Music and Sound Effects", "MARCO CAPRELLI"},
+	{"PC Version", "RICCARDO BALLARINO"},
+	{"Project Manager", "LOVRANO CANEPA"},
+	{"Production", "BRUNO BOZ"},
+	{"Special Thanks to", "LUIGI BENEDICENTI - GILDA and DANILO"},
+	{"Copyright 1992 Euclidea s.r.l ITALY", "All rights reserved"}
+};
+
+/*
+	game callables
+*/
+
+void Parallaction_ns::_c_null(void *parm) {
+
+	return;
+}
+
+void Parallaction_ns::_c_play_boogie(void *parm) {
+
+	static uint16 flag = 1;
+
+	if (flag == 0)
+		return;
+	flag = 0;
+
+	_vm->_soundMan->setMusicFile("boogie2");
+	_vm->_soundMan->playMusic();
+
+	return;
+}
+
+
+void Parallaction_ns::_c_score(void *parm) {
+	_score += 5;
+	return;
+}
+
+void Parallaction_ns::_c_fade(void *parm) {
+
+	_vm->_gfx->setBlackPalette();
+
+	Gfx::Palette pal;
+	memset(pal, 0, sizeof(Gfx::Palette));
+
+	for (uint16 _di = 0; _di < 64; _di++) {
+		_vm->_gfx->fadePalette(pal);
+		_vm->_gfx->setPalette(pal);
+
+		g_system->delayMillis(20);
+		_vm->_gfx->updateScreen();
+	}
+
+	return;
+}
+
+
+
+void Parallaction_ns::_c_moveSarc(void *parm) {
+
+	Animation *a;
+
+	if (_introSarcData2 != 0) {
+
+		_introSarcData2 = 0;
+		if (_moveSarcZones[0] == NULL) {
+
+			_moveSarcZones[0] = _vm->findZone("sarc1");
+			_moveSarcZones[1] = _vm->findZone("sarc2");
+			_moveSarcZones[2] = _vm->findZone("sarc3");
+			_moveSarcZones[3] = _vm->findZone("sarc4");
+			_moveSarcZones[4] = _vm->findZone("sarc5");
+
+			_moveSarcExaZones[0] = _vm->findZone("sarc1exa");
+			_moveSarcExaZones[1] = _vm->findZone("sarc2exa");
+			_moveSarcExaZones[2] = _vm->findZone("sarc3exa");
+			_moveSarcExaZones[3] = _vm->findZone("sarc4exa");
+			_moveSarcExaZones[4] = _vm->findZone("sarc5exa");
+
+		}
+
+		a = _vm->findAnimation("sposta");
+
+		_moveSarcZone1 = (Zone*)parm;
+
+		for (uint16 _si = 0; _si < 5; _si++) {
+			if (_moveSarcZones[_si] == _moveSarcZone1) {
+				_moveSarcZone0 = _moveSarcExaZones[_si];
+			}
+		}
+
+		_introSarcData1 = _introSarcData3 - _moveSarcZone1->_left;
+		a->_z = _introSarcData3;
+		a->_frame = _moveSarcZone1->_top - (_introSarcData1 / 20);
+		_introSarcData3 = _moveSarcZone1->_left;
+
+		if (_introSarcData1 > 0) {
+			a->_left = _introSarcData1 / 2;
+		} else {
+			a->_left = -_introSarcData1 / 2;
+		}
+
+		if (_introSarcData1 > 0) {
+			a->_top = 2;
+		} else {
+			a->_top = -2;
+		}
+
+		return;
+
+	}
+
+	_introSarcData2 = 1;
+	_moveSarcZone1->translate(_introSarcData1, -_introSarcData1 / 20);
+	_moveSarcZone0->translate(_introSarcData1, -_introSarcData1 / 20);
+
+	if (_moveSarcZones[0]->_left == 35 &&
+		_moveSarcZones[1]->_left == 68 &&
+		_moveSarcZones[2]->_left == 101 &&
+		_moveSarcZones[3]->_left == 134 &&
+		_moveSarcZones[4]->_left == 167) {
+
+		a = _vm->findAnimation("finito");
+
+		a->_flags |= (kFlagsActive | kFlagsActing);
+		_localFlags[_vm->_currentLocationIndex] |= 0x20;		// GROSS HACK: activates 'finito' flag in dinoit_museo.loc
+	}
+
+	return;
+
+}
+
+
+
+
+void Parallaction_ns::_c_contaFoglie(void *parm) {
+
+	num_foglie++;
+	if (num_foglie != 6)
+		return;
+
+	_commandFlags |= 0x1000;
+
+	return;
+}
+
+void Parallaction_ns::_c_zeroFoglie(void *parm) {
+	num_foglie = 0;
+	return;
+}
+
+void Parallaction_ns::_c_trasformata(void *parm) {
+	_engineFlags ^= kEngineTransformedDonna;
+	return;
+}
+
+void Parallaction_ns::_c_offMouse(void *parm) {
+	_vm->showCursor(false);
+	_engineFlags |= kEngineBlockInput;
+	return;
+}
+
+void Parallaction_ns::_c_onMouse(void *parm) {
+	_engineFlags &= ~kEngineBlockInput;
+	_vm->showCursor(true);
+	return;
+}
+
+
+
+void Parallaction_ns::_c_setMask(void *parm) {
+
+	_vm->_gfx->intGrottaHackMask();
+
+	return;
+}
+
+void Parallaction_ns::_c_endComment(void *param) {
+
+	byte* _enginePal = _vm->_gfx->_palette;
+	Gfx::Palette pal;
+
+	uint32 si;
+	for (si = 0; si < 32; si++) {
+
+		byte al = _enginePal[si*3+1];
+		if (al > _enginePal[si*3+2]) {
+			al = _enginePal[si*3+1];
+		} else {
+			al = _enginePal[si*3+2];
+		}
+
+		if (al < _enginePal[si*3]) {
+			al = _enginePal[si*3];
+		} else {
+			al = _enginePal[si*3+1];
+		}
+
+		if (al > _enginePal[si*3+2]) {
+			al = _enginePal[si*3+1];
+		} else {
+			al = _enginePal[si*3+2];
+		}
+
+		pal[si*3] = al;
+		pal[si*3+2] = al;
+		pal[si*3+1] = al;
+
+	}
+
+	int16 w = 0, h = 0;
+	_vm->_gfx->getStringExtent(_vm->_location._endComment, 130, &w, &h);
+
+	Common::Rect r(w+5, h+5);
+	r.moveTo(5, 5);
+	_vm->_gfx->floodFill(Gfx::kBitFront, r, 0);
+
+	r.setWidth(w+3);
+	r.setHeight(h+3);
+	r.moveTo(7, 7);
+	_vm->_gfx->floodFill(Gfx::kBitFront, r, 1);
+
+	_vm->_gfx->setFont(kFontDialogue);
+	_vm->_gfx->displayWrappedString(_vm->_location._endComment, 3, 5, 0, 130);
+	_vm->_gfx->updateScreen();
+
+	uint32 di = 0;
+	for (di = 0; di < PALETTE_COLORS; di++) {
+		for (si = 0; si <= 93; si +=3) {
+
+			int8 al;
+
+			if (_enginePal[si] != pal[si]) {
+				al = _enginePal[si];
+				if (al > pal[si])
+					al = 1;
+				else
+					al = -1;
+				_enginePal[si] += al;
+			}
+
+			if (_enginePal[si+1] != pal[si+1]) {
+				al = _enginePal[si+1];
+				if (al > pal[si+1])
+					al = 1;
+				else
+					al = -1;
+				_enginePal[si+1] += al;
+			}
+
+			if (_enginePal[si+2] != pal[si+2]) {
+				al = _enginePal[si+2];
+				if (al > pal[si+2])
+					al = 1;
+				else
+					al = -1;
+				_enginePal[si+2] += al;
+			}
+
+		}
+
+		_vm->_gfx->setPalette(_enginePal);
+		g_system->delayMillis(20);
+		_vm->_gfx->updateScreen();
+
+	}
+
+	waitUntilLeftClick();
+
+	return;
+}
+
+void Parallaction_ns::_c_frankenstein(void *parm) {
+
+	Gfx::Palette pal0;
+	Gfx::Palette pal1;
+
+	for (uint16 i = 0; i <= BASE_PALETTE_COLORS; i++) {
+		pal0[(i+FIRST_BASE_COLOR)] = _vm->_gfx->_palette[i];
+		pal0[(i+FIRST_BASE_COLOR)*3+1] = 0;
+		pal0[(i+FIRST_BASE_COLOR)*3+2] = 0;
+
+		pal1[(i+FIRST_BASE_COLOR)*3+1] = 0;
+		pal1[(i+FIRST_BASE_COLOR)*3+2] = 0;
+	}
+
+	for (uint16 _di = 0; _di < 30; _di++) {
+		g_system->delayMillis(20);
+		_vm->_gfx->setPalette(pal0, FIRST_BASE_COLOR, BASE_PALETTE_COLORS);
+		_vm->_gfx->updateScreen();
+		g_system->delayMillis(20);
+		_vm->_gfx->setPalette(pal1, FIRST_BASE_COLOR, BASE_PALETTE_COLORS);
+		_vm->_gfx->updateScreen();
+	}
+
+	_vm->_gfx->setPalette(_vm->_gfx->_palette);
+	_vm->_gfx->updateScreen();
+
+	return;
+}
+
+
+void Parallaction_ns::_c_finito(void *parm) {
+
+	const char **v8C = endMsg0;
+	const char **v7C = endMsg1;
+	const char **v6C = endMsg2;
+	const char **v5C = endMsg3;
+	const char **v4C = endMsg4;
+	const char **v3C = endMsg5;
+	const char **v2C = endMsg6;
+	const char **v1C = endMsg7;
+
+	Common::File stream;
+
+	stream.open(_vm->_characterName, Common::File::kFileWriteMode);
+	if (stream.isOpen())
+		stream.close();
+
+	Common::File streamDino, streamDough, streamDonna;
+
+	streamDino.open("dino");
+	streamDough.open("dough");
+	streamDonna.open("donna");
+
+	bool gameCompleted = streamDino.isOpen() && streamDough.isOpen() && streamDonna.isOpen();
+
+	streamDino.close();
+	streamDough.close();
+	streamDonna.close();
+
+	cleanInventory();
+
+	_vm->_gfx->setPalette(_vm->_gfx->_palette);
+
+	if (gameCompleted) {
+		_vm->_gfx->setFont(kFontMenu);
+		_vm->_gfx->displayCenteredString(70, v4C[_language]);
+		_vm->_gfx->displayCenteredString(100, v3C[_language]);
+		_vm->_gfx->displayCenteredString(130, v2C[_language]);
+		_vm->_gfx->displayCenteredString(160, v1C[_language]);
+
+		_vm->_gfx->updateScreen();
+		waitUntilLeftClick();
+
+		strcpy(_vm->_location._name, "estgrotta.drki");
+
+		_engineFlags |= kEngineChangeLocation;
+	} else {
+		_vm->_gfx->setFont(kFontMenu);
+		_vm->_gfx->displayCenteredString(70, v8C[_language]);
+		_vm->_gfx->displayCenteredString(100, v7C[_language]);
+		_vm->_gfx->displayCenteredString(130, v6C[_language]);
+		_vm->_gfx->displayCenteredString(160, v5C[_language]);
+
+		_vm->_gfx->updateScreen();
+		waitUntilLeftClick();
+
+		_vm->_menu->selectCharacter();
+	}
+
+	// this code saves main character animation from being removed from the following code
+	_vm->_animations.remove(&_vm->_char._ani);
+	_vm->_locationNames[0][0] = '\0';
+	_vm->_numLocations = 0;
+	_commandFlags = 0;
+
+	// this flag tells freeZones to unconditionally remove *all* Zones
+	_engineFlags |= kEngineQuit;
+
+	// TODO (LIST): this sequence should be just _zones.clear()
+	_vm->freeZones();
+
+	// TODO (LIST): this sequence should be just _animations.clear()
+	_vm->freeAnimations();
+
+	// this dangerous flag can now be cleared
+	_engineFlags &= ~kEngineQuit;
+
+	// main character animation is restored
+	_vm->_animations.push_front(&_vm->_char._ani);
+	_score = 0;
+
+	return;
+}
+
+void Parallaction_ns::_c_ridux(void *parm) {
+	_vm->changeCharacter(_minidinoName);
+	return;
+}
+
+void Parallaction_ns::_c_testResult(void *parm) {
+	_vm->_gfx->swapBuffers();
+
+	_vm->_disk->selectArchive("disk1");
+	_vm->parseLocation("common");
+
+	_vm->_gfx->setFont(kFontMenu);
+
+	_vm->_gfx->displayCenteredString(38, _slideText[0]);
+	_vm->_gfx->displayCenteredString(58, _slideText[1]);
+
+	_vm->_gfx->copyScreen(Gfx::kBitFront, Gfx::kBitBack);
+	_vm->_gfx->copyScreen(Gfx::kBitFront, Gfx::kBit2);
+
+	return;
+}
+
+void Parallaction_ns::_c_offSound(void*) {
+	_vm->_soundMan->stopSfx(0);
+	_vm->_soundMan->stopSfx(1);
+	_vm->_soundMan->stopSfx(2);
+	_vm->_soundMan->stopSfx(3);
+}
+
+void Parallaction_ns::_c_startMusic(void*) {
+	_vm->_soundMan->playMusic();
+}
+
+void Parallaction_ns::_c_closeMusic(void*) {
+	_vm->_soundMan->stopMusic();
+}
+
+/*
+	intro callables
+*/
+
+void Parallaction_ns::_c_startIntro(void *parm) {
+	_rightHandAnim = _vm->findAnimation("righthand");
+
+	if (_vm->getPlatform() == Common::kPlatformPC) {
+		_vm->_soundMan->setMusicFile("intro");
+		_vm->_soundMan->playMusic();
+	}
+
+	_engineFlags |= kEngineBlockInput;
+
+	return;
+}
+
+void Parallaction_ns::_c_endIntro(void *parm) {
+
+	_vm->_gfx->setFont(kFontMenu);
+
+	debugC(1, kDebugLocation, "endIntro()");
+
+	for (uint16 _si = 0; _si < 6; _si++) {
+		_vm->_gfx->displayCenteredString(80, _credits[_si]._role);
+		_vm->_gfx->displayCenteredString(100, _credits[_si]._name);
+
+		_vm->_gfx->updateScreen();
+
+		for (uint16 v2 = 0; v2 < 100; v2++) {
+			_mouseButtons = kMouseNone;
+			_vm->updateInput();
+			if (_mouseButtons == kMouseLeftUp)
+				break;
+
+			_vm->waitTime( 1 );
+		}
+
+		_vm->_gfx->copyScreen(Gfx::kBitBack, Gfx::kBitFront);
+	}
+	debugC(1, kDebugLocation, "endIntro(): done showing credits");
+
+	if ((_vm->getFeatures() & GF_DEMO) == 0) {
+		_vm->_gfx->displayCenteredString(80, "CLICK MOUSE BUTTON TO START");
+		_vm->_gfx->updateScreen();
+
+		waitUntilLeftClick();
+
+		_engineFlags &= ~kEngineBlockInput;
+		_vm->_menu->selectCharacter();
+	} else {
+		waitUntilLeftClick();
+	}
+
+	return;
+}
+
+void Parallaction_ns::_c_moveSheet(void *parm) {
+
+	static uint16 x = 319;
+
+	if (x > 66)
+		x -= 16;
+
+	Common::Rect r;
+
+	r.left = x;
+	r.top = 47;
+	r.right = (x + 32 > 319) ? 319 : (x + 32);
+	r.bottom = 199;
+	_vm->_gfx->floodFill(Gfx::kBitBack, r, 1);
+	_vm->_gfx->floodFill(Gfx::kBit2, r, 1);
+
+	if (x >= 104) return;
+
+	r.left = x+215;
+	r.top = 47;
+	r.right = (x + 247 > 319) ? 319 : (x + 247);
+	r.bottom = 199;
+	_vm->_gfx->floodFill(Gfx::kBitBack, r, 12);
+	_vm->_gfx->floodFill(Gfx::kBit2, r, 12);
+
+	return;
+}
+
+void plotPixel(int x, int y, int color, void *data) {
+	_vm->_gfx->plotMaskPixel(x, y, color);
+}
+
+void Parallaction_ns::_c_sketch(void *parm) {
+
+	static uint16 index = 1;
+
+	uint16 newy = _rightHandPositions[2*index+1];
+	uint16 newx = _rightHandPositions[2*index];
+
+	uint16 oldy = _rightHandPositions[2*(index-1)+1];
+	uint16 oldx = _rightHandPositions[2*(index-1)];
+
+	Graphics::drawLine(oldx, oldy, newx, newy, 0, plotPixel, NULL);
+
+	_rightHandAnim->_left = newx;
+	_rightHandAnim->_top = newy - 20;
+
+	index++;
+
+	return;
+}
+
+
+
+
+void Parallaction_ns::_c_shade(void *parm) {
+
+	Common::Rect r(
+		_rightHandAnim->_left - 36,
+		_rightHandAnim->_top - 36,
+		_rightHandAnim->_left,
+		_rightHandAnim->_top
+	);
+
+	_vm->_gfx->fillMaskRect(r, 0);
+
+	return;
+
+}
+
+void Parallaction_ns::_c_projector(void*) {
+#ifdef HALFBRITE
+	static int dword_16032 = 0;
+
+//	Bitmap bm;
+//	InitBitMap(&bm);
+
+	if (dword_16032 != 0) {
+/*		// keep drawing spotlight in its final place
+		_vm->_gfx->flatBlitCnv(&scnv, 110, 25, Gfx::kBitFront);
+		BltBitMap(&bm, 0, 0, &_screen._bitMap, 110, 25, a3->??, a3->??, 0x20, 0x20);
+*/		return;
+	}
+
+	_vm->_gfx->setHalfbriteMode(true);
+/*
+	// move spot light around the stage
+	int d7, d6;
+	for (d7 = 0; d7 < 150; d7++) {
+
+		if (d7 < 100) {
+			int d1 = d7;
+			if (d1 < 0)
+				d1++;
+
+			d1 >>= 1;
+			d6 = 50 - d1;
+		} else {
+			int d1 = d7 / 100;
+			if (d1 < 0)
+				d1++;
+
+			d1 >>= 1;
+			d6 = d1;
+		}
+
+		BltBitMap(&bm, 0, 0, &_screen._bitMap, d7+20, d6, a3->??, a3->??, 0x20, 0x20);
+		sub_1590C(d6 + a3->??);
+		BltBitMap(&bm, 0, 0, &_screen._bitMap, d7+20, d6, a3->??, a3->??, 0xFA, 0x20);
+	}
+
+	for (d7 = 50; d7 > -10; d7--) {
+		BltBitMap(&bm, 0, 0, &_screen._bitMap, d7+120, d6, a3->??, a3->??, 0x20, 0x20);
+		sub_1590C(d6 + a3->??);
+		BltBitMap(&bm, 0, 0, &_screen._bitMap, d7+120, d6, a3->??, a3->??, 0xFA, 0x20);
+	}
+
+	BltBitMap(&bm, 0, 0, &_screen._bitMap, d7+120, d6, a3->??, a3->??, 0x20, 0x20);
+	_vm->_gfx->flatBlitCnv(&scnv, d7+120, d6, Gfx::kBitFront);
+*/
+
+	dword_16032 = 1;
+	return;
+#endif
+}
+
+void Parallaction_ns::_c_HBOff(void*) {
+#ifdef HALFBRITE
+	_vm->_gfx->setHalfbriteMode(false);
+#endif
+}
+
+void Parallaction_ns::_c_HBOn(void*) {
+#ifdef HALFBRITE
+	_vm->_gfx->setHalfbriteMode(true);
+#endif
+}
+
+
+} // namespace Parallaction

Modified: scummvm/trunk/engines/parallaction/module.mk
===================================================================
--- scummvm/trunk/engines/parallaction/module.mk	2007-07-29 16:58:52 UTC (rev 28301)
+++ scummvm/trunk/engines/parallaction/module.mk	2007-07-29 17:02:08 UTC (rev 28302)
@@ -2,7 +2,7 @@
 
 MODULE_OBJS := \
 	animation.o \
-	callables.o \
+	callables_ns.o \
 	commands.o \
 	debug.o \
 	detection.o \

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-07-29 16:58:52 UTC (rev 28301)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-07-29 17:02:08 UTC (rev 28302)
@@ -497,6 +497,42 @@
 private:
 	void 		initResources();
 
+	typedef void (Parallaction_ns::*Callable)(void*);
+
+	// common callables
+	void _c_play_boogie(void*);
+	void _c_startIntro(void*);
+	void _c_endIntro(void*);
+	void _c_moveSheet(void*);
+	void _c_sketch(void*);
+	void _c_shade(void*);
+	void _c_score(void*);
+	void _c_fade(void*);
+	void _c_moveSarc(void*);
+	void _c_contaFoglie(void*);
+	void _c_zeroFoglie(void*);
+	void _c_trasformata(void*);
+	void _c_offMouse(void*);
+	void _c_onMouse(void*);
+	void _c_setMask(void*);
+	void _c_endComment(void*);
+	void _c_frankenstein(void*);
+	void _c_finito(void*);
+	void _c_ridux(void*);
+	void _c_testResult(void*);
+
+	// dos specific callables
+	void _c_null(void*);
+
+	// amiga specific callables
+	void _c_projector(void*);
+	void _c_HBOff(void*);
+	void _c_offSound(void*);
+	void _c_startMusic(void*);
+	void _c_closeMusic(void*);
+	void _c_HBOn(void*);
+
+	Callable _callables[25];
 };
 
 class Parallaction_br : public Parallaction {

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-07-29 16:58:52 UTC (rev 28301)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-07-29 17:02:08 UTC (rev 28302)
@@ -69,9 +69,10 @@
 }
 
 void Parallaction_ns::callFunction(uint index, void* parm) {
+	printf("index = %i\n", index);
 	assert(index >= 0 && index < 25);	// magic value 25 is maximum # of callables for Nippon Safes
 
-	_callables[index](parm);
+	(this->*_callables[index])(parm);
 }
 
 

Modified: scummvm/trunk/engines/parallaction/staticres.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/staticres.cpp	2007-07-29 16:58:52 UTC (rev 28301)
+++ scummvm/trunk/engines/parallaction/staticres.cpp	2007-07-29 17:02:08 UTC (rev 28302)
@@ -472,40 +472,6 @@
 	"loop"
 };
 
-typedef void (*callable)(void*);
-
-
-void _c_play_boogie(void*);
-void _c_startIntro(void*);
-void _c_endIntro(void*);
-void _c_moveSheet(void*);
-void _c_sketch(void*);
-void _c_shade(void*);
-void _c_score(void*);
-void _c_fade(void*);
-void _c_moveSarc(void*);
-void _c_contaFoglie(void*);
-void _c_zeroFoglie(void*);
-void _c_trasformata(void*);
-void _c_offMouse(void*);
-void _c_onMouse(void*);
-void _c_setMask(void*);
-void _c_endComment(void*);
-void _c_frankenstein(void*);
-void _c_finito(void*);
-void _c_ridux(void*);
-void _c_testResult(void*);
-void _c_null(void*);
-
-void _c_projector(void*);
-void _c_HBOff(void*);
-void _c_offSound(void*);
-void _c_startMusic(void*);
-void _c_closeMusic(void*);
-void _c_HBOn(void*);
-
-callable _callables[25];
-
 const char *_dinoName = "dino";
 const char *_donnaName = "donna";
 const char *_doughName = "dough";
@@ -516,6 +482,7 @@
 const char *_minidoughName = "minidough";
 const char *_minidrkiName = "minidrki";
 
+#define CALLABLE_NS(x) &Parallaction_ns::x
 
 void Parallaction_ns::initResources() {
 
@@ -535,57 +502,57 @@
 	_localFlagNames->addData("visited");
 
 	if (getPlatform() == Common::kPlatformPC) {
-		_callables[0] = 	_c_play_boogie;
-		_callables[1] = 	_c_play_boogie;
-		_callables[2] = 	_c_startIntro;
-		_callables[3] = 	_c_endIntro;
-		_callables[4] = 	_c_moveSheet;
-		_callables[5] = 	_c_sketch;
-		_callables[6] = 	_c_shade;
-		_callables[7] = 	_c_score;
-		_callables[8] = 	_c_null;
-		_callables[9] = 	_c_null;
-		_callables[10] = 	_c_null;
-		_callables[11] = 	_c_fade;
-		_callables[12] = 	_c_play_boogie;
-		_callables[13] = 	_c_moveSarc;
-		_callables[14] = 	_c_contaFoglie;
-		_callables[15] = 	_c_zeroFoglie;
-		_callables[16] = 	_c_trasformata;
-		_callables[17] = 	_c_offMouse;
-		_callables[18] = 	_c_onMouse;
-		_callables[19] = 	_c_setMask;
-		_callables[20] = 	_c_endComment;
-		_callables[21] = 	_c_frankenstein;
-		_callables[22] = 	_c_finito;
-		_callables[23] = 	_c_ridux;
-		_callables[24] = 	_c_testResult;
+		_callables[0] = 	CALLABLE_NS(_c_play_boogie);
+		_callables[1] = 	CALLABLE_NS(_c_play_boogie);
+		_callables[2] = 	CALLABLE_NS(_c_startIntro);
+		_callables[3] = 	CALLABLE_NS(_c_endIntro);
+		_callables[4] = 	CALLABLE_NS(_c_moveSheet);
+		_callables[5] = 	CALLABLE_NS(_c_sketch);
+		_callables[6] = 	CALLABLE_NS(_c_shade);
+		_callables[7] = 	CALLABLE_NS(_c_score);
+		_callables[8] = 	CALLABLE_NS(_c_null);
+		_callables[9] = 	CALLABLE_NS(_c_null);
+		_callables[10] = 	CALLABLE_NS(_c_null);
+		_callables[11] = 	CALLABLE_NS(_c_fade);
+		_callables[12] = 	CALLABLE_NS(_c_play_boogie);
+		_callables[13] = 	CALLABLE_NS(_c_moveSarc);
+		_callables[14] = 	CALLABLE_NS(_c_contaFoglie);
+		_callables[15] = 	CALLABLE_NS(_c_zeroFoglie);
+		_callables[16] = 	CALLABLE_NS(_c_trasformata);
+		_callables[17] = 	CALLABLE_NS(_c_offMouse);
+		_callables[18] = 	CALLABLE_NS(_c_onMouse);
+		_callables[19] = 	CALLABLE_NS(_c_setMask);
+		_callables[20] = 	CALLABLE_NS(_c_endComment);
+		_callables[21] = 	CALLABLE_NS(_c_frankenstein);
+		_callables[22] = 	CALLABLE_NS(_c_finito);
+		_callables[23] = 	CALLABLE_NS(_c_ridux);
+		_callables[24] = 	CALLABLE_NS(_c_testResult);
 	} else {
-		_callables[0] = 	_c_projector;
-		_callables[1] = 	_c_HBOff;
-		_callables[2] = 	_c_startIntro;
-		_callables[3] = 	_c_endIntro;
-		_callables[4] = 	_c_moveSheet;
-		_callables[5] = 	_c_sketch;
-		_callables[6] = 	_c_shade;
-		_callables[7] = 	_c_score;
-		_callables[8] = 	_c_offSound;
-		_callables[9] = 	_c_startMusic;
-		_callables[10] = 	_c_closeMusic;
-		_callables[11] = 	_c_fade;
-		_callables[12] = 	_c_HBOn;
-		_callables[13] = 	_c_moveSarc;
-		_callables[14] = 	_c_contaFoglie;
-		_callables[15] = 	_c_zeroFoglie;
-		_callables[16] = 	_c_trasformata;
-		_callables[17] = 	_c_offMouse;
-		_callables[18] = 	_c_onMouse;
-		_callables[19] = 	_c_setMask;
-		_callables[20] = 	_c_endComment;
-		_callables[21] = 	_c_frankenstein;
-		_callables[22] = 	_c_finito;
-		_callables[23] = 	_c_ridux;
-		_callables[24] = 	_c_testResult;
+		_callables[0] = 	CALLABLE_NS(_c_projector);
+		_callables[1] = 	CALLABLE_NS(_c_HBOff);
+		_callables[2] = 	CALLABLE_NS(_c_startIntro);
+		_callables[3] = 	CALLABLE_NS(_c_endIntro);
+		_callables[4] = 	CALLABLE_NS(_c_moveSheet);
+		_callables[5] = 	CALLABLE_NS(_c_sketch);
+		_callables[6] = 	CALLABLE_NS(_c_shade);
+		_callables[7] = 	CALLABLE_NS(_c_score);
+		_callables[8] = 	CALLABLE_NS(_c_offSound);
+		_callables[9] = 	CALLABLE_NS(_c_startMusic);
+		_callables[10] = 	CALLABLE_NS(_c_closeMusic);
+		_callables[11] = 	CALLABLE_NS(_c_fade);
+		_callables[12] = 	CALLABLE_NS(_c_HBOn);
+		_callables[13] = 	CALLABLE_NS(_c_moveSarc);
+		_callables[14] = 	CALLABLE_NS(_c_contaFoglie);
+		_callables[15] = 	CALLABLE_NS(_c_zeroFoglie);
+		_callables[16] = 	CALLABLE_NS(_c_trasformata);
+		_callables[17] = 	CALLABLE_NS(_c_offMouse);
+		_callables[18] = 	CALLABLE_NS(_c_onMouse);
+		_callables[19] = 	CALLABLE_NS(_c_setMask);
+		_callables[20] = 	CALLABLE_NS(_c_endComment);
+		_callables[21] = 	CALLABLE_NS(_c_frankenstein);
+		_callables[22] = 	CALLABLE_NS(_c_finito);
+		_callables[23] = 	CALLABLE_NS(_c_ridux);
+		_callables[24] = 	CALLABLE_NS(_c_testResult);
 	}
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list