diff options
| author | Eugene Sandulenko | 2005-08-30 08:54:33 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-08-30 08:54:33 +0000 |
| commit | 43fc9012847e2a94e16392737b8cebf2e1fd1f18 (patch) | |
| tree | de04671d517b3d657870d45195263afab9f04598 | |
| parent | 94fcb89549c02009c90bb5250b2e5b59ad085496 (diff) | |
| download | scummvm-rg350-43fc9012847e2a94e16392737b8cebf2e1fd1f18.tar.gz scummvm-rg350-43fc9012847e2a94e16392737b8cebf2e1fd1f18.tar.bz2 scummvm-rg350-43fc9012847e2a94e16392737b8cebf2e1fd1f18.zip | |
Fix compilation.
svn-id: r18716
| -rw-r--r-- | kyra/screen.cpp | 16 | ||||
| -rw-r--r-- | kyra/screen.h | 4 |
2 files changed, 10 insertions, 10 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() { diff --git a/kyra/screen.h b/kyra/screen.h index 6ce4fa5569..b6a54ec7b1 100644 --- a/kyra/screen.h +++ b/kyra/screen.h @@ -69,8 +69,8 @@ public: 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: |