[Scummvm-cvs-logs] CVS: scummvm/gui ListWidget.cpp,1.2,1.3 dialog.cpp,1.7,1.8 gui.cpp,1.5,1.6 newgui.h,1.1.1.1,1.2 widget.h,1.2,1.3
Max Horn
fingolfin at users.sourceforge.net
Sat Sep 7 18:09:05 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.1.1.1,1.2 imuse.cpp,1.8,1.9 script.cpp,1.3,1.4 scumm.h,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound fmopl.cpp,1.2,1.3 mididrv.cpp,1.3,1.4 mididrv.h,1.1.1.1,1.2 mixer.cpp,1.6,1.7 mixer.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/gui
In directory usw-pr-cvs1:/tmp/cvs-serv12143/gui
Modified Files:
ListWidget.cpp dialog.cpp gui.cpp newgui.h widget.h
Log Message:
rewrote config class; cleanup; code restructuring
Index: ListWidget.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/ListWidget.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ListWidget.cpp 24 Aug 2002 21:56:58 -0000 1.2
+++ ListWidget.cpp 8 Sep 2002 01:08:11 -0000 1.3
@@ -231,7 +231,7 @@
buffer += _list[pos];
- gui->drawString(buffer, _x+5, _y+2 + LINE_HEIGHT * i, _w - 10,
+ gui->drawString(buffer.c_str(), _x+5, _y+2 + LINE_HEIGHT * i, _w - 10,
(_selectedItem == pos && _hasFocus) ? gui->_textcolorhi : gui->_textcolor);
}
}
Index: dialog.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/dialog.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dialog.cpp 1 Sep 2002 16:37:08 -0000 1.7
+++ dialog.cpp 8 Sep 2002 01:08:11 -0000 1.8
@@ -328,7 +328,7 @@
s->_saveLoadSlot = _savegameList->getSelected();
s->_saveLoadCompatible = false;
s->_saveLoadFlag = 1; // 1 for save, I assume (Painelf)
- strcpy(s->_saveLoadName, _savegameList->getSelectedString());
+ strcpy(s->_saveLoadName, _savegameList->getSelectedString().c_str());
close();
}
break;
@@ -494,9 +494,9 @@
scumm->_mixer->setVolume(_soundVolumeSfx);
scumm->_mixer->setMusicVolume(_soundVolumeMusic);
- scummcfg->set("master_volume", _soundVolumeMaster);
- scummcfg->set("music_volume", _soundVolumeMusic);
- scummcfg->set("sfx_volume", _soundVolumeSfx);
+ scummcfg->setInt("master_volume", _soundVolumeMaster);
+ scummcfg->setInt("music_volume", _soundVolumeMusic);
+ scummcfg->setInt("sfx_volume", _soundVolumeSfx);
scummcfg->flush();
}
case kCancelCmd:
Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/gui.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gui.cpp 1 Sep 2002 16:37:08 -0000 1.5
+++ gui.cpp 8 Sep 2002 01:08:12 -0000 1.6
@@ -20,7 +20,7 @@
*/
#include "stdafx.h"
-#include "scumm.h"
+#include "scumm/scumm.h"
#include "sound/mididrv.h"
#include "scumm/sound.h"
#include "scumm/imuse.h"
@@ -625,9 +625,9 @@
_s->_mixer->setVolume(_s->_sound->_sound_volume_sfx);
_s->_mixer->setMusicVolume(_s->_sound->_sound_volume_music);
- scummcfg->set("master_volume", _s->_sound->_sound_volume_master);
- scummcfg->set("music_volume", _s->_sound->_sound_volume_music);
- scummcfg->set("sfx_volume", _s->_sound->_sound_volume_sfx);
+ scummcfg->setInt("master_volume", _s->_sound->_sound_volume_master);
+ scummcfg->setInt("music_volume", _s->_sound->_sound_volume_music);
+ scummcfg->setInt("sfx_volume", _s->_sound->_sound_volume_sfx);
scummcfg->flush();
close();
Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- newgui.h 21 Aug 2002 16:07:24 -0000 1.1.1.1
+++ newgui.h 8 Sep 2002 01:08:12 -0000 1.2
@@ -23,7 +23,7 @@
#include "scummsys.h"
#include "system.h" // For events
-#include "util.h"
+#include "common/list.h"
class Dialog;
class Scumm;
Index: widget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- widget.h 31 Aug 2002 13:42:07 -0000 1.2
+++ widget.h 8 Sep 2002 01:08:12 -0000 1.3
@@ -22,7 +22,7 @@
#define WIDGET_H
#include "scummsys.h"
-#include "common/util.h"
+#include "common/str.h"
class Dialog;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.1.1.1,1.2 imuse.cpp,1.8,1.9 script.cpp,1.3,1.4 scumm.h,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound fmopl.cpp,1.2,1.3 mididrv.cpp,1.3,1.4 mididrv.h,1.1.1.1,1.2 mixer.cpp,1.6,1.7 mixer.h,1.3,1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list