thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source 
svn-id: r35259
This commit is contained in:
Filippos Karapetis 2008-12-06 13:35:27 +00:00
parent e625bd54de
commit f3a60a8c96
8 changed files with 37 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

54
engines/saga/interface.cpp
View file

@ -787,15 +787,11 @@ void Interface::drawVerbPanel(Surface *backBuffer, PanelButton* panelButton) {
}
void Interface::draw() {
Surface *backBuffer;
int i;
Surface *backBuffer = _vm->_gfx->getBackBuffer();
Point leftPortraitPoint;
Point rightPortraitPoint;
Rect rect;
backBuffer = _vm->_gfx->getBackBuffer();
if (_vm->_scene->isInIntro() || _fadeMode == kFadeOut)
return;
@ -806,7 +802,7 @@ void Interface::draw() {
_mainPanel.getRect(rect);
backBuffer->blit(rect, _mainPanel.image);
for (i = 0; i < kVerbTypeIdsMax; i++) {
for (int i = 0; i < kVerbTypeIdsMax; i++) {
if (_verbTypeToPanelButton[i] != NULL) {
drawVerbPanel(backBuffer, _verbTypeToPanelButton[i]);
}
@ -934,10 +930,8 @@ void Interface::drawPanelText(Surface *ds, InterfacePanel *panel, PanelButton *p
void Interface::drawOption() {
const char *text;
Surface *backBuffer;
int i;
int fontHeight;
uint j, idx;
uint idx;
int fgColor;
int bgColor;
Rect rect;
@ -947,13 +941,12 @@ void Interface::drawOption() {
Point point;
Point sliderPoint;
int spritenum = 0;
backBuffer = _vm->_gfx->getBackBuffer();
Surface *backBuffer = _vm->_gfx->getBackBuffer();
_optionPanel.getRect(rect);
backBuffer->blit(rect, _optionPanel.image);
for (i = 0; i < _optionPanel.buttonsCount; i++) {
for (int i = 0; i < _optionPanel.buttonsCount; i++) {
panelButton = &_optionPanel.buttons[i];
if (panelButton->type == kPanelButtonOption) {
@ -992,7 +985,7 @@ void Interface::drawOption() {
rect.top++;
rect2 = rect;
fontHeight = _vm->_font->getHeight(kKnownFontSmall);
for (j = 0; j < _vm->getDisplayInfo().optionSaveFileVisible; j++) {
for (uint j = 0; j < _vm->getDisplayInfo().optionSaveFileVisible; j++) {
if (_vm->getGameType() == GType_ITE)
bgColor = kITEColorDarkGrey0C;
else
@ -1020,13 +1013,11 @@ void Interface::drawOption() {
}
void Interface::drawQuit() {
Surface *backBuffer;
Surface *backBuffer = _vm->_gfx->getBackBuffer();
Rect rect;
int i;
PanelButton *panelButton;
backBuffer = _vm->_gfx->getBackBuffer();
_quitPanel.getRect(rect);
if (_vm->getGameType() == GType_ITE)
drawButtonBox(backBuffer, rect, kButton, false);
@ -1087,13 +1078,11 @@ void Interface::setQuit(PanelButton *panelButton) {
}
void Interface::drawLoad() {
Surface *backBuffer;
Surface *backBuffer = _vm->_gfx->getBackBuffer();
Rect rect;
int i;
PanelButton *panelButton;
backBuffer = _vm->_gfx->getBackBuffer();
_loadPanel.getRect(rect);
if (_vm->getGameType() == GType_ITE)
drawButtonBox(backBuffer, rect, kButton, false);
@ -1310,13 +1299,11 @@ void Interface::drawTextInput(Surface *ds, InterfacePanel *panel, PanelButton *p
}
void Interface::drawSave() {
Surface *backBuffer;
Surface *backBuffer = _vm->_gfx->getBackBuffer();
Rect rect;
int i;
PanelButton *panelButton;
backBuffer = _vm->_gfx->getBackBuffer();
_savePanel.getRect(rect);
if (_vm->getGameType() == GType_ITE)
drawButtonBox(backBuffer, rect, kButton, false);
@ -1337,13 +1324,11 @@ void Interface::drawSave() {
}
void Interface::drawProtect() {
Surface *backBuffer;
Surface *backBuffer = _vm->_gfx->getBackBuffer();
Rect rect;
int i;
PanelButton *panelButton;
backBuffer = _vm->_gfx->getBackBuffer();
_protectPanel.getRect(rect);
drawButtonBox(backBuffer, rect, kButton, false);
@ -1878,7 +1863,7 @@ void Interface::update(const Point& mousePoint, int updateFlag) {
}
void Interface::drawStatusBar() {
Surface *backBuffer;
Surface *backBuffer = _vm->_gfx->getBackBuffer();
Rect rect;
Point textPoint;
int stringWidth;
@ -1895,8 +1880,6 @@ void Interface::drawStatusBar() {
if (_fadeMode == kFadeOut)
return;
backBuffer = _vm->_gfx->getBackBuffer();
// Erase background of status bar
rect.left = _vm->getDisplayInfo().statusXOffset;
rect.top = _vm->getDisplayInfo().statusYOffset;
@ -2722,7 +2705,6 @@ void Interface::mapPanelShow() {
int i;
byte *resource;
size_t resourceLength, imageLength;
Surface *backBuffer;
Rect rect;
byte *image;
int imageWidth, imageHeight;
@ -2731,8 +2713,6 @@ void Interface::mapPanelShow() {
_vm->_gfx->showCursor(false);
backBuffer = _vm->_gfx->getBackBuffer();
rect.left = rect.top = 0;
_vm->_resource->loadResource(_interfaceContext,
@ -2763,7 +2743,7 @@ void Interface::mapPanelShow() {
rect.setWidth(imageWidth);
rect.setHeight(imageHeight);
backBuffer->blit(rect, image);
_vm->_gfx->getBackBuffer()->blit(rect, image);
// Evil Evil
for (i = 0; i < 6 ; i++) {
@ -2806,16 +2786,13 @@ void Interface::mapPanelClean() {
}
void Interface::mapPanelDrawCrossHair() {
Surface *backBuffer;
backBuffer = _vm->_gfx->getBackBuffer();
_mapPanelCrossHairState = !_mapPanelCrossHairState;
Point mapPosition = _vm->_isoMap->getMapPosition();
Rect screen(_vm->getDisplayWidth(), _vm->_scene->getHeight());
if (screen.contains(mapPosition)) {
_vm->_sprite->draw(backBuffer, _vm->getDisplayClip(), _vm->_sprite->_mainSprites,
_vm->_sprite->draw(_vm->_gfx->getBackBuffer(), _vm->getDisplayClip(), _vm->_sprite->_mainSprites,
_mapPanelCrossHairState? RID_ITE_SPR_CROSSHAIR : RID_ITE_SPR_CROSSHAIR + 1,
mapPosition, 256);
}
@ -2835,7 +2812,6 @@ void Interface::keyBoss() {
int i;
byte *resource;
size_t resourceLength, imageLength;
Surface *backBuffer;
Rect rect;
byte *image;
int imageWidth, imageHeight;
@ -2844,8 +2820,6 @@ void Interface::keyBoss() {
_vm->_gfx->showCursor(false);
backBuffer = _vm->_gfx->getBackBuffer();
rect.left = rect.top = 0;
_vm->_resource->loadResource(_interfaceContext, RID_IHNM_BOSS_SCREEN, resource, resourceLength);
@ -2873,7 +2847,7 @@ void Interface::keyBoss() {
cPal[i].blue = 128;
}
backBuffer->blit(rect, image);
_vm->_gfx->getBackBuffer()->blit(rect, image);
_vm->_gfx->setPalette(cPal);