[Scummvm-cvs-logs] CVS: scummex scummex.cpp,1.17,1.18 scummex.h,1.9,1.10

Max Horn fingolfin at users.sourceforge.net
Mon Sep 22 16:44:05 CEST 2003


Update of /cvsroot/scummvm/scummex
In directory sc8-pr-cvs1:/tmp/cvs-serv2831

Modified Files:
	scummex.cpp scummex.h 
Log Message:
uhm, why has this been changed again? it's bad style to use globals if you can get away with member vars; in fact not only can you get away here, you can even make them private

Index: scummex.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/scummex.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- scummex.cpp	22 Sep 2003 19:47:58 -0000	1.17
+++ scummex.cpp	22 Sep 2003 23:43:29 -0000	1.18
@@ -25,14 +25,6 @@
 #include "scummex.h"
 #include "descumm.h"
 
-File _input;
-File _output;
-uint32 _blockId;
-	
-struct RoomTable _roomTable[200];
-
-struct BlockTable _blockTable[60000];
-
 ScummEX::ScummEX() {
     _image = new Image();
     _sound = new Sound();
@@ -45,8 +37,6 @@
 	char buf[256];
 	
 	if (_input.isOpen()) {
-		free(_roomTable);
-		free(_blockTable);
 		_input.close();
 	}
 		

Index: scummex.h
===================================================================
RCS file: /cvsroot/scummvm/scummex/scummex.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- scummex.h	22 Sep 2003 18:25:16 -0000	1.9
+++ scummex.h	22 Sep 2003 23:43:29 -0000	1.10
@@ -30,6 +30,12 @@
 
 class ScummEX {
 private:
+	File _input;
+	File _output;
+	uint32 _blockId;
+		
+	struct BlockTable _blockTable[60000];
+	
 	byte _encbyte;
 	
 	Image *_image;
@@ -38,9 +44,6 @@
 	GUI_wxWindows *_gui;
 
 public:
-	/*File _input;
-	File _output;
-	uint32 _blockId;*/
 	int _scummVersion;
 
 	ScummEX();





More information about the Scummvm-git-logs mailing list