[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.121,1.122 gfx.cpp,2.268,2.269 imuse.cpp,2.115,2.116 palette.cpp,2.4,2.5 player_v2.cpp,2.47,2.48 player_v2.h,2.27,2.28 scummvm.cpp,2.592,2.593
Max Horn
fingolfin at users.sourceforge.net
Sat Feb 28 05:17:13 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32588/scumm
Modified Files:
debugger.cpp gfx.cpp imuse.cpp palette.cpp player_v2.cpp
player_v2.h scummvm.cpp
Log Message:
renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend
Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- debugger.cpp 22 Feb 2004 21:02:06 -0000 1.121
+++ debugger.cpp 28 Feb 2004 12:58:09 -0000 1.122
@@ -786,7 +786,7 @@
if (vs != NULL)
_vm->markRectAsDirty(vs->number, 0, vs->width, 0, vs->height);
_vm->drawDirtyScreenParts();
- _vm->_system->update_screen();
+ _vm->_system->updateScreen();
}
bool ScummDebugger::Cmd_PrintDraft(int argc, const char **argv) {
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/gfx.cpp,v
retrieving revision 2.268
retrieving revision 2.269
diff -u -d -r2.268 -r2.269
--- gfx.cpp 24 Feb 2004 04:51:02 -0000 2.268
+++ gfx.cpp 28 Feb 2004 12:58:09 -0000 2.269
@@ -2446,7 +2446,7 @@
// Draw the current state to the screen and wait half a sec so the user
// can watch the effect taking place.
- _system->update_screen();
+ _system->updateScreen();
waitForTimer(30);
}
}
@@ -2552,7 +2552,7 @@
if (++blits >= blits_before_refresh) {
blits = 0;
- _system->update_screen();
+ _system->updateScreen();
waitForTimer(30);
}
}
@@ -2560,7 +2560,7 @@
free(offsets);
if (blits != 0) {
- _system->update_screen();
+ _system->updateScreen();
waitForTimer(30);
}
}
@@ -2588,7 +2588,7 @@
vs->width,
0, vs->height - step,
vs->width, step);
- _system->update_screen();
+ _system->updateScreen();
waitForTimer(kPictureDelay);
y += step;
@@ -2603,7 +2603,7 @@
vs->width,
0, 0,
vs->width, step);
- _system->update_screen();
+ _system->updateScreen();
waitForTimer(kPictureDelay);
y += step;
@@ -2618,7 +2618,7 @@
vs->width,
vs->width - step, 0,
step, vs->height);
- _system->update_screen();
+ _system->updateScreen();
waitForTimer(kPictureDelay);
x += step;
@@ -2633,7 +2633,7 @@
vs->width,
0, 0,
step, vs->height);
- _system->update_screen();
+ _system->updateScreen();
waitForTimer(kPictureDelay);
x += step;
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.115
retrieving revision 2.116
diff -u -d -r2.115 -r2.116
--- imuse.cpp 9 Feb 2004 01:27:24 -0000 2.115
+++ imuse.cpp 28 Feb 2004 12:58:10 -0000 2.116
@@ -1760,10 +1760,10 @@
//
////////////////////////////////////////////////////////////
-IMuse::IMuse(OSystem *system, IMuseInternal *target) : _system(system), _target(target) { _mutex = system->create_mutex(); }
-IMuse::~IMuse() { if (_mutex) _system->delete_mutex(_mutex); if (_target) delete _target; }
-inline void IMuse::in() const { _system->lock_mutex(_mutex); }
-inline void IMuse::out() const { _system->unlock_mutex(_mutex); }
+IMuse::IMuse(OSystem *system, IMuseInternal *target) : _system(system), _target(target) { _mutex = system->createMutex(); }
+IMuse::~IMuse() { if (_mutex) _system->deleteMutex(_mutex); if (_target) delete _target; }
+inline void IMuse::in() const { _system->lockMutex(_mutex); }
+inline void IMuse::out() const { _system->unlockMutex(_mutex); }
void IMuse::on_timer(MidiDriver *midi) { in(); _target->on_timer(midi); out(); }
void IMuse::pause(bool paused) { in(); _target->pause(paused); out(); }
Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette.cpp,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- palette.cpp 13 Feb 2004 11:36:44 -0000 2.4
+++ palette.cpp 28 Feb 2004 12:58:10 -0000 2.5
@@ -911,7 +911,7 @@
}
}
- _system->set_palette(palette_colors, first, num);
+ _system->setPalette(palette_colors, first, num);
_palDirtyMax = -1;
_palDirtyMin = 256;
Index: player_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.cpp,v
retrieving revision 2.47
retrieving revision 2.48
diff -u -d -r2.47 -r2.48
--- player_v2.cpp 24 Feb 2004 22:39:39 -0000 2.47
+++ player_v2.cpp 28 Feb 2004 12:58:10 -0000 2.48
@@ -349,7 +349,7 @@
_system = scumm->_system;
_mixer = scumm->_mixer;
_sample_rate = _system->getOutputSampleRate();
- _mutex = _system->create_mutex();
+ _mutex = _system->createMutex();
_header_len = (scumm->_features & GF_OLD_BUNDLE) ? 4 : 6;
@@ -384,7 +384,7 @@
// Detach the premix callback handler
_mixer->setupPremix(0, 0);
mutex_down();
- _system->delete_mutex (_mutex);
+ _system->deleteMutex (_mutex);
}
void Player_V2::set_pcjr(bool pcjr) {
Index: player_v2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.h,v
retrieving revision 2.27
retrieving revision 2.28
diff -u -d -r2.27 -r2.28
--- player_v2.h 8 Jan 2004 20:37:25 -0000 2.27
+++ player_v2.h 28 Feb 2004 12:58:10 -0000 2.28
@@ -127,8 +127,8 @@
ChannelInfo _channels[5];
protected:
- void mutex_up() { _system->lock_mutex (_mutex); }
- void mutex_down() { _system->unlock_mutex (_mutex); }
+ void mutex_up() { _system->lockMutex (_mutex); }
+ void mutex_down() { _system->unlockMutex (_mutex); }
virtual void nextTick();
virtual void clear_channel(int i);
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.592
retrieving revision 2.593
diff -u -d -r2.592 -r2.593
--- scummvm.cpp 27 Feb 2004 05:51:04 -0000 2.592
+++ scummvm.cpp 28 Feb 2004 12:58:10 -0000 2.593
@@ -1223,7 +1223,7 @@
while (!_quit) {
updatePalette();
- _system->update_screen();
+ _system->updateScreen();
diff -= _system->get_msecs();
waitForTimer(delta * 15 + diff);
More information about the Scummvm-git-logs
mailing list