[Scummvm-cvs-logs] CVS: scummvm/bs2/driver d_sound.cpp,1.5,1.6 d_sound.h,1.2,1.3 driver96.h,1.14,1.15 misc.cpp,1.7,1.8 rdwin.cpp,1.4,1.5
Oliver Kiehl
olki at users.sourceforge.net
Wed Jul 30 12:26:14 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2 anims.cpp,1.6,1.7 build_display.cpp,1.8,1.9 build_display.h,1.2,1.3 console.cpp,1.4,1.5 console.h,1.3,1.4 controls.cpp,1.5,1.6 debug.cpp,1.4,1.5 debug.h,1.3,1.4 function.cpp,1.4,1.5 icons.cpp,1.3,1.4 interpreter.h,1.4,1.5 layers.cpp,1.3,1.4 logic.cpp,1.3,1.4 maketext.cpp,1.5,1.6 mouse.cpp,1.6,1.7 protocol.cpp,1.3,1.4 resman.cpp,1.9,1.10 router.cpp,1.5,1.6 save_rest.cpp,1.5,1.6 sound.cpp,1.6,1.7 speech.cpp,1.9,1.10 startup.cpp,1.6,1.7 sword2.cpp,1.7,1.8 sword2.h,1.3,1.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm Makefile,1.38,1.39 Makefile.common,1.52,1.53 Makefile.mingw,1.17,1.18 configure,1.33,1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv11580/bs2/driver
Modified Files:
d_sound.cpp d_sound.h driver96.h misc.cpp rdwin.cpp
Log Message:
rename bs2 to sword2 to have the same name as the original engine.
besides this way all our engines start with an "s" ;)
Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- d_sound.cpp 29 Jul 2003 12:34:46 -0000 1.5
+++ d_sound.cpp 30 Jul 2003 19:25:30 -0000 1.6
@@ -225,7 +225,7 @@
//
// --------------------------------------------------------------------------
//
-// int32 StopSpeechBS2(void)
+// int32 StopSpeechSword2(void)
//
// Stops the speech from playing.
//
@@ -405,7 +405,7 @@
-BS2Sound::BS2Sound(void) {
+Sword2Sound::Sword2Sound(void) {
soundOn = 0;
speechStatus = 0;
@@ -461,7 +461,7 @@
// --------------------------------------------------------------------------
// This function reverse the pan table, thus reversing the stereo.
// --------------------------------------------------------------------------
-int32 BS2Sound::ReverseStereo(void)
+int32 Sword2Sound::ReverseStereo(void)
{
int32 i,j;
@@ -480,7 +480,7 @@
// --------------------------------------------------------------------------
// This function returns the index of the sound effect with the ID passed in.
// --------------------------------------------------------------------------
-int32 BS2Sound::GetFxIndex(int32 id)
+int32 Sword2Sound::GetFxIndex(int32 id)
{
@@ -498,7 +498,7 @@
}
-int32 BS2Sound::IsFxOpen(int32 id)
+int32 Sword2Sound::IsFxOpen(int32 id)
{
int32 i = 0;
@@ -523,7 +523,7 @@
// out the ones which are no longer required in a buffer. It is called on
// a slow timer from rdwin.c
// --------------------------------------------------------------------------
-void BS2Sound::FxServer(void)
+void Sword2Sound::FxServer(void)
{
warning("stub FxServer");
@@ -586,7 +586,7 @@
-int32 BS2Sound::InitialiseSound(uint16 freq, uint16 channels, uint16 bitDepth)
+int32 Sword2Sound::InitialiseSound(uint16 freq, uint16 channels, uint16 bitDepth)
{
warning("stub InitaliseSound( %d, %d, %d )", freq, channels, bitDepth);
@@ -672,7 +672,7 @@
}
-int32 BS2Sound::PlaySpeech(uint8 *data, uint8 vol, int8 pan)
+int32 Sword2Sound::PlaySpeech(uint8 *data, uint8 vol, int8 pan)
{
warning("stub PlaySpeech");
@@ -776,7 +776,7 @@
}
-int32 BS2Sound::AmISpeaking()
+int32 Sword2Sound::AmISpeaking()
{
warning("stub AmISpeaking");
/*
@@ -820,7 +820,7 @@
}
-int32 BS2Sound::GetCompSpeechSize(const char *filename, uint32 speechid)
+int32 Sword2Sound::GetCompSpeechSize(const char *filename, uint32 speechid)
{
int32 i;
uint32 speechIndex[2];
@@ -857,7 +857,7 @@
}
-int32 BS2Sound::PreFetchCompSpeech(const char *filename, uint32 speechid, uint8 *waveMem)
+int32 Sword2Sound::PreFetchCompSpeech(const char *filename, uint32 speechid, uint8 *waveMem)
{
uint32 i;
uint16 *data16;
@@ -951,7 +951,7 @@
}
-int32 BS2Sound::PlayCompSpeech(const char *filename, uint32 speechid, uint8 vol, int8 pan)
+int32 Sword2Sound::PlayCompSpeech(const char *filename, uint32 speechid, uint8 vol, int8 pan)
{
warning("stub PlayCompSpeech( %s, %d, %d, %d )", filename, speechid, vol, pan);
/*
@@ -1114,10 +1114,10 @@
}
-int32 BS2Sound::StopSpeechBS2(void)
+int32 Sword2Sound::StopSpeechSword2(void)
{
- warning("stub StopSpeechBS2");
+ warning("stub StopSpeechSword2");
/*
int32 status;
@@ -1146,7 +1146,7 @@
-int32 BS2Sound::GetSpeechStatus(void)
+int32 Sword2Sound::GetSpeechStatus(void)
{
warning("stub GetSpeechStatus");
/*
@@ -1175,7 +1175,7 @@
}
-void BS2Sound::SetSpeechVolume(uint8 volume)
+void Sword2Sound::SetSpeechVolume(uint8 volume)
{
warning("stub SetSpeechVolume");
/*
@@ -1186,13 +1186,13 @@
}
-uint8 BS2Sound::GetSpeechVolume()
+uint8 Sword2Sound::GetSpeechVolume()
{
return speechVol;
}
-void BS2Sound::MuteSpeech(uint8 mute)
+void Sword2Sound::MuteSpeech(uint8 mute)
{
warning("stub MuteSpeech( %d )", mute);
/*
@@ -1209,13 +1209,13 @@
}
-uint8 BS2Sound::IsSpeechMute(void)
+uint8 Sword2Sound::IsSpeechMute(void)
{
return (speechMuted);
}
-int32 BS2Sound::PauseSpeech(void)
+int32 Sword2Sound::PauseSpeech(void)
{
warning("PauseSpeech");
/*
@@ -1228,7 +1228,7 @@
return(RD_OK);
}
-int32 BS2Sound::UnpauseSpeech(void)
+int32 Sword2Sound::UnpauseSpeech(void)
{
warning("UnpauseSpeech");
/*
@@ -1242,7 +1242,7 @@
}
-int32 BS2Sound::OpenFx(int32 id, uint8 *data)
+int32 Sword2Sound::OpenFx(int32 id, uint8 *data)
{
warning("stub OpenFx( %d )", id);
@@ -1357,7 +1357,7 @@
}
-int32 BS2Sound::PlayFx(int32 id, uint8 *data, uint8 vol, int8 pan, uint8 type)
+int32 Sword2Sound::PlayFx(int32 id, uint8 *data, uint8 vol, int8 pan, uint8 type)
{
warning("stub PlayFx( %d, %d, %d, %d )", id, vol, pan, type);
@@ -1463,7 +1463,7 @@
}
-int32 BS2Sound::SetFxVolumePan(int32 id, uint8 vol, int8 pan)
+int32 Sword2Sound::SetFxVolumePan(int32 id, uint8 vol, int8 pan)
{
warning("stub SetFxVolumePan( %d, %d, %d )", id, vol, pan);
/*
@@ -1479,7 +1479,7 @@
return RD_OK;
}
-int32 BS2Sound::SetFxIdVolume(int32 id, uint8 vol)
+int32 Sword2Sound::SetFxIdVolume(int32 id, uint8 vol)
{
warning("stub SetFxIdVolume( %d, %d )", id, vol);
/*
@@ -1496,7 +1496,7 @@
-int32 BS2Sound::ClearAllFx(void)
+int32 Sword2Sound::ClearAllFx(void)
{
warning("stub ClearAllFx");
@@ -1531,7 +1531,7 @@
}
-int32 BS2Sound::CloseFx(int32 id)
+int32 Sword2Sound::CloseFx(int32 id)
{
warning("stub CloseFx( %d )", id);
@@ -1562,7 +1562,7 @@
}
-int32 BS2Sound::PauseFx(void)
+int32 Sword2Sound::PauseFx(void)
{
warning("stub PauseFx");
@@ -1597,7 +1597,7 @@
}
-int32 BS2Sound::PauseFxForSequence(void)
+int32 Sword2Sound::PauseFxForSequence(void)
{
warning("stub PauseFxForSequence");
@@ -1632,7 +1632,7 @@
-int32 BS2Sound::UnpauseFx(void)
+int32 Sword2Sound::UnpauseFx(void)
{
warning("stub UnpauseFx");
@@ -1657,13 +1657,13 @@
-uint8 BS2Sound::GetFxVolume()
+uint8 Sword2Sound::GetFxVolume()
{
return fxVol;
}
-void BS2Sound::SetFxVolume(uint8 volume)
+void Sword2Sound::SetFxVolume(uint8 volume)
{
warning("stub SetFxVolume( %d )", volume);
/*
@@ -1680,7 +1680,7 @@
}
-void BS2Sound::MuteFx(uint8 mute)
+void Sword2Sound::MuteFx(uint8 mute)
{
warning("stub MuteFx( %d )");
/*
@@ -1702,7 +1702,7 @@
*/
}
-uint8 BS2Sound::IsFxMute(void)
+uint8 Sword2Sound::IsFxMute(void)
{
return (fxMuted);
}
@@ -1710,7 +1710,7 @@
-void BS2Sound::StartMusicFadeDown(int i)
+void Sword2Sound::StartMusicFadeDown(int i)
{
@@ -1723,7 +1723,7 @@
}
-int32 BS2Sound::StreamMusic(uint8 *filename, int32 looping)
+int32 Sword2Sound::StreamMusic(uint8 *filename, int32 looping)
{
warning("stub StreamMusic( %s, %d )", filename, looping);
@@ -1966,7 +1966,7 @@
}
-void BS2Sound::UpdateSampleStreaming(void)
+void Sword2Sound::UpdateSampleStreaming(void)
{
warning("stub UpdateSampleStreaming");
@@ -2122,7 +2122,7 @@
-int32 BS2Sound::StreamCompMusic(const char *filename, uint32 musicId, int32 looping)
+int32 Sword2Sound::StreamCompMusic(const char *filename, uint32 musicId, int32 looping)
{
warning("stub StreamCompMusic( %s, %d, %d )", filename, musicId, looping);
/*
@@ -2533,7 +2533,7 @@
}
-void BS2Sound::UpdateCompSampleStreaming(void)
+void Sword2Sound::UpdateCompSampleStreaming(void)
{
warning("stub UpdateCompSampleStreaming");
/*
@@ -2743,7 +2743,7 @@
*/
}
-int32 BS2Sound::DipMusic()
+int32 Sword2Sound::DipMusic()
{
warning("stub DipMusic");
/*
@@ -2818,7 +2818,7 @@
return RD_OK;
}
-int32 BS2Sound::MusicTimeRemaining()
+int32 Sword2Sound::MusicTimeRemaining()
{
warning("stub MusicTimeRemaaining");
/*
@@ -2845,7 +2845,7 @@
-void BS2Sound::StopMusic(void)
+void Sword2Sound::StopMusic(void)
{
int32 i;
@@ -2880,7 +2880,7 @@
}
-int32 BS2Sound::PauseMusic(void)
+int32 Sword2Sound::PauseMusic(void)
{
warning("stub PauseMusic");
/*
@@ -2907,7 +2907,7 @@
return(RD_OK);
}
-int32 BS2Sound::UnpauseMusic(void)
+int32 Sword2Sound::UnpauseMusic(void)
{
warning("stub UnpauseMusic");
/*
@@ -2932,7 +2932,7 @@
}
-void BS2Sound::SetMusicVolume(uint8 volume)
+void Sword2Sound::SetMusicVolume(uint8 volume)
{
warning("stub SetMusicVolume( %d )", volume);
/*
@@ -2947,13 +2947,13 @@
}
-uint8 BS2Sound::GetMusicVolume()
+uint8 Sword2Sound::GetMusicVolume()
{
return (uint8) volMusic[0];
}
-void BS2Sound::MuteMusic(uint8 mute)
+void Sword2Sound::MuteMusic(uint8 mute)
{
warning("stub MuteMusic( %d )", mute);
/*
@@ -2981,14 +2981,14 @@
}
-uint8 BS2Sound::IsMusicMute(void)
+uint8 Sword2Sound::IsMusicMute(void)
{
return (musicMuted);
}
-void BS2Sound::GetSoundStatus(_drvSoundStatus *s)
+void Sword2Sound::GetSoundStatus(_drvSoundStatus *s)
{
int i;
@@ -3033,7 +3033,7 @@
}
-void BS2Sound::SetSoundStatus(_drvSoundStatus *s)
+void Sword2Sound::SetSoundStatus(_drvSoundStatus *s)
{
int i;
Index: d_sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- d_sound.h 29 Jul 2003 12:34:46 -0000 1.2
+++ d_sound.h 30 Jul 2003 19:25:30 -0000 1.3
@@ -40,9 +40,9 @@
#include "sound/mixer.h"
-class BS2Sound {
+class Sword2Sound {
public:
- BS2Sound(void);
+ Sword2Sound(void);
void FxServer(void);
int32 InitialiseSound(uint16 freq, uint16 channels, uint16 bitDepth);
int32 PlaySpeech(uint8 *data, uint8 vol, int8 pan);
@@ -50,7 +50,7 @@
int32 PreFetchCompSpeech(const char *filename, uint32 speechid, uint8 *waveMem);
int32 GetCompSpeechSize(const char *filename, uint32 speechid);
int32 AmISpeaking();
- int32 StopSpeechBS2(void);
+ int32 StopSpeechSword2(void);
int32 GetSpeechStatus(void);
int32 PauseSpeech(void);
int32 UnpauseSpeech(void);
Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/driver96.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- driver96.h 29 Jul 2003 12:34:46 -0000 1.14
+++ driver96.h 30 Jul 2003 19:25:30 -0000 1.15
@@ -824,7 +824,7 @@
//
// --------------------------------------------------------------------------
//
-// int32 StopSpeechBS2(void)
+// int32 StopSpeechSword2(void)
//
// Stops the speech from playing.
//
@@ -1582,7 +1582,7 @@
//-----------------------------------------------------------------------------
// Macro for reporting a non-fatal driver error
//-----------------------------------------------------------------------------
-#ifdef _BS2_DEBUG
+#ifdef _SWORD2_DEBUG
static int32 rderror;
#define Driver(f) \
if (rderror = f) \
Index: misc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/misc.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- misc.cpp 28 Jul 2003 08:04:03 -0000 1.7
+++ misc.cpp 30 Jul 2003 19:25:30 -0000 1.8
@@ -22,7 +22,7 @@
#include "../sword2.h"
uint32 SVM_timeGetTime(void) {
- return g_bs2->_syst->get_msecs();
+ return g_sword2->_syst->get_msecs();
}
void SVM_VirtualUnlock(uint8 *free_memman, uint32 total_free_memory) {
Index: rdwin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/rdwin.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rdwin.cpp 28 Jul 2003 07:22:40 -0000 1.4
+++ rdwin.cpp 30 Jul 2003 19:25:30 -0000 1.5
@@ -149,7 +149,7 @@
//-----------------------------------------------------------------------------
// OSystem Event Handler. Full of cross platform goodness and 99% fat free!
//-----------------------------------------------------------------------------
-void BS2State::parseEvents() {
+void Sword2State::parseEvents() {
OSystem::Event event;
while (_system->poll_event(&event)) {
@@ -537,7 +537,7 @@
DestroyWindow(hwnd);
*/
// just quit for now
- g_bs2->_syst->quit();
+ g_sword2->_syst->quit();
return(RD_OK);
}
@@ -547,7 +547,7 @@
int32 ServiceWindows(void)
{
- g_bs2->parseEvents();
+ g_sword2->parseEvents();
// warning("stub ServiceWindows"); // too noisy
/*
MSG msg;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2 anims.cpp,1.6,1.7 build_display.cpp,1.8,1.9 build_display.h,1.2,1.3 console.cpp,1.4,1.5 console.h,1.3,1.4 controls.cpp,1.5,1.6 debug.cpp,1.4,1.5 debug.h,1.3,1.4 function.cpp,1.4,1.5 icons.cpp,1.3,1.4 interpreter.h,1.4,1.5 layers.cpp,1.3,1.4 logic.cpp,1.3,1.4 maketext.cpp,1.5,1.6 mouse.cpp,1.6,1.7 protocol.cpp,1.3,1.4 resman.cpp,1.9,1.10 router.cpp,1.5,1.6 save_rest.cpp,1.5,1.6 sound.cpp,1.6,1.7 speech.cpp,1.9,1.10 startup.cpp,1.6,1.7 sword2.cpp,1.7,1.8 sword2.h,1.3,1.4
- Next message: [Scummvm-cvs-logs] CVS: scummvm Makefile,1.38,1.39 Makefile.common,1.52,1.53 Makefile.mingw,1.17,1.18 configure,1.33,1.34
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list