[Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.19,1.20 control.h,1.6,1.7 screen.cpp,1.29,1.30 screen.h,1.10,1.11 sword1.cpp,1.26,1.27
Robert G?ffringmann
lavosspawn at users.sourceforge.net
Sat Jan 3 21:22:02 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen sound.cpp,1.27,1.28
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.20,1.21 control.h,1.7,1.8 mouse.cpp,1.18,1.19 object.h,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv27511/sword1
Modified Files:
control.cpp control.h screen.cpp screen.h sword1.cpp
Log Message:
removed speed button from control panel and made the game do a full screen refresh after leaving the control panel
Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- control.cpp 1 Jan 2004 17:18:00 -0000 1.19
+++ control.cpp 4 Jan 2004 05:21:22 -0000 1.20
@@ -317,7 +317,7 @@
return id;
else if (id == BUTTON_TEXT) {
SwordEngine::_systemVars.showText ^= 1;
- _buttons[6]->setSelected(SwordEngine::_systemVars.showText);
+ _buttons[5]->setSelected(SwordEngine::_systemVars.showText);
}
break;
case BUTTON_SAVE_PANEL:
@@ -365,8 +365,8 @@
if (SwordEngine::_systemVars.deathScreenFlag)
createButtons(_deathButtons, 3);
else {
- createButtons(_panelButtons, 8);
- _buttons[6]->setSelected(SwordEngine::_systemVars.showText);
+ createButtons(_panelButtons, 7);
+ _buttons[5]->setSelected(SwordEngine::_systemVars.showText);
}
if (SwordEngine::_systemVars.deathScreenFlag == 2) // end of game
@@ -379,9 +379,8 @@
renderText(_lStrings[STR_RESTART], 180, 260 + 40, TEXT_LEFT_ALIGN);
renderText(_lStrings[STR_QUIT], 180, 296 + 40, TEXT_LEFT_ALIGN);
- renderText(_lStrings[STR_SPEED], 460, 188 + 40, TEXT_RIGHT_ALIGN);
- renderText(_lStrings[STR_VOLUME], 460, 224 + 40, TEXT_RIGHT_ALIGN);
- renderText(_lStrings[STR_TEXT], 460, 260 + 40, TEXT_RIGHT_ALIGN);
+ renderText(_lStrings[STR_VOLUME], 460, 188 + 40, TEXT_RIGHT_ALIGN);
+ renderText(_lStrings[STR_TEXT], 460, 224 + 40, TEXT_RIGHT_ALIGN);
} else {
renderText(_lStrings[STR_RESTORE], 285, 224 + 40, TEXT_LEFT_ALIGN);
if (SwordEngine::_systemVars.deathScreenFlag == 3) // just started game
@@ -794,14 +793,13 @@
{250, 296 + 40, SR_BUTTON, BUTTON_QUIT }
};
-const ButtonInfo SwordControl::_panelButtons[8] = {
+const ButtonInfo SwordControl::_panelButtons[7] = {
{145, 188 + 40, SR_BUTTON, BUTTON_SAVE_PANEL },
{145, 224 + 40, SR_BUTTON, BUTTON_RESTORE_PANEL },
{145, 260 + 40, SR_BUTTON, BUTTON_RESTART },
{145, 296 + 40, SR_BUTTON, BUTTON_QUIT },
- {475, 188 + 40, SR_BUTTON, BUTTON_SPEED },
- {475, 224 + 40, SR_BUTTON, BUTTON_VOLUME_PANEL },
- {475, 260 + 40, SR_TEXT_BUTTON, BUTTON_TEXT },
+ {475, 188 + 40, SR_BUTTON, BUTTON_VOLUME_PANEL },
+ {475, 224 + 40, SR_TEXT_BUTTON, BUTTON_TEXT },
{475, 332 + 40, SR_BUTTON, BUTTON_DONE }
};
Index: control.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- control.h 31 Dec 2003 17:38:27 -0000 1.6
+++ control.h 4 Jan 2004 05:21:22 -0000 1.7
@@ -108,7 +108,7 @@
void createButtons(const ButtonInfo *buttons, uint8 num);
void destroyButtons(void);
ControlButton *_buttons[MAX_BUTTONS];
- static const ButtonInfo _deathButtons[3], _panelButtons[8], _saveButtons[16], _volumeButtons[1];
+ static const ButtonInfo _deathButtons[3], _panelButtons[7], _saveButtons[16], _volumeButtons[1];
static const uint8 _languageStrings[8 * 20][43];
const uint8 (*_lStrings)[43];
ObjectMan *_objMan;
Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- screen.cpp 3 Jan 2004 12:29:21 -0000 1.29
+++ screen.cpp 4 Jan 2004 05:21:22 -0000 1.30
@@ -110,7 +110,8 @@
_system->set_palette(_targetPalette + 4 * start, start, length);
}
-void SwordScreen::refreshPalette(void) {
+void SwordScreen::fullRefresh(void) {
+ _fullRefresh = true;
_system->set_palette(_targetPalette, 0, 256);
}
Index: screen.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/screen.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- screen.h 3 Jan 2004 12:29:21 -0000 1.10
+++ screen.h 4 Jan 2004 05:21:22 -0000 1.11
@@ -78,7 +78,7 @@
void fadeUpPalette(void);
void fnSetPalette(uint8 start, uint16 length, uint32 id, bool fadeUp);
bool stillFading(void);
- void refreshPalette(void);
+ void fullRefresh(void);
void updateScreen(void);
void showFrame(uint16 x, uint16 y, uint32 resId, uint32 frameNo, const byte *fadeMask = NULL, int8 fadeStatus = 0);
Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- sword1.cpp 1 Jan 2004 15:22:15 -0000 1.26
+++ sword1.cpp 4 Jan 2004 05:21:22 -0000 1.27
@@ -1144,7 +1144,7 @@
else if (((_keyPressed == 63) && (SwordLogic::_scriptVars[MOUSE_STATUS] & 1)) || (_systemVars.deathScreenFlag)) {
retCode = _control->runPanel();
if (!retCode)
- _screen->refreshPalette();
+ _screen->fullRefresh();
}
// do something smart here to implement pausing the game. If we even want that, that is.
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen sound.cpp,1.27,1.28
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 control.cpp,1.20,1.21 control.h,1.7,1.8 mouse.cpp,1.18,1.19 object.h,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list