[Scummvm-cvs-logs] CVS: scummvm/kyra screen.cpp,1.2,1.3 screen.h,1.1,1.2

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13886

Modified Files:
	screen.cpp screen.h 
Log Message:
Fix compilation.


Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/screen.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- screen.cpp	19 Aug 2005 22:23:13 -0000	1.2
+++ screen.cpp	30 Aug 2005 08:54:33 -0000	1.3
@@ -29,10 +29,10 @@
 Screen::Screen(KyraEngine *vm, OSystem *system)
 	: _system(system), _vm(vm) {
 	_curPage = 0;
-	for (int pageNum = 0; pageNum < PAGE_NUM; pageNum += 2) {
-		uint8 *pagePtr = (uint8 *)malloc(PAGE_SIZE);
+	for (int pageNum = 0; pageNum < KYRA_PAGE_NUM; pageNum += 2) {
+		uint8 *pagePtr = (uint8 *)malloc(KYRA_PAGE_SIZE);
 		if (pagePtr) {
-			memset(pagePtr, 0, PAGE_SIZE);
+			memset(pagePtr, 0, KYRA_PAGE_SIZE);
 			_pagePtrs[pageNum] = _pagePtrs[pageNum + 1] = pagePtr;
 		}
 	}
@@ -43,7 +43,7 @@
 }
 
 Screen::~Screen() {
-	for (int pageNum = 0; pageNum < PAGE_NUM; pageNum += 2) {
+	for (int pageNum = 0; pageNum < KYRA_PAGE_NUM; pageNum += 2) {
 		free(_pagePtrs[pageNum]);
 		_pagePtrs[pageNum] = _pagePtrs[pageNum + 1] = 0;
 	}
@@ -58,14 +58,14 @@
 
 uint8 *Screen::getPagePtr(int pageNum) {
 	debug(9, "Screen::getPagePtr(%d)", pageNum);
-	assert(pageNum < PAGE_NUM);
+	assert(pageNum < KYRA_PAGE_NUM);
 	return _pagePtrs[pageNum];
 }
 
 void Screen::clearPage(int pageNum) {
 	debug(9, "Screen::clearPage(%d)", pageNum);
-	assert(pageNum < PAGE_NUM);
-	memset(getPagePtr(pageNum), 0, PAGE_SIZE);
+	assert(pageNum < KYRA_PAGE_NUM);
+	memset(getPagePtr(pageNum), 0, KYRA_PAGE_SIZE);
 }
 
 int Screen::setCurPage(int pageNum) {
@@ -77,7 +77,7 @@
 
 void Screen::clearCurPage() {
 	debug(9, "Screen::clearCurPage()");
-	memset(getPagePtr(_curPage), 0, PAGE_SIZE);
+	memset(getPagePtr(_curPage), 0, KYRA_PAGE_SIZE);
 }
 
 void Screen::fadeFromBlack() {

Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/screen.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- screen.h	19 Aug 2005 22:12:09 -0000	1.1
+++ screen.h	30 Aug 2005 08:54:33 -0000	1.2
@@ -69,8 +69,8 @@
 	enum {
 		SCREEN_W  = 320,
 		SCREEN_H  = 200,
-		PAGE_SIZE = 320 * 200 + 1024,
-		PAGE_NUM  = 16
+		KYRA_PAGE_SIZE = 320 * 200 + 1024,
+		KYRA_PAGE_NUM  = 16
 	};
 
 private: