[Scummvm-cvs-logs] CVS: scummvm/scumm base-costume.h,1.41,1.42 charset.cpp,2.153,2.154 input.cpp,2.34,2.35 player_v2.cpp,2.62,2.63 player_v2a.cpp,2.33,2.34

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2352

Modified Files:
	base-costume.h charset.cpp input.cpp player_v2.cpp 
	player_v2a.cpp 
Log Message:
Fix line endings

Index: base-costume.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/base-costume.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- base-costume.h	3 Sep 2005 16:31:37 -0000	1.41
+++ base-costume.h	3 Sep 2005 19:49:25 -0000	1.42
@@ -1,167 +1,167 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2005 The ScummVM project
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * $Header$
- *
- */
-
-#ifndef BASE_COSTUME_H
-#define BASE_COSTUME_H
-
-#include "common/scummsys.h"
-#include "scumm/actor.h"		// for CostumeData
-
-namespace Scumm {
-
-#if !defined(__GNUC__)
-#pragma START_PACK_STRUCTS
-#endif
-
-struct CostumeInfo {
-	uint16 width, height;
-	int16 rel_x, rel_y;
-	int16 move_x, move_y;
-} GCC_PACK;
-
-#if !defined(__GNUC__)
-#pragma END_PACK_STRUCTS
-#endif
-
-
-
-#ifdef PALMOS_68K
-extern const byte *smallCostumeScaleTable;
-extern const byte *bigCostumeScaleTable;
-#else
-extern const byte smallCostumeScaleTable[256];
-extern const byte bigCostumeScaleTable[768];
-#endif
-
-
-
-class Actor;
-class ScummEngine;
-struct VirtScreen;
-
-class BaseCostumeLoader {
-protected:
-	ScummEngine *_vm;
-
-public:
-	BaseCostumeLoader(ScummEngine *vm) : _vm(vm) {}
-	virtual ~BaseCostumeLoader() {}
-
-	virtual void loadCostume(int id) = 0;
-	virtual byte increaseAnims(Actor *a) = 0;
-	virtual void costumeDecodeData(Actor *a, int frame, uint usemask) = 0;
-
-	bool hasManyDirections(int id) { return false; }
-};
-
-
-/**
- * Base class for both ClassicCostumeRenderer and AkosRenderer.
- */
-class BaseCostumeRenderer {
-public:
-	Common::Rect _clipOverride;
-	byte _actorID;
-
-	byte _shadow_mode;
-	byte *_shadow_table;
-
-	int _actorX, _actorY;
-	byte _zbuf;
-	byte _scaleX, _scaleY;
-
-	int _draw_top, _draw_bottom;
-	byte _paletteNum;
-	bool _skipLimbs;
-	bool _actorDrawVirScr;
-
-
-protected:
-	ScummEngine *_vm;
-
-	// Destination
-	Graphics::Surface _out;
-	int32 _numStrips;
-
-	// Source pointer
-	const byte *_srcptr;
-
-	// current move offset
-	int _xmove, _ymove;
-
-	// whether to draw the actor mirrored
-	bool _mirror;
-
-	// width and height of cel to decode
-	int _width, _height;
-
-	struct Codec1 {
-		// Parameters for the original ("V1") costume codec.
-		const byte *scaletable;
-		byte mask, shr;
-		byte repcolor;
-		byte replen;
-		int scaleXstep;
-		int x, y;
-		int scaleXindex, scaleYindex;
-		int skip_width;
-		byte *destptr;
-		const byte *mask_ptr;
-	};
-
-public:
-	BaseCostumeRenderer(ScummEngine *scumm) {
-		_actorID = 0;
-		_shadow_mode = 0;
-		_shadow_table = 0;
-		_actorX = _actorY = 0;
-		_zbuf = 0;
-		_scaleX = _scaleY = 0;
-		_draw_top = _draw_bottom = 0;
-
-		_vm = scumm;
-		_numStrips = -1;
-		_srcptr = 0;
-		_xmove = _ymove = 0;
-		_mirror = false;
-		_width = _height = 0;
-		_skipLimbs = 0;
-		_paletteNum = 0;
-	}
-	virtual ~BaseCostumeRenderer() {}
-
-	virtual void setPalette(byte *palette) = 0;
-	virtual void setFacing(const Actor *a) = 0;
-	virtual void setCostume(int costume) = 0;
-
-
-	byte drawCostume(const VirtScreen &vs, int numStrips, const Actor *a, bool drawToBackBuf);
-
-protected:
-	virtual byte drawLimb(const Actor *a, int limb) = 0;
-
-	void codec1_ignorePakCols(Codec1 &v1, int num);
-};
-
-} // End of namespace Scumm
-
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001  Ludvig Strigeus
+ * Copyright (C) 2001-2005 The ScummVM project
+ *
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * $Header$
+ *
+ */
+
+#ifndef BASE_COSTUME_H
+#define BASE_COSTUME_H
+
+#include "common/scummsys.h"
+#include "scumm/actor.h"		// for CostumeData
+
+namespace Scumm {
+
+#if !defined(__GNUC__)
+#pragma START_PACK_STRUCTS
+#endif
+
+struct CostumeInfo {
+	uint16 width, height;
+	int16 rel_x, rel_y;
+	int16 move_x, move_y;
+} GCC_PACK;
+
+#if !defined(__GNUC__)
+#pragma END_PACK_STRUCTS
+#endif
+
+
+
+#ifdef PALMOS_68K
+extern const byte *smallCostumeScaleTable;
+extern const byte *bigCostumeScaleTable;
+#else
+extern const byte smallCostumeScaleTable[256];
+extern const byte bigCostumeScaleTable[768];
+#endif
+
+
+
+class Actor;
+class ScummEngine;
+struct VirtScreen;
+
+class BaseCostumeLoader {
+protected:
+	ScummEngine *_vm;
+
+public:
+	BaseCostumeLoader(ScummEngine *vm) : _vm(vm) {}
+	virtual ~BaseCostumeLoader() {}
+
+	virtual void loadCostume(int id) = 0;
+	virtual byte increaseAnims(Actor *a) = 0;
+	virtual void costumeDecodeData(Actor *a, int frame, uint usemask) = 0;
+
+	bool hasManyDirections(int id) { return false; }
+};
+
+
+/**
+ * Base class for both ClassicCostumeRenderer and AkosRenderer.
+ */
+class BaseCostumeRenderer {
+public:
+	Common::Rect _clipOverride;
+	byte _actorID;
+
+	byte _shadow_mode;
+	byte *_shadow_table;
+
+	int _actorX, _actorY;
+	byte _zbuf;
+	byte _scaleX, _scaleY;
+
+	int _draw_top, _draw_bottom;
+	byte _paletteNum;
+	bool _skipLimbs;
+	bool _actorDrawVirScr;
+
+
+protected:
+	ScummEngine *_vm;
+
+	// Destination
+	Graphics::Surface _out;
+	int32 _numStrips;
+
+	// Source pointer
+	const byte *_srcptr;
+
+	// current move offset
+	int _xmove, _ymove;
+
+	// whether to draw the actor mirrored
+	bool _mirror;
+
+	// width and height of cel to decode
+	int _width, _height;
+
+	struct Codec1 {
+		// Parameters for the original ("V1") costume codec.
+		const byte *scaletable;
+		byte mask, shr;
+		byte repcolor;
+		byte replen;
+		int scaleXstep;
+		int x, y;
+		int scaleXindex, scaleYindex;
+		int skip_width;
+		byte *destptr;
+		const byte *mask_ptr;
+	};
+
+public:
+	BaseCostumeRenderer(ScummEngine *scumm) {
+		_actorID = 0;
+		_shadow_mode = 0;
+		_shadow_table = 0;
+		_actorX = _actorY = 0;
+		_zbuf = 0;
+		_scaleX = _scaleY = 0;
+		_draw_top = _draw_bottom = 0;
+
+		_vm = scumm;
+		_numStrips = -1;
+		_srcptr = 0;
+		_xmove = _ymove = 0;
+		_mirror = false;
+		_width = _height = 0;
+		_skipLimbs = 0;
+		_paletteNum = 0;
+	}
+	virtual ~BaseCostumeRenderer() {}
+
+	virtual void setPalette(byte *palette) = 0;
+	virtual void setFacing(const Actor *a) = 0;
+	virtual void setCostume(int costume) = 0;
+
+
+	byte drawCostume(const VirtScreen &vs, int numStrips, const Actor *a, bool drawToBackBuf);
+
+protected:
+	virtual byte drawLimb(const Actor *a, int limb) = 0;
+
+	void codec1_ignorePakCols(Codec1 &v1, int num);
+};
+
+} // End of namespace Scumm
+
 #endif
