libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-20 08:53:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation.

Browse Source 
svn-id: r18716
This commit is contained in:
Eugene Sandulenko 2005-08-30 08:54:33 +00:00
parent 94fcb89549
commit 43fc901284
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kyra/screen.cpp
View File

@ -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() {

4
kyra/screen.h
View File

@ -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: