mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-24 11:36:22 +00:00
CGE: Remove mixer
This commit is contained in:
Strangerke
parent
8de4d8c402
commit
e69c7a3ac4
@ -46,7 +46,6 @@
|
||||
#include "cge/talk.h"
|
||||
#include "cge/vmenu.h"
|
||||
#include "cge/gettext.h"
|
||||
#include "cge/mixer.h"
|
||||
#include "cge/cge_main.h"
|
||||
#include "cge/cge.h"
|
||||
#include "cge/walk.h"
|
||||
@ -257,12 +256,6 @@ Common::Error CGEEngine::saveGameState(int slot, const Common::String &desc) {
|
||||
|
||||
void CGEEngine::saveSound() {
|
||||
warning("STUB: CGEEngine::saveSound");
|
||||
/* Convert to saving any such needed data in ScummVM configuration file
|
||||
|
||||
CFile cfg(usrPath(progName(CFG_EXT)), WRI);
|
||||
if (!cfg._error)
|
||||
cfg.write(&_sndDrvInfo, sizeof(_sndDrvInfo) - sizeof(_sndDrvInfo.Vol2));
|
||||
*/
|
||||
}
|
||||
|
||||
void CGEEngine::saveGame(int slotNumber, const Common::String &desc) {
|
||||
@ -914,13 +907,10 @@ void CGEEngine::optionTouch(int opt, uint16 mask) {
|
||||
switchColorMode();
|
||||
break;
|
||||
case 2:
|
||||
if (mask & kMouseLeftUp) {
|
||||
if (mask & kMouseLeftUp)
|
||||
switchMusic();
|
||||
} else if (mask & kMouseRightUp)
|
||||
if (!Mixer::_appear) {
|
||||
Mixer::_appear = true;
|
||||
new Mixer(this, kButtonX, kButtonY);
|
||||
}
|
||||
else if (mask & kMouseRightUp)
|
||||
warning("TODO: Use ScummVM sound dialog");
|
||||
break;
|
||||
case 3:
|
||||
if (mask & kMouseLeftUp)
|
||||
|
||||
@ -1,150 +0,0 @@
|
||||
/* ScummVM - Graphic Adventure Engine
|
||||
*
|
||||
* ScummVM is the legal property of its developers, whose names
|
||||
* are too numerous to list here. Please refer to the COPYRIGHT
|
||||
* file distributed with this source distribution.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
* This code is based on original Soltys source code
|
||||
* Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
|
||||
*/
|
||||
|
||||
#include "cge/mixer.h"
|
||||
#include "cge/text.h"
|
||||
#include "cge/snail.h"
|
||||
#include "cge/events.h"
|
||||
#include "cge/snddrv.h"
|
||||
#include "cge/cge_main.h"
|
||||
|
||||
namespace CGE {
|
||||
|
||||
extern Mouse *Mouse;
|
||||
|
||||
bool Mixer::_appear = false;
|
||||
|
||||
Mixer::Mixer(CGEEngine *vm, int x, int y) : Sprite(vm, NULL), _fall(kMixFall), _vm(vm) {
|
||||
_appear = true;
|
||||
_mb[0] = new Bitmap("VOLUME");
|
||||
_mb[1] = NULL;
|
||||
setShapeList(_mb);
|
||||
setName(_text->getText(kMixName));
|
||||
_flags._syst = true;
|
||||
_flags._kill = true;
|
||||
_flags._bDel = true;
|
||||
gotoxy(x, y);
|
||||
_z = kMixZ;
|
||||
|
||||
// slaves
|
||||
|
||||
Seq ls[kMixMax];
|
||||
|
||||
for (uint i = 0; i < kMixMax; i++) {
|
||||
static char fn[] = "V00";
|
||||
wtom(i, fn + 1, 10, 2);
|
||||
_lb[i] = new Bitmap(fn);
|
||||
ls[i]._now = ls[i]._next = i;
|
||||
ls[i]._dx = ls[i]._dy = ls[i]._dly = 0;
|
||||
}
|
||||
_lb[kMixMax] = NULL;
|
||||
|
||||
for (uint i = 0; i < ArrayCount(_led); i++) {
|
||||
register Sprite *spr = new Sprite(_vm, _lb);
|
||||
|
||||
Seq *seq = (Seq *)malloc(kMixMax * sizeof(Seq));
|
||||
Common::copy(ls, ls + kMixMax, seq);
|
||||
spr->setSeq(seq);
|
||||
|
||||
spr->gotoxy(x + 2 + 12 * i, y + 8);
|
||||
spr->_flags._tran = true;
|
||||
spr->_flags._kill = true;
|
||||
spr->_flags._bDel = false;
|
||||
spr->_z = kMixZ;
|
||||
_led[i] = spr;
|
||||
}
|
||||
_led[ArrayCount(_led) - 1]->_flags._bDel = true;
|
||||
|
||||
_vga->_showQ->insert(this);
|
||||
for (uint i = 0; i < ArrayCount(_led); i++)
|
||||
_vga->_showQ->insert(_led[i]);
|
||||
|
||||
//--- reset balance
|
||||
warning("STUB: MIXER::MIXER() reset balance of digital and midi volumes");
|
||||
/* i = (_sndDrvInfo.Vol4._ml + _sndDrvInfo.Vol4._mr) / 2;
|
||||
_sndDrvInfo.Vol4._ml = i;
|
||||
_sndDrvInfo.Vol4._mr = i;
|
||||
i = (_sndDrvInfo.Vol4._dl + _sndDrvInfo.Vol4._dr) / 2;
|
||||
_sndDrvInfo.Vol4._dl = i;
|
||||
_sndDrvInfo.Vol4._dr = i;
|
||||
*/
|
||||
update();
|
||||
_time = kMixDelay;
|
||||
}
|
||||
|
||||
Mixer::~Mixer() {
|
||||
_appear = false;
|
||||
}
|
||||
|
||||
#pragma argsused
|
||||
void Mixer::touch(uint16 mask, int x, int y) {
|
||||
Sprite::touch(mask, x, y);
|
||||
|
||||
if (mask & kMouseLeftUp) {
|
||||
warning("STUB: Mixer::touch(): Digital Volume");
|
||||
/* uint8 *vol = (&_sndDrvInfo.Vol2._d) + (x < _w / 2);
|
||||
if (y < kMixButtonHigh) {
|
||||
if (*vol < 0xFF)
|
||||
*vol += 0x11;
|
||||
} else if (y >= _h - kMixButtonHigh) {
|
||||
if (*vol > 0x00)
|
||||
*vol -= 0x11;
|
||||
}
|
||||
update();
|
||||
*/
|
||||
}
|
||||
}
|
||||
|
||||
void Mixer::tick() {
|
||||
int x = _mouse->_x;
|
||||
int y = _mouse->_y;
|
||||
if (spriteAt(x, y) == this) {
|
||||
_fall = kMixFall;
|
||||
if (_flags._hold)
|
||||
touch(kMouseLeftUp, x - _x, y - _y);
|
||||
} else {
|
||||
if (_fall) {
|
||||
_fall--;
|
||||
} else {
|
||||
for (uint i = 0; i < ArrayCount(_led); i++)
|
||||
_snail_->addCom(kSnKill, -1, 0, _led[i]);
|
||||
_snail_->addCom(kSnKill, -1, 0, this);
|
||||
}
|
||||
}
|
||||
_time = kMixDelay;
|
||||
}
|
||||
|
||||
void Mixer::update() {
|
||||
warning("STUB: Mixer::Update");
|
||||
/*
|
||||
_led[0]->step(_sndDrvInfo.Vol4._ml);
|
||||
_led[1]->step(_sndDrvInfo.Vol4._dl);
|
||||
*/
|
||||
_snail_->addCom2(kSnExec, -1, 0, kSndSetVolume);
|
||||
}
|
||||
|
||||
} // End of namespace CGE
|
||||
@ -1,60 +0,0 @@
|
||||
/* ScummVM - Graphic Adventure Engine
|
||||
*
|
||||
* ScummVM is the legal property of its developers, whose names
|
||||
* are too numerous to list here. Please refer to the COPYRIGHT
|
||||
* file distributed with this source distribution.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*
|
||||
*/
|
||||
|
||||
/*
|
||||
* This code is based on original Soltys source code
|
||||
* Copyright (c) 1994-1995 Janus B. Wisniewski and L.K. Avalon
|
||||
*/
|
||||
|
||||
#ifndef __CGE_MIXER__
|
||||
#define __CGE_MIXER__
|
||||
|
||||
#include "cge/vga13h.h"
|
||||
|
||||
namespace CGE {
|
||||
|
||||
#define kMixMax 16 // count of Leds
|
||||
#define kMixZ 64 // mixer Z position
|
||||
#define kMixDelay 12 // 6/s
|
||||
#define kMixFall 6 // in MIX_DELAY units
|
||||
#define kMixButtonHigh 6 // mixer button high
|
||||
#define kMixName 105 // sprite name
|
||||
|
||||
class Mixer : public Sprite {
|
||||
BitmapPtr _mb[2];
|
||||
BitmapPtr _lb[kMixMax + 1];
|
||||
Sprite *_led[2];
|
||||
int _fall;
|
||||
void update();
|
||||
public:
|
||||
static bool _appear;
|
||||
Mixer(CGEEngine *vm, int x, int y);
|
||||
~Mixer();
|
||||
void touch(uint16 mask, int x, int y);
|
||||
void tick();
|
||||
private:
|
||||
CGEEngine *_vm;
|
||||
};
|
||||
|
||||
} // End of namespace CGE
|
||||
|
||||
#endif
|
||||
@ -12,7 +12,6 @@ MODULE_OBJS := \
|
||||
game.o \
|
||||
general.o \
|
||||
gettext.o \
|
||||
mixer.o \
|
||||
snail.o \
|
||||
sound.o \
|
||||
talk.o \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user