[Scummvm-cvs-logs] CVS: scummvm/scumm resource.cpp,1.282,1.283 scumm.cpp,1.260,1.261 scumm.h,1.511,1.512
Travis Howell
kirben at users.sourceforge.net
Mon Oct 18 07:38:08 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm input.cpp,2.2,2.3 script.cpp,1.201,1.202 scumm.cpp,1.259,1.260 scumm.h,1.510,1.511 vars.cpp,1.111,1.112
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.455,1.456
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26912/scumm
Modified Files:
resource.cpp scumm.cpp scumm.h
Log Message:
_images not required.
Free extra HE resources on exit.
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -d -r1.282 -r1.283
--- resource.cpp 7 Oct 2004 16:09:29 -0000 1.282
+++ resource.cpp 18 Oct 2004 14:37:38 -0000 1.283
@@ -2445,7 +2445,6 @@
_roomVars = (int32 *)calloc(_numRoomVariables, sizeof(int32));
_scummVars = (int32 *)calloc(_numVariables, sizeof(int32));
_bitVars = (byte *)calloc(_numBitVariables >> 3, 1);
- _images = (uint16 *)calloc(_numImages, sizeof(uint16));
if (_features & GF_HUMONGOUS)
_arraySlot = (byte *)calloc(_numArray, 1);
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -d -r1.260 -r1.261
--- scumm.cpp 18 Oct 2004 06:40:35 -0000 1.260
+++ scumm.cpp 18 Oct 2004 14:37:38 -0000 1.261
@@ -978,10 +978,12 @@
free(_inventory);
free(_verbs);
free(_objs);
+ free(_roomVars);
free(_scummVars);
free(_bitVars);
free(_newNames);
free(_classData);
+ free(_arraySlot);
free(_roomStrips);
free(_languageIndex);
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.511
retrieving revision 1.512
diff -u -d -r1.511 -r1.512
--- scumm.h 18 Oct 2004 06:40:35 -0000 1.511
+++ scumm.h 18 Oct 2004 14:37:38 -0000 1.512
@@ -463,7 +463,6 @@
byte *_arraySlot;
uint16 *_inventory;
uint16 *_newNames;
- uint16 *_images;
public:
// VAR is a wrapper around scummVar, which attempts to include additional
// useful information should an illegal var access be detected.
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm input.cpp,2.2,2.3 script.cpp,1.201,1.202 scumm.cpp,1.259,1.260 scumm.h,1.510,1.511 vars.cpp,1.111,1.112
- Next message: [Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.455,1.456
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list