\ No newline at end of file

Index: charset.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/charset.cpp,v
retrieving revision 2.153
retrieving revision 2.154
diff -u -d -r2.153 -r2.154
--- charset.cpp	3 Sep 2005 16:31:37 -0000	2.153
+++ charset.cpp	3 Sep 2005 19:49:25 -0000	2.154
@@ -1,1831 +1,1831 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001-2005 The ScummVM project
- *
- * 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
[...3631 lines suppressed...]
+#ifdef PALMOS_68K
+#include "scumm_globals.h"
+
+_GINIT(Charset)
+_GSETPTR(Scumm::germanCharsetDataV2, GBVARS_GERMANCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM)
+_GSETPTR(Scumm::frenchCharsetDataV2, GBVARS_FRENCHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM)
+_GSETPTR(Scumm::englishCharsetDataV2, GBVARS_ENGLISHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM)
+_GSETPTR(Scumm::italianCharsetDataV2, GBVARS_ITALIANCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM)
+_GSETPTR(Scumm::spanishCharsetDataV2, GBVARS_SPANISHCHARSETDATAV2_INDEX, byte, GBVARS_SCUMM)
+_GEND
+
+_GRELEASE(Charset)
+_GRELEASEPTR(GBVARS_GERMANCHARSETDATAV2_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_FRENCHCHARSETDATAV2_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_ENGLISHCHARSETDATAV2_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_ITALIANCHARSETDATAV2_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_SPANISHCHARSETDATAV2_INDEX, GBVARS_SCUMM)
+_GEND
+
+#endif

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.34
retrieving revision 2.35
diff -u -d -r2.34 -r2.35
--- input.cpp	3 Sep 2005 16:31:37 -0000	2.34
+++ input.cpp	3 Sep 2005 19:49:25 -0000	2.35
@@ -1,500 +1,500 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2005 The ScummVM project
- *
- * 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
[...969 lines suppressed...]
+
+		if (VAR_CHARINC != 0xFF)
+			VAR(VAR_CHARINC) = _defaultTalkDelay;
+	} else if (_lastKeyHit == '~' || _lastKeyHit == '#') { // Debug console
+		_debugger->attach();
+	} else if (_version <= 2) {
+		// Store the input type. So far we can't distinguish
+		// between 1, 3 and 5.
+		// 1) Verb	2) Scene	3) Inv.		4) Key
+		// 5) Sentence Bar
+
+		if (_lastKeyHit) {		// Key Input
+			VAR(VAR_KEYPRESS) = _lastKeyHit;
+		}
+	}
+
+	_mouseAndKeyboardStat = _lastKeyHit;
+}
+
+} // End of namespace Scumm

Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.62
retrieving revision 2.63
diff -u -d -r2.62 -r2.63
--- player_v2.cpp	3 Sep 2005 16:31:37 -0000	2.62
+++ player_v2.cpp	3 Sep 2005 19:49:25 -0000	2.63
@@ -1,1004 +1,1004 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2005 The ScummVM project
- *
- * 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
[...1977 lines suppressed...]
+_GSETPTR(Scumm::hulls, GBVARS_HULLS_INDEX, int16, GBVARS_SCUMM)
+_GSETPTR(Scumm::freqmod_lengths, GBVARS_FREQMODLENGTHS_INDEX, uint16, GBVARS_SCUMM)
+_GSETPTR(Scumm::freqmod_offsets, GBVARS_FREQMODOFFSETS_INDEX, uint16, GBVARS_SCUMM)
+_GSETPTR(Scumm::freqmod_table, GBVARS_FREQMODTABLE_INDEX, int8, GBVARS_SCUMM)
+_GSETPTR(Scumm::spk_freq_table, GBVARS_SPKFREQTABLE_INDEX, uint16, GBVARS_SCUMM)
+_GSETPTR(Scumm::pcjr_freq_table, GBVARS_PCJRFREQTABLE_INDEX, uint16, GBVARS_SCUMM)
+_GEND
+
+_GRELEASE(PlayerV2)
+_GRELEASEPTR(GBVARS_NOTELENGTHS_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_HULLOFFSETS_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_HULLS_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_FREQMODLENGTHS_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_FREQMODOFFSETS_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_FREQMODTABLE_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_SPKFREQTABLE_INDEX, GBVARS_SCUMM)
+_GRELEASEPTR(GBVARS_PCJRFREQTABLE_INDEX, GBVARS_SCUMM)
+_GEND
+
+#endif

Index: player_v2a.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2a.cpp,v
retrieving revision 2.33
retrieving revision 2.34
diff -u -d -r2.33 -r2.34
--- player_v2a.cpp	3 Sep 2005 16:31:37 -0000	2.33
+++ player_v2a.cpp	3 Sep 2005 19:49:25 -0000	2.34
@@ -1,1419 +1,1419 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2005 The ScummVM project
- *
- * 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
[...2807 lines suppressed...]
+			delete _slot[i].sound;
+			_slot[i].sound = NULL;
+			_slot[i].id = 0;
+		}
+	}
+}
+
+int Player_V2A::getMusicTimer() const {
+	return 0;	// FIXME - need to keep track of playing music resources
+}
+
+int Player_V2A::getSoundStatus(int nr) const {
+	for (int i = 0; i < V2A_MAXSLOTS; i++) {
+		if (_slot[i].id == nr)
+			return 1;
+	}
+	return 0;
+}
+
+} // End of namespace Scumm