[Scummvm-git-logs] scummvm master -> 1ff9e931dc4d6253edacf8fcb05bd9c358c70027
dreammaster
dreammaster at scummvm.org
Wed Oct 4 13:06:25 CEST 2017
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1b136180e7 TITANIC: DE: Translations for music room music
1ff9e931dc TITANIC: DE: Fix animations changing seasons in Arboretum
Commit: 1b136180e79bfd4119cb51535cd41d52420a8a8f
https://github.com/scummvm/scummvm/commit/1b136180e79bfd4119cb51535cd41d52420a8a8f
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-04T07:05:32-04:00
Commit Message:
TITANIC: DE: Translations for music room music
Changed paths:
engines/titanic/sound/music_player.cpp
diff --git a/engines/titanic/sound/music_player.cpp b/engines/titanic/sound/music_player.cpp
index fe75382..ae0b64f 100644
--- a/engines/titanic/sound/music_player.cpp
+++ b/engines/titanic/sound/music_player.cpp
@@ -22,6 +22,7 @@
#include "titanic/sound/music_player.h"
#include "titanic/sound/music_room.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -131,32 +132,32 @@ bool CMusicPlayer::CreateMusicPlayerMsg(CCreateMusicPlayerMsg *msg) {
if (musicHandler) {
ins = musicHandler->createInstrument(BELLS, 3);
- ins->load(0, "z#490.wav", 60);
- ins->load(1, "z#488.wav", 62);
- ins->load(2, "z#489.wav", 63);
+ ins->load(0, TRANSLATE("z#490.wav", "z#227.wav"), 60);
+ ins->load(1, TRANSLATE("z#488.wav", "z#225.wav"), 62);
+ ins->load(2, TRANSLATE("z#489.wav", "z#226.wav"), 63);
ins = musicHandler->createInstrument(SNAKE, 5);
- ins->load(0, "z#493.wav", 22);
- ins->load(1, "z#495.wav", 29);
- ins->load(2, "z#492.wav", 34);
- ins->load(3, "z#494.wav", 41);
- ins->load(4, "z#491.wav", 46);
+ ins->load(0, TRANSLATE("z#493.wav", "z#230.wav"), 22);
+ ins->load(1, TRANSLATE("z#495.wav", "z#232.wav"), 29);
+ ins->load(2, TRANSLATE("z#492.wav", "z#229.wav"), 34);
+ ins->load(3, TRANSLATE("z#494.wav", "z#231.wav"), 41);
+ ins->load(4, TRANSLATE("z#491.wav", "z#228.wav"), 46);
ins = musicHandler->createInstrument(PIANO, 5);
- ins->load(0, "z#499.wav", 26);
- ins->load(1, "z#497.wav", 34);
- ins->load(2, "z#498.wav", 38);
- ins->load(3, "z#496.wav", 46);
- ins->load(4, "z#500.wav", 60);
+ ins->load(0, TRANSLATE("z#499.wav", "z#236.wav"), 26);
+ ins->load(1, TRANSLATE("z#497.wav", "z#234.wav"), 34);
+ ins->load(2, TRANSLATE("z#498.wav", "z#235.wav"), 38);
+ ins->load(3, TRANSLATE("z#496.wav", "z#233.wav"), 46);
+ ins->load(4, TRANSLATE("z#500.wav", "z#237.wav"), 60);
ins = musicHandler->createInstrument(BASS, 7);
- ins->load(0, "z#504.wav", 22);
- ins->load(1, "z#507.wav", 29);
- ins->load(2, "z#503.wav", 34);
- ins->load(3, "z#506.wav", 41);
- ins->load(4, "z#502.wav", 46);
- ins->load(5, "z#505.wav", 53);
- ins->load(6, "z#501.wav", 58);
+ ins->load(0, TRANSLATE("z#504.wav", "z#241.wav"), 22);
+ ins->load(1, TRANSLATE("z#507.wav", "z#244.wav"), 29);
+ ins->load(2, TRANSLATE("z#503.wav", "z#240.wav"), 34);
+ ins->load(3, TRANSLATE("z#506.wav", "z#243.wav"), 41);
+ ins->load(4, TRANSLATE("z#502.wav", "z#239.wav"), 46);
+ ins->load(5, TRANSLATE("z#505.wav", "z#242.wav"), 53);
+ ins->load(6, TRANSLATE("z#501.wav", "z#238.wav"), 58);
CMusicRoom::_musicHandler->setActive(_musicActive);
}
Commit: 1ff9e931dc4d6253edacf8fcb05bd9c358c70027
https://github.com/scummvm/scummvm/commit/1ff9e931dc4d6253edacf8fcb05bd9c358c70027
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-10-04T07:06:08-04:00
Commit Message:
TITANIC: DE: Fix animations changing seasons in Arboretum
Changed paths:
engines/titanic/game/season_background.cpp
diff --git a/engines/titanic/game/season_background.cpp b/engines/titanic/game/season_background.cpp
index d663c40..bea3b35 100644
--- a/engines/titanic/game/season_background.cpp
+++ b/engines/titanic/game/season_background.cpp
@@ -21,6 +21,7 @@
*/
#include "titanic/game/season_background.h"
+#include "titanic/translation.h"
namespace Titanic {
@@ -65,40 +66,46 @@ bool CSeasonBackground::ChangeSeasonMsg(CChangeSeasonMsg *msg) {
switch (_seasonNum) {
case SEASON_SUMMER:
- playMovie(0, 45, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
- _defaultFrame = 45;
+ playMovie(0, TRANSLATE(45, 49), MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+ _defaultFrame = TRANSLATE(45, 49);
break;
case SEASON_AUTUMN:
if (_flag) {
- playMovie(232, 278, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
- _defaultFrame = 278;
+ playMovie(TRANSLATE(232, 49), TRANSLATE(278, 98),
+ MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+ _defaultFrame = TRANSLATE(278, 98);
} else {
- playMovie(45, 91, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
- _defaultFrame = 91;
+ playMovie(TRANSLATE(45, 196), TRANSLATE(91, 245),
+ MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+ _defaultFrame = TRANSLATE(91, 245);
}
break;
case SEASON_WINTER:
if (_flag) {
- playMovie(278, 326, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
- _defaultFrame = 326;
+ playMovie(TRANSLATE(278, 98), TRANSLATE(326, 147),
+ MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+ _defaultFrame = TRANSLATE(326, 147);
} else {
CStatusChangeMsg changeMsg;
changeMsg._newStatus = 0;
changeMsg.execute("PickUpSpeechCentre");
- playMovie(91, 139, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
- _defaultFrame = 139;
+ playMovie(TRANSLATE(91, 245), TRANSLATE(139, 294),
+ MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+ _defaultFrame = TRANSLATE(139, 294);
}
break;
case SEASON_SPRING:
if (_flag) {
- playMovie(326, 417, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
- _defaultFrame = 417;
+ playMovie(TRANSLATE(326, 147), TRANSLATE(417, 195),
+ MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+ _defaultFrame = TRANSLATE(417, 195);
} else {
- playMovie(139, 228, MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
- _defaultFrame = 228;
+ playMovie(TRANSLATE(139, 294), TRANSLATE(228, 342),
+ MOVIE_NOTIFY_OBJECT | MOVIE_WAIT_FOR_FINISH);
+ _defaultFrame = TRANSLATE(228, 342);
}
break;
@@ -115,7 +122,7 @@ bool CSeasonBackground::MovieEndMsg(CMovieEndMsg *msg) {
onMsg.execute("SeasonalAdjust");
}
- if (msg->_endFrame == 91 && !_flag) {
+ if (msg->_endFrame == TRANSLATE(91, 245) && !_flag) {
CStatusChangeMsg changeMsg;
changeMsg.execute("PickUpSpeechCentre");
}
@@ -125,8 +132,8 @@ bool CSeasonBackground::MovieEndMsg(CMovieEndMsg *msg) {
bool CSeasonBackground::ActMsg(CActMsg *msg) {
if (msg->_action == "PlayerGetsSpeechCentre") {
- loadFrame(278);
- _defaultFrame = 278;
+ _defaultFrame = TRANSLATE(278, 98);
+ loadFrame(_defaultFrame);
_flag = true;
}
More information about the Scummvm-git-logs
mailing list