[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.312,2.313 script_v100he.cpp,2.25,2.26 script_v2.cpp,2.253,2.254 script_v5.cpp,1.266,1.267 script_v6.cpp,1.417,1.418 script_v6he.cpp,2.138,2.139 script_v72he.cpp,2.181,2.182 script_v7he.cpp,2.117,2.118 script_v8.cpp,2.277,2.278 script_v80he.cpp,2.62,2.63 script_v90he.cpp,2.105,2.106

Chris Apers chrilith at users.sourceforge.net
Tue Oct 19 05:31:05 CEST 2004 

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

Modified Files:
	intern.h script_v100he.cpp script_v2.cpp script_v5.cpp 
	script_v6.cpp script_v6he.cpp script_v72he.cpp script_v7he.cpp 
	script_v8.cpp script_v80he.cpp script_v90he.cpp 
Log Message:
Help PalmOS (and more ?) to save memory

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.312
retrieving revision 2.313
diff -u -d -r2.312 -r2.313
--- intern.h	17 Oct 2004 11:47:12 -0000	2.312
+++ intern.h	19 Oct 2004 12:30:40 -0000	2.313
@@ -31,6 +31,14 @@
 class NutRenderer; // V8 Font Renderer
 struct ArrayHeader;
 
+// This is to help devices with small memory (PDA, smartphones, ...)
+// to save abit of memory used by opcode names in the Scumm engine.
+#ifndef REDUCE_MEMORY_USAGE
+#	define _OPCODE(ver, x)	{ &ver::x, #x }
+#else
+#	define _OPCODE(ver, x)	{ &ver::x, "" }
+#endif
+
 class ScummEngine_v5 : public ScummEngine {
 protected:
 	typedef void (ScummEngine_v5::*OpcodeProcV5)();

Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.25
retrieving revision 2.26
diff -u -d -r2.25 -r2.26
--- script_v100he.cpp	17 Oct 2004 11:47:12 -0000	2.25
+++ script_v100he.cpp	19 Oct 2004 12:30:40 -0000	2.26
@@ -39,7 +39,7 @@
 
 namespace Scumm {
 
-#define OPCODE(x)	{ &ScummEngine_v100he::x, #x }
+#define OPCODE(x)	_OPCODE(ScummEngine_v100he, x)
 
 void ScummEngine_v100he::setupOpcodes() {
 	static const OpcodeEntryV100he opcodes[256] = {

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v2.cpp,v
retrieving revision 2.253
retrieving revision 2.254
diff -u -d -r2.253 -r2.254
--- script_v2.cpp	11 Oct 2004 22:27:25 -0000	2.253
+++ script_v2.cpp	19 Oct 2004 12:30:40 -0000	2.254
@@ -31,7 +31,7 @@
 
 namespace Scumm {
 
-#define OPCODE(x)	{ &ScummEngine_v2::x, #x }
+#define OPCODE(x)	_OPCODE(ScummEngine_v2, x)
 
 void ScummEngine_v2::setupOpcodes() {
 	static const OpcodeEntryV2 opcodes[256] = {

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- script_v5.cpp	30 Sep 2004 22:39:13 -0000	1.266
+++ script_v5.cpp	19 Oct 2004 12:30:40 -0000	1.267
@@ -31,7 +31,7 @@
 
 namespace Scumm {
 
-#define OPCODE(x)	{ &ScummEngine_v5::x, #x }
+#define OPCODE(x)	_OPCODE(ScummEngine_v5, x)
 
 void ScummEngine_v5::setupOpcodes() {
 	static const OpcodeEntryV5 opcodes[256] = {

Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -d -r1.417 -r1.418
--- script_v6.cpp	16 Oct 2004 05:10:14 -0000	1.417
+++ script_v6.cpp	19 Oct 2004 12:30:40 -0000	1.418
@@ -45,7 +45,7 @@
 
 namespace Scumm {
 
-#define OPCODE(x)	{ &ScummEngine_v6::x, #x }
+#define OPCODE(x)	_OPCODE(ScummEngine_v6, x)
 
 void ScummEngine_v6::setupOpcodes() {
 	static const OpcodeEntryV6 opcodes[256] = {

Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.138
retrieving revision 2.139
diff -u -d -r2.138 -r2.139
--- script_v6he.cpp	18 Oct 2004 00:44:10 -0000	2.138
+++ script_v6he.cpp	19 Oct 2004 12:30:41 -0000	2.139
@@ -63,7 +63,7 @@
 //     transparency in akos.cpp
 //     negative size in file read/write
 
-#define OPCODE(x)	{ &ScummEngine_v60he::x, #x }
+#define OPCODE(x)	_OPCODE(ScummEngine_v60he, x)
 
 void ScummEngine_v60he::setupOpcodes() {
 	static const OpcodeEntryv60he opcodes[256] = {

Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.181
retrieving revision 2.182
diff -u -d -r2.181 -r2.182
--- script_v72he.cpp	18 Oct 2004 05:10:15 -0000	2.181
+++ script_v72he.cpp	19 Oct 2004 12:30:41 -0000	2.182
@@ -40,7 +40,7 @@
 
 namespace Scumm {
 
-#define OPCODE(x)	{ &ScummEngine_v72he::x, #x }
+#define OPCODE(x)	_OPCODE(ScummEngine_v72he, x)
 
 void ScummEngine_v72he::setupOpcodes() {
 	static const OpcodeEntryV72he opcodes[256] = {

Index: script_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v7he.cpp,v
retrieving revision 2.117
retrieving revision 2.118
diff -u -d -r2.117 -r2.118
--- script_v7he.cpp	18 Oct 2004 05:23:43 -0000	2.117
+++ script_v7he.cpp	19 Oct 2004 12:30:41 -0000	2.118
@@ -41,7 +41,7 @@
 
 namespace Scumm {
 
-#define OPCODE(x)	{ &ScummEngine_v70he::x, #x }
+#define OPCODE(x)	_OPCODE(ScummEngine_v70he, x)
 
 void ScummEngine_v70he::setupOpcodes() {
 	static const OpcodeEntryv70he opcodes[256] = {

Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.277
retrieving revision 2.278
diff -u -d -r2.277 -r2.278
--- script_v8.cpp	8 Oct 2004 07:04:57 -0000	2.277
+++ script_v8.cpp	19 Oct 2004 12:30:41 -0000	2.278
@@ -36,7 +36,7 @@
 
 namespace Scumm {
 
-#define OPCODE(x)	{ &ScummEngine_v8::x, #x }
+#define OPCODE(x)	_OPCODE(ScummEngine_v8, x)
 
 void ScummEngine_v8::setupOpcodes() {
 	static const OpcodeEntryV8 opcodes[256] = {

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.62
retrieving revision 2.63
diff -u -d -r2.62 -r2.63
--- script_v80he.cpp	17 Oct 2004 11:47:12 -0000	2.62
+++ script_v80he.cpp	19 Oct 2004 12:30:42 -0000	2.63
@@ -39,7 +39,7 @@
 
 namespace Scumm {
 
-#define OPCODE(x)	{ &ScummEngine_v80he::x, #x }
+#define OPCODE(x)	_OPCODE(ScummEngine_v80he, x)
 
 void ScummEngine_v80he::setupOpcodes() {
 	static const OpcodeEntryV80he opcodes[256] = {

Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.105
retrieving revision 2.106
diff -u -d -r2.105 -r2.106
--- script_v90he.cpp	17 Oct 2004 11:47:12 -0000	2.105
+++ script_v90he.cpp	19 Oct 2004 12:30:42 -0000	2.106
@@ -39,7 +39,7 @@
 
 namespace Scumm {
 
-#define OPCODE(x)	{ &ScummEngine_v90he::x, #x }
+#define OPCODE(x)	_OPCODE(ScummEngine_v90he, x)
 
 void ScummEngine_v90he::setupOpcodes() {
 	static const OpcodeEntryV90he opcodes[256] = {

More information about the Scummvm-git-logs mailing list