[Scummvm-git-logs] scummvm master -> ec8a35dc5dd399aa7f766fb57d83c3d17c47e2b5
mduggan
noreply at scummvm.org
Sun Jul 7 06:41:02 UTC 2024
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e3b13b3c62 DGDS: Remove unused variable
76a2745922 DGDS: Small cleanups
ec8a35dc5d DGDS: Update TTM opcodes slightly
Commit: e3b13b3c62af509871aca79c68255ebda58d8974
https://github.com/scummvm/scummvm/commit/e3b13b3c62af509871aca79c68255ebda58d8974
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-07-07T16:35:05+10:00
Commit Message:
DGDS: Remove unused variable
Changed paths:
engines/dgds/globals.cpp
diff --git a/engines/dgds/globals.cpp b/engines/dgds/globals.cpp
index 99132bc429f..5d99e76ce1a 100644
--- a/engines/dgds/globals.cpp
+++ b/engines/dgds/globals.cpp
@@ -61,8 +61,6 @@ _lastOpcode1SceneChageNum(0), _sceneOp12SceneNum(0), _currentSelectedItem(0),
_gameMinsToAddOnLClick(0), _gameMinsToAddOnStartDrag(0), _gameMinsToAddOnRClick(0), _gameMinsToAddOnDragFinished(0),
_gameMinsToAddOnObjInteraction(0), _gameIsInteractiveGlobal(0), _sceneOpcode15FromScene(0),
_sceneOpcode15ToScene(0) {
- DgdsEngine *engine = static_cast<DgdsEngine *>(g_engine);
-
_globals.push_back(clock.getGameMinsAddedGlobal(1));
_globals.push_back(clock.getGameTicksUpGlobal(0x64));
_globals.push_back(clock.getGameTicksDownGlobal(0x63));
Commit: 76a2745922a240d9753c94c7bb2437cec6eb4490
https://github.com/scummvm/scummvm/commit/76a2745922a240d9753c94c7bb2437cec6eb4490
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-07-07T16:35:58+10:00
Commit Message:
DGDS: Small cleanups
Changed paths:
engines/dgds/globals.cpp
engines/dgds/globals.h
engines/dgds/request.cpp
engines/dgds/scene.cpp
diff --git a/engines/dgds/globals.cpp b/engines/dgds/globals.cpp
index 5d99e76ce1a..bbeedcb8474 100644
--- a/engines/dgds/globals.cpp
+++ b/engines/dgds/globals.cpp
@@ -82,16 +82,14 @@ _sceneOpcode15ToScene(0) {
}
Globals::~Globals() {
- for (auto &g : _globals) {
+ for (auto &g : _globals)
delete g;
- }
}
int16 Globals::getGlobal(uint16 num) {
for (auto &global : _globals) {
- if (global->_num == num) {
+ if (global->getNum() == num)
return global->get();
- }
}
error("getGlobal: requested non-existing global %d", num);
@@ -99,9 +97,8 @@ int16 Globals::getGlobal(uint16 num) {
int16 Globals::setGlobal(uint16 num, int16 val) {
for (auto &global : _globals) {
- if (global->_num == num) {
+ if (global->getNum() == num)
return global->set(val);
- }
}
error("setGlobal: requested non-existing global %d", num);
diff --git a/engines/dgds/globals.h b/engines/dgds/globals.h
index acd9de82384..fb8c60dae87 100644
--- a/engines/dgds/globals.h
+++ b/engines/dgds/globals.h
@@ -45,11 +45,12 @@ class Global {
public:
Global(uint16 num) : _num(num) {}
virtual ~Global() {}
- uint16 _num;
virtual int16 get() = 0;
virtual int16 set(int16 val) = 0;
virtual uint16 getNum() const { return _num; }
virtual void setRaw(int16 val) = 0; /// only for use in loading state.
+private:
+ uint16 _num;
};
/*
diff --git a/engines/dgds/request.cpp b/engines/dgds/request.cpp
index ab39930d85b..e105db7bbd7 100644
--- a/engines/dgds/request.cpp
+++ b/engines/dgds/request.cpp
@@ -366,19 +366,19 @@ void ButtonGadget::draw(Graphics::ManagedSurface *dst) const {
int fontHeight = font->getFontHeight();
- bool twoline;
+ //bool twoline;
int yoffset;
uint32 linebreak = name.find('&');
Common::String line1, line2;
if (linebreak != Common::String::npos) {
- twoline = true;
+ //twoline = true;
name.setChar(' ', linebreak);
yoffset = _height + 1 - fontHeight * 2;
line1 = _buttonName.substr(0, linebreak);
line2 = _buttonName.substr(linebreak + 1);
} else {
- twoline = false;
+ //twoline = false;
yoffset = _height - fontHeight;
line1 = _buttonName;
}
diff --git a/engines/dgds/scene.cpp b/engines/dgds/scene.cpp
index cfa63e87bbf..292e6fed723 100644
--- a/engines/dgds/scene.cpp
+++ b/engines/dgds/scene.cpp
@@ -83,6 +83,8 @@ Common::String _sceneConditionStr(SceneCondition cflag) {
ret += "equal";
if (cflag & kSceneCondNegate)
ret += "-not";
+ if (cflag & kSceneCondAbsVal)
+ ret += "(abs)";
return ret;
}
Commit: ec8a35dc5dd399aa7f766fb57d83c3d17c47e2b5
https://github.com/scummvm/scummvm/commit/ec8a35dc5dd399aa7f766fb57d83c3d17c47e2b5
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-07-07T16:37:09+10:00
Commit Message:
DGDS: Update TTM opcodes slightly
Changed paths:
engines/dgds/ttm.cpp
diff --git a/engines/dgds/ttm.cpp b/engines/dgds/ttm.cpp
index 385ed008920..ae2372a8812 100644
--- a/engines/dgds/ttm.cpp
+++ b/engines/dgds/ttm.cpp
@@ -135,12 +135,13 @@ static const char *ttmOpName(uint16 op) {
case 0x0000: return "FINISH";
case 0x0020: return "SAVE(free?) BACKGROUND";
case 0x0070: return "FREE PALETTE";
- case 0x0080: return "FREE SHAPE / DRAW BACKGROUND??";
+ case 0x0080: return "FREE SHAPE";
case 0x0090: return "FREE FONT";
case 0x00B0: return "NULLOP";
case 0x0110: return "PURGE";
case 0x0400: return "PALETTE RESET ?";
- case 0x0510: return "UNKNOWN 0x0510";
+ case 0x0500: return "UNKNOWN 0x0500 (flip mode ?)";
+ case 0x0510: return "UNKNOWN 0x0510 (flip mode off?)";
case 0x0ff0: return "FINISH FRAME / DRAW";
case 0x1020: return "SET DELAY";
case 0x1030: return "SET BRUSH";
@@ -168,7 +169,7 @@ static const char *ttmOpName(uint16 op) {
case 0x4200: return "STORE AREA";
case 0x4210: return "SAVE GETPUT REGION";
case 0xa000: return "DRAW PIXEL";
- case 0xa010: return "WIPE 10?";
+ case 0xa010: return "WIPE DISSOLVE";
case 0xa020: return "WIPE 20?";
case 0xa030: return "WIPE OUT-TO-IN";
case 0xa040: return "WIPE INTERLACED";
@@ -226,6 +227,7 @@ static const char *ttmOpName(uint16 op) {
case 0xc040: return "DESELECT_SAMPLE";
case 0xc050: return "PLAY_SAMPLE";
case 0xc060: return "STOP_SAMPLE";
+ case 0xc0e0: return "FADE SONG";
default: return "UNKNOWN!!";
}
@@ -895,6 +897,7 @@ void TTMInterpreter::handleOperation(TTMEnviro &env, TTMSeq &seq, uint16 op, byt
case 0xb600: // DRAW SCREEN?? 6 args // HoC onward
case 0xc040: // DESELECT_SAMPLE // SQ5 demo onward
case 0xc060: // STOP_SAMPLE // SQ5 demo onward
+ case 0xc0e0: // FADE SONG songnum, destvol, ticks (1/60th sec)
default:
if (count < 15)
More information about the Scummvm-git-logs
mailing list