ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

synced imuse digital with scummvm imuse and related stuff

Browse Source
This commit is contained in:
Pawel Kolodziejski
2008-03-10 23:06:07 +00:00
parent 857527b278
commit f11e24b7b1
32 changed files with 1536 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/lua.cpp
+10 -8
View File
@@ -42,6 +42,8 @@
#include "engine/imuse/imuse.h"
#include "mixer/mixer.h"
#include <cstdio>
#include <cmath>
#include <zlib.h>
@@ -1880,7 +1882,7 @@ static void ImStartSound() {
group = check_int(3);
// Start the sound with the appropriate settings
if (g_imuse->startSound(soundName, group, 0, 127, 0, priority)) {
if (g_imuse->startSound(soundName, group, 0, 127, 0, priority, NULL)) {
lua_pushstring(soundName);
} else {
// Allow soft failing when loading sounds, hard failing when not
@@ -1929,32 +1931,32 @@ static void ImSetVoiceEffect() {
static void ImSetMusicVol() {
DEBUG_FUNCTION();
g_imuse->setGroupMusicVolume(check_int(1));
g_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, check_int(1));
}
static void ImGetMusicVol() {
DEBUG_FUNCTION();
lua_pushnumber(g_imuse->getGroupMusicVolume());
lua_pushnumber(g_mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType));
}
static void ImSetVoiceVol() {
DEBUG_FUNCTION();
g_imuse->setGroupVoiceVolume(check_int(1));
g_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, check_int(1));
}
static void ImGetVoiceVol() {
DEBUG_FUNCTION();
lua_pushnumber(g_imuse->getGroupVoiceVolume());
lua_pushnumber(g_mixer->getVolumeForSoundType(Audio::Mixer::kSpeechSoundType));
}
static void ImSetSfxVol() {
DEBUG_FUNCTION();
g_imuse->setGroupSfxVolume(check_int(1));
g_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, check_int(1));
}
static void ImGetSfxVol() {
DEBUG_FUNCTION();
lua_pushnumber(g_imuse->getGroupSfxVolume());
lua_pushnumber(g_mixer->getVolumeForSoundType(Audio::Mixer::kSFXSoundType));
}
static void ImSetParam() {
@@ -2961,7 +2963,7 @@ static void GetSaveGameImage() {
filename = luaL_check_string(1);
SaveGame *savedState = new SaveGame(filename, false);
dataSize = savedState->beginSection('SIMG');
data = (char *)malloc(dataSize);
data = new char[dataSize];
savedState->read(data, dataSize);
screenshot = new Bitmap(data, width, height, "screenshot");
if (screenshot) {