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

I misunderstood sev on how sf75() should work. Perhaps this is better?

Browse source 
svn-id: r18932
This commit is contained in:
Torbjörn Andersson 2005-10-04 18:19:14 +00:00
parent ba306c80f4
commit 0719a4e6c2
4 changed files with 40 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
saga/interface.cpp
View file

@ -76,7 +76,6 @@ Interface::Interface(SagaEngine *vm) : _vm(vm) {
size_t resourceLength;
int i;
// Load interface module resource file context
_interfaceContext = _vm->_resource->getContext(GAME_RESOURCEFILE);
if (_interfaceContext == NULL) {
@ -127,13 +126,14 @@ Interface::Interface(SagaEngine *vm) : _vm(vm) {
// TODO
}
setPortraitBgColor(0, 0, 0);
_mainPanel.x = _vm->getDisplayInfo().mainPanelXOffset;
_mainPanel.y = _vm->getDisplayInfo().mainPanelYOffset;
_mainPanel.currentButton = NULL;
_inventoryUpButton = _mainPanel.getButton(_vm->getDisplayInfo().inventoryUpButtonIndex);
_inventoryDownButton = _mainPanel.getButton(_vm->getDisplayInfo().inventoryDownButtonIndex);
_conversePanel.x = _vm->getDisplayInfo().conversePanelXOffset;
_conversePanel.y = _vm->getDisplayInfo().conversePanelYOffset;
_conversePanel.currentButton = NULL;
@ -451,7 +451,6 @@ bool Interface::processAscii(uint16 ascii, bool synthetic) {
case '4':
converseSetPos(ascii);
break;
}
break;
case kPanelMap:
@ -591,6 +590,13 @@ void Interface::draw() {
converseDisplayTextLines(backBuffer);
}
if (_vm->getGameType() == GType_IHNM) {
_vm->_gfx->setPaletteColor(254,
_portraitBgColor.red,
_portraitBgColor.green,
_portraitBgColor.blue);
}
if (_panelMode == kPanelMain || _panelMode == kPanelConverse ||
_lockedMode == kPanelMain || _lockedMode == kPanelConverse) {
leftPortraitPoint.x = _mainPanel.x + _vm->getDisplayInfo().leftPortraitXOffset;
@ -1444,7 +1450,6 @@ void Interface::drawStatusBar() {
return;
}
// Erase background of status bar
rect.left = _vm->getDisplayInfo().statusXOffset;
rect.top = _vm->getDisplayInfo().statusYOffset;
@ -1566,7 +1571,6 @@ void Interface::handleMainUpdate(const Point& mousePoint) {
if (changed) {
draw();
}
}
//inventory stuff