[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
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.40,1.41
- Next message: [Scummvm-cvs-logs] CVS: scummex descumm.h,1.2,1.3 image.cpp,1.10,1.11 image.h,1.7,1.8 resource.cpp,1.14,1.15 resource.h,1.7,1.8 scummex.cpp,1.18,1.19 scummex.h,1.10,1.11 scummsys.h,1.1.1.1,1.2 sound.h,1.3,1.4 wxwindows.cpp,1.14,1.15 wxwindows.h,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
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();
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.40,1.41
- Next message: [Scummvm-cvs-logs] CVS: scummex descumm.h,1.2,1.3 image.cpp,1.10,1.11 image.h,1.7,1.8 resource.cpp,1.14,1.15 resource.h,1.7,1.8 scummex.cpp,1.18,1.19 scummex.h,1.10,1.11 scummsys.h,1.1.1.1,1.2 sound.h,1.3,1.4 wxwindows.cpp,1.14,1.15 wxwindows.h,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list