aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/dm.cpp
diff options
context:
space:
mode:
authorBendegúz Nagy2016-07-04 14:22:17 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commit94c878143e75e872ba8c82b31a5564c9b4e6437c (patch)
tree922ef19851d85f21e948f8475a834eec5de48958 /engines/dm/dm.cpp
parent01ed61e06642b506ba2c471002a410bbbb659167 (diff)
downloadscummvm-rg350-94c878143e75e872ba8c82b31a5564c9b4e6437c.tar.gz
scummvm-rg350-94c878143e75e872ba8c82b31a5564c9b4e6437c.tar.bz2
scummvm-rg350-94c878143e75e872ba8c82b31a5564c9b4e6437c.zip
DM: Add F0108_DUNGEONVIEW_DrawFloorOrnament
Diffstat (limited to 'engines/dm/dm.cpp')
-rw-r--r--engines/dm/dm.cpp27
1 files changed, 15 insertions, 12 deletions
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp
index ae7852d649..7de740d3a9 100644
--- a/engines/dm/dm.cpp
+++ b/engines/dm/dm.cpp
@@ -72,12 +72,16 @@ uint16 getFlag(uint16 val, uint16 mask) {
return val & mask;
}
-void setFlag(uint16 &val, uint16 mask) {
- val |= mask;
+uint16 setFlag(uint16 &val, uint16 mask) {
+ return val |= mask;
}
-void clearFlag(uint16 &val, uint16 mask) {
- val &= ~mask;
+uint16 clearFlag(uint16 &val, uint16 mask) {
+ return val &= ~mask;
+}
+
+uint16 toggleFlag(uint16& val, uint16 mask) {
+ return val ^= mask;
}
DMEngine::DMEngine(OSystem *syst) : Engine(syst), _console(nullptr) {
@@ -146,7 +150,7 @@ void DMEngine::f463_initializeGame() {
_displayMan->f460_initializeGraphicData();
// DUMMY CODE: next line
_displayMan->loadPalette(g19_PalCredits);
-
+
_eventMan->initMouse();
while (_loadsaveMan->f435_loadgame() != k1_LoadgameSuccess) {
@@ -166,14 +170,13 @@ void DMEngine::f463_initializeGame() {
warning("MISSING CODE: F0357_COMMAND_DiscardAllInput");
}
- void DMEngine::f448_initMemoryManager()
- {
- warning("STUB FUNCTION");
- for (uint16 i = 0; i < 16; ++i)
- _displayMan->_g347_paletteTopAndBottomScreen[i] = g21_PalDungeonView[0][i];
- }
+void DMEngine::f448_initMemoryManager() {
+ warning("STUB FUNCTION");
+ for (uint16 i = 0; i < 16; ++i)
+ _displayMan->_g347_paletteTopAndBottomScreen[i] = g21_PalDungeonView[0][i];
+}
- void DMEngine::f462_startGame() {
+void DMEngine::f462_startGame() {
_g331_pressingEye = false;
_g332_stopPressingEye = false;
_g333_pressingMouth = false;