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

logicalWidth -> width

Browse Source 
logicalHeight -> height

svn-id: r35488
This commit is contained in:
Filippos Karapetis 2008-12-22 14:36:58 +00:00
parent 3e0b81a99e
commit 9a57f42399
16 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
engines/saga/actor.cpp
View File

@ -110,14 +110,14 @@ Actor::Actor(SagaEngine *vm) : _vm(vm) {
_lastTickMsec = 0;
_yCellCount = _vm->_scene->getHeight();
_xCellCount = _vm->getDisplayInfo().logicalWidth;
_xCellCount = _vm->getDisplayInfo().width;
_pathCell = (int8 *)malloc(_yCellCount * _xCellCount * sizeof(*_pathCell));
_pathRect.left = 0;
_pathRect.right = _vm->getDisplayInfo().logicalWidth;
_pathRect.right = _vm->getDisplayInfo().width;
_pathRect.top = _vm->getDisplayInfo().pathStartY;
_pathRect.bottom = _vm->getDisplayInfo().logicalHeight;
_pathRect.bottom = _vm->getDisplayInfo().height;
// Get actor resource file context
_actorContext = _vm->_resource->getContext(GAME_RESOURCEFILE);
@ -820,13 +820,13 @@ void Actor::handleSpeech(int msec) {
height = _vm->_font->getHeight(kKnownFontScript, _activeSpeech.strings[0], width - 2, _activeSpeech.getFontFlags(0)) + 1;
if (_vm->getGameId() == GID_IHNM) {
if (height > _vm->_scene->getHeight(true) / 2 && width < _vm->getDisplayInfo().logicalWidth - 20) {
width = _vm->getDisplayInfo().logicalWidth - 20;
if (height > _vm->_scene->getHeight(true) / 2 && width < _vm->getDisplayInfo().width - 20) {
width = _vm->getDisplayInfo().width - 20;
height = _vm->_font->getHeight(kKnownFontScript, _activeSpeech.strings[0], width - 2, _activeSpeech.getFontFlags(0)) + 1;
}
} else if (_vm->getGameId() == GID_ITE) {
if (height > 40 && width < _vm->getDisplayInfo().logicalWidth - 100) {
width = _vm->getDisplayInfo().logicalWidth - 100;
if (height > 40 && width < _vm->getDisplayInfo().width - 100) {
width = _vm->getDisplayInfo().width - 100;
height = _vm->_font->getHeight(kKnownFontScript, _activeSpeech.strings[0], width - 2, _activeSpeech.getFontFlags(0)) + 1;
}
}
@ -837,8 +837,8 @@ void Actor::handleSpeech(int msec) {
actor = getActor(_activeSpeech.actorIds[0]);
_activeSpeech.speechBox.setHeight(height);
if (_activeSpeech.speechBox.right > _vm->getDisplayInfo().logicalWidth - 10) {
_activeSpeech.drawRect.left = _vm->getDisplayInfo().logicalWidth - 10 - width;
if (_activeSpeech.speechBox.right > _vm->getDisplayInfo().width - 10) {
_activeSpeech.drawRect.left = _vm->getDisplayInfo().width - 10 - width;
} else {
_activeSpeech.drawRect.left = _activeSpeech.speechBox.left;
}
@ -891,7 +891,7 @@ bool Actor::calcScreenPosition(CommonObjectData *commonObjectData) {
}
result = commonObjectData->_screenPosition.x > -64 &&
commonObjectData->_screenPosition.x < _vm->getDisplayInfo().logicalWidth + 64 &&
commonObjectData->_screenPosition.x < _vm->getDisplayInfo().width + 64 &&
commonObjectData->_screenPosition.y > -64 &&
commonObjectData->_screenPosition.y < _vm->_scene->getHeight() + 64;
@ -1096,7 +1096,7 @@ void Actor::drawSpeech(void) {
actor = getActor(_activeSpeech.actorIds[i]);
calcScreenPosition(actor);
textPoint.x = CLIP(actor->_screenPosition.x - width / 2, 10, _vm->getDisplayInfo().logicalWidth - 10 - width);
textPoint.x = CLIP(actor->_screenPosition.x - width / 2, 10, _vm->getDisplayInfo().width - 10 - width);
if (_vm->getGameId() == GID_ITE)
textPoint.y = CLIP(actor->_screenPosition.y - 58, 10, _vm->_scene->getHeight(true) - 10 - height);
@ -1135,7 +1135,7 @@ void Actor::actorSpeech(uint16 actorId, const char **strings, int stringsCount,
_activeSpeech.playing = false;
_activeSpeech.slowModeCharIndex = 0;
dist = MIN(actor->_screenPosition.x - 10, _vm->getDisplayInfo().logicalWidth - 10 - actor->_screenPosition.x);
dist = MIN(actor->_screenPosition.x - 10, _vm->getDisplayInfo().width - 10 - actor->_screenPosition.x);
if (_vm->getGameId() == GID_ITE)
dist = CLIP<int16>(dist, 60, 150);
@ -1149,9 +1149,9 @@ void Actor::actorSpeech(uint16 actorId, const char **strings, int stringsCount,
_activeSpeech.speechBox.right += 10 - _activeSpeech.speechBox.left;
_activeSpeech.speechBox.left = 10;
}
if (_activeSpeech.speechBox.right > _vm->getDisplayInfo().logicalWidth - 10) {
_activeSpeech.speechBox.left -= _activeSpeech.speechBox.right - _vm->getDisplayInfo().logicalWidth - 10;
_activeSpeech.speechBox.right = _vm->getDisplayInfo().logicalWidth - 10;
if (_activeSpeech.speechBox.right > _vm->getDisplayInfo().width - 10) {
_activeSpeech.speechBox.left -= _activeSpeech.speechBox.right - _vm->getDisplayInfo().width - 10;
_activeSpeech.speechBox.right = _vm->getDisplayInfo().width - 10;
}
// HACK for the compact disk in Ellen's chapter

4
engines/saga/actor_walk.cpp
View File

@ -101,7 +101,7 @@ bool Actor::validFollowerLocation(const Location &location) {
Point point;
location.toScreenPointXY(point);
if ((point.x < 5) || (point.x >= _vm->getDisplayInfo().logicalWidth - 5) ||
if ((point.x < 5) || (point.x >= _vm->getDisplayInfo().width - 5) ||
(point.y < 0) || (point.y > _vm->_scene->getHeight())) {
return false;
}
@ -856,7 +856,7 @@ bool Actor::followProtagonist(ActorData *actor) {
newLocation.y += _vm->_rnd.getRandomNumber(prefer1.y - 1) - prefer1.y / 2;
}
newLocation.x = CLIP<int>(newLocation.x, -31 * 4, (_vm->getDisplayInfo().logicalWidth + 31) * 4);
newLocation.x = CLIP<int>(newLocation.x, -31 * 4, (_vm->getDisplayInfo().width + 31) * 4);
return actorWalkTo(actor->_id, newLocation);
}

4
engines/saga/animation.cpp
View File

@ -540,8 +540,8 @@ void Anim::play(uint16 animId, int vectorTime, bool playing) {
frame = anim->currentFrame;
// FIXME: if start > 0, then this works incorrectly
decodeFrame(anim, anim->frameOffsets[frame], displayBuffer, _vm->getDisplayInfo().logicalWidth * _vm->getDisplayInfo().logicalHeight);
_vm->_render->addDirtyRect(Common::Rect(0, 0, _vm->getDisplayInfo().logicalWidth, _vm->getDisplayInfo().logicalHeight));
decodeFrame(anim, anim->frameOffsets[frame], displayBuffer, _vm->getDisplayInfo().width * _vm->getDisplayInfo().height);
_vm->_render->addDirtyRect(Common::Rect(0, 0, _vm->getDisplayInfo().width, _vm->getDisplayInfo().height));
_vm->_frameCount++;
anim->currentFrame++;
if (anim->completed != 65535) {

4
engines/saga/detection.cpp
View File

@ -312,8 +312,8 @@ SaveStateDescriptor SagaMetaEngine::querySaveMetaInfos(const char *target, int s
namespace Saga {
bool SagaEngine::initGame() {
_displayClip.right = getDisplayInfo().logicalWidth;
_displayClip.bottom = getDisplayInfo().logicalHeight;
_displayClip.right = getDisplayInfo().width;
_displayClip.bottom = getDisplayInfo().height;
return _resource->createContexts();
}

4
engines/saga/displayinfo.h
View File

@ -45,8 +45,8 @@ struct PanelButton {
};
struct GameDisplayInfo {
int logicalWidth;
int logicalHeight;
int width;
int height;
int pathStartY;
int sceneHeight;

6
engines/saga/events.cpp
View File

@ -180,8 +180,8 @@ int Events::handleContinuous(Event *event) {
size_t len;
_vm->_scene->getBGMaskInfo(w, h, maskBuffer, len);
rect.left = (_vm->getDisplayInfo().logicalWidth - w) / 2;
rect.top = (_vm->getDisplayInfo().logicalHeight - h) / 2;
rect.left = (_vm->getDisplayInfo().width - w) / 2;
rect.top = (_vm->getDisplayInfo().height - h) / 2;
rect.setWidth(w);
rect.setHeight(h);
@ -319,7 +319,7 @@ int Events::handleOneShot(Event *event) {
backGroundSurface->blit(bgInfo.bounds, bgInfo.buffer);
// If it is inset scene then draw black border
if (bgInfo.bounds.width() < _vm->getDisplayInfo().logicalWidth || bgInfo.bounds.height() < _vm->_scene->getHeight()) {
if (bgInfo.bounds.width() < _vm->getDisplayInfo().width || bgInfo.bounds.height() < _vm->_scene->getHeight()) {
Common::Rect rect1(2, bgInfo.bounds.height() + 4);
Common::Rect rect2(bgInfo.bounds.width() + 4, 2);
Common::Rect rect3(2, bgInfo.bounds.height() + 4);

4
engines/saga/interface.cpp
View File

@ -1884,7 +1884,7 @@ void Interface::drawStatusBar() {
// Erase background of status bar
rect.left = _vm->getDisplayInfo().statusXOffset;
rect.top = _vm->getDisplayInfo().statusYOffset;
rect.right = rect.left + _vm->getDisplayInfo().logicalWidth;
rect.right = rect.left + _vm->getDisplayInfo().width;
rect.bottom = rect.top + _vm->getDisplayInfo().statusHeight;
_vm->_gfx->drawRect(rect, _vm->getDisplayInfo().statusBGColor - offset);
@ -2792,7 +2792,7 @@ void Interface::mapPanelDrawCrossHair() {
_mapPanelCrossHairState = !_mapPanelCrossHairState;
Point mapPosition = _vm->_isoMap->getMapPosition();
Rect screen(_vm->getDisplayInfo().logicalWidth, _vm->_scene->getHeight());
Rect screen(_vm->getDisplayInfo().width, _vm->_scene->getHeight());
if (screen.contains(mapPosition)) {
_vm->_sprite->draw(_vm->_sprite->_mainSprites,

6
engines/saga/introproc_fta2.cpp
View File

@ -101,9 +101,9 @@ void MoviePlayerSMK::playVideo() {
bool MoviePlayerSMK::processFrame() {
Graphics::Surface *screen = _vm->_system->lockScreen();
copyFrameToBuffer((byte *)screen->pixels,
(_vm->getDisplayInfo().logicalWidth - getWidth()) / 2,
(_vm->getDisplayInfo().logicalHeight - getHeight()) / 2,
_vm->getDisplayInfo().logicalWidth);
(_vm->getDisplayInfo().width - getWidth()) / 2,
(_vm->getDisplayInfo().height - getHeight()) / 2,
_vm->getDisplayInfo().width);
_vm->_system->unlockScreen();
if (!getAudioLag() || getFrameWaitTime() || _frameSkipped > getFrameRate()) {

4
engines/saga/introproc_ite.cpp
View File

@ -114,7 +114,7 @@ Event *Scene::ITEQueueDialogue(Event *q_event, int n_dialogues, const IntroDialo
textEntry.effectKnownColor = kKnownColorTransparent;
textEntry.useRect = true;
textEntry.rect.left = 0;
textEntry.rect.right = _vm->getDisplayInfo().logicalWidth;
textEntry.rect.right = _vm->getDisplayInfo().width;
if (_vm->getLanguage() == Common::DE_DEU) {
textEntry.rect.top = INTRO_DE_CAPTION_Y;
} else if (_vm->getLanguage() == Common::IT_ITA) {
@ -122,7 +122,7 @@ Event *Scene::ITEQueueDialogue(Event *q_event, int n_dialogues, const IntroDialo
} else {
textEntry.rect.top = INTRO_CAPTION_Y;
}
textEntry.rect.bottom = _vm->getDisplayInfo().logicalHeight;
textEntry.rect.bottom = _vm->getDisplayInfo().height;
textEntry.font = kKnownFontMedium;
textEntry.flags = (FontEffectFlags)(kFontOutline | kFontCentered);

12
engines/saga/isomap.cpp
View File

@ -295,7 +295,7 @@ void IsoMap::adjustScroll(bool jump) {
}
playerPoint.y -= 28;
playerPoint.x += _viewScroll.x - _vm->getDisplayInfo().logicalWidth/2;
playerPoint.x += _viewScroll.x - _vm->getDisplayInfo().width/2;
playerPoint.y += _viewScroll.y - _vm->_scene->getHeight()/2;
minScrollPos.x = playerPoint.x - SAGA_SCROLL_LIMIT_X1;
@ -401,8 +401,8 @@ void IsoMap::drawSprite(SpriteList &spriteList, int spriteNumber, const Location
spritePointer.x = screenPosition.x + xAlign;
spritePointer.y = screenPosition.y + yAlign;
_tileClip.left = CLIP<int>(spritePointer.x, 0, _vm->getDisplayInfo().logicalWidth);
_tileClip.right = CLIP<int>(spritePointer.x + width, 0, _vm->getDisplayInfo().logicalWidth);
_tileClip.left = CLIP<int>(spritePointer.x, 0, _vm->getDisplayInfo().width);
_tileClip.right = CLIP<int>(spritePointer.x + width, 0, _vm->getDisplayInfo().width);
_tileClip.top = CLIP<int>(spritePointer.y, 0, _vm->_scene->getHeight());
_tileClip.bottom = CLIP<int>(spritePointer.y + height, 0, _vm->_scene->getHeight());
@ -441,7 +441,7 @@ void IsoMap::drawTiles(const Location *location) {
metaTileY.x = (u0 - v0) * 128 - (view1.x * 16 + fineScroll.x);
metaTileY.y = (view1.y * 16 - fineScroll.y) - (u0 + v0) * 64;
workAreaWidth = _vm->getDisplayInfo().logicalWidth + 128;
workAreaWidth = _vm->getDisplayInfo().width + 128;
workAreaHeight = _vm->_scene->getHeight() + 128 + 80;
for (u1 = u0, v1 = v0; metaTileY.y < workAreaHeight; u1--, v1-- ) {
@ -852,8 +852,8 @@ void IsoMap::drawTile(uint16 tileIndex, const Point &point, const Location *loca
}
while ((col < _tileClip.right) && (count < fgRunCount)) {
assert(_vm->_gfx->getBackBufferPixels() <= (byte *)(drawPointer + count));
assert((_vm->_gfx->getBackBufferPixels() + (_vm->getDisplayInfo().logicalWidth *
_vm->getDisplayInfo().logicalHeight)) > (byte *)(drawPointer + count));
assert((_vm->_gfx->getBackBufferPixels() + (_vm->getDisplayInfo().width *
_vm->getDisplayInfo().height)) > (byte *)(drawPointer + count));
drawPointer[count] = readPointer[count];
count++;
col++;

2
engines/saga/render.cpp
View File

@ -55,7 +55,7 @@ Render::Render(SagaEngine *vm, OSystem *system) {
_vm->_timer->installTimerProc(&fpsTimerCallback, 1000000, this);
#endif
_backGroundSurface.create(_vm->getDisplayInfo().logicalWidth, _vm->getDisplayInfo().logicalHeight, 1);
_backGroundSurface.create(_vm->getDisplayInfo().width, _vm->getDisplayInfo().height, 1);
_flags = 0;

2
engines/saga/saga.cpp
View File

@ -215,7 +215,7 @@ Common::Error SagaEngine::init() {
_previousTicks = _system->getMillis();
// Initialize graphics
_gfx = new Gfx(this, _system, getDisplayInfo().logicalWidth, getDisplayInfo().logicalHeight);
_gfx = new Gfx(this, _system, getDisplayInfo().width, getDisplayInfo().height);
// Graphics driver should be initialized before console
_console = new Console(this);

16
engines/saga/scene.cpp
View File

@ -501,9 +501,9 @@ void Scene::changeScene(int16 sceneNumber, int actorsEntrance, SceneTransitionTy
_vm->_interface->setStatusText("Click or Press Return to continue. Press Q to quit.", 96);
_vm->_font->textDrawRect(kKnownFontMedium, sceneSubstitutes[i].title,
Common::Rect(0, 7, _vm->getDisplayInfo().logicalWidth, 27), _vm->KnownColor2ColorId(kKnownColorBrightWhite), _vm->KnownColor2ColorId(kKnownColorBlack), kFontOutline);
Common::Rect(0, 7, _vm->getDisplayInfo().width, 27), _vm->KnownColor2ColorId(kKnownColorBrightWhite), _vm->KnownColor2ColorId(kKnownColorBlack), kFontOutline);
_vm->_font->textDrawRect(kKnownFontMedium, sceneSubstitutes[i].message,
Common::Rect(24, getHeight() - 33, _vm->getDisplayInfo().logicalWidth - 11,
Common::Rect(24, getHeight() - 33, _vm->getDisplayInfo().width - 11,
getHeight()), _vm->KnownColor2ColorId(kKnownColorBrightWhite), _vm->KnownColor2ColorId(kKnownColorBlack), kFontOutline);
return;
}
@ -538,8 +538,8 @@ void Scene::getBGInfo(BGInfo &bgInfo) {
bgInfo.bounds.left = 0;
bgInfo.bounds.top = 0;
if (_bg.w < _vm->getDisplayInfo().logicalWidth) {
bgInfo.bounds.left = (_vm->getDisplayInfo().logicalWidth - _bg.w) / 2;
if (_bg.w < _vm->getDisplayInfo().width) {
bgInfo.bounds.left = (_vm->getDisplayInfo().width - _bg.w) / 2;
}
if (_bg.h < getHeight()) {
@ -571,7 +571,7 @@ bool Scene::offscreenPath(Point &testPoint) {
return false;
}
point.x = CLIP<int>(testPoint.x, 0, _vm->getDisplayInfo().logicalWidth - 1);
point.x = CLIP<int>(testPoint.x, 0, _vm->getDisplayInfo().width - 1);
point.y = CLIP<int>(testPoint.y, 0, _bgMask.h - 1);
if (point == testPoint) {
return false;
@ -737,13 +737,13 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) {
_sceneClip.left = 0;
_sceneClip.top = 0;
_sceneClip.right = _vm->getDisplayInfo().logicalWidth;
_sceneClip.right = _vm->getDisplayInfo().width;
_sceneClip.bottom = getHeight();
} else {
BGInfo backGroundInfo;
getBGInfo(backGroundInfo);
_sceneClip = backGroundInfo.bounds;
if (!(_bg.w < _vm->getDisplayInfo().logicalWidth || _bg.h < getHeight()))
if (!(_bg.w < _vm->getDisplayInfo().width || _bg.h < getHeight()))
_outsetSceneNumber = _sceneNumber;
}
@ -1057,7 +1057,7 @@ void Scene::processSceneResources() {
// At least in ITE the mask needs to be clipped.
_bgMask.w = MIN(_bgMask.w, _vm->getDisplayInfo().logicalWidth);
_bgMask.w = MIN(_bgMask.w, _vm->getDisplayInfo().width);
_bgMask.h = MIN(_bgMask.h, getHeight());
debug(4, "BACKGROUND MASK width=%d height=%d length=%d", _bgMask.w, _bgMask.h, (int)_bgMask.buf_len);

2
engines/saga/scene.h
View File

@ -358,7 +358,7 @@ class Scene {
int getHeight(bool speech = false) const {
if (_vm->getGameId() == GID_IHNM && _vm->_scene->currentChapterNumber() == 8 && !speech)
return _vm->getDisplayInfo().logicalHeight;
return _vm->getDisplayInfo().height;
else
return _vm->getDisplayInfo().sceneHeight;
}

4
engines/saga/sfuncs.cpp
View File

@ -1219,7 +1219,7 @@ void Script::sfPlacard(SCRIPTFUNC_PARAMS) {
event.param2 = 0;
event.param3 = _vm->_scene->getHeight();
event.param4 = 0;
event.param5 = _vm->getDisplayInfo().logicalWidth;
event.param5 = _vm->getDisplayInfo().width;
q_event = _vm->_events->chain(q_event, &event);
// Put the text in the center of the viewport, assuming it will fit on
@ -1232,7 +1232,7 @@ void Script::sfPlacard(SCRIPTFUNC_PARAMS) {
textEntry.knownColor = kKnownColorBrightWhite;
textEntry.effectKnownColor = kKnownColorBlack;
textEntry.point.x = _vm->getDisplayInfo().logicalWidth / 2;
textEntry.point.x = _vm->getDisplayInfo().width / 2;
textEntry.point.y = (_vm->_scene->getHeight() - _vm->_font->getHeight(kKnownFontMedium)) / 2;
textEntry.font = kKnownFontMedium;
textEntry.flags = (FontEffectFlags)(kFontOutline | kFontCentered);

4
engines/saga/sprite.cpp
View File

@ -243,8 +243,8 @@ void Sprite::drawClip(const Point &spritePointer, int width, int height, const b
for (i = io; i < clipHeight; i++) {
for (j = jo; j < clipWidth; j++) {
assert(_vm->_gfx->getBackBufferPixels() <= (byte *)(bufRowPointer + j + spritePointer.x));
assert((_vm->_gfx->getBackBufferPixels() + (_vm->getDisplayInfo().logicalWidth *
_vm->getDisplayInfo().logicalHeight)) > (byte *)(bufRowPointer + j + spritePointer.x));
assert((_vm->_gfx->getBackBufferPixels() + (_vm->getDisplayInfo().width *
_vm->getDisplayInfo().height)) > (byte *)(bufRowPointer + j + spritePointer.x));
assert((const byte *)spriteBuffer <= (const byte *)(srcRowPointer + j));
assert(((const byte *)spriteBuffer + (width * height)) > (const byte *)(srcRowPointer + j));