[Scummvm-cvs-logs] CVS: scummvm/sword2/driver _mouse.cpp,1.27,1.28 d_draw.cpp,1.44,1.45 d_draw.h,1.15,1.16 d_sound.cpp,1.81,1.82 d_sound.h,1.31,1.32 driver96.h,1.61,1.62 keyboard.cpp,1.13,1.14 language.cpp,1.10,1.11 menu.cpp,1.22,1.23 palette.cpp,1.25,1.26 rdwin.cpp,1.37,1.38 render.cpp,1.42,1.43 sprite.cpp,1.32,1.33
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Sun Nov 16 06:20:07 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.20,1.21 sound.cpp,1.13,1.14
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.45,1.46 build_display.cpp,1.48,1.49 console.cpp,1.34,1.35 console.h,1.13,1.14 controls.cpp,1.50,1.51 controls.h,1.10,1.11 debug.cpp,1.30,1.31 defs.h,1.7,1.8 events.cpp,1.21,1.22 function.cpp,1.40,1.41 header.h,1.4,1.5 icons.cpp,1.26,1.27 icons.h,1.8,1.9 interpreter.cpp,1.24,1.25 layers.cpp,1.21,1.22 logic.cpp,1.32,1.33 logic.h,1.20,1.21 maketext.cpp,1.29,1.30 maketext.h,1.8,1.9 mem_view.cpp,1.20,1.21 memory.cpp,1.17,1.18 memory.h,1.11,1.12 mouse.cpp,1.43,1.44 mouse.h,1.10,1.11 protocol.cpp,1.19,1.20 resman.cpp,1.71,1.72 resman.h,1.15,1.16 router.cpp,1.30,1.31 router.h,1.11,1.12 save_rest.cpp,1.39,1.40 scroll.cpp,1.14,1.15 sound.cpp,1.34,1.35 speech.cpp,1.49,1.50 startup.cpp,1.33,1.34 sword2.cpp,1.85,1.86 sword2.h,1.41,1.42 sync.cpp,1.14,1.15 tony_gsdk.cpp,1.17,1.18 walker.cpp,1.28,1.29 credits.h,1.7,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv23499/driver
Modified Files:
_mouse.cpp d_draw.cpp d_draw.h d_sound.cpp d_sound.h
driver96.h keyboard.cpp language.cpp menu.cpp palette.cpp
rdwin.cpp render.cpp sprite.cpp
Log Message:
More cleanup. I've eliminated all the temporary global variables I've added
over the past few weeks, except for g_sword2. (Of course, this doesn't
necessarily make the code any prettier, but we can work on that later.)
Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/_mouse.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- _mouse.cpp 11 Nov 2003 07:43:02 -0000 1.27
+++ _mouse.cpp 16 Nov 2003 14:18:29 -0000 1.28
@@ -17,11 +17,7 @@
* $Header$
*/
-#include "stdafx.h"
-#include "sword2/driver/driver96.h"
-#include "sword2/driver/d_draw.h"
-#include "sword2/driver/render.h"
-#include "sword2/driver/menu.h"
+#include "common/stdafx.h"
#include "sword2/sword2.h"
namespace Sword2 {
@@ -171,7 +167,7 @@
if (_mouseAnim)
decompressMouse(_mouseData, _mouseSprite, _mouseAnim->mousew, _mouseAnim->mouseh, mouse_width);
- g_system->set_mouse_cursor(_mouseData, mouse_width, mouse_height, hotspot_x, hotspot_y);
+ _vm->_system->set_mouse_cursor(_mouseData, mouse_width, mouse_height, hotspot_x, hotspot_y);
}
/**
@@ -225,12 +221,12 @@
animateMouse();
drawMouse();
- g_system->show_mouse(true);
+ _vm->_system->show_mouse(true);
} else {
if (_luggageAnim)
drawMouse();
else
- g_system->show_mouse(false);
+ _vm->_system->show_mouse(false);
}
return RD_OK;
@@ -260,12 +256,12 @@
animateMouse();
drawMouse();
- g_system->show_mouse(true);
+ _vm->_system->show_mouse(true);
} else {
if (_mouseAnim)
drawMouse();
else
- g_system->show_mouse(false);
+ _vm->_system->show_mouse(false);
}
return RD_OK;
Index: d_draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_draw.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- d_draw.cpp 11 Nov 2003 07:43:02 -0000 1.44
+++ d_draw.cpp 16 Nov 2003 14:18:29 -0000 1.45
@@ -17,22 +17,18 @@
* $Header$
*/
-#include "stdafx.h"
-#include "sound/mixer.h"
+#include "common/stdafx.h"
#include "sword2/sword2.h"
-#include "sword2/driver/driver96.h"
-#include "sword2/driver/d_draw.h"
+#include "sword2/driver/menu.h"
#include "sword2/driver/render.h"
-#include "sword2/header.h" // HACK: For cutscenes instruction message
-#include "sword2/maketext.h" // HACK: For cutscenes instruction message
namespace Sword2 {
-Graphics::Graphics(int16 width, int16 height)
- : _iconCount(0), _needFullRedraw(false), _fadeStatus(RDFADE_NONE),
- _mouseSprite(NULL), _mouseAnim(NULL), _luggageAnim(NULL),
- _layer(0), _renderAverageTime(60), _lightMask(NULL),
- _screenWide(width), _screenDeep(height) {
+Graphics::Graphics(Sword2Engine *vm, int16 width, int16 height)
+ : _vm(vm), _iconCount(0), _needFullRedraw(false),
+ _fadeStatus(RDFADE_NONE), _mouseSprite(NULL), _mouseAnim(NULL),
+ _luggageAnim(NULL), _layer(0), _renderAverageTime(60),
+ _lightMask(NULL), _screenWide(width), _screenDeep(height) {
int i, j;
@@ -40,7 +36,7 @@
if (!_buffer)
error("Could not initialise display");
- g_system->init_size(width, height);
+ _vm->_system->init_size(width, height);
for (i = 0; i < ARRAYSIZE(_blockSurfaces); i++)
_blockSurfaces[i] = NULL;
@@ -98,19 +94,19 @@
void MoviePlayer::openTextObject(_movieTextObject *obj) {
if (obj->textSprite)
- g_graphics->createSurface(obj->textSprite, &_textSurface);
+ _vm->_graphics->createSurface(obj->textSprite, &_textSurface);
}
void MoviePlayer::closeTextObject(_movieTextObject *obj) {
if (_textSurface) {
- g_graphics->deleteSurface(_textSurface);
+ _vm->_graphics->deleteSurface(_textSurface);
_textSurface = NULL;
}
}
void MoviePlayer::drawTextObject(_movieTextObject *obj) {
if (obj->textSprite && _textSurface)
- g_graphics->drawSurface(obj->textSprite, _textSurface);
+ _vm->_graphics->drawSurface(obj->textSprite, _textSurface);
}
/**
@@ -130,32 +126,32 @@
uint8 oldPal[1024];
uint8 tmpPal[1024];
- g_graphics->clearScene();
+ _vm->_graphics->clearScene();
// HACK: Draw instructions
//
// I'm using the the menu area, because that's unlikely to be
// touched by anything else during the cutscene.
- memset(g_graphics->_buffer, 0, g_graphics->_screenWide * MENUDEEP);
+ memset(_vm->_graphics->_buffer, 0, _vm->_graphics->_screenWide * MENUDEEP);
uint8 msg[] = "Cutscene - Press ESC to exit";
- mem *data = fontRenderer->makeTextSprite(msg, 640, 255, g_sword2->_speechFontId);
+ mem *data = _vm->_fontRenderer->makeTextSprite(msg, 640, 255, _vm->_speechFontId);
_frameHeader *frame = (_frameHeader *) data->ad;
_spriteInfo msgSprite;
uint8 *msgSurface;
- msgSprite.x = g_graphics->_screenWide / 2 - frame->width / 2;
+ msgSprite.x = _vm->_graphics->_screenWide / 2 - frame->width / 2;
msgSprite.y = RDMENU_MENUDEEP / 2 - frame->height / 2;
msgSprite.w = frame->width;
msgSprite.h = frame->height;
msgSprite.type = RDSPR_DISPLAYALIGN | RDSPR_NOCOMPRESSION | RDSPR_TRANS;
msgSprite.data = data->ad + sizeof(_frameHeader);
- g_graphics->createSurface(&msgSprite, &msgSurface);
- g_graphics->drawSurface(&msgSprite, msgSurface);
- g_graphics->deleteSurface(msgSurface);
- memory->freeMemory(data);
+ _vm->_graphics->createSurface(&msgSprite, &msgSurface);
+ _vm->_graphics->drawSurface(&msgSprite, msgSurface);
+ _vm->_graphics->deleteSurface(msgSurface);
+ _vm->_memory->freeMemory(data);
// In case the cutscene has a long lead-in, start just before
// the first line of text.
@@ -170,12 +166,12 @@
// The text should probably be colored the same as the rest of
// the in-game text.
- memcpy(oldPal, g_graphics->_palCopy, 1024);
+ memcpy(oldPal, _vm->_graphics->_palCopy, 1024);
memset(tmpPal, 0, 1024);
tmpPal[255 * 4 + 0] = 255;
tmpPal[255 * 4 + 1] = 255;
tmpPal[255 * 4 + 2] = 255;
- g_graphics->setPalette(0, 256, tmpPal, RDPAL_INSTANT);
+ _vm->_graphics->setPalette(0, 256, tmpPal, RDPAL_INSTANT);
PlayingSoundHandle handle = 0;
@@ -186,28 +182,28 @@
break;
if (frameCounter == text[textCounter]->startFrame) {
- g_graphics->clearScene();
+ _vm->_graphics->clearScene();
openTextObject(text[textCounter]);
drawTextObject(text[textCounter]);
if (text[textCounter]->speech) {
- g_sword2->_mixer->playRaw(&handle, text[textCounter]->speech, text[textCounter]->speechBufferSize, 22050, SoundMixer::FLAG_16BITS);
+ _vm->_mixer->playRaw(&handle, text[textCounter]->speech, text[textCounter]->speechBufferSize, 22050, SoundMixer::FLAG_16BITS);
}
}
if (frameCounter == text[textCounter]->endFrame) {
closeTextObject(text[textCounter]);
- g_graphics->clearScene();
+ _vm->_graphics->clearScene();
textCounter++;
}
frameCounter++;
- g_graphics->updateDisplay();
+ _vm->_graphics->updateDisplay();
_keyboardEvent ke;
- if (g_input->readKey(&ke) == RD_OK && ke.keycode == 27) {
- g_sword2->_mixer->stopHandle(handle);
+ if (_vm->_input->readKey(&ke) == RD_OK && ke.keycode == 27) {
+ _vm->_mixer->stopHandle(handle);
skipCutscene = true;
break;
}
@@ -216,38 +212,38 @@
// frame rate the original movies had, or even if it
// was constant, but this seems to work reasonably.
- g_system->delay_msecs(90);
+ _vm->_system->delay_msecs(90);
}
closeTextObject(text[textCounter]);
- g_graphics->clearScene();
- g_graphics->setNeedFullRedraw();
+ _vm->_graphics->clearScene();
+ _vm->_graphics->setNeedFullRedraw();
// HACK: Remove the instructions created above
Common::Rect r;
- memset(g_graphics->_buffer, 0, g_graphics->_screenWide * MENUDEEP);
+ memset(_vm->_graphics->_buffer, 0, _vm->_graphics->_screenWide * MENUDEEP);
r.left = r.top = 0;
- r.right = g_graphics->_screenWide;
+ r.right = _vm->_graphics->_screenWide;
r.bottom = MENUDEEP;
- g_graphics->updateRect(&r);
+ _vm->_graphics->updateRect(&r);
// FIXME: For now, only play the lead-out music for cutscenes
// that have subtitles.
if (!skipCutscene)
- g_sound->playLeadOut(musicOut);
+ _vm->_sound->playLeadOut(musicOut);
- g_graphics->setPalette(0, 256, oldPal, RDPAL_INSTANT);
+ _vm->_graphics->setPalette(0, 256, oldPal, RDPAL_INSTANT);
}
// Lead-in and lead-out music are, as far as I can tell, only used for
// the animated cut-scenes, so this seems like a good place to close
// both of them.
- g_sound->closeFx(-1);
- g_sound->closeFx(-2);
+ _vm->_sound->closeFx(-1);
+ _vm->_sound->closeFx(-2);
return RD_OK;
}
Index: d_draw.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_draw.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- d_draw.h 11 Nov 2003 07:43:02 -0000 1.15
+++ d_draw.h 16 Nov 2003 14:18:29 -0000 1.16
@@ -20,7 +20,7 @@
#ifndef D_DRAW_H
#define D_DRAW_H
-#include "sword2/driver/driver96.h"
+#include "common/rect.h"
namespace Sword2 {
@@ -61,13 +61,15 @@
class MoviePlayer {
private:
+ Sword2Engine *_vm;
+
uint8 *_textSurface;
void openTextObject(_movieTextObject *obj);
void closeTextObject(_movieTextObject *obj);
void drawTextObject(_movieTextObject *obj);
public:
- MoviePlayer() : _textSurface(NULL) {}
+ MoviePlayer(Sword2Engine *vm) : _vm(vm), _textSurface(NULL) {}
int32 play(char *filename, _movieTextObject *text[], uint8 *musicOut);
};
@@ -80,6 +82,8 @@
friend class MoviePlayer;
private:
+ Sword2Engine *_vm;
+
byte *_buffer;
int32 _renderCaps;
@@ -174,7 +178,7 @@
int32 decompressRLE16(uint8 *dest, uint8 *source, int32 decompSize, uint8 *colTable);
public:
- Graphics(int16 width, int16 height);
+ Graphics(Sword2Engine *vm, int16 width, int16 height);
// Game screen metrics
int16 _screenWide;
Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- d_sound.cpp 11 Nov 2003 07:43:02 -0000 1.81
+++ d_sound.cpp 16 Nov 2003 14:18:29 -0000 1.82
@@ -32,13 +32,9 @@
// Does anyone who can run the original interpreter have any
// opinions on this?
-#include "stdafx.h"
-#include "sound/audiostream.h"
-#include "sound/mixer.h"
-#include "sound/rate.h"
+#include "common/stdafx.h"
+#include "common/file.h"
#include "sword2/sword2.h"
-#include "sword2/driver/driver96.h"
-#include "sword2/driver/d_sound.h"
namespace Sword2 {
@@ -119,8 +115,9 @@
((Sound *) param)->fxServer(data, len);
}
-Sound::Sound(SoundMixer *mixer) {
- _mutex = g_system->create_mutex();
+Sound::Sound(Sword2Engine *vm) {
+ _vm = vm;
+ _mutex = _vm->_system->create_mutex();
_soundOn = false;
_speechStatus = false;
@@ -133,21 +130,20 @@
_musicVol = 16;
_musicMuted = 0;
- _mixer = mixer;
memset(_fx, 0, sizeof(_fx));
_soundHandleSpeech = 0;
_soundOn = true;
- _converter = makeRateConverter(_music[0].getRate(), _mixer->getOutputRate(), _music[0].isStereo(), false);
+ _converter = makeRateConverter(_music[0].getRate(), _vm->_mixer->getOutputRate(), _music[0].isStereo(), false);
- _mixer->setupPremix(premix_proc, this);
+ _vm->_mixer->setupPremix(premix_proc, this);
}
Sound::~Sound() {
if (_mutex)
- g_system->delete_mutex(_mutex);
+ _vm->_system->delete_mutex(_mutex);
}
// --------------------------------------------------------------------------
@@ -248,8 +244,8 @@
}
while (_fx[i]._handle) {
- g_graphics->updateDisplay();
- g_system->delay_msecs(30);
+ _vm->_graphics->updateDisplay();
+ _vm->_system->delay_msecs(30);
}
}
@@ -418,7 +414,7 @@
uint32 flags = SoundMixer::FLAG_16BITS | SoundMixer::FLAG_AUTOFREE;
- _mixer->playRaw(&_soundHandleSpeech, data16, bufferSize, 22050, flags, -1, volume, p);
+ _vm->_mixer->playRaw(&_soundHandleSpeech, data16, bufferSize, 22050, flags, -1, volume, p);
_speechStatus = true;
}
@@ -437,7 +433,7 @@
return RD_OK;
if (_speechStatus) {
- g_engine->_mixer->stopHandle(_soundHandleSpeech);
+ _vm->_mixer->stopHandle(_soundHandleSpeech);
_speechStatus = false;
return RD_OK;
}
@@ -474,7 +470,7 @@
_speechVol = volume;
if (_soundHandleSpeech != 0 && !_speechMuted && getSpeechStatus() == RDSE_SAMPLEPLAYING) {
- g_engine->_mixer->setChannelVolume(_soundHandleSpeech, 16 * _speechVol);
+ _vm->_mixer->setChannelVolume(_soundHandleSpeech, 16 * _speechVol);
}
}
@@ -498,7 +494,7 @@
if (getSpeechStatus() == RDSE_SAMPLEPLAYING) {
byte volume = mute ? 0 : 16 * _speechVol;
- g_engine->_mixer->setChannelVolume(_soundHandleSpeech, volume);
+ _vm->_mixer->setChannelVolume(_soundHandleSpeech, volume);
}
}
@@ -517,7 +513,7 @@
void Sound::pauseSpeech(void) {
if (getSpeechStatus() == RDSE_SAMPLEPLAYING) {
_speechPaused = true;
- g_engine->_mixer->pauseHandle(_soundHandleSpeech, true);
+ _vm->_mixer->pauseHandle(_soundHandleSpeech, true);
}
}
@@ -528,7 +524,7 @@
void Sound::unpauseSpeech(void) {
if (_speechPaused) {
_speechPaused = false;
- g_engine->_mixer->pauseHandle(_soundHandleSpeech, false);
+ _vm->_mixer->pauseHandle(_soundHandleSpeech, false);
}
}
@@ -664,7 +660,7 @@
byte volume = _fxMuted ? 0 : vol * _fxVol;
int8 p = _panTable[pan + 16];
- g_engine->_mixer->playRaw(&_fx[i]._handle, _fx[i]._buf, _fx[i]._bufSize, _fx[i]._rate, _fx[i]._flags, -1, volume, p);
+ _vm->_mixer->playRaw(&_fx[i]._handle, _fx[i]._buf, _fx[i]._bufSize, _fx[i]._rate, _fx[i]._flags, -1, volume, p);
} else {
if (type == RDSE_FXLEADIN || type == RDSE_FXLEADOUT) {
if (type == RDSE_FXLEADIN)
@@ -685,7 +681,7 @@
byte volume = _musicMuted ? 0 : musicVolTable[_musicVol];
- g_engine->_mixer->playRaw(&_fx[i]._handle, _fx[i]._buf, _fx[i]._bufSize, _fx[i]._rate, _fx[i]._flags, -1, volume, 0);
+ _vm->_mixer->playRaw(&_fx[i]._handle, _fx[i]._buf, _fx[i]._bufSize, _fx[i]._rate, _fx[i]._flags, -1, volume, 0);
} else {
hr = openFx(id, data);
if (hr != RD_OK) {
@@ -708,7 +704,7 @@
byte volume = _fxMuted ? 0 : vol * _fxVol;
int8 p = _panTable[pan + 16];
- g_engine->_mixer->playRaw(&_fx[i]._handle, _fx[i]._buf, _fx[i]._bufSize, _fx[i]._rate, _fx[i]._flags, -1, volume, p);
+ _vm->_mixer->playRaw(&_fx[i]._handle, _fx[i]._buf, _fx[i]._bufSize, _fx[i]._rate, _fx[i]._flags, -1, volume, p);
}
}
}
@@ -735,8 +731,8 @@
_fx[i]._volume = vol;
if (!_fxMuted) {
- g_engine->_mixer->setChannelVolume(_fx[i]._handle, _fx[i]._volume * _fxVol);
- g_engine->_mixer->setChannelPan(_fx[i]._handle, _panTable[pan + 16]);
+ _vm->_mixer->setChannelVolume(_fx[i]._handle, _fx[i]._volume * _fxVol);
+ _vm->_mixer->setChannelPan(_fx[i]._handle, _panTable[pan + 16]);
}
return RD_OK;
@@ -750,7 +746,7 @@
_fx[i]._volume = vol;
if (!_fxMuted)
- g_engine->_mixer->setChannelVolume(_fx[i]._handle, vol * _fxVol);
+ _vm->_mixer->setChannelVolume(_fx[i]._handle, vol * _fxVol);
return RD_OK;
}
@@ -766,7 +762,7 @@
for (int i = 0; i < MAXFX; i++) {
if (_fx[i]._id && _fx[i]._id != -1 && _fx[i]._id != -2) {
- g_engine->_mixer->stopHandle(_fx[i]._handle);
+ _vm->_mixer->stopHandle(_fx[i]._handle);
_fx[i]._id = 0;
_fx[i]._paused = false;
if (_fx[i]._buf != NULL) {
@@ -797,7 +793,7 @@
if (i == MAXFX)
return RDERR_FXNOTOPEN;
- g_engine->_mixer->stopHandle(_fx[i]._handle);
+ _vm->_mixer->stopHandle(_fx[i]._handle);
_fx[i]._id = 0;
_fx[i]._paused = false;
if (_fx[i]._buf != NULL) {
@@ -814,7 +810,7 @@
if (!_fxPaused) {
for (int i = 0; i < MAXFX; i++) {
if (_fx[i]._id) {
- g_engine->_mixer->pauseHandle(_fx[i]._handle, true);
+ _vm->_mixer->pauseHandle(_fx[i]._handle, true);
_fx[i]._paused = true;
} else
_fx[i]._paused = false;
@@ -827,7 +823,7 @@
if (!_fxPaused) {
for (int i = 0; i < MAXFX; i++) {
if (_fx[i]._id && _fx[i]._id != -2) {
- g_engine->_mixer->pauseHandle(_fx[i]._handle, true);
+ _vm->_mixer->pauseHandle(_fx[i]._handle, true);
_fx[i]._paused = true;
} else {
_fx[i]._paused = false;
@@ -841,7 +837,7 @@
if (_fxPaused) {
for (int i = 0; i < MAXFX; i++) {
if (_fx[i]._paused && _fx[i]._id) {
- g_engine->_mixer->pauseHandle(_fx[i]._handle, false);
+ _vm->_mixer->pauseHandle(_fx[i]._handle, false);
}
}
_fxPaused = false;
@@ -871,7 +867,7 @@
// Now update the volume of any fxs playing
for (int i = 0; i < MAXFX; i++) {
if (_fx[i]._id && !_fxMuted)
- g_engine->_mixer->setChannelVolume(_fx[i]._handle, _fx[i]._volume * _fxVol);
+ _vm->_mixer->setChannelVolume(_fx[i]._handle, _fx[i]._volume * _fxVol);
}
}
@@ -889,7 +885,7 @@
if (_fx[i]._id) {
byte volume = mute ? 0 : _fx[i]._volume * _fxVol;
- g_engine->_mixer->setChannelVolume(_fx[i]._handle, volume);
+ _vm->_mixer->setChannelVolume(_fx[i]._handle, volume);
}
}
}
Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/d_sound.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- d_sound.h 2 Nov 2003 10:12:08 -0000 1.31
+++ d_sound.h 16 Nov 2003 14:18:29 -0000 1.32
@@ -23,7 +23,6 @@
#include "sound/audiostream.h"
#include "sound/mixer.h"
#include "sound/rate.h"
-#include "common/file.h"
namespace Sword2 {
@@ -71,7 +70,7 @@
class Sound {
private:
- SoundMixer *_mixer;
+ Sword2Engine *_vm;
OSystem::MutexRef _mutex;
RateConverter *_converter;
@@ -100,7 +99,7 @@
void updateCompSampleStreaming(int16 *data, uint len);
public:
- Sound(SoundMixer *mixer);
+ Sound(Sword2Engine *vm);
~Sound();
void fxServer(int16 *data, uint len);
int32 playCompSpeech(const char *filename, uint32 speechid, uint8 vol, int8 pan);
Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/driver96.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- driver96.h 13 Nov 2003 07:59:52 -0000 1.61
+++ driver96.h 16 Nov 2003 14:18:29 -0000 1.62
@@ -20,13 +20,10 @@
#ifndef DRIVER96_H
#define DRIVER96_H
-#include "common/scummsys.h"
-#include "base/engine.h" // for warning()
-#include "common/system.h"
-#include "common/rect.h"
-
namespace Sword2 {
+class Sword2Engine;
+
//
// Defines
// -------
@@ -282,6 +279,9 @@
#define MAX_KEY_BUFFER 32
class Input {
+private:
+ Sword2Engine *_vm;
+
uint8 _mouseBacklog;
uint8 _mouseLogPos;
_mouseEvent _mouseLog[MAX_MOUSE_EVENTS];
@@ -303,8 +303,8 @@
int16 _mouseX;
int16 _mouseY;
- Input() :
- _mouseBacklog(0), _mouseLogPos(0), _keyBacklog(0),
+ Input(Sword2Engine *vm) :
+ _vm(vm), _mouseBacklog(0), _mouseLogPos(0), _keyBacklog(0),
_keyLogPos(0) {};
void parseEvents(void);
Index: keyboard.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/keyboard.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- keyboard.cpp 11 Nov 2003 07:43:02 -0000 1.13
+++ keyboard.cpp 16 Nov 2003 14:18:29 -0000 1.14
@@ -17,8 +17,8 @@
* $Header$
*/
-#include "stdafx.h"
-#include "sword2/driver/driver96.h"
+#include "common/stdafx.h"
+#include "sword2/sword2.h"
namespace Sword2 {
Index: language.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/language.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- language.cpp 28 Oct 2003 19:51:30 -0000 1.10
+++ language.cpp 16 Nov 2003 14:18:29 -0000 1.11
@@ -17,8 +17,8 @@
* $Header$
*/
-#include "stdafx.h"
-#include "sword2/driver/driver96.h"
+#include "common/stdafx.h"
+#include "sword2/sword2.h"
namespace Sword2 {
Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/menu.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- menu.cpp 11 Nov 2003 10:30:24 -0000 1.22
+++ menu.cpp 16 Nov 2003 14:18:29 -0000 1.23
@@ -17,11 +17,8 @@
* $Header$
*/
-#include "stdafx.h"
-#include "common/rect.h"
-#include "sword2/driver/driver96.h"
-#include "sword2/driver/menu.h"
-#include "sword2/driver/d_draw.h"
+#include "common/stdafx.h"
+#include "sword2/sword2.h"
#include "sword2/driver/render.h"
namespace Sword2 {
@@ -65,10 +62,10 @@
static int32 lastTime = 0;
if (lastTime == 0) {
- lastTime = g_system->get_msecs();
+ lastTime = _vm->_system->get_msecs();
frameCount = 1;
} else {
- delta = g_system->get_msecs() - lastTime;
+ delta = _vm->_system->get_msecs() - lastTime;
if (delta > 250) {
lastTime += delta;
delta = 250;
Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/palette.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- palette.cpp 11 Nov 2003 10:30:25 -0000 1.25
+++ palette.cpp 16 Nov 2003 14:18:29 -0000 1.26
@@ -17,12 +17,10 @@
* $Header$
*/
-#include "stdafx.h"
-#include "common/util.h"
-#include "base/engine.h"
+#include "common/stdafx.h"
+// #include "common/util.h"
+// #include "base/engine.h"
#include "sword2/sword2.h"
-#include "sword2/driver/d_draw.h"
-#include "sword2/driver/driver96.h"
namespace Sword2 {
@@ -116,9 +114,9 @@
if (noEntries) {
memcpy(&_palCopy[startEntry][0], colourTable, noEntries * 4);
if (fadeNow == RDPAL_INSTANT)
- g_system->set_palette((const byte *) _palCopy, startEntry, noEntries);
+ _vm->_system->set_palette((const byte *) _palCopy, startEntry, noEntries);
} else
- g_system->set_palette((const byte *) _palCopy, 0, 256);
+ _vm->_system->set_palette((const byte *) _palCopy, 0, 256);
}
void Graphics::dimPalette(void) {
@@ -127,7 +125,7 @@
for (int i = 0; i < 256 * 4; i++)
p[i] /= 2;
- g_system->set_palette(p, 0, 256);
+ _vm->_system->set_palette(p, 0, 256);
}
/**
@@ -141,7 +139,7 @@
_fadeTotalTime = (int32) (time * 1000);
_fadeStatus = RDFADE_UP;
- _fadeStartTime = g_system->get_msecs();
+ _fadeStartTime = _vm->_system->get_msecs();
return RD_OK;
}
@@ -157,7 +155,7 @@
_fadeTotalTime = (int32) (time * 1000);
_fadeStatus = RDFADE_DOWN;
- _fadeStartTime = g_system->get_msecs();
+ _fadeStartTime = _vm->_system->get_msecs();
return RD_OK;
}
@@ -175,7 +173,7 @@
void Graphics::waitForFade(void) {
while (getFadeStatus() != RDFADE_NONE && getFadeStatus() != RDFADE_BLACK) {
updateDisplay();
- g_system->delay_msecs(20);
+ _vm->_system->delay_msecs(20);
}
}
@@ -196,7 +194,7 @@
// I don't know if this is necessary, but let's limit how often the
// palette is updated, just to be safe.
- currentTime = g_system->get_msecs();
+ currentTime = _vm->_system->get_msecs();
if (currentTime - previousTime <= 25)
return;
@@ -228,7 +226,7 @@
}
}
- g_system->set_palette(newPalette, 0, 256);
+ _vm->_system->set_palette(newPalette, 0, 256);
}
} // End of namespace Sword2
Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/rdwin.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- rdwin.cpp 11 Nov 2003 07:43:02 -0000 1.37
+++ rdwin.cpp 16 Nov 2003 14:18:29 -0000 1.38
@@ -19,11 +19,7 @@
#include "common/stdafx.h"
#include "sword2/sword2.h"
-#include "sword2/driver/driver96.h"
-#include "sword2/driver/d_draw.h"
-#include "sword2/driver/render.h"
#include "sword2/driver/menu.h"
-#include "sword2/driver/d_sound.h"
namespace Sword2 {
@@ -34,7 +30,7 @@
void Input::parseEvents(void) {
OSystem::Event event;
- while (g_system->poll_event(&event)) {
+ while (_vm->_system->poll_event(&event)) {
switch (event.event_code) {
case OSystem::EVENT_KEYDOWN:
writeKey(event.kbd.ascii, event.kbd.keycode, event.kbd.flags);
@@ -56,7 +52,7 @@
logMouseEvent(RD_RIGHTBUTTONUP);
break;
case OSystem::EVENT_QUIT:
- g_sword2->closeGame();
+ _vm->closeGame();
break;
default:
break;
@@ -74,19 +70,19 @@
*/
void Graphics::updateDisplay(void) {
- g_input->parseEvents();
+ _vm->_input->parseEvents();
fadeServer();
// FIXME: We re-render the entire picture area of the screen for each
// frame, which is pretty horrible.
if (_needFullRedraw) {
- g_system->copy_rect(_buffer + MENUDEEP * _screenWide, _screenWide, 0, MENUDEEP, _screenWide, _screenDeep - 2 * MENUDEEP);
+ _vm->_system->copy_rect(_buffer + MENUDEEP * _screenWide, _screenWide, 0, MENUDEEP, _screenWide, _screenDeep - 2 * MENUDEEP);
_needFullRedraw = false;
}
// We still need to update because of fades, menu animations, etc.
- g_system->update_screen();
+ _vm->_system->update_screen();
}
/**
@@ -97,7 +93,7 @@
OSystem::Property prop;
prop.caption = windowName;
- g_system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
+ _vm->_system->property(OSystem::PROP_SET_WINDOW_CAPTION, &prop);
}
} // End of namespace Sword2
Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/render.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- render.cpp 11 Nov 2003 10:30:25 -0000 1.42
+++ render.cpp 16 Nov 2003 14:18:29 -0000 1.43
@@ -17,12 +17,10 @@
* $Header$
*/
-#include "stdafx.h"
-#include "sword2/driver/driver96.h"
-#include "sword2/driver/d_draw.h"
-#include "sword2/driver/render.h"
-#include "sword2/driver/menu.h"
+#include "common/stdafx.h"
#include "sword2/sword2.h"
+#include "sword2/driver/menu.h"
+#include "sword2/driver/render.h"
namespace Sword2 {
@@ -32,7 +30,7 @@
#define BLOCKHBITS 6
void Graphics::updateRect(Common::Rect *r) {
- g_system->copy_rect(_buffer + r->top * _screenWide + r->left,
+ _vm->_system->copy_rect(_buffer + r->top * _screenWide + r->left,
_screenWide, r->left, r->top, r->right - r->left,
r->bottom - r->top);
}
@@ -575,7 +573,7 @@
*/
void Graphics::initialiseRenderCycle(void) {
- _initialTime = g_system->get_msecs();
+ _initialTime = _vm->_system->get_msecs();
_totalTime = _initialTime + MILLISECSPERCYCLE;
}
@@ -588,7 +586,7 @@
_scrollXOld = _scrollX;
_scrollYOld = _scrollY;
- _startTime = g_system->get_msecs();
+ _startTime = _vm->_system->get_msecs();
if (_startTime + _renderAverageTime >= _totalTime) {
_scrollX = _scrollXTarget;
@@ -614,7 +612,7 @@
static int32 renderCountIndex = 0;
int32 time;
- time = g_system->get_msecs();
+ time = _vm->_system->get_msecs();
renderTimeLog[renderCountIndex] = time - _startTime;
_startTime = time;
_renderAverageTime = (renderTimeLog[0] + renderTimeLog[1] + renderTimeLog[2] + renderTimeLog[3]) >> 2;
@@ -639,8 +637,8 @@
if (_scrollXTarget == _scrollX && _scrollYTarget == _scrollY) {
// If we have already reached the scroll target sleep for the
// rest of the render cycle.
- g_sword2->sleepUntil(_totalTime);
- _initialTime = g_system->get_msecs();
+ _vm->sleepUntil(_totalTime);
+ _initialTime = _vm->_system->get_msecs();
_totalTime += MILLISECSPERCYCLE;
return true;
}
Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/sprite.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- sprite.cpp 11 Nov 2003 07:43:02 -0000 1.32
+++ sprite.cpp 16 Nov 2003 14:18:29 -0000 1.33
@@ -17,10 +17,8 @@
* $Header$
*/
-#include "stdafx.h"
-#include "sword2/driver/driver96.h"
-#include "sword2/driver/d_draw.h"
-#include "sword2/driver/render.h"
+#include "common/stdafx.h"
+#include "sword2/sword2.h"
namespace Sword2 {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen command.cpp,1.20,1.21 sound.cpp,1.13,1.14
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.45,1.46 build_display.cpp,1.48,1.49 console.cpp,1.34,1.35 console.h,1.13,1.14 controls.cpp,1.50,1.51 controls.h,1.10,1.11 debug.cpp,1.30,1.31 defs.h,1.7,1.8 events.cpp,1.21,1.22 function.cpp,1.40,1.41 header.h,1.4,1.5 icons.cpp,1.26,1.27 icons.h,1.8,1.9 interpreter.cpp,1.24,1.25 layers.cpp,1.21,1.22 logic.cpp,1.32,1.33 logic.h,1.20,1.21 maketext.cpp,1.29,1.30 maketext.h,1.8,1.9 mem_view.cpp,1.20,1.21 memory.cpp,1.17,1.18 memory.h,1.11,1.12 mouse.cpp,1.43,1.44 mouse.h,1.10,1.11 protocol.cpp,1.19,1.20 resman.cpp,1.71,1.72 resman.h,1.15,1.16 router.cpp,1.30,1.31 router.h,1.11,1.12 save_rest.cpp,1.39,1.40 scroll.cpp,1.14,1.15 sound.cpp,1.34,1.35 speech.cpp,1.49,1.50 startup.cpp,1.33,1.34 sword2.cpp,1.85,1.86 sword2.h,1.41,1.42 sync.cpp,1.14,1.15 tony_gsdk.cpp,1.17,1.18 walker.cpp,1.28,1.29 credits.h,1.7,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list