[Scummvm-git-logs] scummvm master -> 42d701bab77f2578f73f3ec5a30a6124a7e1bac7
sev-
sev at scummvm.org
Sat Mar 28 17:00:30 UTC 2020
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
4d9f49d41f DIRECTOR: Remove redundant warning
0ae5ca631c DIRECTOR: Do not error on bad movies
f6e7e77130 DIRECTOR: Do not die when VWCR resource is not found
7baf53c61f PRINCE: I18N: Added strings which were mistakingly missed
42d701bab7 PRINCE: I18N: Regenerate prince_translation.dat
Commit: 4d9f49d41f0782f330e1278c2c39c18aa7d024e7
https://github.com/scummvm/scummvm/commit/4d9f49d41f0782f330e1278c2c39c18aa7d024e7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-28T18:00:18+01:00
Commit Message:
DIRECTOR: Remove redundant warning
Changed paths:
engines/director/transitions.cpp
diff --git a/engines/director/transitions.cpp b/engines/director/transitions.cpp
index 6321e2e41f..978c3c6c0a 100644
--- a/engines/director/transitions.cpp
+++ b/engines/director/transitions.cpp
@@ -326,8 +326,6 @@ static void dissolveTrans(TransParams &t, Score *score, Common::Rect &clipRect)
int hMask = (1L << hBits) - 1;
int vShift = hBits;
- warning("w: %d h: %d vBits: %d hBits: %d hMask: %x", w, h, vBits, hBits, hMask);
-
// Calculate steps
uint32 pixPerStepInit = 1;
t.steps = (1 << (hBits + vBits)) - 1;
Commit: 0ae5ca631c6d38b3bc06fc6113fabd1f549c8708
https://github.com/scummvm/scummvm/commit/0ae5ca631c6d38b3bc06fc6113fabd1f549c8708
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-28T18:00:18+01:00
Commit Message:
DIRECTOR: Do not error on bad movies
Changed paths:
engines/director/score.cpp
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index d4c8304ca2..a9c1df67bc 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -142,7 +142,10 @@ void Score::loadArchive() {
}
// Score
- assert(_movieArchive->hasResource(MKTAG('V', 'W', 'S', 'C'), -1));
+ if (!_movieArchive->hasResource(MKTAG('V', 'W', 'S', 'C'), -1)) {
+ warning("Score::loadArchive(): Wrong movie format. VWSC resource missing");
+ return;
+ }
loadFrames(*_movieArchive->getFirstResource(MKTAG('V', 'W', 'S', 'C')));
// Configuration Information
Commit: f6e7e77130356e24ff43b8cc72c21f563231f8c8
https://github.com/scummvm/scummvm/commit/f6e7e77130356e24ff43b8cc72c21f563231f8c8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-28T18:00:18+01:00
Commit Message:
DIRECTOR: Do not die when VWCR resource is not found
Changed paths:
engines/director/archive.cpp
diff --git a/engines/director/archive.cpp b/engines/director/archive.cpp
index 36b9b1ffc0..37e4e411ef 100644
--- a/engines/director/archive.cpp
+++ b/engines/director/archive.cpp
@@ -249,8 +249,10 @@ Common::SeekableSubReadStreamEndian *MacArchive::getResource(uint32 tag, uint16
assert(_resFork);
Common::SeekableReadStream *stream = _resFork->getResource(tag, id);
- if (stream == nullptr)
- error("MacArchive::getResource('%s', %d): Resource doesn't exit", tag2str(tag), id);
+ if (stream == nullptr) {
+ warning("MacArchive::getResource('%s', %d): Resource doesn't exit", tag2str(tag), id);
+ return nullptr;
+ }
return new Common::SeekableSubReadStreamEndian(stream, 0, stream->size(), true, DisposeAfterUse::NO);
}
Commit: 7baf53c61fbe6b08b7907ffb24c08b0c05a82caf
https://github.com/scummvm/scummvm/commit/7baf53c61fbe6b08b7907ffb24c08b0c05a82caf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-28T18:00:18+01:00
Commit Message:
PRINCE: I18N: Added strings which were mistakingly missed
Changed paths:
devtools/create_prince/en.po
devtools/create_prince/prince.pot
diff --git a/devtools/create_prince/en.po b/devtools/create_prince/en.po
index 8378d0935d..99df641b5a 100644
--- a/devtools/create_prince/en.po
+++ b/devtools/create_prince/en.po
@@ -88,7 +88,7 @@ msgstr "HERO: A playground?! Oh, I get it!|That must be a joke. Ha, ha."
#: dialog0001.txt:100005
msgid "OTHER: Jesteśmy dowcipni. A teraz idź już stąd.|To nie miejsce dla szaleńców.#E4#B0"
msgstr ""
-"OTHER: We're amuzed. Now go away from here.|This is not a place for crazy "
+"OTHER: We're amused. Now go away from here.|This is not a place for crazy "
"people.#E4#B0"
#: dialog0001.txt:100101
@@ -124,7 +124,7 @@ msgstr "OTHER: To me, all humans are lunatics."
msgid "OTHER: Żyjecie jakieś marne dwieście czy ile tam|lat i to źle na was działa."
msgstr ""
"OTHER: You live a miserable two hundred or whatever|years and it still "
-"sucks...."
+"sucks."
#: dialog0001.txt:100403
msgid "OTHER: Ciągle gnacie tu i tam, spieszycie się i|nie potraficie usiedzieć nawet stu lat|w jednym miejscu."
@@ -10281,7 +10281,7 @@ msgstr "3 coins - A mean for opportunity."
#: invtxt.txt:62
msgid "4 monety - Prawie absolut."
-msgstr "4 coins - Almost absolut."
+msgstr "4 coins - Almost absolute."
#: invtxt.txt:63
msgid "5 monet - Ideał."
@@ -10780,7 +10780,7 @@ msgstr ""
#: mob.lst:8001
msgid "zamek - Klasyka. Tak mały, że znalezienie go|graniczyło z cudem."
-msgstr "castle - Classic. So small that finding it was almost a miracle."
+msgstr "lock - Classic. So small that finding it was almost a miracle."
#: mob.lst:8002
msgid "słowik - Biedny ptak..."
@@ -10920,7 +10920,7 @@ msgstr ""
#: mob.lst:11007
msgid "zamek - Kolejny zamek do zdobycia."
-msgstr "castle - Another castle to get."
+msgstr "lock - Another castle to get."
#: mob.lst:11008
msgid "drzwi do skarbca - Impregnowane drewno wzmocnione żelaznymi|ćwiekami.+Nie do wyważenia. Nawet dla niedźwiedzia."
@@ -11595,11 +11595,11 @@ msgstr ""
#: mob.lst:29002
msgid "wyjście - Z kolan na nogi."
-msgstr "exit - From my knees to my feet."
+msgstr "exit - From my knees to my legs."
#: mob.lst:29003
msgid "wyjście - Z kolan na nogi."
-msgstr "exit - From my knees to my feet."
+msgstr "exit - From my knees to my legs."
#: mob.lst:29004
msgid "butelki - Puste jak głowa Sheili."
@@ -12090,13 +12090,21 @@ msgid "MÅ‚yn - "
msgstr "The Mill - "
#: mob.lst:52001
-msgid "powrót - "
-msgstr "exit - "
+msgid "dźwignia - "
+msgstr "lever - "
#: mob.lst:52002
+msgid "przycisk - "
+msgstr "button - "
+
+#: mob.lst:52003
msgid "powrót - "
msgstr "exit - "
+#: variatxt.txt:9
+msgid "Nie mogę tego wząć."
+msgstr "I cannot take it."
+
#: variatxt.txt:10
msgid "Nie mogę tego użyć."
msgstr "I cannot use it."
@@ -12536,3 +12544,171 @@ msgstr "Good little devil."
#: variatxt.txt:3501
msgid "Zawór już odkręcony."
msgstr "Valve is already opened."
+
+#: variatxt.txt:3502
+msgid "Zawór już zakręcony."
+msgstr "Valve already closed."
+
+#: variatxt.txt:3503
+msgid "Lepiej nie będę przytykać ręki|do strumienia lawy."
+msgstr "I'd better not put my hand|to the lava stream."
+
+#: variatxt.txt:3504
+msgid "Bum."
+msgstr "Boom."
+
+#: variatxt.txt:3505
+msgid "Lepiej nie pokazywać się im na te|ich kaprawe oczka."
+msgstr "It is better not to show up in front of their|dull eyes."
+
+#: variatxt.txt:3601
+msgid "Wystarczy..."
+msgstr "Enough..."
+
+#: variatxt.txt:3602
+msgid "Jakoś tak sama mi się ręka|poślizgnęła."
+msgstr "Somehow my hand had slipped."
+
+#: variatxt.txt:3603
+msgid "Nie przy strażniku..."
+msgstr "Not in the presence of the guard..."
+
+#: variatxt.txt:3604
+msgid "Ta świeca nie będzie odpowiednia."
+msgstr "This candle will not be suitable."
+
+#: variatxt.txt:3605
+msgid "Życzymy przyjemnej podróży."
+msgstr "We wish you a pleasant journey."
+
+#: variatxt.txt:3606
+msgid "Nie chciałbym spotkać strażnika...|Pewnie nie darzy mnie już sympatią."
+msgstr ""
+"I don't want to bump into the guard...|He probably doesn't like me anymore."
+
+#: variatxt.txt:3607
+msgid "TÄ™ na razie lepiej zostawiÄ™."
+msgstr "I better leave it for now."
+
+#: variatxt.txt:3608
+msgid "Najpierw lepiej odwiedzÄ™ wszystkie sale."
+msgstr "First, I'd better visit all the rooms."
+
+#: variatxt.txt:3609
+msgid "Nie przy strażniku..."
+msgstr "Not in the guard presence..."
+
+#: variatxt.txt:3610
+msgid "Od razu cieplej."
+msgstr "Warmer right away."
+
+#: variatxt.txt:3611
+msgid "Czasami nadgorliwość może popsuć|najlepsze plany."
+msgstr "Sometimes, zeal can ruin|the best plans."
+
+#: variatxt.txt:3612
+msgid "Nie teraz."
+msgstr "Not now."
+
+#: variatxt.txt:3613
+msgid "Jaka szkoda..."
+msgstr "What a pity..."
+
+#: variatxt.txt:3701
+msgid "Nie mam palców z żelaza!"
+msgstr "I don't have iron fingers!"
+
+#: variatxt.txt:3702
+msgid "Jeden węgielek wystarczy."
+msgstr "One coal is enough."
+
+#: variatxt.txt:3703
+msgid "Hmmm... Węgielek zamienił się w pył..."
+msgstr "Hmmm... The coal has turned into dust..."
+
+#: variatxt.txt:4001
+msgid "Mogę to pożyczyć na chwilę?..."
+msgstr "Can I borrow it for a moment?..."
+
+#: variatxt.txt:4002
+msgid "Nie ma to jak dobrze się|przeciągnąć."
+msgstr "There is nothing better than|stretching."
+
+#: variatxt.txt:4003
+msgid "Chyba był zbyt słabo rozgrzany."
+msgstr "I don't think it was hot enough."
+
+#: variatxt.txt:4004
+msgid "Płomień jest zbyt wątły."
+msgstr "The flame is too weak."
+
+#: variatxt.txt:4005
+msgid "Nareszcie!"
+msgstr "Finally!"
+
+#: variatxt.txt:4006
+msgid "Nie ma sensu zabarwiać tak małej|powłoczki."
+msgstr "It makes no sense to tint such a small|coating."
+
+#: variatxt.txt:4007
+msgid "Teraz powłoka jest czarna jak...|Jak... Eeee... Hmmm..."
+msgstr "Now the coating is black as...|As... Eeeer... Hmmm..."
+
+#: variatxt.txt:4008
+msgid "Już bardziej czarna być nie może."
+msgstr "It couldn't be more black."
+
+#: variatxt.txt:4009
+msgid "Jeden różek nikogo nie oszuka."
+msgstr "One rose will not fool anyone."
+
+#: variatxt.txt:4010
+msgid "Różki wieńczą dzieło."
+msgstr "Roses crown the work."
+
+#: variatxt.txt:4011
+msgid "Nie tutaj."
+msgstr "Not here."
+
+#: variatxt.txt:4012
+msgid "Na ich oczach?..."
+msgstr "In front of them?..."
+
+#: variatxt.txt:4013
+msgid "Na pewno siÄ™ uda."
+msgstr "It will certainly work."
+
+#: variatxt.txt:4014
+msgid "E tam, na pewno siÄ™ nie uda."
+msgstr "Umm, certainly it won't work."
+
+#: variatxt.txt:4101
+msgid "ProszÄ™... Bardzo.... Gotowe..."
+msgstr "You are... Welcome.... Ready..."
+
+#: variatxt.txt:4201
+msgid "Twarde sztuki."
+msgstr "Tough stuff."
+
+#: variatxt.txt:5001
+msgid "Lepiej wrócę na znane mi tereny,|nie chcę pobłądzić."
+msgstr "I better get back to the areas I know,|I don't want to get lost."
+
+#: variatxt.txt:5002
+msgid "Tam w oddali widać jakąś samotną|chałupkę. To pewnie jakaś pustelnia."
+msgstr "There is a single hut over there in the|distance. It must belong to some hermit."
+
+#: variatxt.txt:5003
+msgid "O!... Widzę w oddali opuszczony, stary młyn."
+msgstr "Oh! I can see an old mill in the distance."
+
+#: variatxt.txt:5801
+msgid "Naciśnij w odpowiednim momencie lewy przycisk myszy, by|zaatakować lub cofnąć dłonie."
+msgstr ""
+"Click the left mouse button at the right moment to attack|or withdraw your "
+"palms."
+
+#: variatxt.txt:5802
+msgid "Naciskaj szybko na przemian lewy i prawy przycisk myszki|lub klawisze 'Z' i 'X'."
+msgstr ""
+"Click rapidly the left and right mouse buttons|or press the 'Z' and 'X' keys."
diff --git a/devtools/create_prince/prince.pot b/devtools/create_prince/prince.pot
index 8675f366f8..d5fcb37295 100644
--- a/devtools/create_prince/prince.pot
+++ b/devtools/create_prince/prince.pot
@@ -11007,13 +11007,21 @@ msgid "MÅ‚yn - "
msgstr ""
#: mob.lst:52001
-msgid "powrót - "
+msgid "dźwignia - "
+msgstr ""
+
+#: mob.lst:52001
+msgid "przycisk - "
msgstr ""
#: mob.lst:52002
msgid "powrót - "
msgstr ""
+#: variatxt.txt:9
+msgid "Nie mogę tego wząć."
+msgstr ""
+
#: variatxt.txt:10
msgid "Nie mogę tego użyć."
msgstr ""
Commit: 42d701bab77f2578f73f3ec5a30a6124a7e1bac7
https://github.com/scummvm/scummvm/commit/42d701bab77f2578f73f3ec5a30a6124a7e1bac7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-03-28T18:00:18+01:00
Commit Message:
PRINCE: I18N: Regenerate prince_translation.dat
Changed paths:
dists/engine-data/prince_translation.dat
diff --git a/dists/engine-data/prince_translation.dat b/dists/engine-data/prince_translation.dat
index 0f0bfa7365..c4cedcedce 100644
Binary files a/dists/engine-data/prince_translation.dat and b/dists/engine-data/prince_translation.dat differ
More information about the Scummvm-git-logs
mailing list