[Scummvm-cvs-logs] scummvm master -> 23f368c9814645707a6eb1c7253d6ee3dc3fbf9d
bluegr
bluegr at gmail.com
Sat Jun 13 21:07:12 CEST 2015
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:
559478defc SHERLOCK: Clean up the parameter passed in talk3DOMovieTrigger()
b69b09ef5a SHERLOCK: Clean up ADJUST_COORD slightly
23f368c981 SHERLOCK: Add names of missing opcodes and controls in warning messages
Commit: 559478defccf0f1e9e7a30a13aff4e2b035d9184
https://github.com/scummvm/scummvm/commit/559478defccf0f1e9e7a30a13aff4e2b035d9184
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-06-13T22:04:00+03:00
Commit Message:
SHERLOCK: Clean up the parameter passed in talk3DOMovieTrigger()
Changed paths:
engines/sherlock/scalpel/scalpel_user_interface.cpp
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.cpp b/engines/sherlock/scalpel/scalpel_user_interface.cpp
index 5dcaf31..c8d9aee 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.cpp
+++ b/engines/sherlock/scalpel/scalpel_user_interface.cpp
@@ -1641,8 +1641,7 @@ void ScalpelUserInterface::doTalkControl() {
}
// Trigger to play 3DO movie
- int selector = _vm->_ui->_selector;
- talk.talk3DOMovieTrigger(selector, 0);
+ talk.talk3DOMovieTrigger(_selector, 0);
talk.waitForMore(talk._statements[_selector]._statement.size());
if (talk._talkToAbort)
Commit: b69b09ef5a756700b6fb071f53ea19131182e527
https://github.com/scummvm/scummvm/commit/b69b09ef5a756700b6fb071f53ea19131182e527
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-06-13T22:04:41+03:00
Commit Message:
SHERLOCK: Clean up ADJUST_COORD slightly
Changed paths:
engines/sherlock/tattoo/tattoo_scene.cpp
diff --git a/engines/sherlock/tattoo/tattoo_scene.cpp b/engines/sherlock/tattoo/tattoo_scene.cpp
index 3d4053f..68d93c0 100644
--- a/engines/sherlock/tattoo/tattoo_scene.cpp
+++ b/engines/sherlock/tattoo/tattoo_scene.cpp
@@ -808,7 +808,11 @@ void TattooScene::setupBGArea(const byte cMap[PALETTE_SIZE]) {
}
}
-#define ADJUST_COORD(COORD) if (COORD != -1) COORD *= FIXED_INT_MULTIPLIER
+#define ADJUST_COORD(COORD) \
+ if (COORD.x != -1) \
+ COORD.x *= FIXED_INT_MULTIPLIER; \
+ if (COORD.y != -1) \
+ COORD.y *= FIXED_INT_MULTIPLIER
int TattooScene::startCAnim(int cAnimNum, int playRate) {
TattooEngine &vm = *(TattooEngine *)_vm;
@@ -831,14 +835,10 @@ int TattooScene::startCAnim(int cAnimNum, int playRate) {
PositionFacing teleport2 = cAnim._teleport[1];
// If the co-ordinates are valid (not -1), adjust them by the fixed int multiplier
- ADJUST_COORD(goto1.x);
- ADJUST_COORD(goto1.y);
- ADJUST_COORD(goto2.x);
- ADJUST_COORD(goto2.y);
- ADJUST_COORD(teleport1.x);
- ADJUST_COORD(teleport1.y);
- ADJUST_COORD(teleport2.x);
- ADJUST_COORD(teleport2.y);
+ ADJUST_COORD(goto1);
+ ADJUST_COORD(goto2);
+ ADJUST_COORD(teleport1);
+ ADJUST_COORD(teleport2);
// See if the Player must walk to a position before the animation starts
SpriteType savedPlayerType = people[HOLMES]._type;
Commit: 23f368c9814645707a6eb1c7253d6ee3dc3fbf9d
https://github.com/scummvm/scummvm/commit/23f368c9814645707a6eb1c7253d6ee3dc3fbf9d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-06-13T22:05:51+03:00
Commit Message:
SHERLOCK: Add names of missing opcodes and controls in warning messages
Changed paths:
engines/sherlock/tattoo/tattoo_talk.cpp
engines/sherlock/tattoo/tattoo_user_interface.cpp
diff --git a/engines/sherlock/tattoo/tattoo_talk.cpp b/engines/sherlock/tattoo/tattoo_talk.cpp
index 3768d12..78396c9 100644
--- a/engines/sherlock/tattoo/tattoo_talk.cpp
+++ b/engines/sherlock/tattoo/tattoo_talk.cpp
@@ -361,8 +361,8 @@ OpcodeReturn TattooTalk::cmdNPCLabelSet(const byte *&str) {
return RET_SUCCESS;
}
-OpcodeReturn TattooTalk::cmdPassword(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdPassword(const byte *&str) { error("TODO: script opcode (cmdPassword)"); }
+OpcodeReturn TattooTalk::cmdPlaySong(const byte *&str) { error("TODO: script opcode (cmdPlaySong)"); }
OpcodeReturn TattooTalk::cmdRestorePeopleSequence(const byte *&str) {
int npcNum = *++str - 1;
@@ -687,9 +687,9 @@ OpcodeReturn TattooTalk::cmdSetNPCWalkGraphics(const byte *&str) {
return RET_SUCCESS;
}
-OpcodeReturn TattooTalk::cmdSetSceneEntryFlag(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdSetTalkSequence(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdSetWalkControl(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdSetSceneEntryFlag(const byte *&str) { error("TODO: script opcode (cmdSetSceneEntryFlag)"); }
+OpcodeReturn TattooTalk::cmdSetTalkSequence(const byte *&str) { error("TODO: script opcode (cmdSetTalkSequence)"); }
+OpcodeReturn TattooTalk::cmdSetWalkControl(const byte *&str) { error("TODO: script opcode (cmdSetWalkControl)"); }
// Dummy opcode
OpcodeReturn TattooTalk::cmdTalkInterruptsDisable(const byte *&str) { error("Dummy opcode cmdTalkInterruptsDisable called"); }
@@ -697,11 +697,11 @@ OpcodeReturn TattooTalk::cmdTalkInterruptsDisable(const byte *&str) { error("Dum
// Dummy opcode
OpcodeReturn TattooTalk::cmdTalkInterruptsEnable(const byte *&str) { error("Dummy opcode cmdTalkInterruptsEnable called"); }
-OpcodeReturn TattooTalk::cmdTurnSoundsOff(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdWalkHolmesAndNPCToCAnimation(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdWalkNPCToCAnimation(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdWalkNPCToCoords(const byte *&str) { error("TODO: script opcode"); }
-OpcodeReturn TattooTalk::cmdWalkHomesAndNPCToCoords(const byte *&str) { error("TODO: script opcode"); }
+OpcodeReturn TattooTalk::cmdTurnSoundsOff(const byte *&str) { error("TODO: script opcode (cmdTurnSoundsOff)"); }
+OpcodeReturn TattooTalk::cmdWalkHolmesAndNPCToCAnimation(const byte *&str) { error("TODO: script opcode (cmdWalkHolmesAndNPCToCAnimation)"); }
+OpcodeReturn TattooTalk::cmdWalkNPCToCAnimation(const byte *&str) { error("TODO: script opcode (cmdWalkNPCToCAnimation)"); }
+OpcodeReturn TattooTalk::cmdWalkNPCToCoords(const byte *&str) { error("TODO: script opcode (cmdWalkNPCToCoords)"); }
+OpcodeReturn TattooTalk::cmdWalkHomesAndNPCToCoords(const byte *&str) { error("TODO: script opcode (cmdWalkHomesAndNPCToCoords)"); }
} // End of namespace Tattoo
diff --git a/engines/sherlock/tattoo/tattoo_user_interface.cpp b/engines/sherlock/tattoo/tattoo_user_interface.cpp
index 4fb4adb..fffde83 100644
--- a/engines/sherlock/tattoo/tattoo_user_interface.cpp
+++ b/engines/sherlock/tattoo/tattoo_user_interface.cpp
@@ -406,31 +406,31 @@ void TattooUserInterface::doStandardControl() {
}
void TattooUserInterface::doLookControl() {
- warning("TODO: ui control");
+ warning("TODO: ui control (look)");
}
void TattooUserInterface::doFileControl() {
- warning("TODO: ui control");
+ warning("TODO: ui control (file)");
}
void TattooUserInterface::doInventoryControl() {
- warning("TODO: ui control");
+ warning("TODO: ui control (inventory)");
}
void TattooUserInterface::doVerbControl() {
- warning("TODO: ui control");
+ warning("TODO: ui control (verb)");
}
void TattooUserInterface::doTalkControl() {
- warning("TODO: ui control");
+ warning("TODO: ui control (talk)");
}
void TattooUserInterface::doMessageControl() {
- warning("TODO: ui control");
+ warning("TODO: ui control (message)");
}
void TattooUserInterface::doLabControl() {
- warning("TODO: ui control");
+ warning("TODO: ui control (lab)");
}
void TattooUserInterface::displayObjectNames() {
More information about the Scummvm-git-logs
mailing list