From 5f7e8231ca0cadfb8da93dd75f7ac7665092dee7 Mon Sep 17 00:00:00 2001
From: Joost Peters
Date: Wed, 14 May 2003 21:25:03 +0000
Subject: some renaming (consistency)

svn-id: r7515
---
 sky/grid.cpp | 4 ++--
 sky/grid.h   | 8 ++++----
 sky/mouse.h  | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sky/grid.cpp b/sky/grid.cpp
index c4e1a8918e..5cf8d8ef0e 100644
--- a/sky/grid.cpp
+++ b/sky/grid.cpp
@@ -132,7 +132,7 @@ int8 SkyGrid::_gridConvertTable[] = {
 SkyGrid::SkyGrid(SkyDisk *pDisk) {
 
 	_gameGrids = (uint8 *)malloc(TOT_NO_GRIDS * GRID_SIZE);
-	_disk = pDisk;
+	_skyDisk = pDisk;
 }
 
 SkyGrid::~SkyGrid(void) {
@@ -144,7 +144,7 @@ void SkyGrid::loadGrids(void) {
 
 	// 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)
 }
 
diff --git a/sky/grid.h b/sky/grid.h
index ed5ef44e35..e214415aca 100644
--- a/sky/grid.h
+++ b/sky/grid.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef __SkyGrid__
-#define __SkyGrid__
+#ifndef SKYGRID_H
+#define SKYGRID_H
 
 #include "stdafx.h"
 #include "disk.h"
@@ -53,7 +53,7 @@ public:
 private:
 	static int8 _gridConvertTable[];
 	uint8 *_gameGrids;
-	SkyDisk *_disk;
+	SkyDisk *_skyDisk;
 };
 
-#endif //__SkyGrid__
+#endif //SKYGRID_H
diff --git a/sky/mouse.h b/sky/mouse.h
index 3f136ffc36..5d971942c8 100644
--- a/sky/mouse.h
+++ b/sky/mouse.h
@@ -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 @@ protected:
 
 };
 
-#endif //__SkyMouse__
+#endif //SKYMOUSE_H
-- 
cgit v1.2.3