[Scummvm-cvs-logs] CVS: scummvm/sky grid.cpp,1.5,1.6 grid.h,1.3,1.4 mouse.h,1.1,1.2

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1:/tmp/cvs-serv4545/sky

Modified Files:
	grid.cpp grid.h mouse.h 
Log Message:
some renaming (consistency)

Index: grid.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/grid.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- grid.cpp	29 Apr 2003 14:34:22 -0000	1.5
+++ grid.cpp	14 May 2003 21:25:03 -0000	1.6
@@ -132,7 +132,7 @@
 SkyGrid::SkyGrid(SkyDisk *pDisk) {
 
 	_gameGrids = (uint8 *)malloc(TOT_NO_GRIDS * GRID_SIZE);
-	_disk = pDisk;
+	_skyDisk = pDisk;
 }
 
 SkyGrid::~SkyGrid(void) {
@@ -144,7 +144,7 @@
 
 	// no endian conversion necessary as I'm using uint8* instead of uint32*
 	for (uint8 cnt = 0; cnt < TOT_NO_GRIDS; cnt++)
-		_disk->loadFile(GRID_FILE_START + cnt, _gameGrids + (cnt * GRID_SIZE));
+		_skyDisk->loadFile(GRID_FILE_START + cnt, _gameGrids + (cnt * GRID_SIZE));
 	// todo: add BASS hack for Reich's door (grid.asm, load_grids proc)
 }
 

Index: grid.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/grid.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- grid.h	29 Apr 2003 14:34:22 -0000	1.3
+++ grid.h	14 May 2003 21:25:03 -0000	1.4
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __SkyGrid__
-#define __SkyGrid__
+#ifndef SKYGRID_H
+#define SKYGRID_H
 
 #include "stdafx.h"
 #include "disk.h"
@@ -53,7 +53,7 @@
 private:
 	static int8 _gridConvertTable[];
 	uint8 *_gameGrids;
-	SkyDisk *_disk;
+	SkyDisk *_skyDisk;
 };
 
-#endif //__SkyGrid__
+#endif //SKYGRID_H

Index: mouse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mouse.h	5 May 2003 13:19:59 -0000	1.1
+++ mouse.h	14 May 2003 21:25:03 -0000	1.2
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __SkyMouse__
-#define __SkyMouse__
+#ifndef SKYMOUSE_H
+#define SKYMOUSE_H
 
 #include "stdafx.h"
 #include "sky/disk.h"
@@ -81,4 +81,4 @@
 
 };
 
-#endif //__SkyMouse__
+#endif //SKYMOUSE_H