[Scummvm-cvs-logs] CVS: scummvm/scumm gfx.h,1.2,1.3 object.cpp,1.2,1.3 scummvm.cpp,1.25,1.26

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv16966

Modified Files:
	gfx.h object.cpp scummvm.cpp 
Log Message:
renamed unk3/unk4 to scaleX/scaleY

Index: gfx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gfx.h	31 Aug 2002 19:26:04 -0000	1.2
+++ gfx.h	19 Sep 2002 11:06:10 -0000	1.3
@@ -84,7 +84,8 @@
 	uint16 number, areaX, areaY, areaWidth, areaHeight;
 	int16 posX, posY;
 	uint16 width, height;
-	uint16 unk3, unk4, image;
+	uint16 scaleX, scaleY;
+	uint16 image;
 
 	uint16 mode;
 };

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/object.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- object.cpp	1 Sep 2002 15:01:39 -0000	1.2
+++ object.cpp	19 Sep 2002 11:06:10 -0000	1.3
@@ -1180,8 +1180,8 @@
 		eo->height = objectHeight;
 	}
 
-	eo->unk3 = f;
-	eo->unk4 = g;
+	eo->scaleX = f;
+	eo->scaleY = g;
 	eo->image = image;
 
 	eo->mode = mode;
@@ -1244,8 +1244,8 @@
 	bdd.dataptr = bomp + 10;
 	bdd.x = eo->posX;
 	bdd.y = eo->posY;
-	bdd.scale_x = (unsigned char)eo->unk3;
-	bdd.scale_y = (unsigned char)eo->unk4;
+	bdd.scale_x = (unsigned char)eo->scaleX;
+	bdd.scale_y = (unsigned char)eo->scaleY;
 
 	drawBomp(&bdd, 0, bdd.dataptr, 1, 0);
 	updateDirtyRect(vs->number, bdd.x, bdd.x + bdd.srcwidth, bdd.y, bdd.y + bdd.srcheight, 0);

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- scummvm.cpp	18 Sep 2002 10:56:23 -0000	1.25
+++ scummvm.cpp	19 Sep 2002 11:06:10 -0000	1.26
@@ -161,7 +161,8 @@
 	delete _bundle;
 	delete _sound;
 	delete _imuse;
-	if (_existLanguageFile) delete _languageBuffer;
+	if (_existLanguageFile)
+		delete _languageBuffer;
 }
 
 void Scumm::scummInit()