[Scummvm-cvs-logs] CVS: scummvm/saga interface.cpp,1.116,1.117

[Torbjörn Andersson]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6115

Modified Files:
	interface.cpp 
Log Message:
Cleanup


Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- interface.cpp	14 Jul 2005 17:46:19 -0000	1.116
+++ interface.cpp	17 Jul 2005 13:36:38 -0000	1.117
@@ -523,12 +523,10 @@
 
 	if (panelButton->state) {
 		textColor = _vm->getDisplayInfo().verbTextActiveColor;
+	} else if (panelButton == rightButtonVerbPanelButton) {
+		textColor = _vm->getDisplayInfo().verbTextActiveColor;
 	} else {
-		if (panelButton == rightButtonVerbPanelButton) {
-			textColor = _vm->getDisplayInfo().verbTextActiveColor;
-		} else {
-			textColor = _vm->getDisplayInfo().verbTextColor;
-		}
+		textColor = _vm->getDisplayInfo().verbTextColor;
 	}
 
 	if (panelButton == currentVerbPanelButton) {
@@ -557,11 +555,9 @@
 	if (_vm->_scene->isInDemo() || _fadeMode == kFadeOut)
 		return;
 
-
 	drawStatusBar();
 
 	if (_panelMode == kPanelMain) {
-
 		_mainPanel.getRect(rect);		
 		backBuffer->blit(rect, _mainPanel.image);
 
@@ -570,14 +566,10 @@
 				drawVerbPanel(backBuffer, _verbTypeToPanelButton[i]);
 			}
 		}
-	} else {
-		if (_panelMode == kPanelConverse) {	
-
-			_conversePanel.getRect(rect);
-			backBuffer->blit(rect, _conversePanel.image);
-
-			converseDisplayTextLines(backBuffer);
-		}
+	} else if (_panelMode == kPanelConverse) {	
+		_conversePanel.getRect(rect);
+		backBuffer->blit(rect, _conversePanel.image);
+		converseDisplayTextLines(backBuffer);
 	}
 
 	if (_panelMode == kPanelMain || _panelMode == kPanelConverse ||
@@ -1498,7 +1490,6 @@
 }
 
 void Interface::addToInventory(int objectId) {
-
 	if (_inventoryCount >= _inventorySize) {
 		return;
 	}
@@ -1512,8 +1503,7 @@
 
 	_inventoryPos = 0;
 	updateInventory(0);
-
-	draw();	
+	draw();
 }
 
 void Interface::removeFromInventory(int objectId) {
@@ -1575,7 +1565,6 @@
 		}
 		_mainPanel.calcPanelButtonRect(&_mainPanel.buttons[i], rect);
 		
-//4debug		drawRect(backBuffer, rect, kITEColorWhite); 
 		point.x = rect.left;
 		point.y = rect.top;
 		obj = _vm->_actor->getObj(_inventory[ci]);