aboutsummaryrefslogtreecommitdiff
path: root/kyra/screen.cpp
diff options
context:
space:
mode:
authorEugene Sandulenko2005-08-30 08:54:33 +0000
committerEugene Sandulenko2005-08-30 08:54:33 +0000
commit43fc9012847e2a94e16392737b8cebf2e1fd1f18 (patch)
treede04671d517b3d657870d45195263afab9f04598 /kyra/screen.cpp
parent94fcb89549c02009c90bb5250b2e5b59ad085496 (diff)
downloadscummvm-rg350-43fc9012847e2a94e16392737b8cebf2e1fd1f18.tar.gz
scummvm-rg350-43fc9012847e2a94e16392737b8cebf2e1fd1f18.tar.bz2
scummvm-rg350-43fc9012847e2a94e16392737b8cebf2e1fd1f18.zip
Fix compilation.
svn-id: r18716
Diffstat (limited to 'kyra/screen.cpp')
-rw-r--r--kyra/screen.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/kyra/screen.cpp b/kyra/screen.cpp
index 681e613d64..6edd357388 100644
--- a/kyra/screen.cpp
+++ b/kyra/screen.cpp
@@ -29,10 +29,10 @@ namespace Kyra {
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(KyraEngine *vm, OSystem *system)
}
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 @@ void Screen::updateScreen() {
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 @@ int Screen::setCurPage(int pageNum) {
void Screen::clearCurPage() {
debug(9, "Screen::clearCurPage()");
- memset(getPagePtr(_curPage), 0, PAGE_SIZE);
+ memset(getPagePtr(_curPage), 0, KYRA_PAGE_SIZE);
}
void Screen::fadeFromBlack() {