[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.60,1.61 interface.cpp,1.75,1.76
Torbjörn Andersson
eriktorbjorn at users.sourceforge.net
Tue Apr 19 00:44:38 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1400
Modified Files:
game.cpp interface.cpp
Log Message:
Fixed warnings.
Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- game.cpp 18 Apr 2005 20:03:10 -0000 1.60
+++ game.cpp 19 Apr 2005 07:44:00 -0000 1.61
@@ -42,23 +42,23 @@
// ITE section
static PanelButton ITE_MainPanelButtons[] = {
- {kPanelButtonVerb, 52, 4, 57, 10, kVerbWalkTo, 'w', 0, 1},
- {kPanelButtonVerb, 52, 15, 57, 10, kVerbLookAt, 'l', 2, 3},
- {kPanelButtonVerb, 52, 26, 57, 10, kVerbPickUp, 'p', 4, 5},
- {kPanelButtonVerb, 52, 37, 57, 10, kVerbTalkTo, 't', 0, 1},
- {kPanelButtonVerb, 110, 4, 56, 10, kVerbOpen, 'o', 6, 7},
- {kPanelButtonVerb, 110, 15, 56, 10, kVerbClose, 'c', 8, 9},
- {kPanelButtonVerb, 110, 26, 56, 10, kVerbUse, 'u', 10, 11},
- {kPanelButtonVerb, 110, 37, 56, 10, kVerbGive, 'g', 12, 13},
- {kPanelButtonArrow, 306, 6, 8, 5, 0, 'u', 0, 0},
- {kPanelButtonArrow, 306, 41, 8, 5, 1, 'd', 0, 0}
+ {kPanelButtonVerb, 52, 4, 57, 10, kVerbWalkTo, 'w', 0, 1, 0, 0},
+ {kPanelButtonVerb, 52, 15, 57, 10, kVerbLookAt, 'l', 2, 3, 0, 0},
+ {kPanelButtonVerb, 52, 26, 57, 10, kVerbPickUp, 'p', 4, 5, 0, 0},
+ {kPanelButtonVerb, 52, 37, 57, 10, kVerbTalkTo, 't', 0, 1, 0, 0},
+ {kPanelButtonVerb, 110, 4, 56, 10, kVerbOpen, 'o', 6, 7, 0, 0},
+ {kPanelButtonVerb, 110, 15, 56, 10, kVerbClose, 'c', 8, 9, 0, 0},
+ {kPanelButtonVerb, 110, 26, 56, 10, kVerbUse, 'u', 10, 11, 0, 0},
+ {kPanelButtonVerb, 110, 37, 56, 10, kVerbGive, 'g', 12, 13, 0, 0},
+ {kPanelButtonArrow, 306, 6, 8, 5, 0, 'u', 0, 0, 0, 0},
+ {kPanelButtonArrow, 306, 41, 8, 5, 1, 'd', 0, 0, 0, 0}
};
static PanelButton ITE_ConversePanelButtons[] = {
- {kPanelButtonConverseText, 52, 6 + CONVERSE_TEXT_HEIGHT * 0, CONVERSE_MAX_TEXT_WIDTH, CONVERSE_TEXT_HEIGHT, 0, '1', 0, 0},
- {kPanelButtonConverseText, 52, 6 + CONVERSE_TEXT_HEIGHT * 1, CONVERSE_MAX_TEXT_WIDTH, CONVERSE_TEXT_HEIGHT, 1, '2', 0, 0},
- {kPanelButtonConverseText, 52, 6 + CONVERSE_TEXT_HEIGHT * 2, CONVERSE_MAX_TEXT_WIDTH, CONVERSE_TEXT_HEIGHT, 2, '3', 0, 0},
- {kPanelButtonConverseText, 52, 6 + CONVERSE_TEXT_HEIGHT * 3, CONVERSE_MAX_TEXT_WIDTH, CONVERSE_TEXT_HEIGHT, 3, '4', 0, 0},
+ {kPanelButtonConverseText, 52, 6 + CONVERSE_TEXT_HEIGHT * 0, CONVERSE_MAX_TEXT_WIDTH, CONVERSE_TEXT_HEIGHT, 0, '1', 0, 0, 0, 0},
+ {kPanelButtonConverseText, 52, 6 + CONVERSE_TEXT_HEIGHT * 1, CONVERSE_MAX_TEXT_WIDTH, CONVERSE_TEXT_HEIGHT, 1, '2', 0, 0, 0, 0},
+ {kPanelButtonConverseText, 52, 6 + CONVERSE_TEXT_HEIGHT * 2, CONVERSE_MAX_TEXT_WIDTH, CONVERSE_TEXT_HEIGHT, 2, '3', 0, 0, 0, 0},
+ {kPanelButtonConverseText, 52, 6 + CONVERSE_TEXT_HEIGHT * 3, CONVERSE_MAX_TEXT_WIDTH, CONVERSE_TEXT_HEIGHT, 3, '4', 0, 0, 0, 0},
{kPanelButtonArrow, 257, 6, 9, 6, 0, 'u', 0, 4, 2, 0},
{kPanelButtonArrow, 257, 41, 9, 6, 1, 'd', 1, 5, 3, 0},
};
@@ -204,11 +204,11 @@
// IHNM section
static PanelButton IHNM_MainPanelButtons[] = {
- {kPanelButtonVerb, 0, 0, 0, 0, kVerbWalkTo, ' ', 0, 0}, //TODO
+ {kPanelButtonVerb, 0, 0, 0, 0, kVerbWalkTo, ' ', 0, 0, 0, 0}, //TODO
};
static PanelButton IHNM_ConversePanelButtons[] = {
- {kPanelButtonConverseText, 0, 0, 0, 0, 0, '1', 0, 0}, //TODO
+ {kPanelButtonConverseText, 0, 0, 0, 0, 0, '1', 0, 0, 0, 0}, //TODO
};
static GameDisplayInfo IHNM_DisplayInfo = {
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- interface.cpp 18 Apr 2005 20:03:10 -0000 1.75
+++ interface.cpp 19 Apr 2005 07:44:01 -0000 1.76
@@ -803,7 +803,6 @@
char bullet[2] = {
(char)0xb7, 0
};
- Point point;
Rect rect(8, CONVERSE_TEXT_LINES * CONVERSE_TEXT_HEIGHT);
assert(_conversePanel.buttonsCount >= 6);
@@ -898,7 +897,6 @@
}
void Interface::handleConverseUpdate(const Point& mousePoint) {
- Rect rect;
bool changed;
PanelButton *last = _conversePanel.currentButton;
@@ -935,8 +933,6 @@
void Interface::handleConverseClick(const Point& mousePoint) {
- Rect rect;
-
_conversePanel.currentButton = converseHitTest(mousePoint);
if (_conversePanel.currentButton == NULL) {
More information about the Scummvm-git-logs
mailing list