From 201336367b2e864b960966568df0a472efdbe1e5 Mon Sep 17 00:00:00 2001 From: Tobias Gunkel Date: Sun, 29 Apr 2012 17:23:07 +0200 Subject: ANDROID: disable compression for zip-file assets and recompress uncompressed zip-files before adding them as assets to the apk --- backends/platform/android/android.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/backends/platform/android/android.mk b/backends/platform/android/android.mk index 2e8fd62152..9292a16595 100644 --- a/backends/platform/android/android.mk +++ b/backends/platform/android/android.mk @@ -130,7 +130,18 @@ $(PATH_STAGE_PREFIX).%/res/drawable/scummvm.png: $(PATH_RESOURCES)/drawable/scum $(FILE_RESOURCES_MAIN): $(FILE_MANIFEST) $(RESOURCES) $(ANDROID_JAR8) $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(INSTALL) -d $(PATH_BUILD_ASSETS) $(INSTALL) -c -m 644 $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(PATH_BUILD_ASSETS)/ - $(AAPT) package -f -M $< -S $(PATH_RESOURCES) -A $(PATH_BUILD_ASSETS) -I $(ANDROID_JAR8) -F $@ + work_dir=`pwd`; \ + for i in $(PATH_BUILD_ASSETS)/*.zip; do \ + echo "recompress $$i"; \ + cd $$work_dir; \ + $(RM) -rf $(PATH_BUILD_ASSETS)/tmp; \ + $(MKDIR) $(PATH_BUILD_ASSETS)/tmp; \ + unzip -q $$i -d $(PATH_BUILD_ASSETS)/tmp; \ + cd $(PATH_BUILD_ASSETS)/tmp; \ + zip -r ../`basename $$i` *; \ + done + @$(RM) -rf $(PATH_BUILD_ASSETS)/tmp + $(AAPT) package -f -0 zip -M $< -S $(PATH_RESOURCES) -A $(PATH_BUILD_ASSETS) -I $(ANDROID_JAR8) -F $@ $(PATH_BUILD)/%/$(FILE_RESOURCES): $(PATH_BUILD)/%/AndroidManifest.xml $(PATH_STAGE_PREFIX).%/res/values/strings.xml $(PATH_STAGE_PREFIX).%/res/drawable/scummvm.png plugins/lib%.so $(ANDROID_JAR8) $(AAPT) package -f -M $< -S $(PATH_STAGE_PREFIX).$*/res -I $(ANDROID_JAR8) -F $@ -- cgit v1.2.3 From 190efefdd259eedc10d8d8ea4e113392daff12af Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Wed, 4 Jul 2012 02:20:42 +0200 Subject: I18N: Update the Norwegian (Bokmål)-translation --- po/nb_NO.po | 1039 ++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 567 insertions(+), 472 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 9dfc58331c..0975877d65 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-06-24 18:06+0100\n" -"PO-Revision-Date: 2011-04-25 22:56+0100\n" -"Last-Translator: Einar Johan T. Smen \n" +"PO-Revision-Date: 2012-07-04 02:19+0100\n" +"Last-Translator: Einar Johan Smen \n" "Language-Team: somaen \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -37,7 +37,8 @@ msgstr "Tilgjengelige motorer:" msgid "Go up" msgstr "G tilbake" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:66 +#: gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "G til forrige mappeniv" @@ -46,24 +47,37 @@ msgctxt "lowres" msgid "Go up" msgstr "G tilbake" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 -#: gui/saveload.cpp:64 gui/saveload.cpp:173 gui/themebrowser.cpp:54 -#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 -#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:274 +#: gui/browser.cpp:69 +#: gui/chooser.cpp:45 +#: gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 +#: gui/massadd.cpp:94 +#: gui/options.cpp:1228 +#: gui/saveload.cpp:64 +#: gui/saveload.cpp:173 +#: gui/themebrowser.cpp:54 +#: engines/engine.cpp:442 +#: engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:865 +#: engines/parallaction/saveload.cpp:274 #: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:70 +#: gui/chooser.cpp:46 +#: gui/themebrowser.cpp:55 msgid "Choose" msgstr "Velg" -#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125 -#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 -#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209 +#: gui/gui-manager.cpp:115 +#: engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 +#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:191 +#: engines/scumm/help.cpp:209 #: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Lukk" @@ -72,20 +86,23 @@ msgstr "Lukk" msgid "Mouse click" msgstr "Musklikk" -#: gui/gui-manager.cpp:122 base/main.cpp:300 +#: gui/gui-manager.cpp:122 +#: base/main.cpp:300 msgid "Display keyboard" msgstr "Vis tastatur" -#: gui/gui-manager.cpp:126 base/main.cpp:304 +#: gui/gui-manager.cpp:126 +#: base/main.cpp:304 msgid "Remap keys" msgstr "Omkoble taster" -#: gui/gui-manager.cpp:129 base/main.cpp:307 -#, fuzzy +#: gui/gui-manager.cpp:129 +#: base/main.cpp:307 msgid "Toggle FullScreen" msgstr "Veksle fullskjerm" -#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 +#: gui/KeysDialog.h:36 +#: gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Velg en handling for kobling" @@ -93,17 +110,31 @@ msgstr "Velg en handling for kobling" msgid "Map" msgstr "Koble" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 -#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:561 -#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 -#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 -#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 -#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 -#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 -#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:274 +#: gui/KeysDialog.cpp:42 +#: gui/launcher.cpp:346 +#: gui/launcher.cpp:1001 +#: gui/launcher.cpp:1005 +#: gui/massadd.cpp:91 +#: gui/options.cpp:1229 +#: engines/engine.cpp:361 +#: engines/engine.cpp:372 +#: engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1775 +#: engines/agos/animation.cpp:561 +#: engines/groovie/script.cpp:420 +#: engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 +#: engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 +#: engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 +#: engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 +#: engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 +#: engines/parallaction/saveload.cpp:274 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -113,12 +144,16 @@ msgstr "OK" msgid "Select an action and click 'Map'" msgstr "Velg en handling, og trykk 'Koble'" -#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 +#: gui/KeysDialog.cpp:80 +#: gui/KeysDialog.cpp:102 +#: gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Koblet tast : %s" -#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 +#: gui/KeysDialog.cpp:82 +#: gui/KeysDialog.cpp:104 +#: gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Koblet tast: ingen" @@ -139,13 +174,11 @@ msgstr "Spill" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194 -msgid "" -"Short game identifier used for referring to savegames and running the game " -"from the command line" -msgstr "" -"Kort spill-identifikator, brukt for referere til lagrede spill, og kjre " -"spillet fra kommandolinjen" +#: gui/launcher.cpp:191 +#: gui/launcher.cpp:193 +#: gui/launcher.cpp:194 +msgid "Short game identifier used for referring to savegames and running the game from the command line" +msgstr "Kort spill-identifikator, brukt for referere til lagrede spill, og kjre spillet fra kommandolinjen" #: gui/launcher.cpp:193 msgctxt "lowres" @@ -156,7 +189,9 @@ msgstr "ID:" msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:198 +#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgid "Full title of the game" msgstr "Full spilltittel" @@ -169,16 +204,17 @@ msgstr "Navn:" msgid "Language:" msgstr "Sprk:" -#: gui/launcher.cpp:204 gui/launcher.cpp:205 -msgid "" -"Language of the game. This will not turn your Spanish game version into " -"English" -msgstr "" -"Spillets sprk. Dette vil ikke gjre din spanske spillversjon om til engelsk " -"versjon" +#: gui/launcher.cpp:204 +#: gui/launcher.cpp:205 +msgid "Language of the game. This will not turn your Spanish game version into English" +msgstr "Spillets sprk. Dette vil ikke gjre din spanske spillversjon om til engelsk versjon" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 +#: gui/launcher.cpp:220 +#: gui/options.cpp:80 +#: gui/options.cpp:730 +#: gui/options.cpp:743 +#: gui/options.cpp:1199 #: audio/null.cpp:40 msgid "" msgstr "" @@ -187,7 +223,9 @@ msgstr "" msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219 +#: gui/launcher.cpp:216 +#: gui/launcher.cpp:218 +#: gui/launcher.cpp:219 msgid "Platform the game was originally designed for" msgstr "Plattform spillet opprinnelig ble designet for" @@ -197,15 +235,18 @@ msgid "Platform:" msgstr "Plattform:" #: gui/launcher.cpp:231 -#, fuzzy msgid "Engine" -msgstr "Undersk" +msgstr "Motor" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 +#: gui/options.cpp:1062 +#: gui/options.cpp:1079 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 +#: gui/options.cpp:1062 +#: gui/options.cpp:1079 msgid "GFX" msgstr "GFX" @@ -218,7 +259,8 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillinger" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 +#: gui/options.cpp:1085 msgid "Audio" msgstr "Lyd" @@ -231,11 +273,13 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillinger" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 +#: gui/options.cpp:1090 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 +#: gui/options.cpp:1092 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -249,7 +293,8 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillinger" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 +#: gui/options.cpp:1100 msgid "MIDI" msgstr "MIDI" @@ -262,7 +307,8 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillinger" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 +#: gui/options.cpp:1106 msgid "MT-32" msgstr "MT-32" @@ -275,11 +321,13 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillinger" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 +#: gui/options.cpp:1113 msgid "Paths" msgstr "Sti" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 +#: gui/options.cpp:1115 msgctxt "lowres" msgid "Paths" msgstr "Sti" @@ -293,54 +341,80 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spillsti:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 +#: gui/options.cpp:1139 msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327 +#: gui/launcher.cpp:324 +#: gui/launcher.cpp:326 +#: gui/launcher.cpp:327 msgid "Specifies path to additional data used the game" msgstr "Bestemmer sti til ytterligere data brukt av spillet" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 +#: gui/options.cpp:1141 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 +#: gui/options.cpp:1123 msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/launcher.cpp:333 +#: gui/launcher.cpp:335 +#: gui/launcher.cpp:336 +#: gui/options.cpp:1123 +#: gui/options.cpp:1125 +#: gui/options.cpp:1126 msgid "Specifies where your savegames are put" msgstr "Bestemmer sti til lagrede spill" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 +#: gui/options.cpp:1125 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 +#: gui/launcher.cpp:354 +#: gui/launcher.cpp:453 +#: gui/launcher.cpp:511 +#: gui/launcher.cpp:565 +#: gui/options.cpp:1134 +#: gui/options.cpp:1142 +#: gui/options.cpp:1151 +#: gui/options.cpp:1258 +#: gui/options.cpp:1264 +#: gui/options.cpp:1272 +#: gui/options.cpp:1302 +#: gui/options.cpp:1308 +#: gui/options.cpp:1315 +#: gui/options.cpp:1408 +#: gui/options.cpp:1411 #: gui/options.cpp:1423 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/launcher.cpp:359 +#: gui/launcher.cpp:459 +#: gui/launcher.cpp:569 +#: gui/options.cpp:1252 +#: gui/options.cpp:1296 +#: gui/options.cpp:1414 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 +#: gui/options.cpp:1417 msgid "Select SoundFont" msgstr "Velg SoundFont" -#: gui/launcher.cpp:523 gui/launcher.cpp:677 +#: gui/launcher.cpp:523 +#: gui/launcher.cpp:677 msgid "Select directory with game data" msgstr "Velg mappe med spilldata" @@ -356,11 +430,13 @@ msgstr "Velg mappe for lagrede spill" msgid "This game ID is already taken. Please choose another one." msgstr "Denne spill-IDen er allerede i bruk. Vennligst velg en annen." -#: gui/launcher.cpp:621 engines/dialogs.cpp:110 +#: gui/launcher.cpp:621 +#: engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~vslutt" -#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:621 +#: backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Avslutt ScummVM" @@ -368,7 +444,8 @@ msgstr "Avslutt ScummVM" msgid "A~b~out..." msgstr "~O~m..." -#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:622 +#: backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Om ScummVM" @@ -396,11 +473,13 @@ msgstr "~ msgid "Load savegame for selected game" msgstr "pne lagret spill for det valgte spillet" -#: gui/launcher.cpp:633 gui/launcher.cpp:1120 +#: gui/launcher.cpp:633 +#: gui/launcher.cpp:1120 msgid "~A~dd Game..." msgstr "~L~egg til spill..." -#: gui/launcher.cpp:633 gui/launcher.cpp:640 +#: gui/launcher.cpp:633 +#: gui/launcher.cpp:640 msgid "Hold Shift for Mass Add" msgstr "Hold Shift for legge til flere" @@ -408,7 +487,8 @@ msgstr "Hold Shift for msgid "~E~dit Game..." msgstr "~R~ediger spill..." -#: gui/launcher.cpp:635 gui/launcher.cpp:642 +#: gui/launcher.cpp:635 +#: gui/launcher.cpp:642 msgid "Change game options" msgstr "Endre spillinstillinger" @@ -416,11 +496,13 @@ msgstr "Endre spillinstillinger" msgid "~R~emove Game" msgstr "~F~jern spill" -#: gui/launcher.cpp:637 gui/launcher.cpp:644 +#: gui/launcher.cpp:637 +#: gui/launcher.cpp:644 msgid "Remove game from the list. The game data files stay intact" msgstr "Fjern spill fra listen. Spilldataene forblir intakte" -#: gui/launcher.cpp:640 gui/launcher.cpp:1120 +#: gui/launcher.cpp:640 +#: gui/launcher.cpp:1120 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~L~egg til spill..." @@ -439,31 +521,36 @@ msgstr "~F~jern spill" msgid "Search in game list" msgstr "Sk i spilliste" -#: gui/launcher.cpp:656 gui/launcher.cpp:1167 +#: gui/launcher.cpp:656 +#: gui/launcher.cpp:1167 msgid "Search:" msgstr "Sk:" -#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:214 +#: gui/launcher.cpp:680 +#: engines/dialogs.cpp:114 +#: engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:716 +#: engines/cruise/menu.cpp:214 msgid "Load game:" msgstr "pne spill:" -#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 -#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 -#: engines/cruise/menu.cpp:214 backends/platform/wince/CEActionsPocket.cpp:267 +#: gui/launcher.cpp:680 +#: engines/dialogs.cpp:114 +#: engines/scumm/dialogs.cpp:188 +#: engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:716 +#: engines/cruise/menu.cpp:214 +#: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "pne" #: gui/launcher.cpp:788 -msgid "" -"Do you really want to run the mass game detector? This could potentially add " -"a huge number of games." -msgstr "" -"Vil du virkelig kjre flerspill-finneren? Dette kan potensielt legge til et " -"stort antall spill." +msgid "Do you really want to run the mass game detector? This could potentially add a huge number of games." +msgstr "Vil du virkelig kjre flerspill-finneren? Dette kan potensielt legge til et stort antall spill." -#: gui/launcher.cpp:789 gui/launcher.cpp:937 +#: gui/launcher.cpp:789 +#: gui/launcher.cpp:937 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -471,7 +558,8 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:789 gui/launcher.cpp:937 +#: gui/launcher.cpp:789 +#: gui/launcher.cpp:937 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -501,8 +589,7 @@ msgstr "Dette spillet st #: gui/launcher.cpp:1005 msgid "ScummVM could not find any engine capable of running the selected game!" -msgstr "" -"ScummVM kunne ikke finne noen motor som kunne kjre det valgte spillet!" +msgstr "ScummVM kunne ikke finne noen motor som kunne kjre det valgte spillet!" #: gui/launcher.cpp:1119 msgctxt "lowres" @@ -513,7 +600,8 @@ msgstr "Legg til flere..." msgid "Mass Add..." msgstr "Legg til flere..." -#: gui/massadd.cpp:78 gui/massadd.cpp:81 +#: gui/massadd.cpp:78 +#: gui/massadd.cpp:81 msgid "... progress ..." msgstr "... fremdrift ..." @@ -524,7 +612,7 @@ msgstr "S #: gui/massadd.cpp:261 #, c-format msgid "Discovered %d new games, ignored %d previously added games." -msgstr "" +msgstr "Fant %d nye spill, ignorerte %d spill som har blitt lagt til tidligere." #: gui/massadd.cpp:265 #, c-format @@ -532,9 +620,9 @@ msgid "Scanned %d directories ..." msgstr "Sjekket %d mapper ..." #: gui/massadd.cpp:268 -#, fuzzy, c-format +#, c-format msgid "Discovered %d new games, ignored %d previously added games ..." -msgstr "Fant %d nye spill ..." +msgstr "Fant %d nye spill, ignorerte %d spill som har blitt lagt til tidligere..." #: gui/options.cpp:78 msgid "Never" @@ -576,27 +664,30 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:248 +#: gui/options.cpp:474 +#: gui/options.cpp:575 +#: gui/options.cpp:644 +#: gui/options.cpp:852 msgctxt "soundfont" msgid "None" msgstr "Ingen" #: gui/options.cpp:382 msgid "Failed to apply some of the graphic options changes:" -msgstr "" +msgstr "Klarte ikke aktivere enkelte av endringene i grafikkinstillinger:" #: gui/options.cpp:394 msgid "the video mode could not be changed." -msgstr "" +msgstr "videomodusen kunne ikke endres." #: gui/options.cpp:400 msgid "the fullscreen setting could not be changed" -msgstr "" +msgstr "fullskjermsinnstillingen kunne ikke endres" #: gui/options.cpp:406 msgid "the aspect ratio setting could not be changed" -msgstr "" +msgstr "aspektrate-innstillingen kunne ikke endres" #: gui/options.cpp:727 msgid "Graphics mode:" @@ -606,7 +697,8 @@ msgstr "Grafikkmodus:" msgid "Render mode:" msgstr "Tegnemodus:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:741 +#: gui/options.cpp:742 msgid "Special dithering modes supported by some games" msgstr "Spesiel dithering-modus stttet av enkelte spill" @@ -632,11 +724,14 @@ msgstr "Foretrukket enhet:" msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:764 +#: gui/options.cpp:766 msgid "Specifies preferred sound device or sound card emulator" msgstr "Velger foretrukket lydenhet eller lydkort-emulator" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:764 +#: gui/options.cpp:766 +#: gui/options.cpp:767 msgid "Specifies output sound device or sound card emulator" msgstr "Velger ut-lydenhet eller lydkortemulator" @@ -654,7 +749,8 @@ msgstr "Musikkenhet:" msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:793 +#: gui/options.cpp:794 msgid "AdLib is used for music in many games" msgstr "AdLib brukes til musikk i mange spill" @@ -662,13 +758,10 @@ msgstr "AdLib brukes til musikk i mange spill" msgid "Output rate:" msgstr "Utrate:" -#: gui/options.cpp:804 gui/options.cpp:805 -msgid "" -"Higher value specifies better sound quality but may be not supported by your " -"soundcard" -msgstr "" -"Hyere verdier gir bedre lydkvalitet, men stttes kanskje ikke av ditt " -"lydkort " +#: gui/options.cpp:804 +#: gui/options.cpp:805 +msgid "Higher value specifies better sound quality but may be not supported by your soundcard" +msgstr "Hyere verdier gir bedre lydkvalitet, men stttes kanskje ikke av ditt lydkort " #: gui/options.cpp:815 msgid "GM Device:" @@ -682,7 +775,8 @@ msgstr "Velger standard lydenhet for General MIDI-utdata" msgid "Don't use General MIDI music" msgstr "Ikke bruk General MIDI-musikk" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:837 +#: gui/options.cpp:899 msgid "Use first available device" msgstr "Bruk frste tilgjengelige enhet" @@ -690,7 +784,9 @@ msgstr "Bruk f msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:849 +#: gui/options.cpp:851 +#: gui/options.cpp:852 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "SoundFont stttes ikke av enkelte lydkort, FluidSynth og Timidity" @@ -723,13 +819,10 @@ msgstr "Velger standard lydenhet for Roland MT-32/LAPC1/CM32I/CM64-avspilling" msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:875 gui/options.cpp:877 -msgid "" -"Check if you want to use your real hardware Roland-compatible sound device " -"connected to your computer" -msgstr "" -"Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og " -"vil bruke dette." +#: gui/options.cpp:875 +#: gui/options.cpp:877 +msgid "Check if you want to use your real hardware Roland-compatible sound device connected to your computer" +msgstr "Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og vil bruke dette." #: gui/options.cpp:877 msgctxt "lowres" @@ -752,11 +845,13 @@ msgstr "Ikke bruk Roland MT-32-musikk" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:920 +#: gui/options.cpp:930 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:921 +#: gui/options.cpp:931 msgid "Subtitles" msgstr "Undertekster" @@ -812,7 +907,9 @@ msgstr "Demp alle" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:962 +#: gui/options.cpp:964 +#: gui/options.cpp:965 msgid "Special sound effects volume" msgstr "Volum for spesielle lydeffekter" @@ -839,7 +936,9 @@ msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1139 +#: gui/options.cpp:1141 +#: gui/options.cpp:1142 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Velger sti for ytterligere data brukt av alle spill eller ScummVM" @@ -891,9 +990,8 @@ msgid "Language of ScummVM GUI" msgstr "Sprk i ScummVM-GUIet" #: gui/options.cpp:1347 -#, fuzzy msgid "You have to restart ScummVM before your changes will take effect." -msgstr "Du m omstarte ScummVM for at endringene skal skje. " +msgstr "Du m starte ScummVM p nytt for at endringene skal tre i kraft. " #: gui/options.cpp:1360 msgid "Select directory for savegames" @@ -916,26 +1014,26 @@ msgid "Select directory for plugins" msgstr "Velg mappe for plugins" #: gui/options.cpp:1450 -msgid "" -"The theme you selected does not support your current language. If you want " -"to use this theme you need to switch to another language first." -msgstr "" -"Temaet du valgte sttter ikke det aktive sprket. Hvis du vil bruke dette " -"temaet, m du bytte til et annet sprk frst." +msgid "The theme you selected does not support your current language. If you want to use this theme you need to switch to another language first." +msgstr "Temaet du valgte sttter ikke det aktive sprket. Hvis du vil bruke dette temaet, m du bytte til et annet sprk frst." -#: gui/saveload.cpp:59 gui/saveload.cpp:257 +#: gui/saveload.cpp:59 +#: gui/saveload.cpp:257 msgid "No date saved" msgstr "Ingen dato lagret" -#: gui/saveload.cpp:60 gui/saveload.cpp:258 +#: gui/saveload.cpp:60 +#: gui/saveload.cpp:258 msgid "No time saved" msgstr "Ingen tid lagret" -#: gui/saveload.cpp:61 gui/saveload.cpp:259 +#: gui/saveload.cpp:61 +#: gui/saveload.cpp:259 msgid "No playtime saved" msgstr "Ingen spilltid lagret" -#: gui/saveload.cpp:68 gui/saveload.cpp:173 +#: gui/saveload.cpp:68 +#: gui/saveload.cpp:173 msgid "Delete" msgstr "Slett" @@ -955,7 +1053,8 @@ msgstr "Tid: " msgid "Playtime: " msgstr "Spilltid: " -#: gui/saveload.cpp:305 gui/saveload.cpp:372 +#: gui/saveload.cpp:305 +#: gui/saveload.cpp:372 msgid "Untitled savestate" msgstr "Ikke navngitt spilltilstand" @@ -988,7 +1087,10 @@ msgstr "Antialiased Tegner (16bpp)" msgid "Antialiased (16bpp)" msgstr "Antialiased (16bpp)" -#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332 +#: gui/widget.cpp:322 +#: gui/widget.cpp:324 +#: gui/widget.cpp:330 +#: gui/widget.cpp:332 msgid "Clear value" msgstr "Tm verdi" @@ -1001,13 +1103,15 @@ msgstr "Motoren st msgid "Menu" msgstr "Meny" -#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:290 +#: backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Hopp over" -#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:293 +#: backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" @@ -1082,7 +1186,7 @@ msgstr "Spillmotor-plugin st #: common/error.cpp:71 msgid "User canceled" -msgstr "" +msgstr "Brukeren avbrt" #: common/error.cpp:75 msgid "Unknown error" @@ -1091,15 +1195,15 @@ msgstr "Ukjent feil" #: engines/advancedDetector.cpp:324 #, c-format msgid "The game in '%s' seems to be unknown." -msgstr "" +msgstr "Spillet i '%s' ser ut til vre ukjent." #: engines/advancedDetector.cpp:325 msgid "Please, report the following data to the ScummVM team along with name" -msgstr "" +msgstr "Vennligst rapporter de flgende dataene til ScummVM-teamet sammen med navnet" #: engines/advancedDetector.cpp:327 msgid "of the game you tried to add and its version/language/etc.:" -msgstr "" +msgstr "p spillet du forskte legge til, og dets versjon/sprk/etc.:" #: engines/dialogs.cpp:84 msgid "~R~esume" @@ -1125,22 +1229,28 @@ msgstr "~H~jelp" msgid "~A~bout" msgstr "~O~m" -#: engines/dialogs.cpp:104 engines/dialogs.cpp:180 +#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:180 msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" -#: engines/dialogs.cpp:106 engines/dialogs.cpp:182 +#: engines/dialogs.cpp:106 +#: engines/dialogs.cpp:182 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" -#: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/dialogs.cpp:115 +#: engines/agi/saveload.cpp:803 +#: engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:728 msgid "Save game:" msgstr "Lagret spill:" -#: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 +#: engines/dialogs.cpp:115 +#: engines/agi/saveload.cpp:803 +#: engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 #: engines/sci/engine/kfile.cpp:728 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 @@ -1151,25 +1261,22 @@ msgid "Save" msgstr "Lagre" #: engines/dialogs.cpp:144 -msgid "" -"Sorry, this engine does not currently provide in-game help. Please consult " -"the README for basic information, and for instructions on how to obtain " -"further assistance." -msgstr "" +msgid "Sorry, this engine does not currently provide in-game help. Please consult the README for basic information, and for instructions on how to obtain further assistance." +msgstr "Beklager, men denne motoren sttter for yeblikket ikke hjelp i spillet. Vennligst se i README-filen for grunnleggende informasjon, og for instruksjoner om hvordan du kan f ytterligere hjelp." #: engines/dialogs.cpp:228 #, c-format -msgid "" -"Gamestate save failed (%s)! Please consult the README for basic information, " -"and for instructions on how to obtain further assistance." -msgstr "" +msgid "Gamestate save failed (%s)! Please consult the README for basic information, and for instructions on how to obtain further assistance." +msgstr "Lagring av spilltilstand feilet (%s)! Vennligst konsulter README-filen for grunnleggende informasjon og instruksjon om hvordan du fr ytterligere hjelp." -#: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:301 +#: engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:302 +#: engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~A~vbryt" @@ -1180,21 +1287,19 @@ msgstr "~T~aster" #: engines/engine.cpp:235 msgid "Could not initialize color format." -msgstr "" +msgstr "Kunne ikke initalisere fargeformat." #: engines/engine.cpp:243 -#, fuzzy msgid "Could not switch to video mode: '" -msgstr "Nvrende videomodus:" +msgstr "Kunne ikke veksle til videomodus: '" #: engines/engine.cpp:252 -#, fuzzy msgid "Could not apply aspect ratio setting." -msgstr "Veksle aspekt-rate korrigering" +msgstr "Kunne ikke aktivere aspektrate-innstilling." #: engines/engine.cpp:257 msgid "Could not apply fullscreen setting." -msgstr "" +msgstr "Kunne ikke aktivere fullskjermsinnstilling." #: engines/engine.cpp:357 msgid "" @@ -1204,6 +1309,11 @@ msgid "" "the data files to your hard disk instead.\n" "See the README file for details." msgstr "" +"Du ser ut til spille dette spillet direkte fra\n" +"CDen. Dette er kjent for skape problemer,\n" +"og det er derfor anbefalt at du kopierer\n" +"datafilene til harddisken din istedet.\n" +"Se README-filen for detaljer." #: engines/engine.cpp:368 msgid "" @@ -1216,108 +1326,99 @@ msgstr "" #: engines/engine.cpp:426 #, c-format -msgid "" -"Gamestate load failed (%s)! Please consult the README for basic information, " -"and for instructions on how to obtain further assistance." +msgid "Gamestate load failed (%s)! Please consult the README for basic information, and for instructions on how to obtain further assistance." msgstr "" #: engines/engine.cpp:439 -msgid "" -"WARNING: The game you are about to start is not yet fully supported by " -"ScummVM. As such, it is likely to be unstable, and any saves you make might " -"not work in future versions of ScummVM." -msgstr "" +msgid "WARNING: The game you are about to start is not yet fully supported by ScummVM. As such, it is likely to be unstable, and any saves you make might not work in future versions of ScummVM." +msgstr "ADVARSEL: Spillet du prver starte er ikke fullstendig stttet av ScummVM. Derfor er det sannsynlig at det vil vre ustabilt, og det er ikke sikkert at lagrede spill vil fortsette fungere i fremtidige versjoner av ScummVM." #: engines/engine.cpp:442 msgid "Start anyway" -msgstr "" +msgstr "Start allikevel" -#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47 +#: engines/agi/detection.cpp:145 +#: engines/dreamweb/detection.cpp:47 #: engines/sci/detection.cpp:390 msgid "Use original save/load screens" -msgstr "" +msgstr "Bruk originale lagre/laste-skjermer" -#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48 +#: engines/agi/detection.cpp:146 +#: engines/dreamweb/detection.cpp:48 #: engines/sci/detection.cpp:391 msgid "Use the original save/load screens, instead of the ScummVM ones" -msgstr "" +msgstr "Bruk de originale lagre/laste-skjermene, istedenfor ScummVM-variantene" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 +#: engines/sci/engine/kfile.cpp:824 msgid "Restore game:" msgstr "Gjennopprett spill:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 +#: engines/sci/engine/kfile.cpp:824 msgid "Restore" msgstr "Gjenopprett" #: engines/dreamweb/detection.cpp:57 -#, fuzzy msgid "Use bright palette mode" -msgstr "vre hyre gjenstand" +msgstr "Bruk lys palettmodus" #: engines/dreamweb/detection.cpp:58 msgid "Display graphics using the game's bright palette" -msgstr "" +msgstr "Vis grafikk med spillets lyse palett" #: engines/sci/detection.cpp:370 msgid "EGA undithering" msgstr "EGA av-dithering" #: engines/sci/detection.cpp:371 -#, fuzzy msgid "Enable undithering in EGA games" -msgstr "Slr av dithering i EGA-spill som sttter det." +msgstr "Aktiver av-dithering i EGA-spill" #: engines/sci/detection.cpp:380 -#, fuzzy msgid "Prefer digital sound effects" -msgstr "Volum for spesielle lydeffekter" +msgstr "Foretrekk digitale lydeffekter" #: engines/sci/detection.cpp:381 msgid "Prefer digital sound effects instead of synthesized ones" -msgstr "" +msgstr "Foretrekk digitale lydeffekter fremfor syntetiske" #: engines/sci/detection.cpp:400 msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "" +msgstr "Bruk IMF/Yahama-FB-01 for MIDI-output" #: engines/sci/detection.cpp:401 -msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " -"output" +msgid "Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI output" msgstr "" #: engines/sci/detection.cpp:411 msgid "Use CD audio" -msgstr "" +msgstr "Bruk CD-lyd" #: engines/sci/detection.cpp:412 msgid "Use CD audio instead of in-game audio, if available" -msgstr "" +msgstr "Bruk CD-lyd istedenfor spillets lyd, hvis tilgjengelig" #: engines/sci/detection.cpp:422 msgid "Use Windows cursors" -msgstr "" +msgstr "Bruk Windows-muspekere" #: engines/sci/detection.cpp:423 -msgid "" -"Use the Windows cursors (smaller and monochrome) instead of the DOS ones" -msgstr "" +msgid "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" +msgstr "Bruk Windows-muspekerene (mindre, og monokrome) isteden" #: engines/sci/detection.cpp:433 -#, fuzzy msgid "Use silver cursors" -msgstr "Vanlig muspeker" +msgstr "Bruk slvmuspekere" #: engines/sci/detection.cpp:434 -msgid "" -"Use the alternate set of silver cursors, instead of the normal golden ones" -msgstr "" +msgid "Use the alternate set of silver cursors, instead of the normal golden ones" +msgstr "Bruk det alternative settet med slvmuspekere, istedenfor de normale gylne." #: engines/scumm/dialogs.cpp:175 #, c-format msgid "Insert Disk %c and Press Button to Continue." -msgstr "" +msgstr "Sett inn disk %c, og trykk Tast for fortsette." #: engines/scumm/dialogs.cpp:176 #, c-format @@ -1331,27 +1432,26 @@ msgstr "" #: engines/scumm/dialogs.cpp:178 msgid "Game Paused. Press SPACE to Continue." -msgstr "" +msgstr "Spill pauset. Trykk p MELLOMROMstasten for fortsette." #. I18N: You may specify 'Yes' symbol at the end of the line, like this: #. "Moechten Sie wirklich neu starten? (J/N)J" #. Will react to J as 'Yes' #: engines/scumm/dialogs.cpp:182 -#, fuzzy msgid "Are you sure you want to restart? (Y/N)" -msgstr " Er du sikker p at du vil avslutte ?" +msgstr "Er du sikker p at du vil avslutte? (Y/N)" #. I18N: you may specify 'Yes' symbol at the end of the line. See previous comment #: engines/scumm/dialogs.cpp:184 -#, fuzzy msgid "Are you sure you want to quit? (Y/N)" -msgstr " Er du sikker p at du vil avslutte ?" +msgstr "Er du sikker p at du vil avslutte? (Y/N)" #: engines/scumm/dialogs.cpp:189 msgid "Play" -msgstr "" +msgstr "Spill" -#: engines/scumm/dialogs.cpp:191 engines/scumm/help.cpp:82 +#: engines/scumm/dialogs.cpp:191 +#: engines/scumm/help.cpp:82 #: engines/scumm/help.cpp:84 #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 @@ -1366,38 +1466,37 @@ msgstr "" #: engines/scumm/dialogs.cpp:194 msgid "You must enter a name" -msgstr "" +msgstr "Du m skrive inn et navn" #: engines/scumm/dialogs.cpp:195 msgid "The game was NOT saved (disk full?)" -msgstr "" +msgstr "Spillet ble IKKE lagret (full disk?)" #: engines/scumm/dialogs.cpp:196 msgid "The game was NOT loaded" -msgstr "" +msgstr "Spillet ble IKKE lastet" #: engines/scumm/dialogs.cpp:197 #, c-format msgid "Saving '%s'" -msgstr "" +msgstr "Lagrer '%s'" #: engines/scumm/dialogs.cpp:198 #, c-format msgid "Loading '%s'" -msgstr "" +msgstr "Laster '%s'" #: engines/scumm/dialogs.cpp:199 msgid "Name your SAVE game" -msgstr "" +msgstr "Gi det LAGREDE spillet ditt et navn" #: engines/scumm/dialogs.cpp:200 -#, fuzzy msgid "Select a game to LOAD" -msgstr "Velg et tema" +msgstr "Velg et spill for LASTING" #: engines/scumm/dialogs.cpp:201 msgid "Game title)" -msgstr "" +msgstr "Spilltittel)" #. I18N: Previous page button #: engines/scumm/dialogs.cpp:287 @@ -1415,25 +1514,21 @@ msgid "~C~lose" msgstr "~L~ukk" #: engines/scumm/dialogs.cpp:597 -#, fuzzy msgid "Speech Only" -msgstr "Tale" +msgstr "Kun tale" #: engines/scumm/dialogs.cpp:598 -#, fuzzy msgid "Speech and Subtitles" -msgstr "Undertekster" +msgstr "Tale og undertekster" #: engines/scumm/dialogs.cpp:599 -#, fuzzy msgid "Subtitles Only" -msgstr "Undertekster" +msgstr "Kun undertekster" #: engines/scumm/dialogs.cpp:607 -#, fuzzy msgctxt "lowres" msgid "Speech & Subs" -msgstr "Tale" +msgstr "Tekst & Tale" #: engines/scumm/dialogs.cpp:653 msgid "Select a Proficiency Level." @@ -1441,20 +1536,19 @@ msgstr "" #: engines/scumm/dialogs.cpp:655 msgid "Refer to your Loom(TM) manual for help." -msgstr "" +msgstr "Referer til Loom(TM)-hndboka di for hjelp." #: engines/scumm/dialogs.cpp:658 -#, fuzzy msgid "Standard" -msgstr "Standard (16bpp)" +msgstr "Standard" #: engines/scumm/dialogs.cpp:659 msgid "Practice" -msgstr "" +msgstr "Trening" #: engines/scumm/dialogs.cpp:660 msgid "Expert" -msgstr "" +msgstr "Ekspert" #: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" @@ -1484,11 +1578,16 @@ msgstr "Space" msgid "Pause game" msgstr "Pause spill" -#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 -#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 -#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 -#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 -#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 +#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" @@ -1496,9 +1595,12 @@ msgstr "Ctrl" msgid "Load game state 1-10" msgstr "pne spilltilstand 1-10" -#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 -#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 -#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 +#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" @@ -1506,7 +1608,8 @@ msgstr "Alt" msgid "Save game state 1-10" msgstr "Lagre spilltilstand 1-10" -#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 +#: engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" @@ -1587,9 +1690,8 @@ msgid " since they may cause crashes" msgstr " de kan forrsake krsj, eller" #: engines/scumm/help.cpp:110 -#, fuzzy msgid " or incorrect game behavior." -msgstr " feilaktig spilloppfrsel." +msgstr " eller feilaktig spilloppfrsel." #: engines/scumm/help.cpp:114 msgid "Spinning drafts on the keyboard:" @@ -1599,24 +1701,30 @@ msgstr "Spinne drafts p msgid "Main game controls:" msgstr "Hovedkontroller for spill:" -#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:121 +#: engines/scumm/help.cpp:136 #: engines/scumm/help.cpp:161 msgid "Push" msgstr "Dytt" -#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:122 +#: engines/scumm/help.cpp:137 #: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Dra" -#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 -#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:123 +#: engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 +#: engines/scumm/help.cpp:197 #: engines/scumm/help.cpp:207 msgid "Give" msgstr "Gi" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:190 +#: engines/scumm/help.cpp:124 +#: engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:190 #: engines/scumm/help.cpp:208 msgid "Open" msgstr "pne" @@ -1629,43 +1737,54 @@ msgstr "G msgid "Get" msgstr "F" -#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 -#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:198 -#: engines/scumm/help.cpp:213 engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:128 +#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 +#: engines/scumm/help.cpp:198 +#: engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:224 #: engines/scumm/help.cpp:250 msgid "Use" msgstr "Bruk" -#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 +#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:141 msgid "Read" msgstr "Les" -#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 +#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:147 msgid "New kid" msgstr "Bytt unge" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:131 +#: engines/scumm/help.cpp:153 #: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Sl p" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:132 +#: engines/scumm/help.cpp:154 #: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Sl av" -#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:142 +#: engines/scumm/help.cpp:167 #: engines/scumm/help.cpp:194 msgid "Walk to" msgstr "G til" -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:143 +#: engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:195 +#: engines/scumm/help.cpp:210 #: engines/scumm/help.cpp:227 msgid "Pick up" msgstr "Plukk opp" -#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 +#: engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:169 msgid "What is" msgstr "Hva er" @@ -1689,11 +1808,13 @@ msgstr "Fiks" msgid "Switch" msgstr "Bytt" -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:166 +#: engines/scumm/help.cpp:228 msgid "Look" msgstr "Kikk" -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:173 +#: engines/scumm/help.cpp:223 msgid "Talk" msgstr "Snakk" @@ -1738,20 +1859,24 @@ msgstr "spill H p msgid "play C major on distaff" msgstr "spill C dur p distaffen" -#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 +#: engines/scumm/help.cpp:192 +#: engines/scumm/help.cpp:214 msgid "puSh" msgstr "Dytt" -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:215 +#: engines/scumm/help.cpp:193 +#: engines/scumm/help.cpp:215 msgid "pull (Yank)" msgstr "Dra" -#: engines/scumm/help.cpp:196 engines/scumm/help.cpp:212 +#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:212 #: engines/scumm/help.cpp:248 msgid "Talk to" msgstr "Snakk til" -#: engines/scumm/help.cpp:199 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:199 +#: engines/scumm/help.cpp:211 msgid "Look at" msgstr "Se p" @@ -1783,8 +1908,10 @@ msgstr "Merk neste dialog" msgid "Walk" msgstr "G" -#: engines/scumm/help.cpp:225 engines/scumm/help.cpp:234 -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:241 +#: engines/scumm/help.cpp:249 msgid "Inventory" msgstr "Inventar" @@ -1812,7 +1939,8 @@ msgstr "Sl msgid "Kick" msgstr "Spark" -#: engines/scumm/help.cpp:239 engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:239 +#: engines/scumm/help.cpp:247 msgid "Examine" msgstr "Undersk" @@ -1833,31 +1961,38 @@ msgstr "Lagre / msgid "Other game controls:" msgstr "Andre spillkontroller" -#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:267 +#: engines/scumm/help.cpp:257 +#: engines/scumm/help.cpp:267 msgid "Inventory:" msgstr "Inventar:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:258 +#: engines/scumm/help.cpp:274 msgid "Scroll list up" msgstr "Bla liste opp" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:259 +#: engines/scumm/help.cpp:275 msgid "Scroll list down" msgstr "Bla liste ned" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:260 +#: engines/scumm/help.cpp:268 msgid "Upper left item" msgstr "vre venstre gjenstand" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:261 +#: engines/scumm/help.cpp:270 msgid "Lower left item" msgstr "Nedre venstre gjenstand" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:262 +#: engines/scumm/help.cpp:271 msgid "Upper right item" msgstr "vre hyre gjenstand" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:263 +#: engines/scumm/help.cpp:273 msgid "Lower right item" msgstr "Nedre hyre gjenstand" @@ -1869,7 +2004,8 @@ msgstr "Midtre venstre gjenstand" msgid "Middle right item" msgstr "Midtre hyre gjenstand" -#: engines/scumm/help.cpp:279 engines/scumm/help.cpp:284 +#: engines/scumm/help.cpp:279 +#: engines/scumm/help.cpp:284 msgid "Switching characters:" msgstr "Bytte av karakterer:" @@ -1885,7 +2021,8 @@ msgstr "Tredje unge" msgid "Fighting controls (numpad):" msgstr "Kampkontroller (talltastatur)" -#: engines/scumm/help.cpp:295 engines/scumm/help.cpp:296 +#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:296 #: engines/scumm/help.cpp:297 msgid "Step back" msgstr "Bakoversteg" @@ -1977,7 +2114,8 @@ msgid "" "but %s is missing. Using AdLib instead." msgstr "" -#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:202 +#: engines/scumm/scumm.cpp:2278 +#: engines/agos/saveload.cpp:202 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1988,7 +2126,8 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2285 engines/agos/saveload.cpp:167 +#: engines/scumm/scumm.cpp:2285 +#: engines/agos/saveload.cpp:167 #, c-format msgid "" "Failed to load game state from file:\n" @@ -1999,7 +2138,8 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2297 engines/agos/saveload.cpp:210 +#: engines/scumm/scumm.cpp:2297 +#: engines/agos/saveload.cpp:210 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2011,17 +2151,12 @@ msgstr "" "%s" #: engines/scumm/scumm.cpp:2512 -msgid "" -"Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " -"play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " -"directory inside the Tentacle game directory." -msgstr "" -"Vanligvis, ville Maniac Mansion ha startet n. Men ScummVM sttter ikke det " -"enn. S, for spille Maniac Mansion, g til 'Legg til spill' i ScummVM-" -"hovedmenyen og velg 'Maniac'-undermappa i Tentacle-mappa." +msgid "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory." +msgstr "Vanligvis, ville Maniac Mansion ha startet n. Men ScummVM sttter ikke det enn. S, for spille Maniac Mansion, g til 'Legg til spill' i ScummVM-hovedmenyen og velg 'Maniac'-undermappa i Tentacle-mappa." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 +#: engines/mohawk/dialogs.cpp:171 msgid "~Z~ip Mode Activated" msgstr "~Z~ipmodus aktivert" @@ -2032,16 +2167,15 @@ msgstr "~O~verganger aktivert" #. I18N: Drop book page #: engines/mohawk/dialogs.cpp:95 msgid "~D~rop Page" -msgstr "" +msgstr "~D~ropp Side" #: engines/mohawk/dialogs.cpp:99 msgid "~S~how Map" -msgstr "" +msgstr "Vi~s~ Kart" #: engines/mohawk/dialogs.cpp:105 -#, fuzzy msgid "~M~ain Menu" -msgstr "ScummVM Hovedmeny" +msgstr "Hoved~m~eny" #: engines/mohawk/dialogs.cpp:172 msgid "~W~ater Effect Enabled" @@ -2052,48 +2186,34 @@ msgstr "~V~anneffekt aktivert" msgid "Cutscene file '%s' not found!" msgstr "" -#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1287 +#: engines/gob/inter_playtoons.cpp:256 +#: engines/gob/inter_v2.cpp:1287 #: engines/tinsel/saveload.cpp:502 -#, fuzzy msgid "Failed to load game state from file." -msgstr "" -"Klarte ikke pne spilltilstand fra fil:\n" -"\n" -"%s" +msgstr "Klarte ikke pne spilltilstand fra fil." -#: engines/gob/inter_v2.cpp:1357 engines/tinsel/saveload.cpp:515 -#, fuzzy +#: engines/gob/inter_v2.cpp:1357 +#: engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." -msgstr "" -"Klarte ikke lagre spilltilstand til fil:\n" -"\n" -"%s" +msgstr "Klarte ikke lagre spilltilstand fra fil." #: engines/gob/inter_v5.cpp:107 -#, fuzzy msgid "Failed to delete file." -msgstr "" -"Klarte ikke lagre spilltilstand til fil:\n" -"\n" -"%s" +msgstr "Klarte ikke slette fil." #: engines/groovie/script.cpp:420 -#, fuzzy msgid "Failed to save game" -msgstr "" -"Klarte ikke lagre spilltilstand til fil:\n" -"\n" -"%s" +msgstr "Klarte ikke lagre spill." #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 msgid "Studio audience" -msgstr "" +msgstr "Studiopublikum" #: engines/kyra/detection.cpp:63 msgid "Enable studio audience" -msgstr "" +msgstr "Aktiver studiopublikum" #. I18N: This option allows the user to skip text and cutscenes. #: engines/kyra/detection.cpp:73 @@ -2102,39 +2222,37 @@ msgstr "" #: engines/kyra/detection.cpp:74 msgid "Allow text and cutscenes to be skipped" -msgstr "" +msgstr "Tillat hoppe over tekst og kutt-scener" #. I18N: Helium mode makes people sound like they've inhaled Helium. #: engines/kyra/detection.cpp:84 msgid "Helium mode" -msgstr "" +msgstr "Helium-modus" #: engines/kyra/detection.cpp:85 -#, fuzzy msgid "Enable helium mode" -msgstr "Aktiver Roland GS-modus" +msgstr "Aktiver helium-modus" #. I18N: When enabled, this option makes scrolling smoother when #. changing from one screen to another. #: engines/kyra/detection.cpp:99 msgid "Smooth scrolling" -msgstr "" +msgstr "Myk scrolling" #: engines/kyra/detection.cpp:100 msgid "Enable smooth scrolling when walking" -msgstr "" +msgstr "Aktiver myk scrolling nr man gr" #. I18N: When enabled, this option changes the cursor when it floats to the #. edge of the screen to a directional arrow. The player can then click to #. walk towards that direction. #: engines/kyra/detection.cpp:112 -#, fuzzy msgid "Floating cursors" -msgstr "Vanlig muspeker" +msgstr "Flytende muspekere" #: engines/kyra/detection.cpp:113 msgid "Enable floating cursors" -msgstr "" +msgstr "Aktiver flytende muspekere" #. I18N: HP stands for Hit Points #: engines/kyra/detection.cpp:127 @@ -2147,52 +2265,47 @@ msgstr "" #: engines/kyra/lol.cpp:478 msgid "Attack 1" -msgstr "" +msgstr "Angrep 1" #: engines/kyra/lol.cpp:479 msgid "Attack 2" -msgstr "" +msgstr "Angrep 2" #: engines/kyra/lol.cpp:480 msgid "Attack 3" -msgstr "" +msgstr "Angrep 3" #: engines/kyra/lol.cpp:481 msgid "Move Forward" -msgstr "" +msgstr "Beveg Fremover" #: engines/kyra/lol.cpp:482 msgid "Move Back" -msgstr "" +msgstr "Beveg Bakover" #: engines/kyra/lol.cpp:483 msgid "Slide Left" -msgstr "" +msgstr "Skli mot Venstre" #: engines/kyra/lol.cpp:484 -#, fuzzy msgid "Slide Right" -msgstr "Hyre" +msgstr "Skli mot Hyre" #: engines/kyra/lol.cpp:485 -#, fuzzy msgid "Turn Left" -msgstr "Sl av" +msgstr "Svin til Venstre" #: engines/kyra/lol.cpp:486 -#, fuzzy msgid "Turn Right" -msgstr "Peker hyre" +msgstr "Sving til Hyre" #: engines/kyra/lol.cpp:487 -#, fuzzy msgid "Rest" -msgstr "Gjenopprett" +msgstr "Hvil" #: engines/kyra/lol.cpp:488 -#, fuzzy msgid "Options" -msgstr "~V~alg" +msgstr "Valg" #: engines/kyra/lol.cpp:489 #, fuzzy @@ -2207,20 +2320,29 @@ msgid "" "General MIDI ones. After all it might happen\n" "that a few tracks will not be correctly played." msgstr "" +"Du ser ut til bruke en General MIDI-enhet,\n" +"men spillet ditt sttter bare Roland MT32-MIDI.\n" +"Vi forsker koble Roland MT32-instrumentene til\n" +"General MIDI-instrumentene. Allikevel, kan det\n" +"skje at enkelte spor ikke vil spilles riktig." -#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 +#: engines/queen/queen.cpp:59 +#: engines/sky/detection.cpp:44 msgid "Floppy intro" -msgstr "" +msgstr "Diskett-intro" -#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45 +#: engines/queen/queen.cpp:60 +#: engines/sky/detection.cpp:45 msgid "Use the floppy version's intro (CD version only)" -msgstr "" +msgstr "Bruk diskettversjonens intro (Kun for CD-versjon)" #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" "Please download it from www.scummvm.org" msgstr "" +"Fant ikke filen \"sky.cpt\"!\n" +"Vennligst last den ned fra www.scummvm.org" #: engines/sky/compact.cpp:141 msgid "" @@ -2233,29 +2355,33 @@ msgstr "" msgid "PSX stream cutscene '%s' cannot be played in paletted mode" msgstr "" -#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 +#: engines/sword1/animation.cpp:560 +#: engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" -#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 +#: engines/sword1/animation.cpp:570 +#: engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "" -#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 +#: engines/sword1/animation.cpp:576 +#: engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "" #: engines/sword1/control.cpp:863 msgid "" -"ScummVM found that you have old savefiles for Broken Sword 1 that should be " -"converted.\n" -"The old save game format is no longer supported, so you will not be able to " -"load your games if you don't convert them.\n" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be converted.\n" +"The old save game format is no longer supported, so you will not be able to load your games if you don't convert them.\n" "\n" -"Press OK to convert them now, otherwise you will be asked again the next " -"time you start the game.\n" +"Press OK to convert them now, otherwise you will be asked again the next time you start the game.\n" msgstr "" +"ScummVM oppdaget at du har gamle lagrede spill for Broken Sword 1 som br konverteres.\n" +"Det gamle formatet for lagrede spill stttes ikke lengre, s du vil ikke vre i stand til laste de lagrede spillene,\n" +"med mindre du konverterer dem.\n" +"Trykk OK for konvertere dem n, ellers vil du bli spurt igjen neste gang du starter spillet." #: engines/sword1/control.cpp:1232 #, c-format @@ -2266,19 +2392,18 @@ msgstr "" #: engines/sword1/control.cpp:1235 msgid "Keep the old one" -msgstr "" +msgstr "Behold den gamle" #: engines/sword1/control.cpp:1235 msgid "Keep the new one" -msgstr "" +msgstr "Behold den nye" #: engines/sword1/logic.cpp:1633 msgid "This is the end of the Broken Sword 1 Demo" -msgstr "" +msgstr "Dette er slutten p Broken Sword 1-demoen" #: engines/sword2/animation.cpp:435 -msgid "" -"PSX cutscenes found but ScummVM has been built without RGB color support" +msgid "PSX cutscenes found but ScummVM has been built without RGB color support" msgstr "" #: engines/sword2/sword2.cpp:79 @@ -2297,36 +2422,38 @@ msgid "" msgstr "" #: engines/parallaction/saveload.cpp:204 -#, fuzzy msgid "Loading game..." -msgstr "pne spill:" +msgstr "Laster spill..." #: engines/parallaction/saveload.cpp:219 -#, fuzzy msgid "Saving game..." -msgstr "Lagret spill:" +msgstr "Lagrer spill..." #: engines/parallaction/saveload.cpp:272 msgid "" -"ScummVM found that you have old savefiles for Nippon Safes that should be " -"renamed.\n" -"The old names are no longer supported, so you will not be able to load your " -"games if you don't convert them.\n" +"ScummVM found that you have old savefiles for Nippon Safes that should be renamed.\n" +"The old names are no longer supported, so you will not be able to load your games if you don't convert them.\n" "\n" "Press OK to convert them now, otherwise you will be asked next time.\n" msgstr "" +"ScummVM oppdaget at du har gamle lagrede spill for Nippon Safes som br omdpes.\n" +"De gamle navnene stttes ikke lengre, s du vil ikke vre i stand til laste de lagrede spillene,\n" +"med mindre du konverterer dem.\n" +"Trykk OK for konvertere dem n, ellers vil du bli spurt igjen neste gang du starter spillet." #: engines/parallaction/saveload.cpp:319 msgid "ScummVM successfully converted all your savefiles." -msgstr "" +msgstr "ScummVM konverterte alle de lagrede spillene dine uten problemer." #: engines/parallaction/saveload.cpp:321 msgid "" -"ScummVM printed some warnings in your console window and can't guarantee all " -"your files have been converted.\n" +"ScummVM printed some warnings in your console window and can't guarantee all your files have been converted.\n" "\n" "Please report to the team." msgstr "" +"ScummVM skrev ut noen advarsler i konsollvinduet ditt og kan ikke garantere at alle filene dine har blitt konvertert.\n" +"\n" +"Vennligst rapporter dette til teamet." #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" @@ -2338,36 +2465,30 @@ msgstr "DOSBox OPL emulator" #: audio/mididrv.cpp:209 #, c-format -msgid "" -"The selected audio device '%s' was not found (e.g. might be turned off or " -"disconnected)." -msgstr "" +msgid "The selected audio device '%s' was not found (e.g. might be turned off or disconnected)." +msgstr "Den valgte lydenheten '%s' ble ikke funnet (den kan f.eks. vre avsltt eller frakoblet)." -#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:209 +#: audio/mididrv.cpp:221 +#: audio/mididrv.cpp:257 #: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." -msgstr "" +msgstr "Forsker falle tilbake p den neste tilgjengelige enheten..." #: audio/mididrv.cpp:221 #, c-format -msgid "" -"The selected audio device '%s' cannot be used. See log file for more " -"information." -msgstr "" +msgid "The selected audio device '%s' cannot be used. See log file for more information." +msgstr "Den valgte lydenheten '%s' kan ikke brukes. Se logg-filen for mer informasjon." #: audio/mididrv.cpp:257 #, c-format -msgid "" -"The preferred audio device '%s' was not found (e.g. might be turned off or " -"disconnected)." -msgstr "" +msgid "The preferred audio device '%s' was not found (e.g. might be turned off or disconnected)." +msgstr "Den foretrukne lydenheten '%s' ble ikke funnet (den kan f.eks. vre avsltt eller frakoblet)." #: audio/mididrv.cpp:272 #, c-format -msgid "" -"The preferred audio device '%s' cannot be used. See log file for more " -"information." -msgstr "" +msgid "The preferred audio device '%s' cannot be used. See log file for more information." +msgstr "Den foretrukne lydenheten '%s' kan ikke brukes. Se i logg-filen for mer informasjon." #: audio/null.h:43 msgid "No music" @@ -2390,7 +2511,6 @@ msgid "C64 Audio Emulator" msgstr "C64 Lydemulator" #: audio/softsynth/mt32.cpp:293 -#, fuzzy msgid "Initializing MT-32 Emulator" msgstr "Initialiserer MT-32-Emulator" @@ -2421,7 +2541,7 @@ msgstr " (Aktiv)" #: backends/keymapper/remap-dialog.cpp:106 msgid " (Blocked)" -msgstr "" +msgstr " (Blokkert)" #: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" @@ -2508,14 +2628,12 @@ msgid "Disable power off" msgstr "Deaktiver strmsparing" #: backends/platform/iphone/osys_events.cpp:300 -#, fuzzy msgid "Mouse-click-and-drag mode enabled." -msgstr "Touchpad-modus aktivert." +msgstr "Mus-klikk-og-dra-modus aktivert." #: backends/platform/iphone/osys_events.cpp:302 -#, fuzzy msgid "Mouse-click-and-drag mode disabled." -msgstr "Touchpad-modus deaktivert." +msgstr "Mus-klikk-og-dra-modus-deaktivert." #: backends/platform/iphone/osys_events.cpp:313 msgid "Touchpad mode enabled." @@ -2527,7 +2645,7 @@ msgstr "Touchpad-modus deaktivert." #: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" -msgstr "" +msgstr "Klikkmodus" #: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 @@ -2538,9 +2656,8 @@ msgid "Left Click" msgstr "Venstreklikk" #: backends/platform/maemo/maemo.cpp:214 -#, fuzzy msgid "Middle Click" -msgstr "Midtre venstre gjenstand" +msgstr "Midtklikk" #: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 @@ -2550,7 +2667,6 @@ msgid "Right Click" msgstr "Hyreklikk" #: backends/platform/sdl/macosx/appmenu_osx.mm:78 -#, fuzzy msgid "Hide ScummVM" msgstr "Skjul ScummVM" @@ -2582,26 +2698,22 @@ msgstr "Normal (ingen skalering)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 -#, fuzzy msgid "Enabled aspect ratio correction" -msgstr "Veksle aspekt-rate korrigering" +msgstr "Aspekt-rate korrigering aktivert" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 -#, fuzzy msgid "Disabled aspect ratio correction" -msgstr "Veksle aspekt-rate korrigering" +msgstr "Aspekt-rate korrigering deaktivert" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2196 -#, fuzzy msgid "Active graphics filter:" -msgstr "Bytt grafikkfiltre" +msgstr "Aktivt grafikkfilter:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 -#, fuzzy msgid "Windowed mode" -msgstr "Tegnemodus:" +msgstr "Vindusmodus" #: backends/graphics/opengl/opengl-graphics.cpp:135 msgid "OpenGL Normal" @@ -2616,21 +2728,20 @@ msgid "OpenGL Original" msgstr "OpenGL Original" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:415 -#, fuzzy msgid "Current display mode" -msgstr "Nvrende videomodus:" +msgstr "Nvrende videomodus" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:428 msgid "Current scale" -msgstr "" +msgstr "Nvrende skala" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 msgid "Active filter mode: Linear" -msgstr "" +msgstr "Aktiv filtermodus: Linjr" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 msgid "Active filter mode: Nearest" -msgstr "" +msgstr "Aktiv filtermodus: Nrmeste" #: backends/platform/symbian/src/SymbianActions.cpp:38 #: backends/platform/wince/CEActionsSmartphone.cpp:39 @@ -2714,7 +2825,7 @@ msgstr "Horisontal underscan:" #: backends/platform/wii/options.cpp:66 msgid "Vertical underscan:" -msgstr "Vertikal underscan" +msgstr "Vertikal underscan:" #: backends/platform/wii/options.cpp:71 msgid "Input" @@ -2732,11 +2843,13 @@ msgstr "GC Pad-aksellerasjon:" msgid "DVD" msgstr "DVD" -#: backends/platform/wii/options.cpp:89 backends/platform/wii/options.cpp:101 +#: backends/platform/wii/options.cpp:89 +#: backends/platform/wii/options.cpp:101 msgid "Status:" msgstr "Status:" -#: backends/platform/wii/options.cpp:90 backends/platform/wii/options.cpp:102 +#: backends/platform/wii/options.cpp:90 +#: backends/platform/wii/options.cpp:102 msgid "Unknown" msgstr "Ukjent" @@ -2813,17 +2926,15 @@ msgid "Network down" msgstr "Nettverket er nede" #: backends/platform/wii/options.cpp:178 -#, fuzzy msgid "Initializing network" msgstr "Initialiserer nettverk" #: backends/platform/wii/options.cpp:182 -#, fuzzy msgid "Timeout while initializing network" msgstr "Timeout under initialisering av nettverk" #: backends/platform/wii/options.cpp:186 -#, fuzzy, c-format +#, c-format msgid "Network not initialized (%d)" msgstr "Nettverk ikke initialisert (%d)" @@ -2916,8 +3027,7 @@ msgstr "Koble handling til h #: backends/platform/wince/wince-sdl.cpp:519 msgid "You must map a key to the 'Right Click' action to play this game" -msgstr "" -"Du m koble en tast til handlingen 'Hyreklikk' for spille dette spillet" +msgstr "Du m koble en tast til handlingen 'Hyreklikk' for spille dette spillet" #: backends/platform/wince/wince-sdl.cpp:528 msgid "Map hide toolbar action" @@ -2925,9 +3035,7 @@ msgstr "Koble skjul-verkt #: backends/platform/wince/wince-sdl.cpp:532 msgid "You must map a key to the 'Hide toolbar' action to play this game" -msgstr "" -"Du m koble en tast til 'Skjul verktylinje'-handlingen for spille dette " -"spillet" +msgstr "Du m koble en tast til 'Skjul verktylinje'-handlingen for spille dette spillet" #: backends/platform/wince/wince-sdl.cpp:541 msgid "Map Zoom Up action (optional)" @@ -2938,90 +3046,78 @@ msgid "Map Zoom Down action (optional)" msgstr "Koble handlingen Zoom Ned (valgfritt)" #: backends/platform/wince/wince-sdl.cpp:552 -msgid "" -"Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" -msgstr "" -"Ikke glem koble en tast til handlingen 'Skjul verktylinje' for se hele " -"inventaret" +msgid "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" +msgstr "Ikke glem koble en tast til handlingen 'Skjul verktylinje' for se hele inventaret" #: backends/events/default/default-events.cpp:191 -#, fuzzy msgid "Do you really want to return to the Launcher?" -msgstr "Vil du virkelig slette dette lagrede spillet?" +msgstr "Vil du virkelig returnere til oppstarteren?" #: backends/events/default/default-events.cpp:191 -#, fuzzy msgid "Launcher" -msgstr "Sl" +msgstr "Oppstarter" #: backends/events/default/default-events.cpp:213 -#, fuzzy msgid "Do you really want to quit?" -msgstr "Vil du avslutte?" +msgstr "Vil du virkelig avslutte?" #: backends/events/gph/gph-events.cpp:338 #: backends/events/gph/gph-events.cpp:381 #: backends/events/openpandora/op-events.cpp:139 msgid "Touchscreen 'Tap Mode' - Left Click" -msgstr "" +msgstr "Touchskjerm 'Tapmodus' - Venstreklikk" #: backends/events/gph/gph-events.cpp:340 #: backends/events/gph/gph-events.cpp:383 #: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Right Click" -msgstr "" +msgstr "Touchskjerm 'Tapmodus' - Hyreklikk" #: backends/events/gph/gph-events.cpp:342 #: backends/events/gph/gph-events.cpp:385 #: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" -msgstr "" +msgstr "Touchskjerm 'Tapmodus' - Sveve (Ingen Klikk)" #: backends/events/gph/gph-events.cpp:362 -#, fuzzy msgid "Maximum Volume" -msgstr "Volum" +msgstr "Maksimalt Volum" #: backends/events/gph/gph-events.cpp:364 msgid "Increasing Volume" -msgstr "" +msgstr "ker volum" #: backends/events/gph/gph-events.cpp:370 -#, fuzzy msgid "Minimal Volume" -msgstr "Volum" +msgstr "Minimalt Volum" #: backends/events/gph/gph-events.cpp:372 msgid "Decreasing Volume" -msgstr "" +msgstr "Senker volum" #: backends/updates/macosx/macosx-updates.mm:65 msgid "Check for Updates..." -msgstr "" +msgstr "Sjekk for oppdateringer..." #: backends/platform/bada/form.cpp:269 -#, fuzzy msgid "Right Click Once" -msgstr "Hyreklikk" +msgstr "Hyreklikk n gang" #: backends/platform/bada/form.cpp:277 -#, fuzzy msgid "Move Only" -msgstr "Tale" +msgstr "Kun Beveg" #: backends/platform/bada/form.cpp:291 msgid "Escape Key" -msgstr "" +msgstr "ESC-tast" #: backends/platform/bada/form.cpp:296 -#, fuzzy msgid "Game Menu" -msgstr "Spill" +msgstr "Spillmeny" #: backends/platform/bada/form.cpp:301 -#, fuzzy msgid "Show Keypad" -msgstr "Vis tastatur" +msgstr "Vis talltastatur" #: backends/platform/bada/form.cpp:309 msgid "Control Mouse" @@ -3029,31 +3125,30 @@ msgstr "" #: backends/events/maemosdl/maemosdl-events.cpp:192 msgid "Clicking Enabled" -msgstr "" +msgstr "Klikking aktivert" #: backends/events/maemosdl/maemosdl-events.cpp:192 msgid "Clicking Disabled" -msgstr "" +msgstr "Klikking deaktivert" #~ msgid "Hercules Green" #~ msgstr "Hercules Grnn" #~ msgid "Hercules Amber" #~ msgstr "Hercules Oransje" - #~ msgctxt "lowres" + #~ msgid "Hercules Green" #~ msgstr "Hercules Grnn" - #~ msgctxt "lowres" + #~ msgid "Hercules Amber" #~ msgstr "Hercules Oransje" -#, fuzzy #~ msgid "Save game failed!" #~ msgstr "Lagret spill:" - #~ msgctxt "lowres" + #~ msgid "Add Game..." #~ msgstr "Legg til spill..." -- cgit v1.2.3 From 097c61955189c8dc598acb6bb328074950d7fa62 Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Wed, 4 Jul 2012 02:27:39 +0200 Subject: CREDITS: Drop my middle initial to stay within the size-limit for AUTHORS, and add handle. --- AUTHORS | 4 ++-- devtools/credits.pl | 4 ++-- gui/credits.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AUTHORS b/AUTHORS index 9f71be9467..387c602b84 100644 --- a/AUTHORS +++ b/AUTHORS @@ -418,10 +418,10 @@ Other contributions Matteo Angelino Norwegian (Bokmaal): - Einar Johan T. Somaae + Einar Johan Somaaen Norwegian (Nynorsk): - Einar Johan T. Somaae + Einar Johan Somaaen Polish: GrajPoPolsku.pl Team diff --git a/devtools/credits.pl b/devtools/credits.pl index b3a506125f..411ec3c10d 100755 --- a/devtools/credits.pl +++ b/devtools/credits.pl @@ -942,10 +942,10 @@ begin_credits("Credits"); add_person("Matteo Angelino", "Maff", ""); end_section(); begin_section("Norwegian (Bokmål)"); - add_person("Einar Johan T. Sømåen", "", ""); + add_person("Einar Johan Sømåen", "somaen", ""); end_section(); begin_section("Norwegian (Nynorsk)"); - add_person("Einar Johan T. Sømåen", "", ""); + add_person("Einar Johan Sømåen", "somaen", ""); end_section(); begin_section("Polish"); add_person("GrajPoPolsku.pl Team", "", ""); diff --git a/gui/credits.h b/gui/credits.h index ecfe280d20..7226864543 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -486,10 +486,10 @@ static const char *credits[] = { "C0""Matteo Angelino", "", "C1""Norwegian (Bokm\345l)", -"C0""Einar Johan T. S\370m\345en", +"C0""Einar Johan S\370m\345en", "", "C1""Norwegian (Nynorsk)", -"C0""Einar Johan T. S\370m\345en", +"C0""Einar Johan S\370m\345en", "", "C1""Polish", "C0""GrajPoPolsku.pl Team", -- cgit v1.2.3 From e9261cbdd11082dcc46cd60dc60a92c9c10e987c Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Thu, 5 Jul 2012 00:46:28 +0200 Subject: WIN32: Also embed scummclassic.zip in the executable. This is required to have proper translation support with the classic theme without having an external scummclassic.zip. --- dists/scummvm.rc | 1 + dists/scummvm.rc.in | 1 + 2 files changed, 2 insertions(+) diff --git a/dists/scummvm.rc b/dists/scummvm.rc index e5d28d089a..6f24b8797d 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -14,6 +14,7 @@ IDI_COUNT ICON DISCARDABLE "icons/count.ico" ID_GDF_XML DATA "dists/win32/scummvm.gdf.xml" +scummclassic.zip FILE "gui/themes/scummclassic.zip" scummmodern.zip FILE "gui/themes/scummmodern.zip" #ifdef USE_TRANSLATION translations.dat FILE "gui/themes/translations.dat" diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in index 6969e0b2a7..a874b98514 100644 --- a/dists/scummvm.rc.in +++ b/dists/scummvm.rc.in @@ -14,6 +14,7 @@ IDI_COUNT ICON DISCARDABLE "icons/count.ico" ID_GDF_XML DATA "dists/win32/scummvm.gdf.xml" +scummclassic.zip FILE "gui/themes/scummclassic.zip" scummmodern.zip FILE "gui/themes/scummmodern.zip" #ifdef USE_TRANSLATION translations.dat FILE "gui/themes/translations.dat" -- cgit v1.2.3 From fb215929efaefdf0b75521caab8a86e93181c5b2 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 5 Jul 2012 13:42:00 +0300 Subject: SCI: Some updates to SCI32 kernel graphics functions - Added a stub for kSetScroll, which sets the target picture immediately for now - Added an initial stub of kPalCycle (doesn't work correctly yet) - Adjusted the signatures of kUpdateLine and kDeleteLine for LSL6 - Unmapped kSetHotRectangles again, with updated information on how it is used in Phantasmagoria --- engines/sci/engine/kernel.h | 2 + engines/sci/engine/kernel_tables.h | 16 +++---- engines/sci/engine/kgraphics32.cpp | 90 ++++++++++++++++++++++++++++++++++++++ engines/sci/engine/state.cpp | 3 ++ engines/sci/engine/state.h | 2 + engines/sci/graphics/frameout.cpp | 8 ++++ 6 files changed, 113 insertions(+), 8 deletions(-) diff --git a/engines/sci/engine/kernel.h b/engines/sci/engine/kernel.h index c3fcdd06e7..441ea2624f 100644 --- a/engines/sci/engine/kernel.h +++ b/engines/sci/engine/kernel.h @@ -436,6 +436,8 @@ reg_t kObjectIntersect(EngineState *s, int argc, reg_t *argv); reg_t kEditText(EngineState *s, int argc, reg_t *argv); reg_t kMakeSaveCatName(EngineState *s, int argc, reg_t *argv); reg_t kMakeSaveFileName(EngineState *s, int argc, reg_t *argv); +reg_t kSetScroll(EngineState *s, int argc, reg_t *argv); +reg_t kPalCycle(EngineState *s, int argc, reg_t *argv); // SCI2.1 Kernel Functions reg_t kText(EngineState *s, int argc, reg_t *argv); diff --git a/engines/sci/engine/kernel_tables.h b/engines/sci/engine/kernel_tables.h index c4443c92d3..825ec90fa9 100644 --- a/engines/sci/engine/kernel_tables.h +++ b/engines/sci/engine/kernel_tables.h @@ -517,10 +517,8 @@ static SciKernelMapEntry s_kernelMap[] = { { MAP_CALL(EditText), SIG_EVERYWHERE, "o", NULL, NULL }, { MAP_CALL(MakeSaveCatName), SIG_EVERYWHERE, "rr", NULL, NULL }, { MAP_CALL(MakeSaveFileName), SIG_EVERYWHERE, "rri", NULL, NULL }, - - // SCI2 unmapped functions - TODO! - - // PalCycle - called by Game::newRoom. Related to RemapColors. + { MAP_CALL(SetScroll), SIG_EVERYWHERE, "oiiiii(i)", NULL, NULL }, + { MAP_CALL(PalCycle), SIG_EVERYWHERE, "i(.*)", NULL, NULL }, // SCI2 Empty functions @@ -587,8 +585,8 @@ static SciKernelMapEntry s_kernelMap[] = { { MAP_CALL(Font), SIG_EVERYWHERE, "i(.*)", NULL, NULL }, { MAP_CALL(Bitmap), SIG_EVERYWHERE, "(.*)", NULL, NULL }, { MAP_CALL(AddLine), SIG_EVERYWHERE, "oiiiiiiiii", NULL, NULL }, - { MAP_CALL(UpdateLine), SIG_EVERYWHERE, "roiiiiiiiii", NULL, NULL }, - { MAP_CALL(DeleteLine), SIG_EVERYWHERE, "ro", NULL, NULL }, + { MAP_CALL(UpdateLine), SIG_EVERYWHERE, "[r0]oiiiiiiiii", NULL, NULL }, + { MAP_CALL(DeleteLine), SIG_EVERYWHERE, "[r0]o", NULL, NULL }, // SCI2.1 Empty Functions @@ -624,8 +622,6 @@ static SciKernelMapEntry s_kernelMap[] = { { MAP_DUMMY(WinDLL), SIG_EVERYWHERE, "(.*)", NULL, NULL }, { MAP_DUMMY(DeletePic), SIG_EVERYWHERE, "(.*)", NULL, NULL }, { MAP_DUMMY(GetSierraProfileString), SIG_EVERYWHERE, "(.*)", NULL, NULL }, - // SetHotRectangles is used by Phantasmagoria 1, script 64981 (a debug script) - { MAP_DUMMY(SetHotRectangles), SIG_EVERYWHERE, "(.*)", NULL, NULL }, // Unused / debug functions in the in-between SCI2.1 interpreters { MAP_DUMMY(PreloadResource), SIG_EVERYWHERE, "(.*)", NULL, NULL }, @@ -635,6 +631,10 @@ static SciKernelMapEntry s_kernelMap[] = { // SCI2.1 unmapped functions - TODO! + // SetHotRectangles - used by Phantasmagoria 1, script 64981 (used in the chase scene) + // The idea, if I understand correctly, is that the engine generates events + // of a special HotRect type continuously when the mouse is on that rectangle + // MovePlaneItems - used by SQ6 to scroll through the inventory via the up/down buttons // SetPalStyleRange - 2 integer parameters, start and end. All styles from start-end // (inclusive) are set to 0 diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp index 072d4df021..16e54a5429 100644 --- a/engines/sci/engine/kgraphics32.cpp +++ b/engines/sci/engine/kgraphics32.cpp @@ -637,6 +637,96 @@ reg_t kDeleteLine(EngineState *s, int argc, reg_t *argv) { return s->r_acc; } +reg_t kSetScroll(EngineState *s, int argc, reg_t *argv) { + // Called in the intro of LSL6 hires (room 110) + // The end effect of this is the same as the old screen scroll transition + + // 7 parameters + reg_t planeObject = argv[0]; + //int16 x = argv[1].toSint16(); + //int16 y = argv[2].toSint16(); + uint16 pictureId = argv[3].toUint16(); + // param 4: int (0 in LSL6, probably scroll direction? The picture in LSL6 scrolls down) + // param 5: int (first call is 1, then the subsequent one is 0 in LSL6) + // param 6: optional int (0 in LSL6) + + // Set the new picture directly for now + //writeSelectorValue(s->_segMan, planeObject, SELECTOR(left), x); + //writeSelectorValue(s->_segMan, planeObject, SELECTOR(top), y); + writeSelectorValue(s->_segMan, planeObject, SELECTOR(picture), pictureId); + // and update our draw list + g_sci->_gfxFrameout->kernelUpdatePlane(planeObject); + + // TODO + return kStub(s, argc, argv); +} + +reg_t kPalCycle(EngineState *s, int argc, reg_t *argv) { + // Examples: GK1 room 480 (Bayou ritual), LSL6 room 100 (title screen) + + switch (argv[0].toUint16()) { + case 0: { // Palette animation initialization + // 3 or 4 extra params + // Case 1 sends fromColor and speed again, so we don't need them here. + // Only toColor is stored + //uint16 fromColor = argv[1].toUint16(); + s->_palCycleToColor = argv[2].toUint16(); + //uint16 speed = argv[3].toUint16(); + + // Invalidate the picture, so that the palette steps calls (case 1 + // below) can update its palette without it being overwritten by the + // view/picture palettes. + g_sci->_gfxScreen->_picNotValid = 1; + + // TODO: The fourth optional parameter is an unknown integer, and is 0 by default + if (argc == 5) { + // When this variant is used, picNotValid doesn't seem to be set + // (e.g. GK1 room 480). In this case, the animation step calls are + // not made, so perhaps this signifies the palette cycling steps + // to make. + // GK1 sets this to 6 (6 palette steps?) + g_sci->_gfxScreen->_picNotValid = 0; + } + kStub(s, argc, argv); + } + break; + case 1: { // Palette animation step + // This is the same as the old kPaletteAnimate call, with 1 set of colors. + // The end color is set up during initialization in case 0 above. + + // 1 or 2 extra params + uint16 fromColor = argv[1].toUint16(); + uint16 speed = (argc == 2) ? 1 : argv[2].toUint16(); + // TODO: For some reason, this doesn't set the color correctly + // (e.g. LSL6 intro, room 100, Sierra logo) + if (g_sci->_gfxPalette->kernelAnimate(fromColor, s->_palCycleToColor, speed)) + g_sci->_gfxPalette->kernelAnimateSet(); + } + // No kStub() call here, as this gets called loads of times, like kPaletteAnimate + break; + // case 2 hasn't been encountered + // case 3 hasn't been encountered + case 4: // reset any palette cycling and make the picture valid again + // Gets called when changing rooms and after palette cycling animations finish + // 0 or 1 extra params + if (argc == 1) { + g_sci->_gfxScreen->_picNotValid = 0; + // TODO: This also seems to perform more steps + } else { + // The variant with the 1 extra param resets remapping to base + // TODO + } + kStub(s, argc, argv); + break; + default: + // TODO + kStub(s, argc, argv); + break; + } + + return s->r_acc; +} + #endif } // End of namespace Sci diff --git a/engines/sci/engine/state.cpp b/engines/sci/engine/state.cpp index 94a3fe3ae5..0f0c8dcd66 100644 --- a/engines/sci/engine/state.cpp +++ b/engines/sci/engine/state.cpp @@ -122,8 +122,11 @@ void EngineState::reset(bool isRestoring) { _videoState.reset(); _syncedAudioOptions = false; + _vmdPalStart = 0; _vmdPalEnd = 256; + + _palCycleToColor = 255; } void EngineState::speedThrottler(uint32 neededSleep) { diff --git a/engines/sci/engine/state.h b/engines/sci/engine/state.h index 9ae6299d83..81090876c7 100644 --- a/engines/sci/engine/state.h +++ b/engines/sci/engine/state.h @@ -199,6 +199,8 @@ public: uint16 _vmdPalStart, _vmdPalEnd; bool _syncedAudioOptions; + uint16 _palCycleToColor; + /** * Resets the engine state. */ diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index 5b857fe3d8..31ad7a50aa 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -294,6 +294,10 @@ reg_t GfxFrameout::addPlaneLine(reg_t object, Common::Point startPoint, Common:: } void GfxFrameout::updatePlaneLine(reg_t object, reg_t hunkId, Common::Point startPoint, Common::Point endPoint, byte color, byte priority, byte control) { + // Check if we're asked to update a line that was never added + if (object.isNull()) + return; + for (PlaneList::iterator it = _planes.begin(); it != _planes.end(); ++it) { if (it->object == object) { for (PlaneLineList::iterator it2 = it->lines.begin(); it2 != it->lines.end(); ++it2) { @@ -311,6 +315,10 @@ void GfxFrameout::updatePlaneLine(reg_t object, reg_t hunkId, Common::Point star } void GfxFrameout::deletePlaneLine(reg_t object, reg_t hunkId) { + // Check if we're asked to delete a line that was never added (happens during the intro of LSL6) + if (object.isNull()) + return; + for (PlaneList::iterator it = _planes.begin(); it != _planes.end(); ++it) { if (it->object == object) { for (PlaneLineList::iterator it2 = it->lines.begin(); it2 != it->lines.end(); ++it2) { -- cgit v1.2.3 From 4ced5ccf306450bc4b0bd6afd66b5bc7bec1e814 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 5 Jul 2012 13:58:04 +0300 Subject: SCI: Handle calls from MessageState::outputString() to arrays This happens during the intro of LSL6 hires (room 110) --- engines/sci/engine/message.cpp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp index cddd01e10c..a92d572d35 100644 --- a/engines/sci/engine/message.cpp +++ b/engines/sci/engine/message.cpp @@ -400,11 +400,21 @@ Common::String MessageState::processString(const char *s) { void MessageState::outputString(reg_t buf, const Common::String &str) { #ifdef ENABLE_SCI32 if (getSciVersion() >= SCI_VERSION_2) { - SciString *sciString = _segMan->lookupString(buf); - sciString->setSize(str.size() + 1); - for (uint32 i = 0; i < str.size(); i++) - sciString->setValue(i, str.c_str()[i]); - sciString->setValue(str.size(), 0); + if (_segMan->getSegmentType(buf.getSegment()) == SEG_TYPE_STRING) { + SciString *sciString = _segMan->lookupString(buf); + sciString->setSize(str.size() + 1); + for (uint32 i = 0; i < str.size(); i++) + sciString->setValue(i, str.c_str()[i]); + sciString->setValue(str.size(), 0); + } else if (_segMan->getSegmentType(buf.getSegment()) == SEG_TYPE_ARRAY) { + // Happens in the intro of LSL6, we are asked to write the string + // into an array + SciArray *sciString = _segMan->lookupArray(buf); + sciString->setSize(str.size() + 1); + for (uint32 i = 0; i < str.size(); i++) + sciString->setValue(i, make_reg(0, str.c_str()[i])); + sciString->setValue(str.size(), NULL_REG); + } } else { #endif SegmentRef buffer_r = _segMan->dereference(buf); -- cgit v1.2.3 From 112f03390d308af60d9c5f5e9f29c30988d2e968 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Thu, 5 Jul 2012 14:05:26 +0300 Subject: SCI: Fix typo --- engines/sci/graphics/frameout.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index 31ad7a50aa..20b8a241aa 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -295,7 +295,7 @@ reg_t GfxFrameout::addPlaneLine(reg_t object, Common::Point startPoint, Common:: void GfxFrameout::updatePlaneLine(reg_t object, reg_t hunkId, Common::Point startPoint, Common::Point endPoint, byte color, byte priority, byte control) { // Check if we're asked to update a line that was never added - if (object.isNull()) + if (hunkId.isNull()) return; for (PlaneList::iterator it = _planes.begin(); it != _planes.end(); ++it) { @@ -316,7 +316,7 @@ void GfxFrameout::updatePlaneLine(reg_t object, reg_t hunkId, Common::Point star void GfxFrameout::deletePlaneLine(reg_t object, reg_t hunkId) { // Check if we're asked to delete a line that was never added (happens during the intro of LSL6) - if (object.isNull()) + if (hunkId.isNull()) return; for (PlaneList::iterator it = _planes.begin(); it != _planes.end(); ++it) { -- cgit v1.2.3 From b1cc34a080ff31fb22ab466624a99c0cdaeb51c1 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 4 Jul 2012 23:18:29 +0200 Subject: CGE: Remove hack used to store keycode in CGEEvent --- engines/cge/cge_main.cpp | 10 +++++----- engines/cge/cge_main.h | 4 ++-- engines/cge/events.cpp | 17 ++++++++++------- engines/cge/events.h | 1 + engines/cge/vga13h.h | 3 ++- engines/cge/vmenu.cpp | 4 ++-- engines/cge/vmenu.h | 2 +- 7 files changed, 23 insertions(+), 18 deletions(-) diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index fbe37e58a0..a70e32de7e 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -518,8 +518,8 @@ Square::Square(CGEEngine *vm) : Sprite(vm, NULL), _vm(vm) { setShapeList(MB); } -void Square::touch(uint16 mask, int x, int y) { - Sprite::touch(mask, x, y); +void Square::touch(uint16 mask, int x, int y, Common::KeyCode keyCode) { + Sprite::touch(mask, x, y, keyCode); if (mask & kMouseLeftUp) { _vm->XZ(_x + x, _y + y).cell() = 0; _vm->_commandHandlerTurbo->addCommand(kCmdKill, -1, 0, this); @@ -758,11 +758,11 @@ void System::funTouch() { _funDel = n; } -void System::touch(uint16 mask, int x, int y) { +void System::touch(uint16 mask, int x, int y, Common::KeyCode keyCode) { funTouch(); if (mask & kEventKeyb) { - if (x == Common::KEYCODE_ESCAPE) { + if (keyCode == Common::KEYCODE_ESCAPE) { // The original was calling keyClick() // The sound is uselessly annoying and noisy, so it has been removed _vm->killText(); @@ -926,7 +926,7 @@ void CGEEngine::optionTouch(int opt, uint16 mask) { } #pragma argsused -void Sprite::touch(uint16 mask, int x, int y) { +void Sprite::touch(uint16 mask, int x, int y, Common::KeyCode keyCode) { _vm->_sys->funTouch(); if ((mask & kEventAttn) != 0) diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h index b98fec531d..bde8306f36 100644 --- a/engines/cge/cge_main.h +++ b/engines/cge/cge_main.h @@ -92,7 +92,7 @@ public: void setPal(); void funTouch(); - virtual void touch(uint16 mask, int x, int y); + virtual void touch(uint16 mask, int x, int y, Common::KeyCode keyCode); void tick(); private: CGEEngine *_vm; @@ -101,7 +101,7 @@ private: class Square : public Sprite { public: Square(CGEEngine *vm); - virtual void touch(uint16 mask, int x, int y); + virtual void touch(uint16 mask, int x, int y, Common::KeyCode keyCode); private: CGEEngine *_vm; }; diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp index 98a39a947b..1530c870ef 100644 --- a/engines/cge/events.cpp +++ b/engines/cge/events.cpp @@ -135,9 +135,11 @@ void Keyboard::newKeyboard(Common::Event &event) { if ((event.type == Common::EVENT_KEYDOWN) && (_client)) { CGEEvent &evt = _vm->_eventManager->getNextEvent(); - evt._x = event.kbd.keycode; // Keycode - evt._mask = kEventKeyb; // Event mask - evt._spritePtr = _client; // Sprite pointer + evt._x = 0; + evt._y = 0; + evt._keyCode = event.kbd.keycode; // Keycode + evt._mask = kEventKeyb; // Event mask + evt._spritePtr = _client; // Sprite pointer } } @@ -204,6 +206,7 @@ void Mouse::newMouse(Common::Event &event) { CGEEvent &evt = _vm->_eventManager->getNextEvent(); evt._x = event.mouse.x; evt._y = event.mouse.y; + evt._keyCode = Common::KEYCODE_INVALID; evt._spritePtr = _vm->spriteAt(evt._x, evt._y); switch (event.type) { @@ -269,7 +272,7 @@ void EventManager::handleEvents() { CGEEvent e = _eventQueue[_eventQueueTail]; if (e._mask) { if (_vm->_mouse->_hold && e._spritePtr != _vm->_mouse->_hold) - _vm->_mouse->_hold->touch(e._mask | kEventAttn, e._x - _vm->_mouse->_hold->_x, e._y - _vm->_mouse->_hold->_y); + _vm->_mouse->_hold->touch(e._mask | kEventAttn, e._x - _vm->_mouse->_hold->_x, e._y - _vm->_mouse->_hold->_y, e._keyCode); // update mouse cursor position if (e._mask & kMouseRoll) @@ -278,11 +281,11 @@ void EventManager::handleEvents() { // activate current touched SPRITE if (e._spritePtr) { if (e._mask & kEventKeyb) - e._spritePtr->touch(e._mask, e._x, e._y); + e._spritePtr->touch(e._mask, e._x, e._y, e._keyCode); else - e._spritePtr->touch(e._mask, e._x - e._spritePtr->_x, e._y - e._spritePtr->_y); + e._spritePtr->touch(e._mask, e._x - e._spritePtr->_x, e._y - e._spritePtr->_y, e._keyCode); } else if (_vm->_sys) - _vm->_sys->touch(e._mask, e._x, e._y); + _vm->_sys->touch(e._mask, e._x, e._y, e._keyCode); if (e._mask & kMouseLeftDown) { _vm->_mouse->_hold = e._spritePtr; diff --git a/engines/cge/events.h b/engines/cge/events.h index 6bbd52e4a5..522aa67905 100644 --- a/engines/cge/events.h +++ b/engines/cge/events.h @@ -70,6 +70,7 @@ struct CGEEvent { uint16 _mask; uint16 _x; uint16 _y; + Common::KeyCode _keyCode; Sprite *_spritePtr; }; diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h index beca19f667..a816f7756f 100644 --- a/engines/cge/vga13h.h +++ b/engines/cge/vga13h.h @@ -29,6 +29,7 @@ #define CGE_VGA13H_H #include "common/serializer.h" +#include "common/events.h" #include "graphics/surface.h" #include "cge/general.h" #include "cge/bitmap.h" @@ -146,7 +147,7 @@ public: void step(int nr = -1); Seq *setSeq(Seq *seq); CommandHandler::Command *snList(SnList type); - virtual void touch(uint16 mask, int x, int y); + virtual void touch(uint16 mask, int x, int y, Common::KeyCode keyCode); virtual void tick(); void sync(Common::Serializer &s); private: diff --git a/engines/cge/vmenu.cpp b/engines/cge/vmenu.cpp index a317a765d4..84b557f4a6 100644 --- a/engines/cge/vmenu.cpp +++ b/engines/cge/vmenu.cpp @@ -89,11 +89,11 @@ Vmenu::~Vmenu() { #define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember)) -void Vmenu::touch(uint16 mask, int x, int y) { +void Vmenu::touch(uint16 mask, int x, int y, Common::KeyCode keyCode) { if (!_items) return; - Sprite::touch(mask, x, y); + Sprite::touch(mask, x, y, keyCode); y -= kTextVMargin - 1; int n = 0; diff --git a/engines/cge/vmenu.h b/engines/cge/vmenu.h index 89ef7a9484..928b48f11c 100644 --- a/engines/cge/vmenu.h +++ b/engines/cge/vmenu.h @@ -58,7 +58,7 @@ public: MenuBar *_bar; Vmenu(CGEEngine *vm, Choice *list, int x, int y); ~Vmenu(); - virtual void touch(uint16 mask, int x, int y); + virtual void touch(uint16 mask, int x, int y, Common::KeyCode keyCode); private: char *_vmgt; CGEEngine *_vm; -- cgit v1.2.3 From 14a59b97b289416bc124985e7b5f3b45d8e7a7e0 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Wed, 4 Jul 2012 23:36:11 +0200 Subject: CGE: Silent some CppCheck warnings --- engines/cge/bitmap.cpp | 3 +++ engines/cge/vmenu.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/engines/cge/bitmap.cpp b/engines/cge/bitmap.cpp index 309b89bdda..4f85957b3d 100644 --- a/engines/cge/bitmap.cpp +++ b/engines/cge/bitmap.cpp @@ -123,12 +123,15 @@ Bitmap::~Bitmap() { Bitmap &Bitmap::operator=(const Bitmap &bmp) { debugC(1, kCGEDebugBitmap, "&Bitmap::operator ="); + if (this == &bmp) + return *this; uint8 *v0 = bmp._v; _w = bmp._w; _h = bmp._h; _m = NULL; _map = 0; + _vm = bmp._vm; delete[] _v; if (v0 == NULL) { diff --git a/engines/cge/vmenu.cpp b/engines/cge/vmenu.cpp index 84b557f4a6..910e54d267 100644 --- a/engines/cge/vmenu.cpp +++ b/engines/cge/vmenu.cpp @@ -63,7 +63,7 @@ Vmenu *Vmenu::_addr = NULL; int Vmenu::_recent = -1; Vmenu::Vmenu(CGEEngine *vm, Choice *list, int x, int y) - : Talk(vm, VMGather(list), kTBRect), _menu(list), _bar(NULL), _vm(vm) { + : Talk(vm, VMGather(list), kTBRect), _menu(list), _bar(NULL), _vmgt(NULL), _vm(vm) { Choice *cp; _addr = this; -- cgit v1.2.3 From 75137862967cd18a87dec16a6a322f9f97d54202 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 6 Jul 2012 12:11:12 +0300 Subject: SCI: Add a hack to handle the internal script resolution in Phantasmagoria --- engines/sci/graphics/frameout.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index 20b8a241aa..defc55edb2 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -131,6 +131,20 @@ void GfxFrameout::kernelAddPlane(reg_t object) { tmpRunningWidth = 320; tmpRunningHeight = 200; } + + // HACK: Game scripts in Phantasmagoria 1 seem to use a very odd internal + // resolution, or some other extra calculation is taking place. + // Changing the internal script dimensions to these odd values fixes + // object positioning, but makes the interface picture slightly bigger, + // thus there is a small gap between the room picture and the interface + // edges, plus a couple of pixels of the picture are cut off in the + // bottom. + // FIXME: Find how to properly handle the script dimensions in + // Phantasmagoria. This can't be right. + if (g_sci->getGameId() == GID_PHANTASMAGORIA) { + tmpRunningWidth = 325; + tmpRunningHeight = 213; + } _coordAdjuster->setScriptsResolution(tmpRunningWidth, tmpRunningHeight); } -- cgit v1.2.3 From e4378d5bac1b2467190e21333a037a6af34bba52 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Fri, 6 Jul 2012 13:17:04 +0300 Subject: SCI: Better handling for Phantasmagoria's odd screen size Still not right, as the width isn't set --- engines/sci/graphics/frameout.cpp | 13 +++---------- engines/sci/graphics/screen.cpp | 7 +++++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index defc55edb2..b13c7f4dce 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -132,18 +132,11 @@ void GfxFrameout::kernelAddPlane(reg_t object) { tmpRunningHeight = 200; } - // HACK: Game scripts in Phantasmagoria 1 seem to use a very odd internal - // resolution, or some other extra calculation is taking place. - // Changing the internal script dimensions to these odd values fixes - // object positioning, but makes the interface picture slightly bigger, - // thus there is a small gap between the room picture and the interface - // edges, plus a couple of pixels of the picture are cut off in the - // bottom. - // FIXME: Find how to properly handle the script dimensions in - // Phantasmagoria. This can't be right. + // HACK: Phantasmagoria 1 sets a window size of 630x450. + // We can't set a width of 630, as that messes up the pitch, so we hack + // the internal script width here if (g_sci->getGameId() == GID_PHANTASMAGORIA) { tmpRunningWidth = 325; - tmpRunningHeight = 213; } _coordAdjuster->setScriptsResolution(tmpRunningWidth, tmpRunningHeight); diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp index 4020518b72..3030fb4386 100644 --- a/engines/sci/graphics/screen.cpp +++ b/engines/sci/graphics/screen.cpp @@ -97,6 +97,13 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) { break; } + // Phantasmagoria 1 sets a window area of 630x450 + if (g_sci->getGameId() == GID_PHANTASMAGORIA) { + // TODO: Also set width to 630 (can't be set right now, as it messes up + // the pitch). For now, a hack has been placed in GfxFrameout::kernelAddPlane() + _height = 450; + } + _displayPixels = _displayWidth * _displayHeight; _visualScreen = (byte *)calloc(_pixels, 1); _priorityScreen = (byte *)calloc(_pixels, 1); -- cgit v1.2.3 From 47499fa8a0da90ecb348a7feda2196bba3ea8a13 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sat, 7 Jul 2012 01:10:21 +0100 Subject: DOCS: Update Swedish README from patch #3539543 --- doc/se/LasMig | 160 +++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 136 insertions(+), 24 deletions(-) diff --git a/doc/se/LasMig b/doc/se/LasMig index 656210883f..9ac79b4c35 100644 --- a/doc/se/LasMig +++ b/doc/se/LasMig @@ -1,5 +1,4 @@ ScummVM LÄS MIG -Senast uppdaterad: $Date$ ------------------------------------------------------------------------ För ytterligare information, kompatibilitetslistor, donationsdetaljer, den senaste programversionen, utvecklingsrapporter med mera, var god besök ScummVM:s hemsida på http://www.scummvm.org/ @@ -55,6 +54,8 @@ Innehåll: * 7.8 Att använda komprimerade ljudfiler (MP3, Ogg Vorbis, Flac) * 7.9 Uppspelningsfrekvens 8.0) Konfigurationsfilen + * 8.1 Igenkända nyckelord + * 8.2 Spelinställningar som kan aktiveras via användargränssnittet 9.0) Kompilering @@ -184,13 +185,18 @@ AGOS-spel från Adventuresoft/Horrorsoft: The Feeble Files [feeble] GOB-spel från Coktel Vision: + Bambou le sauveur de la jungle [bambou] Bargon Attack [bargon] + Fascination [fascination] + Geisha [geisha] Gobliiins [gob1] Gobliins 2 [gob2] Goblins 3 [gob3] Lost in Time [lostintime] + Once Upon A Time: Little Red Riding Hood [littlered] The Bizarre Adventures of Woodruff and the Schnibble [woodruff] + Urban Runner [urban] Ween: The Prophecy [ween] MADE-spel från Activision: @@ -221,6 +227,7 @@ MADE-spel från Activision: SCUMM-spel från Humongous Entertainment: Backyard Baseball [baseball] Backyard Baseball 2001 [baseball2001] + Backyard Baseball 2003 [baseball2003] Backyard Football [football] Big Thinkers First Grade [thinker1] Big Thinkers Kindergarten [thinkerk] @@ -288,7 +295,6 @@ Living Books-spel: De följande spelen borde starta, men är ännu ej helt spelbara. Spela dem på egen risk och var god skicka inga buggrapporter angående dem. För senaste nytt angående spelkompatibilitet kan du besöka vår hemsida och läsa kompatibilitetslistan. - Backyard Baseball 2003 [baseball2003] Backyard Football 2002 [football2002] Backyard Soccer [soccer] Backyard Soccer MLS [soccermls] @@ -387,6 +393,11 @@ Instruktionerna för Broken Sword-spelen är för Sold-Out Software-versionerna ------ --------------------------------- Filmscenerna i Broken Sword-spelen har varit med om en hel del (se nästa avdelning om du är intresserad) men i regel behöver du bara kopiera .SMK-filerna från ”SMACKS” eller ”SMACKSHI”-katalogerna på CD-skivorna till samma katalog där de andra datafilerna ligger. (Broken Sword har även en ”SMACKSLO” katalog med samma filmscener, men dessa har lägre kvalitet.) Du kan även lägga dem i en underkatalog med namnet ”video”, om du vill. +För PlayStation-versionerna kan du dumpa originalfilmerna från CD:n. Dumpa varje fil med ändelsen ”STR” som råa sektorer från CD:n (samtliga 2352 bitar per sektor). DU kan även använde de omkodade filmscenerna nedan istället, men detta fungerar inte för alla filmer i Broken Sword II. För ytterligare information, se: + + http://wiki.scummvm.org/index.php/HOWTO-PlayStation_Videos + + Vissa nyutgåvor av spelen, tillika PlayStation-versionen, har inga Smacker videos. Revolution Software har varit goda nog att skapa nykodade filmscener som kan laddas hem från våran hemsida: http://www.scummvm.org/downloads.php @@ -395,7 +406,7 @@ Dessa filmscener är tillgängliga i DXA-format med FLAC-ljud. Kvaliteten är de För de system som är för långsamma för att hantera FLAC-ljud finns ljudet för dessa filmscener att ladda hem separat som OGG Vorbis-ljud. För att se dessa filmscener med OGG Vorbis-ljud krävs en version av ScummVM som kompilerats med stöd för både libVorbis och zlib. -Vi erbjuder även ett tillägg för undertexter i Broken Sword. Packa upp tillägget och följ instruktionerna i readme.txt-filen. (Broken Sword II har redan undertexter; inga modifikationer krävs för dem). +Vi erbjuder även ett tillägg för undertexter i Broken Sword. Packa upp tillägget och följ instruktionerna i readme.txt-filen. Undertextpaketet fungerar för tillfället inte med PlayStation-filmer (Broken Sword II har redan undertexter; inga modifikationer krävs för dem). 3.7.2) Broken Sword-spelens filmscener – en återblick: @@ -475,7 +486,7 @@ Döp om voices.wav på CD4 till voices4.wav 3.14) Notiser om The Legend of Kyrandia: ----- ---------------------------------- -För att spela The Legend of Kyrandia i ScummVM behöver du “kyra.dat”-filen som är tillgänglig från ”Downloads”-avdelningen på ScummVM:s hemsida. +För att spela The Legend of Kyrandia i ScummVM behöver du “kyra.dat”-filen. Filen borde alltid inkluderas med officiella ScummVM-paket. Om ScummVM klagar över att filen saknas kan du finna den på “Downloads”-avdelningen av ScummVM:s hemsida. Märk att den nuvarande Windows-versionen av ScummVM borde ha filen inbyggd i programfilen, och sålunda behöver du bara ladda hem den om ScummVM klagar över att filen saknas. 3.15) Notiser om Sierra AGI-spel med textinmatningshjälp: @@ -537,10 +548,6 @@ Den här versionen har följande kända problem. Du behöver inte rapportera dem FM-TOWNS-versioner av spel: - Kanji-versioner kräver en FM-TOWNS Font ROM - - ScummVM krashar slumpmässigt när FM-TOWNS Font Rom används för - kanji-versionerna av de följande spelen: - The Secret of Monkey Island, Monkey Island 2: LeChuck's Revenge - och Indiana Jones and the Fate of Atlantis Loom: - Att stänga av undertexterna via konfigurationsfilen är inte pålitligt då @@ -590,7 +597,6 @@ Den här versionen har följande kända problem. Du behöver inte rapportera dem The Legend of Kyrandia: - Varken musik eller ljudeffekter i Macintosh diskett-versioner. - Macintosh-CD använder DOS-musik och ljudeffekter. - - PC-9821-versionen saknar stöd för ljudeffekter. Humongous Entertainment-spel: - Endast originalgränssnittet för att ladda och spara kan användas. @@ -668,6 +674,7 @@ Ordning: scummvm [INSTÄLLNINGAR]... [SPEL] --themepath=PATH Sökväg dit GUI-teman lagras --list-themes Visa full lista med alla användbara GUI-teman -e, --music-driver=MODE Välj musik-driver (se även avdelning 7.0) + --list-audio-devices Visar tillgängliga ljudenheter -q, --language=LANG Välj spelets språk (se även avdelning 5.2) -m, --music-volume=NUM Ställ in musikvolym, 0-255 (standard: 192) -s, --sfx-volume=NUM Ställ in ljudeffektsvolym, 0-255 (standard: 192) @@ -822,19 +829,28 @@ Motorer som för närvarande stöder återvändo till launchern: AGI AGOS CINE + COMPOSER + CRUISE DRACI + DRASCULA GOB GROOVIE + HUGO KYRA LURE + MADE + MOHAWK PARALLACTION QUEEN SAGA + SCI SCUMM SKY SWORD1 SWORD2 + TEENAGENT TOUCHE + TSAGE TUCKER @@ -1006,8 +1022,24 @@ Notis för WinCE-användare: På grund av de begränsade tangentborden på de fl Spardata lagras som standard i den aktiva katalogen på vissa plattformar och i förbestämda kataloger på andra plattformar. Du kan ställa in katalogen i konfigurationsfilen genom att ändra savepath-parametern. Se exempel för konfigurationsfilen senare i detta dokument. Plattformar som för närvarande har annorlunda standardkataloger: - Mac OS X: $HOME/Documents/ScummVM Savegames/ - Övriga unix-system: $HOME/.scummvm/ + Mac OS X: + $HOME/Documents/ScummVM Savegames/ + + Övriga unix-system: + $HOME/.scummvm/ + + Windows Vista/7: + \Users\username\AppData\Roaming\ScummVM\Saved games\ + + Windows 2000/XP: + \Documents and Settings\username\Application Data\ScummVM\Saved games\ + + Windows NT4: + \Profiles\username\Application Data\ScummVM\Saved games\ + +Spardata lagras i en gömd map I Windows NT4/2000/XP/Vista/7, som kan kommas åt genom att köra "%APPDATA%%\ScummVM\Saved Games\" eller genom att visa dolda filer i Windows Explorer. + +Notis för användare av NT4/2000/XP/Vista/7: Den förutbestämda platsen för spardata har ändrats i ScummVM 1.5.0. Migrationsfilen kan användas för att kopiera spardata från den förra platsen till den nya. 6.1) Autosparning: @@ -1059,20 +1091,28 @@ Där “xxx” står för positionsnumret (t.ex. 001) i ScummVM. AGI AGOS + CGE CINE + CRUISE DRACI GROOVIE + HUGO KYRA LURE + MOHAWK PARALLACTION QUEEN SAGA + SCI SCUMM SKY SWORD1 SWORD2 + TEENAGENT TINSEL + TOON TOUCHE + TSAGE TUCKER --save-slot/-x: @@ -1086,20 +1126,28 @@ Där “xxx” står för positionsnumret (t.ex. 001) i ScummVM. Motorer som för tillfället stöder --save-slot/-x: AGI + CGE CINE + CRUISE DRACI GROOVIE + HUGO KYRA LURE - PARALLACTION + MOHAWK QUEEN SAGA + SCI SCUMM SKY SWORD1 SWORD2 + TEENAGENT TINSEL + TOON TOUCHE + TSAGE + TUCKER 7.0) Musik och ljud: @@ -1396,7 +1444,7 @@ Att använda frekvenser mellan de ovansagda rekommenderas ej. Till att börja me ---- -------------------- Som standard sparas och laddas konfigrationsfilen i: - Windows Vista: + Windows Vista/7: \Users\username\AppData\Roaming\ScummVM\scummvm.ini, Windows 2000/XP: @@ -1458,6 +1506,9 @@ Ett exempel på en konfigurationsfil ser ut så här: path=C:\amiga_mi2\ music_driver=windows + +8.1) Igenkända nyckelord +---- ------------------- Följande nyckelord kan användas: path string Sökvägen dit spelets datafiler ligger @@ -1483,7 +1534,6 @@ Följande nyckelord kan användas: fullscreen bool Fullskärmsläge aspect_ratio bool Aktivera korrektion av bildförhållande - disable_dithering bool Anti-gitter för EGA-spel gfx_mode string Grafikläge (normalt, 2x, 3x, 2xsai, super2xsai, supereagle, advmame2x, advmame3x, hq2x, hq3x, tv2x, dotmatrix) @@ -1529,6 +1579,29 @@ Följande nyckelord kan användas: boot_param number Skicka det här numret till boot script +Sierra-spel som använder AGI-motorn använder även följande nyckelord: + + originalsaveload bool Ställ in till “true” för att använda + originalskärmarna för ladda/spara + istället för ScummVM:s förbättrade + skärmar + +Sierra-spel som använder SCI-motorn använder även följande nyckelord: + + disable_dithering bool Tar bort gitter artefakter från EGA-spel + prefer_digitalsfx bool Ställ in till “true” för att föredra + digitala ljudeffekter istället för + syntetiserade ljudeffekter + originalsaveload bool Ställ in till “true” för att använda + originalskärmarna för ladda/spara + istället för ScummVM:s förbättrade + skärmar + native_fb01 bool Ställ in till “true” för att använda + ett IBM Music Feature-kort eller en + Yamaha FB-01 FM synthmodul för + MIDI-uppspelning + + Broken Sword II lägger till följande nyckelord: gfx_details number Grafisk detalj (0-3) @@ -1546,6 +1619,13 @@ Flight of the Amazon Queen lägger till följande nyckelord: sfx_mute bool Ställ in till “true” för att deaktivera ljudeffekter + +Jones in the Fast Lane använder även följande nyckelord: + music_mute bool Ställ in till “true” för att använda + CD-ljud, om tillgängligt, istället + spelets vanliga ljud. + + King's Quest VI Windows lägger till följande nyckelord: windows_cursors bool Ställ in till “true” för att använda de svartvita @@ -1553,6 +1633,25 @@ King's Quest VI Windows lägger till följande nyckelord: Ställ in till ”false” för att använda de uppskalade muspekarna som matchar resten av grafiken. + +Lands of Lore: The Throne of Chaos använder även följande nyckelord: + + smooth_scrolling bool Ställ in till “true” för mjukare + skärmrullning när du går från en + skärm till en annan. + floating_cursors bool Ställ in till “true” för att ändra + pekaren till en riktningspil när den + närmar sig kanten av skärmen. Spelaren + kan sedan klicka för att gå mot + den riktningen. + + +Space Quest IV CD använder även följande nyckelord: + + silver_cursors bool Ställ in till “true” för att använda + silverpekare istället för gulpekarna + + Simon the Sorcerer 1 och 2 lägger till följande nyckelord: music_mute bool Ställ in till “true” för att deaktivera musik @@ -1565,6 +1664,28 @@ The Legend of Kyrandia lägger till följande nyckelord: walkspeed int Gånghastighet (0-4) +The Legend of Kyrandia: Malcolm's Revenge använder även följande nyckelord: + + studio_audience bool Ställ in till “true” för att höra + skratt och applåder när Malcolm + berättar ett skämt + skip_support bool Ställ in till “true” för att kunna + skippa text och filmscener + helium_mode bool Ställ in till “true” så låter folk + som att dom inandats helium + +The 7th Guest använder även följande nyckelord: + + t7g_speed string Hastighet på videouppspelning + (normal, tweaked, im_an_ios) + + +8.2) Spelinställningar som kan aktiveras via användargränssnittet +---- ------------------------------------------------------------ +Många av inställningarna i den föregående avdelningen kan aktiveras via användargränssnittet. Om en inställning finns tillgänglig för ett specifikt spel visas en ny tabb med namnet ”Motor” när du lägger till eller ändrar inställningarna för spelet. +Om specialinställningarna inte visas måste spelet köras en gång eller läggas till igen i spellistan i ScummVM:s launcher. Detta uppdaterar inställningarna för varje spel, vilket låter specialinställningarna visas. + + 9.0) Kompilering: ---- ------------ För en uppdaterad överblick för hur man kompilerar ScummVM på diverse plattformar var god se vår Wiki, speciellt den här här sidan: @@ -1599,15 +1720,6 @@ På Win9x/NT/XP kan du definiera USE_WINDBG och lägga till WinDbg för att visa * Var god se: http://wiki.scummvm.org/index.php/Compiling_ScummVM/Windows_CE - Debian GNU/Linux: - * Installera paketen 'build-essential', 'fakeroot', 'debhelper', - och 'libsdl1.2-dev' på ditt system. - * Installera de här paketen (valfria): 'libvorbis-dev' (för Ogg - Vorbis stöd), 'libasound2-dev' (för ALSA sequencer stöd), - 'libmad0-dev' (för MAD MP3 stöd), 'zlib1g-dev' (för stöd av kompresserad spardata). - * Kör 'make deb'. - * Kör sedan 'dpkg -i ../scummvm-cvs*deb', så är du klar. - Mac OS X: * Se till att du har utvecklingsverktygen istallerade. * SDL-utvecklingspaketet för OS X som finns tillgängligt på SLD:s hemsida @@ -1649,4 +1761,4 @@ På Win9x/NT/XP kan du definiera USE_WINDBG och lägga till WinDbg för att visa Lycka till och glada äventyr! ScummVM-teamet. http://www.scummvm.org/ ------------------------------------------------------------------------- \ No newline at end of file +------------------------------------------------------------------------ -- cgit v1.2.3 From 56194194aa1cea352185ab5dcafdbe7ca234a5ef Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sat, 7 Jul 2012 01:15:04 +0100 Subject: I18N: Update Danish translation This was sent by Steffen Nyeland by email. --- po/da_DA.po | 441 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 219 insertions(+), 222 deletions(-) diff --git a/po/da_DA.po b/po/da_DA.po index 50068cae5e..eb62af84a9 100644 --- a/po/da_DA.po +++ b/po/da_DA.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-06-24 18:06+0100\n" -"PO-Revision-Date: 2011-01-08 22:53+0100\n" +"PO-Revision-Date: 2012-06-29 19:45+0100\n" "Last-Translator: Steffen Nyeland \n" "Language-Team: Steffen Nyeland \n" "MIME-Version: 1.0\n" @@ -15,6 +15,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: Dansk\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Poedit-Language: Danish\n" +"X-Poedit-Country: DENMARK\n" #: gui/about.cpp:91 #, c-format @@ -77,7 +79,6 @@ msgid "Remap keys" msgstr "Kortlg taster" #: gui/gui-manager.cpp:129 base/main.cpp:307 -#, fuzzy msgid "Toggle FullScreen" msgstr "Skift fuldskrm" @@ -193,9 +194,8 @@ msgid "Platform:" msgstr "Platform:" #: gui/launcher.cpp:231 -#, fuzzy msgid "Engine" -msgstr "Undersg" +msgstr "Motor" #: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 msgid "Graphics" @@ -386,11 +386,11 @@ msgstr "Start det valgte spil" #: gui/launcher.cpp:628 msgid "~L~oad..." -msgstr "~H~ent..." +msgstr "Ind~l~s..." #: gui/launcher.cpp:628 msgid "Load savegame for selected game" -msgstr "Hent gemmer for det valgte spil" +msgstr "Indls gemmer for det valgte spil" #: gui/launcher.cpp:633 gui/launcher.cpp:1120 msgid "~A~dd Game..." @@ -493,7 +493,7 @@ msgstr "Vil du virkelig fjerne denne spil konfiguration?" #: gui/launcher.cpp:1001 msgid "This game does not support loading games from the launcher." -msgstr "Dette spil understtter ikke hentning af spil fra spiloversigten." +msgstr "Dette spil understtter ikke indlsning af spil fra spiloversigten." #: gui/launcher.cpp:1005 msgid "ScummVM could not find any engine capable of running the selected game!" @@ -520,7 +520,7 @@ msgstr "Skan gennemf #: gui/massadd.cpp:261 #, c-format msgid "Discovered %d new games, ignored %d previously added games." -msgstr "" +msgstr "Opdaget %d nye spil, ignorerede %d tidligere tilfjede spil." #: gui/massadd.cpp:265 #, c-format @@ -528,9 +528,9 @@ msgid "Scanned %d directories ..." msgstr "Gennemset %d biblioteker ..." #: gui/massadd.cpp:268 -#, fuzzy, c-format +#, c-format msgid "Discovered %d new games, ignored %d previously added games ..." -msgstr "Fundet %d nye spil ..." +msgstr "Fundet %d nye spil, ignorer %d tidligere tilfjede spil ..." #: gui/options.cpp:78 msgid "Never" @@ -580,19 +580,19 @@ msgstr "Ingen" #: gui/options.cpp:382 msgid "Failed to apply some of the graphic options changes:" -msgstr "" +msgstr "Anvendelse af ndringer for grafiske indstillinger fejlede:" #: gui/options.cpp:394 msgid "the video mode could not be changed." -msgstr "" +msgstr "videotilstanden kunne ikke ndres." #: gui/options.cpp:400 msgid "the fullscreen setting could not be changed" -msgstr "" +msgstr "fuld skrm indstillingen kunne ikke ndres" #: gui/options.cpp:406 msgid "the aspect ratio setting could not be changed" -msgstr "" +msgstr "billedformat indstillingen ikke kunne ndres" #: gui/options.cpp:727 msgid "Graphics mode:" @@ -672,7 +672,7 @@ msgstr "GM enhed:" #: gui/options.cpp:815 msgid "Specifies default sound device for General MIDI output" -msgstr "Angiver standard lyd enhed for General MIDI udgang" +msgstr "Angiver standard lyd enhed for General MIDI-udgang" #: gui/options.cpp:826 msgid "Don't use General MIDI music" @@ -887,9 +887,8 @@ msgid "Language of ScummVM GUI" msgstr "Sprog for brugerfladen i ScummVM" #: gui/options.cpp:1347 -#, fuzzy msgid "You have to restart ScummVM before your changes will take effect." -msgstr "Du skal genstarte ScummVM for at ndringer vises." +msgstr "Du skal genstarte ScummVM fr dine ndringer har effekt." #: gui/options.cpp:1360 msgid "Select directory for savegames" @@ -1022,20 +1021,17 @@ msgstr "Kunne ikke finde nogen motor istand til at afvikle det valgte spil" #: common/error.cpp:38 msgid "No error" -msgstr "" +msgstr "Ingen fejl" #: common/error.cpp:40 -#, fuzzy msgid "Game data not found" msgstr "Spil data ikke fundet" #: common/error.cpp:42 -#, fuzzy msgid "Game id not supported" msgstr "Spil id ikke understttet" #: common/error.cpp:44 -#, fuzzy msgid "Unsupported color mode" msgstr "Ikke understttet farve tilstand" @@ -1048,7 +1044,6 @@ msgid "Write permission denied" msgstr "Skrive rettighed ngtet" #: common/error.cpp:52 -#, fuzzy msgid "Path does not exist" msgstr "Sti eksistere ikke" @@ -1065,9 +1060,8 @@ msgid "Cannot create file" msgstr "Kan ikke oprette fil" #: common/error.cpp:61 -#, fuzzy msgid "Reading data failed" -msgstr "Lsning fejlet" +msgstr "Lsning af data fejlet" #: common/error.cpp:63 msgid "Writing data failed" @@ -1075,34 +1069,33 @@ msgstr "Skrivning af data fejlet" #: common/error.cpp:66 msgid "Could not find suitable engine plugin" -msgstr "" +msgstr "Kunne ikke finde passende motor udvidelse" #: common/error.cpp:68 -#, fuzzy msgid "Engine plugin does not support save states" -msgstr "Motor understtter ikke fejlfindingsniveau '%s'" +msgstr "Motor udvidelse understtter ikke gemmetilstande" #: common/error.cpp:71 msgid "User canceled" -msgstr "" +msgstr "Bruger annullerede" #: common/error.cpp:75 -#, fuzzy msgid "Unknown error" msgstr "Ukendt fejl" #: engines/advancedDetector.cpp:324 #, c-format msgid "The game in '%s' seems to be unknown." -msgstr "" +msgstr "Spillet i '%s' ser ud til at vre ukendt." #: engines/advancedDetector.cpp:325 msgid "Please, report the following data to the ScummVM team along with name" msgstr "" +"Venligst, rapportere flgende data til ScummVM holdet sammen med navnet" #: engines/advancedDetector.cpp:327 msgid "of the game you tried to add and its version/language/etc.:" -msgstr "" +msgstr "p det spil, du forsgte at tilfje og dets version/sprog/ etc.:" #: engines/dialogs.cpp:84 msgid "~R~esume" @@ -1159,6 +1152,9 @@ msgid "" "the README for basic information, and for instructions on how to obtain " "further assistance." msgstr "" +"Beklager, denne motor leverer i jeblikket ikke spil hjlp. Se venligst " +"README for grundlggende oplysninger, og for at f instruktioner om, hvordan " +"man fr yderligere hjlp." #: engines/dialogs.cpp:228 #, c-format @@ -1166,6 +1162,8 @@ msgid "" "Gamestate save failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" +"Gem af spiltilstand fejlede (%s)! Se venligst README for grundlggende " +"oplysninger, og for at f instruktioner om, hvordan man fr yderligere hjlp." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 @@ -1183,21 +1181,19 @@ msgstr "~T~aster" #: engines/engine.cpp:235 msgid "Could not initialize color format." -msgstr "" +msgstr "Kunne ikke initialisere farveformat." #: engines/engine.cpp:243 -#, fuzzy msgid "Could not switch to video mode: '" -msgstr "Aktuel videotilstand:" +msgstr "Kunne ikke skifte til videotilstand: '" #: engines/engine.cpp:252 -#, fuzzy msgid "Could not apply aspect ratio setting." -msgstr "Skift billedformat korrektion" +msgstr "Kunne ikke anvende billedformat korrektion indstilling." #: engines/engine.cpp:257 msgid "Could not apply fullscreen setting." -msgstr "" +msgstr "Kunne ikke anvende fuldskrm indstilling." #: engines/engine.cpp:357 msgid "" @@ -1207,6 +1203,11 @@ msgid "" "the data files to your hard disk instead.\n" "See the README file for details." msgstr "" +"Det lader til at du spiller dette spil direkte\n" +"fra cd'en. Dette er kendt for at forrsage problemer,\n" +"og det anbefales derfor, at du kopierer\n" +"datafiler til din harddisk i stedet.\n" +"Se README fil for detaljer." #: engines/engine.cpp:368 msgid "" @@ -1216,6 +1217,11 @@ msgid "" "order to listen to the game's music.\n" "See the README file for details." msgstr "" +"Dette spil har lydspor p sin disk. Disse\n" +"spor skal rippes fra disken ved hjlp af\n" +"en passende CD audio udvindingsvrktj\n" +"for at lytte til spillets musik.\n" +"Se README fil for detaljer." #: engines/engine.cpp:426 #, c-format @@ -1223,6 +1229,9 @@ msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" +"Indlsning af spiltilstand fejlede (%s)! Se venligst README for " +"grundlggende oplysninger, og for at f instruktioner om, hvordan man fr " +"yderligere hjlp." #: engines/engine.cpp:439 msgid "" @@ -1230,20 +1239,23 @@ msgid "" "ScummVM. As such, it is likely to be unstable, and any saves you make might " "not work in future versions of ScummVM." msgstr "" +"ADVARSEL: Spillet du er ved at starte endnu ikke er fuldt understttet af " +"ScummVM. Sledes, er det sandsynligt, at det er ustabilt, og alle gemmer du " +"foretager fungerer muligvis ikke i fremtidige versioner af ScummVM." #: engines/engine.cpp:442 msgid "Start anyway" -msgstr "" +msgstr "Start alligevel" #: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47 #: engines/sci/detection.cpp:390 msgid "Use original save/load screens" -msgstr "" +msgstr "Brug original gem/indls skrme" #: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48 #: engines/sci/detection.cpp:391 msgid "Use the original save/load screens, instead of the ScummVM ones" -msgstr "" +msgstr "Brug de originale gem/indls skrme, istedet for dem fra ScummVM" #: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 msgid "Restore game:" @@ -1254,105 +1266,102 @@ msgid "Restore" msgstr "Gendan" #: engines/dreamweb/detection.cpp:57 -#, fuzzy msgid "Use bright palette mode" -msgstr "verste hjre punkt" +msgstr "Brug lys palet tilstand" #: engines/dreamweb/detection.cpp:58 msgid "Display graphics using the game's bright palette" -msgstr "" +msgstr "Vis grafik ved hjlp af spillets lyse palette" #: engines/sci/detection.cpp:370 msgid "EGA undithering" msgstr "EGA farveforgelse" #: engines/sci/detection.cpp:371 -#, fuzzy msgid "Enable undithering in EGA games" -msgstr "Aktiver farveforgelse i EGA spil der understtter det" +msgstr "Aktiver farveforgelse i EGA spil" #: engines/sci/detection.cpp:380 -#, fuzzy msgid "Prefer digital sound effects" -msgstr "Lydstyrke for specielle lydeffekter" +msgstr "Foretrk digitale lydeffekter" #: engines/sci/detection.cpp:381 msgid "Prefer digital sound effects instead of synthesized ones" -msgstr "" +msgstr "Foretrk digitale lydeffekter i stedet for syntetiserede" #: engines/sci/detection.cpp:400 msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "" +msgstr "Brug IMF/Yahama FB-01 til MIDI-udgang" #: engines/sci/detection.cpp:401 msgid "" "Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " "output" msgstr "" +"Bruge et IBM Musik Feature-kort eller et Yahama FB-01 FM synth modul til " +"MIDI-udgang" #: engines/sci/detection.cpp:411 msgid "Use CD audio" -msgstr "" +msgstr "Brug CD lyd" #: engines/sci/detection.cpp:412 msgid "Use CD audio instead of in-game audio, if available" -msgstr "" +msgstr "Brug cd-lyd i stedet for lyd fra spillet, hvis tilgngelige" #: engines/sci/detection.cpp:422 msgid "Use Windows cursors" -msgstr "" +msgstr "Brug Windows markr" #: engines/sci/detection.cpp:423 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" -msgstr "" +msgstr "Brug Windows-markrer (mindre og monokrome) i stedet for dem fra DOS" #: engines/sci/detection.cpp:433 -#, fuzzy msgid "Use silver cursors" -msgstr "Normal markr" +msgstr "Brug slv markr" #: engines/sci/detection.cpp:434 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" +"Brug det alternative st af slv markrer, i stedet for de normale gyldne" #: engines/scumm/dialogs.cpp:175 #, c-format msgid "Insert Disk %c and Press Button to Continue." -msgstr "" +msgstr "Indst Disk %c og Tryk p knappen for at fortstte." #: engines/scumm/dialogs.cpp:176 #, c-format msgid "Unable to Find %s, (%c%d) Press Button." -msgstr "" +msgstr "Kunne ikke finde %s, (%c%d) Tryk p knappen." #: engines/scumm/dialogs.cpp:177 #, c-format msgid "Error reading disk %c, (%c%d) Press Button." -msgstr "" +msgstr "Fejl ved lsning af disk %c, (%c%d) Tryk p knappen." #: engines/scumm/dialogs.cpp:178 msgid "Game Paused. Press SPACE to Continue." -msgstr "" +msgstr "Spil sat p pause. Tryk MELLEMRUM for at fortstte." #. I18N: You may specify 'Yes' symbol at the end of the line, like this: #. "Moechten Sie wirklich neu starten? (J/N)J" #. Will react to J as 'Yes' #: engines/scumm/dialogs.cpp:182 -#, fuzzy msgid "Are you sure you want to restart? (Y/N)" -msgstr " Er du sikker p at du vil afslutte ? " +msgstr "Er du sikker p at du vil genstarte? (J/N) " #. I18N: you may specify 'Yes' symbol at the end of the line. See previous comment #: engines/scumm/dialogs.cpp:184 -#, fuzzy msgid "Are you sure you want to quit? (Y/N)" -msgstr " Er du sikker p at du vil afslutte ? " +msgstr "Er du sikker p at du vil afslutte? (J/N) " #: engines/scumm/dialogs.cpp:189 msgid "Play" -msgstr "" +msgstr "Spil" #: engines/scumm/dialogs.cpp:191 engines/scumm/help.cpp:82 #: engines/scumm/help.cpp:84 @@ -1365,42 +1374,41 @@ msgstr "Afslut" #: engines/scumm/dialogs.cpp:193 msgid "Insert save/load game disk" -msgstr "" +msgstr "Indst gem/indls spil disk" #: engines/scumm/dialogs.cpp:194 msgid "You must enter a name" -msgstr "" +msgstr "Du skal indtaste et name" #: engines/scumm/dialogs.cpp:195 msgid "The game was NOT saved (disk full?)" -msgstr "" +msgstr "Spillet blev ikke gemt (disk fuld?)" #: engines/scumm/dialogs.cpp:196 msgid "The game was NOT loaded" -msgstr "" +msgstr "Spillet blev IKKE indlst" #: engines/scumm/dialogs.cpp:197 #, c-format msgid "Saving '%s'" -msgstr "" +msgstr "Gemmer '%s'" #: engines/scumm/dialogs.cpp:198 #, c-format msgid "Loading '%s'" -msgstr "" +msgstr "Indlser '%s'" #: engines/scumm/dialogs.cpp:199 msgid "Name your SAVE game" -msgstr "" +msgstr "Navngiv din GEMMER" #: engines/scumm/dialogs.cpp:200 -#, fuzzy msgid "Select a game to LOAD" -msgstr "Vlg et tema" +msgstr "Vlg et spil at indlse" #: engines/scumm/dialogs.cpp:201 msgid "Game title)" -msgstr "" +msgstr "Spil titel)" #. I18N: Previous page button #: engines/scumm/dialogs.cpp:287 @@ -1418,46 +1426,41 @@ msgid "~C~lose" msgstr "~L~uk" #: engines/scumm/dialogs.cpp:597 -#, fuzzy msgid "Speech Only" -msgstr "Tale" +msgstr "Kun tale" #: engines/scumm/dialogs.cpp:598 -#, fuzzy msgid "Speech and Subtitles" -msgstr "Undertekster" +msgstr "Tale og Undertekster" #: engines/scumm/dialogs.cpp:599 -#, fuzzy msgid "Subtitles Only" -msgstr "Undertekster" +msgstr "Kun undertekster" #: engines/scumm/dialogs.cpp:607 -#, fuzzy msgctxt "lowres" msgid "Speech & Subs" -msgstr "Tale" +msgstr "Tale & Tekst" #: engines/scumm/dialogs.cpp:653 msgid "Select a Proficiency Level." -msgstr "" +msgstr "Vlg et Frdighedsniveau." #: engines/scumm/dialogs.cpp:655 msgid "Refer to your Loom(TM) manual for help." -msgstr "" +msgstr "Se din Loom(TM) manual for hjlp." #: engines/scumm/dialogs.cpp:658 -#, fuzzy msgid "Standard" -msgstr "Standard (16bpp)" +msgstr "Standard" #: engines/scumm/dialogs.cpp:659 msgid "Practice" -msgstr "" +msgstr "Trning" #: engines/scumm/dialogs.cpp:660 msgid "Expert" -msgstr "" +msgstr "Ekspert" #: engines/scumm/help.cpp:73 msgid "Common keyboard commands:" @@ -1465,7 +1468,7 @@ msgstr "Almindelige tastatur kommandoer:" #: engines/scumm/help.cpp:74 msgid "Save / Load dialog" -msgstr "Gem / Hent dialog" +msgstr "Gem / Indls dialog" #: engines/scumm/help.cpp:76 msgid "Skip line of text" @@ -1497,7 +1500,7 @@ msgstr "Ctrl" #: engines/scumm/help.cpp:79 msgid "Load game state 1-10" -msgstr "Hent spil tilstand 1-10" +msgstr "Indls spil tilstand 1-10" #: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 #: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 @@ -1590,7 +1593,6 @@ msgid " since they may cause crashes" msgstr " siden de kan skabe nedbrud" #: engines/scumm/help.cpp:110 -#, fuzzy msgid " or incorrect game behavior." msgstr " eller ukorrekt opfrsel af spil." @@ -1830,7 +1832,7 @@ msgstr "Komm" #: engines/scumm/help.cpp:246 msgid "Save / Load / Options" -msgstr "Gem / Hent / Indstillinger" +msgstr "Gem / Indls / Indstillinger" #: engines/scumm/help.cpp:255 msgid "Other game controls:" @@ -1979,6 +1981,8 @@ msgid "" "Native MIDI support requires the Roland Upgrade from LucasArts,\n" "but %s is missing. Using AdLib instead." msgstr "" +"Indbygget MIDI understttelse krver Roland opgradering fra LucasArts,\n" +"men %s mangler. Bruger AdLib i stedet." #: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:202 #, c-format @@ -1998,7 +2002,7 @@ msgid "" "\n" "%s" msgstr "" -"Mislykkedes at hente spil tilstand fra fil:\n" +"Mislykkedes at indlse spil tilstand fra fil:\n" "\n" "%s" @@ -2019,6 +2023,9 @@ msgid "" "play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " "directory inside the Tentacle game directory." msgstr "" +"Normalt ville Maniac Mansion begynde nu. Men ScummVM kan ikke gre det " +"endnu. For at spille det, g til 'Tilfj spil' i ScummVM start-menuen og " +"vlg 'Maniac' mappen inde i Tentacle spillets mappe." #. I18N: Option for fast scene switching #: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 @@ -2032,16 +2039,15 @@ msgstr "~O~vergange aktiveret" #. I18N: Drop book page #: engines/mohawk/dialogs.cpp:95 msgid "~D~rop Page" -msgstr "" +msgstr "Smi~d~ side" #: engines/mohawk/dialogs.cpp:99 msgid "~S~how Map" -msgstr "" +msgstr "Vi~s~ kort" #: engines/mohawk/dialogs.cpp:105 -#, fuzzy msgid "~M~ain Menu" -msgstr "ScummVM Hovedmenu" +msgstr "Hoved~m~enu" #: engines/mohawk/dialogs.cpp:172 msgid "~W~ater Effect Enabled" @@ -2050,154 +2056,130 @@ msgstr "~V~andeffekter aktiveret" #: engines/agos/animation.cpp:560 #, c-format msgid "Cutscene file '%s' not found!" -msgstr "" +msgstr "Filmsekvens fil '%s' ikke fundet!" #: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1287 #: engines/tinsel/saveload.cpp:502 -#, fuzzy msgid "Failed to load game state from file." -msgstr "" -"Mislykkedes at hente spil tilstand fra fil:\n" -"\n" -"%s" +msgstr "Mislykkedes at indlse spil tilstand fra fil." #: engines/gob/inter_v2.cpp:1357 engines/tinsel/saveload.cpp:515 -#, fuzzy msgid "Failed to save game state to file." -msgstr "" -"Mislykkedes at gemme spil tilstand til fil:\n" -"\n" -"%s" +msgstr "Mislykkedes at gemme spil tilstand til fil." #: engines/gob/inter_v5.cpp:107 -#, fuzzy msgid "Failed to delete file." -msgstr "" -"Mislykkedes at gemme spil tilstand til fil:\n" -"\n" -"%s" +msgstr "Mislykkedes at slette fil." #: engines/groovie/script.cpp:420 -#, fuzzy msgid "Failed to save game" -msgstr "" -"Mislykkedes at gemme spil tilstand til fil:\n" -"\n" -"%s" +msgstr "Mislykkedes at gemme spil" #. I18N: Studio audience adds an applause and cheering sounds whenever #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 msgid "Studio audience" -msgstr "" +msgstr "Studio publikum" #: engines/kyra/detection.cpp:63 msgid "Enable studio audience" -msgstr "" +msgstr "Aktivr studio publikum" #. I18N: This option allows the user to skip text and cutscenes. #: engines/kyra/detection.cpp:73 msgid "Skip support" -msgstr "" +msgstr "Spring over sttte" #: engines/kyra/detection.cpp:74 msgid "Allow text and cutscenes to be skipped" -msgstr "" +msgstr "Tillad at tekst og filmsekvenser kan springes over" #. I18N: Helium mode makes people sound like they've inhaled Helium. #: engines/kyra/detection.cpp:84 msgid "Helium mode" -msgstr "" +msgstr "Helium tilstand" #: engines/kyra/detection.cpp:85 -#, fuzzy msgid "Enable helium mode" -msgstr "Aktivr Roland GS tilstand" +msgstr "Aktivr helium tilstand" #. I18N: When enabled, this option makes scrolling smoother when #. changing from one screen to another. #: engines/kyra/detection.cpp:99 msgid "Smooth scrolling" -msgstr "" +msgstr "Jvn bevgelse" #: engines/kyra/detection.cpp:100 msgid "Enable smooth scrolling when walking" -msgstr "" +msgstr "Aktivr jvn bevgelse nr du gr" #. I18N: When enabled, this option changes the cursor when it floats to the #. edge of the screen to a directional arrow. The player can then click to #. walk towards that direction. #: engines/kyra/detection.cpp:112 -#, fuzzy msgid "Floating cursors" -msgstr "Normal markr" +msgstr "Flydende markr" #: engines/kyra/detection.cpp:113 msgid "Enable floating cursors" -msgstr "" +msgstr "Aktivr flydende markr" #. I18N: HP stands for Hit Points #: engines/kyra/detection.cpp:127 msgid "HP bar graphs" -msgstr "" +msgstr "HP sjlegrafer" #: engines/kyra/detection.cpp:128 msgid "Enable hit point bar graphs" -msgstr "" +msgstr "Aktivr trfpoint (HP) sjlediagrammer" #: engines/kyra/lol.cpp:478 msgid "Attack 1" -msgstr "" +msgstr "Angreb 1" #: engines/kyra/lol.cpp:479 msgid "Attack 2" -msgstr "" +msgstr "Angreb 2" #: engines/kyra/lol.cpp:480 msgid "Attack 3" -msgstr "" +msgstr "Angreb 3" #: engines/kyra/lol.cpp:481 msgid "Move Forward" -msgstr "" +msgstr "Flyt fremad" #: engines/kyra/lol.cpp:482 msgid "Move Back" -msgstr "" +msgstr "Flyt bagud" #: engines/kyra/lol.cpp:483 msgid "Slide Left" -msgstr "" +msgstr "Flyt til venstre" #: engines/kyra/lol.cpp:484 -#, fuzzy msgid "Slide Right" -msgstr "Hjre" +msgstr "Flyt til hjre" #: engines/kyra/lol.cpp:485 -#, fuzzy msgid "Turn Left" -msgstr "Sluk" +msgstr "Drej til venstre" #: engines/kyra/lol.cpp:486 -#, fuzzy msgid "Turn Right" -msgstr "Pil til hjre" +msgstr "Drej til hjre" #: engines/kyra/lol.cpp:487 -#, fuzzy msgid "Rest" -msgstr "Gendan" +msgstr "Hvil" #: engines/kyra/lol.cpp:488 -#, fuzzy msgid "Options" -msgstr "~I~ndstillinger" +msgstr "Indstillinger" #: engines/kyra/lol.cpp:489 -#, fuzzy msgid "Choose Spell" -msgstr "Vlg" +msgstr "Vlg magi" #: engines/kyra/sound_midi.cpp:475 msgid "" @@ -2207,44 +2189,54 @@ msgid "" "General MIDI ones. After all it might happen\n" "that a few tracks will not be correctly played." msgstr "" +"Det lader til at du en General MIDI-enhed,\n" +"men dit spil kun understtter Roland MT32 MIDI.\n" +"Vi forsger at kortlgge Roland MT32 instrumenterne til\n" +"dem i General MIDI. Trods det kan det ske\n" +"at nogle spor ikke vil blive korrekt afspillet." #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 msgid "Floppy intro" -msgstr "" +msgstr "Diskette intro" #: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45 msgid "Use the floppy version's intro (CD version only)" -msgstr "" +msgstr "Brug diskette versionens intro (kun CD version)" #: engines/sky/compact.cpp:130 msgid "" "Unable to find \"sky.cpt\" file!\n" "Please download it from www.scummvm.org" msgstr "" +"Kunne ikke finde \"sky.cpt\" filen!\n" +"Venligst download den fra www.scummvm.org" #: engines/sky/compact.cpp:141 msgid "" "The \"sky.cpt\" file has an incorrect size.\n" "Please (re)download it from www.scummvm.org" msgstr "" +"\"sky.cpt\" filen har en forkert strrelse.\n" +"Venligst (gen)hent den fra www.scummvm.org" #: engines/sword1/animation.cpp:539 #, c-format msgid "PSX stream cutscene '%s' cannot be played in paletted mode" -msgstr "" +msgstr "PSX stream filmsekvens '%s' kan ikke afspilles i palette tilstand" #: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" +"DXA filmsekvenser fundet, men ScummVM er bygget uden zlib understttelse" #: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" -msgstr "" +msgstr "MPEG2 filmsekvenser understttes ikke lngere" #: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" -msgstr "" +msgstr "Filmsekvens '%s' ikke fundet" #: engines/sword1/control.cpp:863 msgid "" @@ -2256,6 +2248,13 @@ msgid "" "Press OK to convert them now, otherwise you will be asked again the next " "time you start the game.\n" msgstr "" +"ScummVM har konstateret, at du har gamle gemmer for Broken Sword 1, der skal " +"konverteres.\n" +"Det gamle gemte spil format understttes ikke lngere, s vil du ikke vre i " +"stand til at indlse dine spil, hvis du ikke konvertere dem.\n" +"\n" +"Tryk p OK for at konvertere dem nu, ellers vil du blive spurgt igen, nste " +"gang du starter spillet.\n" #: engines/sword1/control.cpp:1232 #, c-format @@ -2263,31 +2262,34 @@ msgid "" "Target new save game already exists!\n" "Would you like to keep the old save game (%s) or the new one (%s)?\n" msgstr "" +"Nyt gemt spil findes allerede!\n" +"Vil du gerne beholde det gamle gemte spil (%s) eller det nye (%s)?\n" #: engines/sword1/control.cpp:1235 msgid "Keep the old one" -msgstr "" +msgstr "Behold den gamle" #: engines/sword1/control.cpp:1235 msgid "Keep the new one" -msgstr "" +msgstr "Behold den nye" #: engines/sword1/logic.cpp:1633 msgid "This is the end of the Broken Sword 1 Demo" -msgstr "" +msgstr "Dette er slutningen af Broken Sword 1 demoen" #: engines/sword2/animation.cpp:435 msgid "" "PSX cutscenes found but ScummVM has been built without RGB color support" msgstr "" +"PSX filmsekvenser fundet, men ScummVM er bygget uden RGB farve understttelse" #: engines/sword2/sword2.cpp:79 msgid "Show object labels" -msgstr "" +msgstr "Vis labels p genstande" #: engines/sword2/sword2.cpp:80 msgid "Show labels for objects on mouse hover" -msgstr "" +msgstr "Vis labels for genstande musen er henover" #: engines/parallaction/saveload.cpp:133 #, c-format @@ -2295,16 +2297,16 @@ msgid "" "Can't save game in slot %i\n" "\n" msgstr "" +"Kan ikke gemme spil p plads %i\n" +"\n" #: engines/parallaction/saveload.cpp:204 -#, fuzzy msgid "Loading game..." -msgstr "Indls spil:" +msgstr "Indlser spil..." #: engines/parallaction/saveload.cpp:219 -#, fuzzy msgid "Saving game..." -msgstr "Gemmer:" +msgstr "Gemmer spil..." #: engines/parallaction/saveload.cpp:272 msgid "" @@ -2315,10 +2317,16 @@ msgid "" "\n" "Press OK to convert them now, otherwise you will be asked next time.\n" msgstr "" +"ScummVM har konstateret, at du har gamle gemmer for Nippon Safes, der skal " +"omdbes.\n" +"De gamle navne er ikke lngere understttet, s du vil ikke vre i stand til " +"at indlse dine spil, hvis du ikke konvertere dem.\n" +"\n" +"Tryk p OK for at konvertere dem nu, ellers vil du blive spurgt nste gang.\n" #: engines/parallaction/saveload.cpp:319 msgid "ScummVM successfully converted all your savefiles." -msgstr "" +msgstr "ScummVM konverterede med succes alle dine gemmer." #: engines/parallaction/saveload.cpp:321 msgid "" @@ -2327,6 +2335,10 @@ msgid "" "\n" "Please report to the team." msgstr "" +"ScummVM udskrev nogle advarsler i dit konsol vindue, og kan ikke garantere " +"at alle dine filer er blevet konverteret.\n" +"\n" +"Venligst rapportr til holdet." #: audio/fmopl.cpp:49 msgid "MAME OPL emulator" @@ -2342,11 +2354,13 @@ msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" +"Den valgte lydenhed '%s' blev ikke fundet (kan f.eks vre slukket eller " +"afbrudt)." #: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 #: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." -msgstr "" +msgstr "Forsger at falde tilbage til den nste tilgngelig enhed..." #: audio/mididrv.cpp:221 #, c-format @@ -2354,6 +2368,7 @@ msgid "" "The selected audio device '%s' cannot be used. See log file for more " "information." msgstr "" +"Den valgte lydenhed '%s' kan ikke bruges. Se log filen for mere information." #: audio/mididrv.cpp:257 #, c-format @@ -2361,6 +2376,8 @@ msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" +"Den foretrukne lydenhed '%s' blev ikke fundet (kan f.eks vre slukket eller " +"afbrudt)." #: audio/mididrv.cpp:272 #, c-format @@ -2368,6 +2385,8 @@ msgid "" "The preferred audio device '%s' cannot be used. See log file for more " "information." msgstr "" +"Den foretrukne lydenhed '%s' kan ikke bruges. Se log filen for mere " +"information." #: audio/null.h:43 msgid "No music" @@ -2390,7 +2409,6 @@ msgid "C64 Audio Emulator" msgstr "C64 lyd emulator" #: audio/softsynth/mt32.cpp:293 -#, fuzzy msgid "Initializing MT-32 Emulator" msgstr "Initialisere MT-32 emulator" @@ -2411,7 +2429,6 @@ msgid "Keymap:" msgstr "Tasteoversigt:" #: backends/keymapper/remap-dialog.cpp:66 -#, fuzzy msgid " (Effective)" msgstr " (Aktiv)" @@ -2421,7 +2438,7 @@ msgstr " (Aktiv)" #: backends/keymapper/remap-dialog.cpp:106 msgid " (Blocked)" -msgstr "" +msgstr "(Blokeret)" #: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" @@ -2508,14 +2525,12 @@ msgid "Disable power off" msgstr "Deaktiver slukning" #: backends/platform/iphone/osys_events.cpp:300 -#, fuzzy msgid "Mouse-click-and-drag mode enabled." -msgstr "Pegeplade tilstand aktiveret." +msgstr "Muse-klik-og-trk tilstand aktiveret." #: backends/platform/iphone/osys_events.cpp:302 -#, fuzzy msgid "Mouse-click-and-drag mode disabled." -msgstr "Pegeplade tilstand deaktiveret." +msgstr "Muse-klik-og-trk tilstand deaktiveret." #: backends/platform/iphone/osys_events.cpp:313 msgid "Touchpad mode enabled." @@ -2527,7 +2542,7 @@ msgstr "Pegeplade tilstand deaktiveret." #: backends/platform/maemo/maemo.cpp:205 msgid "Click Mode" -msgstr "" +msgstr "Klik tilstand" #: backends/platform/maemo/maemo.cpp:211 #: backends/platform/symbian/src/SymbianActions.cpp:42 @@ -2538,9 +2553,8 @@ msgid "Left Click" msgstr "Venstre klik" #: backends/platform/maemo/maemo.cpp:214 -#, fuzzy msgid "Middle Click" -msgstr "Midterste hjre punkt" +msgstr "Miderste klik" #: backends/platform/maemo/maemo.cpp:217 #: backends/platform/symbian/src/SymbianActions.cpp:43 @@ -2550,7 +2564,6 @@ msgid "Right Click" msgstr "Hjre klik" #: backends/platform/sdl/macosx/appmenu_osx.mm:78 -#, fuzzy msgid "Hide ScummVM" msgstr "Skjul ScummVM" @@ -2582,26 +2595,22 @@ msgstr "Normal (ingen skalering)" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2135 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:533 -#, fuzzy msgid "Enabled aspect ratio correction" -msgstr "Skift billedformat korrektion" +msgstr "Aktivr billedformat korrektion" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2141 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:538 -#, fuzzy msgid "Disabled aspect ratio correction" -msgstr "Skift billedformat korrektion" +msgstr "Deaktivr billedformat korrektion" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2196 -#, fuzzy msgid "Active graphics filter:" -msgstr "Skift mellem grafik filtre" +msgstr "Aktive grafik filtre:" #: backends/graphics/surfacesdl/surfacesdl-graphics.cpp:2238 #: backends/graphics/openglsdl/openglsdl-graphics.cpp:477 -#, fuzzy msgid "Windowed mode" -msgstr "Rendere tilstand:" +msgstr "Vindue tilstand" #: backends/graphics/opengl/opengl-graphics.cpp:135 msgid "OpenGL Normal" @@ -2616,21 +2625,20 @@ msgid "OpenGL Original" msgstr "OpenGL Original" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:415 -#, fuzzy msgid "Current display mode" -msgstr "Aktuel videotilstand:" +msgstr "Aktuel videotilstand" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:428 msgid "Current scale" -msgstr "" +msgstr "Aktuel skalering" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:558 msgid "Active filter mode: Linear" -msgstr "" +msgstr "Aktiv filter tilstand: Linr" #: backends/graphics/openglsdl/openglsdl-graphics.cpp:560 msgid "Active filter mode: Nearest" -msgstr "" +msgstr "Aktiv filter tilstand: Nrmest" #: backends/platform/symbian/src/SymbianActions.cpp:38 #: backends/platform/wince/CEActionsSmartphone.cpp:39 @@ -2812,17 +2820,15 @@ msgid "Network down" msgstr "Netvrk nede" #: backends/platform/wii/options.cpp:178 -#, fuzzy msgid "Initializing network" msgstr "Initialisere netvrk" #: backends/platform/wii/options.cpp:182 -#, fuzzy msgid "Timeout while initializing network" msgstr "Tidsgrnse net ved initialisering af netvrk" #: backends/platform/wii/options.cpp:186 -#, fuzzy, c-format +#, c-format msgid "Network not initialized (%d)" msgstr "Netvrk ikke initialiseret (%d)" @@ -2882,12 +2888,12 @@ msgstr "Pil til h #: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Do you want to load or save the game?" -msgstr "Vil du hente eller gemme spillet?" +msgstr "Vil du indlse eller gemme spillet?" #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 msgid " Are you sure you want to quit ? " -msgstr " Er du sikker p at du vil afslutte ? " +msgstr " Er du sikker p at du vil afslutte? " #: backends/platform/wince/CEActionsSmartphone.cpp:50 msgid "Keyboard" @@ -2944,95 +2950,86 @@ msgstr "" "hele oversigten" #: backends/events/default/default-events.cpp:191 -#, fuzzy msgid "Do you really want to return to the Launcher?" -msgstr "Vil du virkelig slette denne gemmer?" +msgstr "Vil du virkelig g tilbage til oversigten?" #: backends/events/default/default-events.cpp:191 -#, fuzzy msgid "Launcher" -msgstr "Slag" +msgstr "Oversigt" #: backends/events/default/default-events.cpp:213 -#, fuzzy msgid "Do you really want to quit?" -msgstr "Vil du afslutte?" +msgstr "Vil du virkelig afslutte?" #: backends/events/gph/gph-events.cpp:338 #: backends/events/gph/gph-events.cpp:381 #: backends/events/openpandora/op-events.cpp:139 msgid "Touchscreen 'Tap Mode' - Left Click" -msgstr "" +msgstr "Touchscreen 'Tap Mode' - Venstre Klik" #: backends/events/gph/gph-events.cpp:340 #: backends/events/gph/gph-events.cpp:383 #: backends/events/openpandora/op-events.cpp:141 msgid "Touchscreen 'Tap Mode' - Right Click" -msgstr "" +msgstr "Touchscreen 'Tap Mode' - Hjre Klik" #: backends/events/gph/gph-events.cpp:342 #: backends/events/gph/gph-events.cpp:385 #: backends/events/openpandora/op-events.cpp:143 msgid "Touchscreen 'Tap Mode' - Hover (No Click)" -msgstr "" +msgstr "Touchscreen 'Tap Mode' - Henover (Ingen Klik)" #: backends/events/gph/gph-events.cpp:362 -#, fuzzy msgid "Maximum Volume" -msgstr "Lydstyrke" +msgstr "Maximal lydstyrke" #: backends/events/gph/gph-events.cpp:364 msgid "Increasing Volume" -msgstr "" +msgstr "Hver lydstyrke" #: backends/events/gph/gph-events.cpp:370 -#, fuzzy msgid "Minimal Volume" -msgstr "Lydstyrke" +msgstr "Minimal lydstyrke" #: backends/events/gph/gph-events.cpp:372 msgid "Decreasing Volume" -msgstr "" +msgstr "Snker lydstyrke" #: backends/updates/macosx/macosx-updates.mm:65 msgid "Check for Updates..." -msgstr "" +msgstr "Sg efter opdateringer..." #: backends/platform/bada/form.cpp:269 -#, fuzzy msgid "Right Click Once" -msgstr "Hjre klik" +msgstr "Enkelt hjre klik" #: backends/platform/bada/form.cpp:277 -#, fuzzy msgid "Move Only" -msgstr "Tale" +msgstr "Flyt kun" #: backends/platform/bada/form.cpp:291 msgid "Escape Key" -msgstr "" +msgstr "Escape tast" #: backends/platform/bada/form.cpp:296 -#, fuzzy msgid "Game Menu" -msgstr "Spil" +msgstr "Spil menu" #: backends/platform/bada/form.cpp:301 -#, fuzzy msgid "Show Keypad" msgstr "Vis tastatur" #: backends/platform/bada/form.cpp:309 msgid "Control Mouse" -msgstr "" +msgstr "Kontrollr mus" #: backends/events/maemosdl/maemosdl-events.cpp:192 msgid "Clicking Enabled" -msgstr "" +msgstr "Klik aktiveret" #: backends/events/maemosdl/maemosdl-events.cpp:192 msgid "Clicking Disabled" -msgstr "" +msgstr "Klik deaktiveret" #~ msgid "Hercules Green" #~ msgstr "Hercules grn" -- cgit v1.2.3 From 6051ec13b7c1610897923201b2a01e5d472cd7d9 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sat, 7 Jul 2012 01:15:59 +0100 Subject: DOCS: Add Danish QuickStart file This was sent by Steffen Nyeland by email. --- doc/da/HurtigStart | 151 +++++++++++++++++++++++++++++++++++++++++++++++++++++ ports.mk | 6 +++ 2 files changed, 157 insertions(+) create mode 100644 doc/da/HurtigStart diff --git a/doc/da/HurtigStart b/doc/da/HurtigStart new file mode 100644 index 0000000000..b54590bba3 --- /dev/null +++ b/doc/da/HurtigStart @@ -0,0 +1,151 @@ +Dette dokument er en delvis oversættelse af den engelske README filen. +Det originale dokument har meget mere information, så hvis du ikke kan +finde det du har brug for her og kan forstå en smule engelsk, så prøv +at se i den Engelske README-fil. + +For mere information, kompatibilitet lister, detaljer om donering, den +seneste udgivelse, statusrapporter og mere, kan du besøge ScummVMs hjemme- +side på: http://www.scummvm.org/ + +Indholdsfortegnelse: +-------------------- +1.0) Indledning + * 1.1 Om ScummVM + * 1.2 Hurtig start +2.0) Kontakt + * 2.1 Rapportering af fejl + +1.0) Indledning: +---- ----------- + +1.1) Om ScummVM: +---- ----------- +ScummVM er et program, som tillader dig at køre visse klassiske grafiske +peg-og-klik eventyr spil, hvis du allerede har deres data filer. Den +smarte del omkring dette: ScummVM erstatter bare de eksekverbare filer +der fulgte med i spillet, så du kan afspille dem på systemer, hvor de +aldrig var designet til! + +Oprindeligt var det designet til at køre LucasArts' SCUMM spil, såsom +Maniac Mansion, Monkey Island, Day of the Tentacle eller Sam and Max. +SCUMM står for 'Script Creation Utility for Maniac Mansion', som var det +første spil som LucasArts designede dette system til. Og langt senere gav +navn til ScummVM ('VM', betyder Virtuel Maskine). + +Efterhånden er understøttelse for en masse ikke-SCUMM spil blevet tilføjet, +og ScummVM understøtter nu også mange af Sierras AGI og SCI-spil (såsom +Kings Quest 1-6, Space Quest 1-5, ...), Discworld 1 og 2, Simon the Sorcerer +1 og 2, Beneath A Steel Sky, Lure of the Temptress, Broken Sword I og II, +Flight of the Amazon Queen, Gobliiins 1-3, The Legend of Kyrandia serien, +mange af Humongous Entertainments børne SCUMM spil (herunder Freddi Fish +and Putt Putt spil) og mange flere. Du kan finde en komplet liste med +oplysninger om, hvilke eventyr der understøttes og hvor godt, på +kompatibilitetssiden. ScummVM forbedres løbende, så vend ofte tilbage. + +Blandt de systemer, som du kan spille disse spil på er regulære desktop +computere (Windows, Linux, Mac OS X, ...), spillekonsoller (Dreamcast, +Nintendo DS og Wii, PS2, PSP, ...), smartphones (Android, iPhone, PocketPC, +Symbian ...) og flere. + +På dette tidspunkt er ScummVM stadig under kraftig udvikling. Vær opmærksom +på, at selvom vi forsøger at sørge for, at mange spil kan gennemføres med få +store fejl, kan nedbrud ske, og vi tilbyder ingen garanti. Når det er sagt, +er nogle af spillene blevet understøttet i lang tid og bør fungerer fint +med alle nyere stabile udgaver. Du kan få en fornemmelse af, hvor godt +hvert spil virker i ScummVM, ved at kigge på kompatibilitetssiden. Faktisk, +hvis du søger lidt rundt, vil du måske opdage, at ScummVM endog anvendes +kommercielt til genudgivelse af nogle af understøttede spil på moderne +platforme. Dette viser, at flere virksomheder er tilfredse med kvaliteten +af ​​programmet, og hvor godt det kan køre nogle af spillene. + +Hvis du har fornøjelse af ScummVM, er du velkommen til at donere ved hjælp +af PayPal-knappen på ScummVM's hjemmeside. Dette vil hjælpe os med at købe +værktøjer nødvendige for at udvikle ScummVM nemmere og hurtigere. Hvis du +ikke kan donere, hjælp og bidrage med en programrettelse! + +1.2) Hurtig start: +---- ------------ +VIGTIGT: Denne korte vejledning antager, at du bruger ScummVM på dansk. +Som standard vil ScummVM bruge dit operativsystem sprog. Hvis du +foretrækker at bruge ScummVM på engelsk, kan du også foretrække at +følge vejledning fra den engelske README fil. + +For de utålmodige blandt jer, er her hvordan du får ScummVM op at køre +i fem enkle trin. + +1. Hent ScummVM fra og +installere det. + +2. Opret en mappe på din harddisk og kopiere spillets datafiler fra de +oprindelige medier til denne mappe. Gentag dette for hvert spil du +ønsker at spille (det er bedre at bruge en separat mappe til hvert spil). + +3. Start ScummVM. + +Hvis ScummVM på dette tidspunkt vises på engelsk i stedet for dansk, gør +som følger for at ændre sprog: + - Klik på 'Options'. + - Klik på højre pil i fanebjælken og vælg 'Misc' fanen. + - Vælg "Dansk" i "GUI Language'og klik på 'OK'. + - Bekræft meddelelsen boksen, der popper op, klik på 'Quit' for at + afslutte ScummVM og derefter genstarte programmet. + +Vælg nu 'Tilføj spil', vælge mappen med spillets datafiler (forsøg ikke +at vælge datafilerne selv!) Og tryk på 'Vælg' + +4. En dialog skulle komme op, hvor du kan konfigurere forskellige +indstillinger, hvis du ønsker det (det burde dog være fint at lade alt +forblive på sin standard). Bekræft dialogen. + +5. Vælg det spil, du ønsker at spille på listen, og tryk på 'Start'. + +ScummVM husker de spil, du tilføjer. Så hvis du lukker ScummVM, vil +listen over spil næste gang du starter den, indeholde alle de spil du +tidligere har tilføjet. Du kan derfor gå direkte til trin 5, medmindre +du ønsker at tilføje flere spil. + +Tip: Hvis du ønsker at tilføje flere spil på én gang, så prøv at trykke +og holde shift-tasten nede før du klikker på 'Tilføj spil' - teksten vil +skifte til 'Tilføj flere', og hvis du trykker på den, bliver du igen bedt +om at vælge en mappe, men denne gang vil ScummVM søge gennem alle +undermapper for understøttede spil. + +2.0) Kontakt: +---- -------- +Den nemmeste måde at kontakte ScummVM holdet på er ved at sende fejlrapporter +(se afsnit 2.1) eller ved at bruge vores fora på http://forums.scummvm.org. +Du kan også deltage og e-maile til scummvm-devel postlisten, eller chatte +med os på IRC (#scummvm på irc.freenode.net). Bed os venligst ikke om at +understøtte et ikke-understøttet spil -- læs FAQ på vores hjemmeside først. +Bemærk, at det officielle sprog i dette forum, mailing liste og chat er +engelsk og ingen andre sprog bør anvendes. + +2.1) Rapportering af fejl: +---- --------------------- +For at rapportere en fejl, skal du oprette en SourceForge konto, og følge +"Bug Tracker" linket fra vores hjemmeside. Sørg for at fejlen er reproducerbare, +og stadig forekommer i den seneste git/Daglig byggede version. +Kontroller også listen med kendte problemer (nedenfor) og kompatibilitetslisten +på vores hjemmeside for spillet, for at sikre, at problemet ikke allerede er kendt: + + http://www.scummvm.org/compatibility_stable.php + +Vær venlig ikke at rapportere fejl på spil, der ikke er anført som værende +mulige at gennemføre i 'understøttede spil' sektionen, eller kompatibilitetslisten. +Vi -ved- disse spil har fejl. + +Inkluder venligst følgende oplysninger: + - ScummVM version (VENLIGST test på den nyeste git/Daglig byggede) + - Detaljer om fejlen, herunder oplysninger om genskabelsen af fejlen + - Sprog i spillet (engelsk, tysk, ...) + - Version af spillet (talkie, diskette, ...) + - Platform og Kompiler (Win32, Linux, FreeBSD, ...) + - Medsend et gemt spil hvis det er muligt + - Hvis fejlen kun skete for nylig, notér venligst den sidste version + uden fejl, og den første version med fejlen. På denne måde kan vi + ordne det hurtigere ved at kigge på de foretagne ændringer. + +Endelig, bedes du rapportere hvert problem separat; indsend ikke flere +problemer på samme billet. (Ellers bliver det svært at spore status for +hver enkelt fejl). Husk også på, at alle fejlrapporter skal skrives på +engelsk. \ No newline at end of file diff --git a/ports.mk b/ports.mk index 271a352596..357a7e297a 100644 --- a/ports.mk +++ b/ports.mk @@ -160,6 +160,8 @@ osxsnap: bundle cp $(srcdir)/doc/QuickStart ./ScummVM-snapshot/doc/QuickStart mkdir ScummVM-snapshot/doc/cz cp $(srcdir)/doc/cz/PrectiMe ./ScummVM-snapshot/doc/cz/PrectiMe + mkdir ScummVM-snapshot/doc/da + cp $(srcdir)/doc/da/HurtigStart ./ScummVM-snapshot/doc/da/HurtigStart mkdir ScummVM-snapshot/doc/de cp $(srcdir)/doc/de/Liesmich ./ScummVM-snapshot/doc/de/Liesmich cp $(srcdir)/doc/de/Schnellstart ./ScummVM-snapshot/doc/de/Schnellstart @@ -176,6 +178,7 @@ osxsnap: bundle cp $(srcdir)/doc/se/Snabbstart ./ScummVM-snapshot/doc/se/Snabbstart /Developer/Tools/SetFile -t ttro -c ttxt ./ScummVM-snapshot/* xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/cz/* + xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/da/* xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/de/* xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/es/* xattr -w "com.apple.TextEncoding" "utf-8;134217984" ./ScummVM-snapshot/doc/fr/* @@ -206,6 +209,7 @@ win32dist: $(EXECUTABLE) mkdir -p $(WIN32PATH)/graphics mkdir -p $(WIN32PATH)/doc mkdir -p $(WIN32PATH)/doc/cz + mkdir -p $(WIN32PATH)/doc/da mkdir -p $(WIN32PATH)/doc/de mkdir -p $(WIN32PATH)/doc/es mkdir -p $(WIN32PATH)/doc/fr @@ -231,6 +235,7 @@ endif cp $(srcdir)/doc/fr/DemarrageRapide $(WIN32PATH)/doc/fr/DemarrageRapide.txt cp $(srcdir)/doc/it/GuidaRapida $(WIN32PATH)/doc/it/GuidaRapida.txt cp $(srcdir)/doc/no-nb/HurtigStart $(WIN32PATH)/doc/no-nb/HurtigStart.txt + cp $(srcdir)/doc/da/HurtigStart $(WIN32PATH)/doc/da/HurtigStart.txt cp $(srcdir)/doc/de/Schnellstart $(WIN32PATH)/doc/de/Schnellstart.txt cp $(srcdir)/doc/se/Snabbstart $(WIN32PATH)/doc/se/Snabbstart.txt cp $(srcdir)/README $(WIN32PATH)/README.txt @@ -246,6 +251,7 @@ endif unix2dos $(WIN32PATH)/*.txt unix2dos $(WIN32PATH)/doc/*.txt unix2dos $(WIN32PATH)/doc/cz/*.txt + unix2dos $(WIN32PATH)/doc/da/*.txt unix2dos $(WIN32PATH)/doc/de/*.txt unix2dos $(WIN32PATH)/doc/es/*.txt unix2dos $(WIN32PATH)/doc/fr/*.txt -- cgit v1.2.3 From 8b55dcf531e2842ca110f244789e29dbd4a0d0c3 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sat, 7 Jul 2012 01:26:25 +0100 Subject: I18N: Regenerate translations data file --- gui/themes/translations.dat | Bin 322629 -> 337762 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat index 4812633011..2307ea20ae 100644 Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ -- cgit v1.2.3 From 10ba526812daf504c086adf3057bdab643d3a3fe Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sat, 7 Jul 2012 20:13:02 +1000 Subject: SCUMM: Add another English Windows version of Freddi Fish and Luther's Maze Madness. --- devtools/scumm-md5.txt | 1 + engines/scumm/scumm-md5.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt index 176f04aaf8..d67f46205c 100644 --- a/devtools/scumm-md5.txt +++ b/devtools/scumm-md5.txt @@ -575,6 +575,7 @@ maze Freddi Fish and Luther's Maze Madness 4f04b321a95d4315ce6d65f8e1dd0368 -1 us All HE 80 - - Kirben cd424f143a141bc59226ad83a6e40f51 -1 nl All HE 98.5 - - daniel9, sugarcube 4dbff3787aedcd96b0b325f2d92d7ad9 -1 us All HE 100 Updated - Kirben + 4522564b3c31aaf218b6a96826a549fd -1 us Windows HE 100 - - legoking831 water Freddi Fish and Luther's Water Worries 4ba37f835be11a59d969f90f272f575b -1 us All HE 80 - - Kirben diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h index 0814e3bfe1..d6198b13c4 100644 --- a/engines/scumm/scumm-md5.h +++ b/engines/scumm/scumm-md5.h @@ -1,5 +1,5 @@ /* - This file was generated by the md5table tool on Fri Jun 15 09:16:45 2012 + This file was generated by the md5table tool on Sat Jul 07 10:02:31 2012 DO NOT EDIT MANUALLY! */ @@ -191,6 +191,7 @@ static const MD5Table md5table[] = { { "45082a5c9f42ba14dacfe1fdeeba819d", "freddicove", "HE 100", "Demo", 18422, Common::EN_ANY, Common::kPlatformUnknown }, { "45152f7cf2ba8f43cf8a8ea2e740ae09", "monkey", "VGA", "VGA", 8357, Common::ES_ESP, Common::kPlatformPC }, { "4521138d15d1fd7649c31fb981746231", "pajama2", "HE 98.5", "Demo", -1, Common::DE_DEU, Common::kPlatformUnknown }, + { "4522564b3c31aaf218b6a96826a549fd", "maze", "HE 100", "", -1, Common::EN_USA, Common::kPlatformWindows }, { "46b53fd430adcfbed791b48a0d4b079f", "funpack", "", "", -1, Common::EN_ANY, Common::kPlatformPC }, { "470c45b636139bb40716daa1c7edaad0", "loom", "EGA", "EGA", -1, Common::DE_DEU, Common::kPlatformPC }, { "477dbafbd66a53c98416dc01aef019ad", "monkey", "EGA", "EGA", -1, Common::IT_ITA, Common::kPlatformPC }, -- cgit v1.2.3 From cfe7bf614b425671167a0b1e92418bfeb7b20bf4 Mon Sep 17 00:00:00 2001 From: D G Turner Date: Sat, 7 Jul 2012 14:37:15 +0100 Subject: TOON: Remove unecessary getSystem() function. This was needed due to the unecessary protected shadow variable hiding the Engine superclass _system member variable. --- engines/toon/character.cpp | 14 +++++++------- engines/toon/movie.cpp | 20 ++++++++++---------- engines/toon/script_func.cpp | 4 ++-- engines/toon/toon.cpp | 3 +-- engines/toon/toon.h | 5 ----- 5 files changed, 20 insertions(+), 26 deletions(-) diff --git a/engines/toon/character.cpp b/engines/toon/character.cpp index e19656f2c8..479f4965f3 100644 --- a/engines/toon/character.cpp +++ b/engines/toon/character.cpp @@ -62,7 +62,7 @@ Character::Character(ToonEngine *vm) : _vm(vm) { _speed = 150; // 150 = nominal drew speed _lastWalkTime = 0; _numPixelToWalk = 0; - _nextIdleTime = _vm->getSystem()->getMillis() + (_vm->randRange(0, 600) + 300) * _vm->getTickLength(); + _nextIdleTime = _vm->_system->getMillis() + (_vm->randRange(0, 600) + 300) * _vm->getTickLength(); _lineToSayId = 0; } @@ -101,7 +101,7 @@ void Character::setFacing(int32 facing) { int32 dir = 0; - _lastWalkTime = _vm->getSystem()->getMillis(); + _lastWalkTime = _vm->_system->getMillis(); if ((_facing - facing + 8) % 8 > (facing - _facing + 8) % 8) dir = 1; else @@ -188,7 +188,7 @@ bool Character::walkTo(int16 newPosX, int16 newPosY) { _currentPathNode = 0; stopSpecialAnim(); - _lastWalkTime = _vm->getSystem()->getMillis(); + _lastWalkTime = _vm->_system->getMillis(); _numPixelToWalk = 0; @@ -220,8 +220,8 @@ bool Character::walkTo(int16 newPosX, int16 newPosY) { } // in 1/1000 pixels - _numPixelToWalk += _speed * (_vm->getSystem()->getMillis() - _lastWalkTime) * _scale / 1024; - _lastWalkTime = _vm->getSystem()->getMillis(); + _numPixelToWalk += _speed * (_vm->_system->getMillis() - _lastWalkTime) * _scale / 1024; + _lastWalkTime = _vm->_system->getMillis(); while (_numPixelToWalk >= 1000 && _currentPathNode < _currentPath.size()) { _x = _currentPath[_currentPathNode].x; @@ -356,8 +356,8 @@ void Character::update(int32 timeIncrement) { } // in 1/1000 pixels - _numPixelToWalk += _speed * (_vm->getSystem()->getMillis() - _lastWalkTime) * _scale / 1024; - _lastWalkTime = _vm->getSystem()->getMillis(); + _numPixelToWalk += _speed * (_vm->_system->getMillis() - _lastWalkTime) * _scale / 1024; + _lastWalkTime = _vm->_system->getMillis(); while (_numPixelToWalk > 1000 && _currentPathNode < _currentPath.size()) { _x = _currentPath[_currentPathNode].x; diff --git a/engines/toon/movie.cpp b/engines/toon/movie.cpp index 8cdf92363f..93e41adf57 100644 --- a/engines/toon/movie.cpp +++ b/engines/toon/movie.cpp @@ -109,40 +109,40 @@ bool Movie::playVideo(bool isFirstIntroVideo) { if (frame) { if (_decoder->isLowRes()) { // handle manually 2x scaling here - Graphics::Surface* surf = _vm->getSystem()->lockScreen(); + Graphics::Surface* surf = _vm->_system->lockScreen(); for (int y = 0; y < frame->h / 2; y++) { memcpy(surf->getBasePtr(0, y * 2 + 0), frame->getBasePtr(0, y), frame->pitch); memcpy(surf->getBasePtr(0, y * 2 + 1), frame->getBasePtr(0, y), frame->pitch); } - _vm->getSystem()->unlockScreen(); + _vm->_system->unlockScreen(); } else { - _vm->getSystem()->copyRectToScreen(frame->pixels, frame->pitch, 0, 0, frame->w, frame->h); + _vm->_system->copyRectToScreen(frame->pixels, frame->pitch, 0, 0, frame->w, frame->h); // WORKAROUND: There is an encoding glitch in the first intro video. This hides this using the adjacent pixels. if (isFirstIntroVideo) { int32 currentFrame = _decoder->getCurFrame(); if (currentFrame >= 956 && currentFrame <= 1038) { debugC(1, kDebugMovie, "Triggered workaround for glitch in first intro video..."); - _vm->getSystem()->copyRectToScreen(frame->getBasePtr(frame->w-188, 123), frame->pitch, frame->w-188, 124, 188, 1); - _vm->getSystem()->copyRectToScreen(frame->getBasePtr(frame->w-188, 126), frame->pitch, frame->w-188, 125, 188, 1); - _vm->getSystem()->copyRectToScreen(frame->getBasePtr(0, 125), frame->pitch, 0, 126, 64, 1); - _vm->getSystem()->copyRectToScreen(frame->getBasePtr(0, 128), frame->pitch, 0, 127, 64, 1); + _vm->_system->copyRectToScreen(frame->getBasePtr(frame->w-188, 123), frame->pitch, frame->w-188, 124, 188, 1); + _vm->_system->copyRectToScreen(frame->getBasePtr(frame->w-188, 126), frame->pitch, frame->w-188, 125, 188, 1); + _vm->_system->copyRectToScreen(frame->getBasePtr(0, 125), frame->pitch, 0, 126, 64, 1); + _vm->_system->copyRectToScreen(frame->getBasePtr(0, 128), frame->pitch, 0, 127, 64, 1); } } } } _decoder->setSystemPalette(); - _vm->getSystem()->updateScreen(); + _vm->_system->updateScreen(); } Common::Event event; - while (_vm->getSystem()->getEventManager()->pollEvent(event)) + while (_vm->_system->getEventManager()->pollEvent(event)) if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE)) { _vm->dirtyAllScreen(); return false; } - _vm->getSystem()->delayMillis(10); + _vm->_system->delayMillis(10); } _vm->dirtyAllScreen(); return !_vm->shouldQuit(); diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp index e9b7534198..1fa4058114 100644 --- a/engines/toon/script_func.cpp +++ b/engines/toon/script_func.cpp @@ -564,9 +564,9 @@ int32 ScriptFunc::sys_Cmd_Exit_Conversation(EMCState *state) { int32 ScriptFunc::sys_Cmd_Set_Mouse_Pos(EMCState *state) { if (_vm->state()->_inCloseUp) { - _vm->getSystem()->warpMouse(stackPos(0), stackPos(1)); + _vm->_system->warpMouse(stackPos(0), stackPos(1)); } else { - _vm->getSystem()->warpMouse(stackPos(0) - _vm->state()->_currentScrollValue, stackPos(1)); + _vm->_system->warpMouse(stackPos(0) - _vm->state()->_currentScrollValue, stackPos(1)); } return 0; } diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp index 0956b965a7..ee427652d8 100644 --- a/engines/toon/toon.cpp +++ b/engines/toon/toon.cpp @@ -820,7 +820,6 @@ Common::Error ToonEngine::run() { ToonEngine::ToonEngine(OSystem *syst, const ADGameDescription *gameDescription) : Engine(syst), _gameDescription(gameDescription), _language(gameDescription->language), _rnd("toon") { - _system = syst; _tickLength = 16; _currentPicture = NULL; _inventoryPicture = NULL; @@ -1224,7 +1223,7 @@ void ToonEngine::loadScene(int32 SceneId, bool forGameLoad) { _script->init(&_sceneAnimationScripts[i]._state, _sceneAnimationScripts[i]._data); if (!forGameLoad) { _script->start(&_sceneAnimationScripts[i]._state, 9 + i); - _sceneAnimationScripts[i]._lastTimer = getSystem()->getMillis(); + _sceneAnimationScripts[i]._lastTimer = _system->getMillis(); _sceneAnimationScripts[i]._frozen = false; _sceneAnimationScripts[i]._frozenForConversation = false; } diff --git a/engines/toon/toon.h b/engines/toon/toon.h index 540f3e403b..d40c489011 100644 --- a/engines/toon/toon.h +++ b/engines/toon/toon.h @@ -289,10 +289,6 @@ public: return _oldTimer2; } - OSystem *getSystem() { - return _system; - } - AudioManager *getAudioManager() { return _audioManager; } @@ -340,7 +336,6 @@ public: void clearDirtyRects(); protected: - OSystem *_system; int32 _tickLength; Resources *_resources; TextResource *_genericTexts; -- cgit v1.2.3 From 4f9b9ce3cc263b5e5ad9a223ca2a01f3b9ddaf39 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Sun, 8 Jul 2012 09:41:25 +1000 Subject: SCUMM: Correct HE version for another English Windows version of Freddi Fish and Luther's Maze Madness. --- devtools/scumm-md5.txt | 2 +- engines/scumm/scumm-md5.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt index d67f46205c..42dcb27d1a 100644 --- a/devtools/scumm-md5.txt +++ b/devtools/scumm-md5.txt @@ -575,7 +575,7 @@ maze Freddi Fish and Luther's Maze Madness 4f04b321a95d4315ce6d65f8e1dd0368 -1 us All HE 80 - - Kirben cd424f143a141bc59226ad83a6e40f51 -1 nl All HE 98.5 - - daniel9, sugarcube 4dbff3787aedcd96b0b325f2d92d7ad9 -1 us All HE 100 Updated - Kirben - 4522564b3c31aaf218b6a96826a549fd -1 us Windows HE 100 - - legoking831 + 4522564b3c31aaf218b6a96826a549fd -1 us Windows HE 99 - - legoking831 water Freddi Fish and Luther's Water Worries 4ba37f835be11a59d969f90f272f575b -1 us All HE 80 - - Kirben diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h index d6198b13c4..d4eefe8c28 100644 --- a/engines/scumm/scumm-md5.h +++ b/engines/scumm/scumm-md5.h @@ -1,5 +1,5 @@ /* - This file was generated by the md5table tool on Sat Jul 07 10:02:31 2012 + This file was generated by the md5table tool on Sat Jul 07 23:39:27 2012 DO NOT EDIT MANUALLY! */ @@ -191,7 +191,7 @@ static const MD5Table md5table[] = { { "45082a5c9f42ba14dacfe1fdeeba819d", "freddicove", "HE 100", "Demo", 18422, Common::EN_ANY, Common::kPlatformUnknown }, { "45152f7cf2ba8f43cf8a8ea2e740ae09", "monkey", "VGA", "VGA", 8357, Common::ES_ESP, Common::kPlatformPC }, { "4521138d15d1fd7649c31fb981746231", "pajama2", "HE 98.5", "Demo", -1, Common::DE_DEU, Common::kPlatformUnknown }, - { "4522564b3c31aaf218b6a96826a549fd", "maze", "HE 100", "", -1, Common::EN_USA, Common::kPlatformWindows }, + { "4522564b3c31aaf218b6a96826a549fd", "maze", "HE 99", "", -1, Common::EN_USA, Common::kPlatformWindows }, { "46b53fd430adcfbed791b48a0d4b079f", "funpack", "", "", -1, Common::EN_ANY, Common::kPlatformPC }, { "470c45b636139bb40716daa1c7edaad0", "loom", "EGA", "EGA", -1, Common::DE_DEU, Common::kPlatformPC }, { "477dbafbd66a53c98416dc01aef019ad", "monkey", "EGA", "EGA", -1, Common::IT_ITA, Common::kPlatformPC }, -- cgit v1.2.3 From e265be07bfb03ee9686ea27b2e12bf4d61ad3732 Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Sun, 8 Jul 2012 09:54:09 +0200 Subject: MOHAWK: Run animations attached to LiveText items. Should fix bug #3541294. --- engines/mohawk/livingbooks.cpp | 14 +++++++++----- engines/mohawk/livingbooks.h | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index 708478a6d8..f5e5e7d7b4 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -3378,11 +3378,10 @@ void LBLiveTextItem::readData(uint16 type, uint16 size, Common::MemoryReadStream LiveTextWord word; word.bounds = _vm->readRect(stream); word.soundId = stream->readUint16(); - // TODO: unknowns - uint16 unknown1 = stream->readUint16(); - uint16 unknown2 = stream->readUint16(); - debug(4, "Word: (%d, %d) to (%d, %d), sound %d, unknowns %04x, %04x", - word.bounds.left, word.bounds.top, word.bounds.right, word.bounds.bottom, word.soundId, unknown1, unknown2); + word.itemType = stream->readUint16(); + word.itemId = stream->readUint16(); + debug(4, "Word: (%d, %d) to (%d, %d), sound %d, item %d (type %d)", + word.bounds.left, word.bounds.top, word.bounds.right, word.bounds.bottom, word.soundId, word.itemId, word.itemType); _words.push_back(word); } @@ -3531,6 +3530,11 @@ void LBLiveTextItem::handleMouseDown(Common::Point pos) { _currentWord = i; _vm->playSound(this, soundId); paletteUpdate(_currentWord, true); + + // TODO: check this in RE + LBItem *item = _vm->getItemById(_words[i].itemId); + if (item) + item->togglePlaying(false); return; } } diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h index 91d6a8cd30..76da7d8219 100644 --- a/engines/mohawk/livingbooks.h +++ b/engines/mohawk/livingbooks.h @@ -537,6 +537,9 @@ protected: struct LiveTextWord { Common::Rect bounds; uint16 soundId; + + uint16 itemType; + uint16 itemId; }; struct LiveTextPhrase { -- cgit v1.2.3 From 87b79f2124a1d13cfd3a62d9a526d1770a340b19 Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Sun, 8 Jul 2012 10:27:31 +0200 Subject: COMPOSER: Fix parsing v1 book groups. This fixes bug #3539019. --- engines/composer/composer.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/engines/composer/composer.cpp b/engines/composer/composer.cpp index 556dad7e94..23a9d2ff85 100644 --- a/engines/composer/composer.cpp +++ b/engines/composer/composer.cpp @@ -381,11 +381,17 @@ void ComposerEngine::loadLibrary(uint id) { filename = getStringFromConfig(_bookGroup, Common::String::format("%d", id)); filename = mangleFilename(filename); + // bookGroup is the basename of the path. + // TODO: tidy this up. _bookGroup.clear(); for (uint i = 0; i < filename.size(); i++) { - if (filename[i] == '\\' || filename[i] == ':') + if (filename[i] == '~' || filename[i] == '/' || filename[i] == ':') continue; for (uint j = 0; j < filename.size(); j++) { + if (filename[j] == '/') { + _bookGroup.clear(); + continue; + } if (filename[j] == '.') break; _bookGroup += filename[j]; -- cgit v1.2.3 From 93cc9c92c90162a73c0da5dee9b26b0a0012d60b Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 8 Jul 2012 12:36:30 +0100 Subject: I18N: Update French translation --- po/fr_FR.po | 117 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 58 insertions(+), 59 deletions(-) diff --git a/po/fr_FR.po b/po/fr_FR.po index be7ddddbed..e153beb3a5 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" -"PO-Revision-Date: 2011-10-23 14:52+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" +"PO-Revision-Date: 2012-07-08 12:24+0100\n" "Last-Translator: Thierry Crozat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" @@ -193,9 +193,8 @@ msgid "Platform:" msgstr "Systme:" #: gui/launcher.cpp:231 -#, fuzzy msgid "Engine" -msgstr "Examiner" +msgstr "Moteur" #: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 msgid "Graphics" @@ -1145,13 +1144,13 @@ msgid "~R~eturn to Launcher" msgstr "Retour au ~L~anceur" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Sauvegarde:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1171,14 +1170,13 @@ msgstr "" "obtenir de l'aide supplmentaire." #: engines/dialogs.cpp:228 -#, fuzzy, c-format +#, c-format msgid "" "Gamestate save failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" -"Dsol, il n'y a pas d'aide disponible dans ce jeu actuellement. Lisez le " -"fichier README pour les informations de base et les instructions pour " -"obtenir de l'aide supplmentaire." +"Echec de la sauvegarde (%s)! Lisez le fichier README pour les informations " +"de base et les instructions pour obtenir de l'aide supplmentaire." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 @@ -1239,14 +1237,13 @@ msgstr "" "Lisez le fichier README pour plus de dtails." #: engines/engine.cpp:426 -#, fuzzy, c-format +#, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" -"Dsol, il n'y a pas d'aide disponible dans ce jeu actuellement. Lisez le " -"fichier README pour les informations de base et les instructions pour " -"obtenir de l'aide supplmentaire." +"Echec du chargement (%s)! . Lisez le fichier README pour les informations de " +"base et les instructions pour obtenir de l'aide supplmentaire." #: engines/engine.cpp:439 msgid "" @@ -1265,84 +1262,88 @@ msgstr "Jouer quand m #: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47 #: engines/sci/detection.cpp:390 msgid "Use original save/load screens" -msgstr "" +msgstr "Utiliser les dialogues sauvegarde/chargement d'origine" #: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48 #: engines/sci/detection.cpp:391 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" +"Utiliser les dialogues sauvegarde/chargement d'origine plutt que ceux de " +"ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Charger le jeu:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Charger" #: engines/dreamweb/detection.cpp:57 -#, fuzzy msgid "Use bright palette mode" -msgstr "lment en haut droite" +msgstr "Utiliser le mode palette lumineuse" #: engines/dreamweb/detection.cpp:58 msgid "Display graphics using the game's bright palette" -msgstr "" +msgstr "Utiliser la palette lumineuse du jeu pour l'affichage" #: engines/sci/detection.cpp:370 msgid "EGA undithering" msgstr "Dtramage EGA" #: engines/sci/detection.cpp:371 -#, fuzzy msgid "Enable undithering in EGA games" -msgstr "Active le dtramage dans les jeux EGA qui le supporte" +msgstr "Activer le dtramage dans les jeux EGA" #: engines/sci/detection.cpp:380 -#, fuzzy msgid "Prefer digital sound effects" -msgstr "Volume des effets spciaux sonores" +msgstr "Prfrer les effets sonors digitals" #: engines/sci/detection.cpp:381 msgid "Prefer digital sound effects instead of synthesized ones" -msgstr "" +msgstr "Prfrer les effets sonores digitaux plutt que ceux synthtiss" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "" +msgid "Use IMF/Yamaha FB-01 for MIDI output" +msgstr "Utiliser IMF/Yamaha FB-01 pour la sortie MIDI" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" +"Utiliser une carte IBM Music Feature ou un module Yamaha FB-01 FM pour la " +"sortie MIDI" #: engines/sci/detection.cpp:411 msgid "Use CD audio" -msgstr "" +msgstr "Utiliser la musique du CD" #: engines/sci/detection.cpp:412 msgid "Use CD audio instead of in-game audio, if available" msgstr "" +"Utiliser la musique du CD quand elle est disponible au lieu de la musique du " +"jeu" #: engines/sci/detection.cpp:422 msgid "Use Windows cursors" -msgstr "" +msgstr "Utiliser les curseurs Windows" #: engines/sci/detection.cpp:423 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" +"Utiliser les curseurs Windows (plus petits et monochromes) au lieu des " +"curseurs DOS" #: engines/sci/detection.cpp:433 -#, fuzzy msgid "Use silver cursors" -msgstr "Curseur normal" +msgstr "Utiliser les curseurs argents" #: engines/sci/detection.cpp:434 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" -msgstr "" +msgstr "Utiliser les curseurs argents au lieu des curseurs normaux dors" #: engines/scumm/dialogs.cpp:175 #, c-format @@ -2096,61 +2097,59 @@ msgstr " #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 msgid "Studio audience" -msgstr "" +msgstr "Public en studio" #: engines/kyra/detection.cpp:63 msgid "Enable studio audience" -msgstr "" +msgstr "Activer le public en studio" #. I18N: This option allows the user to skip text and cutscenes. #: engines/kyra/detection.cpp:73 msgid "Skip support" -msgstr "" +msgstr "Support des interruptions" #: engines/kyra/detection.cpp:74 msgid "Allow text and cutscenes to be skipped" -msgstr "" +msgstr "Permet de sauter les textes et scnes cinmatiques" #. I18N: Helium mode makes people sound like they've inhaled Helium. #: engines/kyra/detection.cpp:84 msgid "Helium mode" -msgstr "" +msgstr "Mode Helium" #: engines/kyra/detection.cpp:85 -#, fuzzy msgid "Enable helium mode" -msgstr "Activer le mode Roland GS" +msgstr "Activer le mode helium" #. I18N: When enabled, this option makes scrolling smoother when #. changing from one screen to another. #: engines/kyra/detection.cpp:99 msgid "Smooth scrolling" -msgstr "" +msgstr "Dfilement rgulier" #: engines/kyra/detection.cpp:100 msgid "Enable smooth scrolling when walking" -msgstr "" +msgstr "Activer le dfilement rgulier en marchant" #. I18N: When enabled, this option changes the cursor when it floats to the #. edge of the screen to a directional arrow. The player can then click to #. walk towards that direction. #: engines/kyra/detection.cpp:112 -#, fuzzy msgid "Floating cursors" -msgstr "Curseur normal" +msgstr "Curseurs flotants" #: engines/kyra/detection.cpp:113 msgid "Enable floating cursors" -msgstr "" +msgstr "Activer les curseurs flotants" #. I18N: HP stands for Hit Points #: engines/kyra/detection.cpp:127 msgid "HP bar graphs" -msgstr "" +msgstr "Bar HP" #: engines/kyra/detection.cpp:128 msgid "Enable hit point bar graphs" -msgstr "" +msgstr "Activer les bars de sant (Hit Point)" #: engines/kyra/lol.cpp:478 msgid "Attack 1" @@ -2201,12 +2200,13 @@ msgid "Choose Spell" msgstr "Choisir un Sort" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Il semble que vous utilisiez un priphrique General MIDI,\n" "mais ce jeu ne support que le MIDI Roland MT32.\n" @@ -2216,11 +2216,11 @@ msgstr "" #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 msgid "Floppy intro" -msgstr "" +msgstr "Intro disquette" #: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45 msgid "Use the floppy version's intro (CD version only)" -msgstr "" +msgstr "Utiliser l'intro de la version disquette (version CD uniquement)" #: engines/sky/compact.cpp:130 msgid "" @@ -2242,6 +2242,7 @@ msgstr "" #, c-format msgid "PSX stream cutscene '%s' cannot be played in paletted mode" msgstr "" +"La scne cinmatique PSX '%s' ne peut pas tre lu avec 256 couleurs ou moins" #: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" @@ -2298,20 +2299,19 @@ msgid "This is the end of the Broken Sword 1 Demo" msgstr "C'est la fin de la dmo des Chevaliers de Baphomet" #: engines/sword2/animation.cpp:435 -#, fuzzy msgid "" "PSX cutscenes found but ScummVM has been built without RGB color support" msgstr "" -"Les squences DXA sont prsente mais ScummVM a t compil sans le support " -"zlib." +"Scnes cinmatique PSX dtectes mais ScummVM a t compil sans le support " +"des couleurs RGB" #: engines/sword2/sword2.cpp:79 msgid "Show object labels" -msgstr "" +msgstr "Afficher la description des objets" #: engines/sword2/sword2.cpp:80 msgid "Show labels for objects on mouse hover" -msgstr "" +msgstr "Afficher la description des objets lors de passage du pointeur" #: engines/parallaction/saveload.cpp:133 #, c-format @@ -2451,9 +2451,8 @@ msgid "Keymap:" msgstr "Affectation des touches:" #: backends/keymapper/remap-dialog.cpp:66 -#, fuzzy msgid " (Effective)" -msgstr "(Actif)" +msgstr "(Effectif)" #: backends/keymapper/remap-dialog.cpp:106 msgid " (Active)" @@ -2461,7 +2460,7 @@ msgstr "(Actif)" #: backends/keymapper/remap-dialog.cpp:106 msgid " (Blocked)" -msgstr "" +msgstr "(Bloqu)" #: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" -- cgit v1.2.3 From 36f63e665a188929bef38f759096a10db8982d50 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 8 Jul 2012 12:38:47 +0100 Subject: I18N: Update all translations from source code This in particular fixes the spelling of Yamaha. --- po/ca_ES.po | 19 +- po/cs_CZ.po | 23 +- po/da_DA.po | 23 +- po/de_DE.po | 53 ++-- po/es_ES.po | 23 +- po/eu.po | 19 +- po/hu_HU.po | 23 +- po/it_IT.po | 21 +- po/nb_NO.po | 762 ++++++++++++++++++++++++--------------------------------- po/nn_NO.po | 18 +- po/pl_PL.po | 19 +- po/pt_BR.po | 19 +- po/ru_RU.po | 19 +- po/scummvm.pot | 18 +- po/se_SE.po | 21 +- po/uk_UA.po | 19 +- 16 files changed, 502 insertions(+), 597 deletions(-) diff --git a/po/ca_ES.po b/po/ca_ES.po index d076f96f55..8a978bee0d 100644 --- a/po/ca_ES.po +++ b/po/ca_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2011-10-04 20:51+0100\n" "Last-Translator: Jordi Vilalta Prat \n" "Language-Team: Catalan \n" @@ -1144,13 +1144,13 @@ msgid "~R~eturn to Launcher" msgstr "~R~etorna al Llanador" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Desa la partida:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1268,11 +1268,11 @@ msgstr "" msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Recupera la partida:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Restaura" @@ -1304,12 +1304,12 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" +msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" @@ -2203,12 +2203,13 @@ msgid "Choose Spell" msgstr "Escull" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Sembla que esteu utilitzant un dispositiu General\n" "MIDI, per el joc noms suporta MIDI de Roland\n" diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 93bfed0261..6bf4e77206 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2012-05-22 21:02+0100\n" "Last-Translator: Zbynk Schwarz \n" "Language-Team: \n" @@ -1131,13 +1131,13 @@ msgid "~R~eturn to Launcher" msgstr "~N~vrat do Spoute" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Uloit hru:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1256,11 +1256,11 @@ msgstr "Pou msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Pout pvodn obrazovky naten/uloen msto ze ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Obnovit hru" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Obnovit" @@ -1289,15 +1289,15 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Upednostovat digitln zvukov efekty ped syntetizovanmi" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "Pout IMF/Yahama FB-01 pro vstup MIDI" +msgid "Use IMF/Yamaha FB-01 for MIDI output" +msgstr "Pout IMF/Yamaha FB-01 pro vstup MIDI" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" -"Pout kartu IBM Music Feature nebo modul syntetiztoru Yahama FB-01 FM pro " +"Pout kartu IBM Music Feature nebo modul syntetiztoru Yamaha FB-01 FM pro " "vstup MIDI" #: engines/sci/detection.cpp:411 @@ -2180,12 +2180,13 @@ msgid "Choose Spell" msgstr "Zvolit Kouzlo" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Zd se, e pouvte zazen General MIDI,\n" "ale Vae hra podporuje pouze Roland MT32 MIDI.\n" diff --git a/po/da_DA.po b/po/da_DA.po index eb62af84a9..d3a39db440 100644 --- a/po/da_DA.po +++ b/po/da_DA.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2012-06-29 19:45+0100\n" "Last-Translator: Steffen Nyeland \n" "Language-Team: Steffen Nyeland \n" @@ -1131,13 +1131,13 @@ msgid "~R~eturn to Launcher" msgstr "~R~etur til oversigt" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Gemmer:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1257,11 +1257,11 @@ msgstr "Brug original gem/indl msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Brug de originale gem/indls skrme, istedet for dem fra ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Gendan spil:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Gendan" @@ -1290,15 +1290,15 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Foretrk digitale lydeffekter i stedet for syntetiserede" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "Brug IMF/Yahama FB-01 til MIDI-udgang" +msgid "Use IMF/Yamaha FB-01 for MIDI output" +msgstr "Brug IMF/Yamaha FB-01 til MIDI-udgang" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" -"Bruge et IBM Musik Feature-kort eller et Yahama FB-01 FM synth modul til " +"Bruge et IBM Musik Feature-kort eller et Yamaha FB-01 FM synth modul til " "MIDI-udgang" #: engines/sci/detection.cpp:411 @@ -2182,12 +2182,13 @@ msgid "Choose Spell" msgstr "Vlg magi" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Det lader til at du en General MIDI-enhed,\n" "men dit spil kun understtter Roland MT32 MIDI.\n" diff --git a/po/de_DE.po b/po/de_DE.po index d68dcb2d8e..c40e08034a 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2012-01-29 21:11+0100\n" "Last-Translator: Simon Sawatzki \n" "Language-Team: Simon Sawatzki (Lead), Lothar Serra Mari " @@ -931,8 +931,9 @@ msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." msgstr "" -"Das ausgewhlte Thema untersttzt nicht die aktuelle Sprache. Wenn Sie dieses " -"Thema benutzen wollen, mssen Sie erst zu einer anderen Sprache wechseln." +"Das ausgewhlte Thema untersttzt nicht die aktuelle Sprache. Wenn Sie " +"dieses Thema benutzen wollen, mssen Sie erst zu einer anderen Sprache " +"wechseln." #: gui/saveload.cpp:59 gui/saveload.cpp:257 msgid "No date saved" @@ -1150,13 +1151,13 @@ msgid "~R~eturn to Launcher" msgstr "Zur Spiele~l~iste" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Speichern:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1250,8 +1251,8 @@ msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" -"Laden des Spielstands %s fehlgeschlagen! Bitte lesen Sie die Liesmich-" -"Datei fr grundlegende Informationen und Anweisungen zu weiterer Hilfe." +"Laden des Spielstands %s fehlgeschlagen! Bitte lesen Sie die Liesmich-Datei " +"fr grundlegende Informationen und Anweisungen zu weiterer Hilfe." #: engines/engine.cpp:439 msgid "" @@ -1276,13 +1277,14 @@ msgstr "Originale Spielstand-Men #: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48 #: engines/sci/detection.cpp:391 msgid "Use the original save/load screens, instead of the ScummVM ones" -msgstr "Verwendet die originalen Mens zum Speichern und Laden statt der von ScummVM." +msgstr "" +"Verwendet die originalen Mens zum Speichern und Laden statt der von ScummVM." -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Spiel laden:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Laden" @@ -1311,16 +1313,16 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Bevorzugt digitale Sound-Effekte statt synthethisierter." #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "IMF/Yahama FB-01 fr MIDI-Ausgabe verwenden" +msgid "Use IMF/Yamaha FB-01 for MIDI output" +msgstr "IMF/Yamaha FB-01 fr MIDI-Ausgabe verwenden" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" -"Verwendet eine Music-Feature-Karte von IBM oder ein " -"Yahama-FB-01-FM-Synthetisierungsmodul fr die MIDI-Ausgabe." +"Verwendet eine Music-Feature-Karte von IBM oder ein Yamaha-FB-01-FM-" +"Synthetisierungsmodul fr die MIDI-Ausgabe." #: engines/sci/detection.cpp:411 msgid "Use CD audio" @@ -2208,12 +2210,13 @@ msgid "Choose Spell" msgstr "Zauberspruch auswhlen" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Sie scheinen ein General-MIDI-Gert zu\n" "verwenden, aber das Spiel untersttzt nur\n" @@ -2280,10 +2283,10 @@ msgid "" "Press OK to convert them now, otherwise you will be asked again the next " "time you start the game.\n" msgstr "" -"ScummVM hat erkannt, dass Sie alte Spielstnde von Baphomets Fluch 1 " -"haben, die umgewandelt werden sollten.\n" -"Das alte Speicherformat wird nicht mehr untersttzt, also knnen Sie " -"diese Spielstnde unkonvertiert nicht laden.\n" +"ScummVM hat erkannt, dass Sie alte Spielstnde von Baphomets Fluch 1 haben, " +"die umgewandelt werden sollten.\n" +"Das alte Speicherformat wird nicht mehr untersttzt, also knnen Sie diese " +"Spielstnde unkonvertiert nicht laden.\n" "\n" "Klicken Sie auf OK, um diese jetzt umzuwandeln, sonst werden Sie erneut " "gefragt, wenn Sie nchstes Mal dieses Spiel starten.\n" @@ -2313,8 +2316,8 @@ msgstr "Das ist das Ende der Demo von Broken Sword 1 (Baphomets Fluch 1)." msgid "" "PSX cutscenes found but ScummVM has been built without RGB color support" msgstr "" -"PSX-Zwischensequenzen gefunden, aber ScummVM wurde ohne Untersttzung " -"fr RGB-Farben erstellt." +"PSX-Zwischensequenzen gefunden, aber ScummVM wurde ohne Untersttzung fr " +"RGB-Farben erstellt." #: engines/sword2/sword2.cpp:79 msgid "Show object labels" @@ -2350,8 +2353,8 @@ msgid "" "\n" "Press OK to convert them now, otherwise you will be asked next time.\n" msgstr "" -"ScummVM hat erkannt, dass Sie alte Spielstnde von Nippon Safes haben, " -"die umbenannt werden sollten.\n" +"ScummVM hat erkannt, dass Sie alte Spielstnde von Nippon Safes haben, die " +"umbenannt werden sollten.\n" "Die alten Dateinamen werden nicht mehr untersttzt, also knnen Sie diese " "Spielstnde unkonvertiert nicht laden.\n" "\n" diff --git a/po/es_ES.po b/po/es_ES.po index 9849a1798b..fffd190695 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.4.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2012-06-22 17:44+0100\n" "Last-Translator: Toms Maidagan\n" "Language-Team: \n" @@ -1136,13 +1136,13 @@ msgid "~R~eturn to Launcher" msgstr "~V~olver al lanzador" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Guardar partida" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1264,11 +1264,11 @@ msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" "Utilizar las pantallas de guardar/cargar originales, en vez de las de ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Cargar partida:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Cargar" @@ -1297,15 +1297,15 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Preferir efectos de sonido digitales en vez de los sintetizados" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "Usar IMF/Yahama FB-01 para la salida MIDI" +msgid "Use IMF/Yamaha FB-01 for MIDI output" +msgstr "Usar IMF/Yamaha FB-01 para la salida MIDI" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" -"Usa una tarjeta IBM Music o un mdulo sintetizador Yahama FB-01 FM para la " +"Usa una tarjeta IBM Music o un mdulo sintetizador Yamaha FB-01 FM para la " "salida MIDI" #: engines/sci/detection.cpp:411 @@ -2190,12 +2190,13 @@ msgid "Choose Spell" msgstr "Elegir hechizo" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Ests usando un dispositivo General Midi, pero el\n" "juego solo es compatible con MIDI Roland MT32.\n" diff --git a/po/eu.po b/po/eu.po index fa0d3030b6..5bc553e572 100644 --- a/po/eu.po +++ b/po/eu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2011-12-15 14:53+0100\n" "Last-Translator: Mikel Iturbe Urretxa \n" "Language-Team: Librezale \n" @@ -1137,13 +1137,13 @@ msgid "~R~eturn to Launcher" msgstr "It~z~uli abiarazlera" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Gorde jokoa:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1261,11 +1261,11 @@ msgstr "" msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Jokoa kargatu:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Kargatu" @@ -1297,12 +1297,12 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" +msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" @@ -2189,12 +2189,13 @@ msgid "Choose Spell" msgstr "Sorginkeria aukeratu" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "General MIDI gailua erabiltzen zaudela dirudi,\n" "baina zure jokoak Roland MT32 MIDI bakarrik\n" diff --git a/po/hu_HU.po b/po/hu_HU.po index c868806a8a..29ad6c3aeb 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2012-06-25 06:21+0100\n" "Last-Translator: George Kormendi \n" "Language-Team: Hungarian\n" @@ -1130,13 +1130,13 @@ msgid "~R~eturn to Launcher" msgstr "Visszatrs az indtba" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Jtk mentse:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1254,11 +1254,11 @@ msgstr "Eredeti ment/t msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Az eredeti ments/betlts kperny hasznlata a ScummVM kpek helyett" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Jtkmenet visszalltsa:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Visszallts" @@ -1287,15 +1287,15 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Digitlis hanghatsok elnyben a szintetizltakkal szemben" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "IMF/Yahama FB-01 hasznlata MIDI kimentre" +msgid "Use IMF/Yamaha FB-01 for MIDI output" +msgstr "IMF/Yamaha FB-01 hasznlata MIDI kimentre" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" -"IBM Music Feature krtya vagy Yahama FB-01 FM szintetiztor modul hasznlata " +"IBM Music Feature krtya vagy Yamaha FB-01 FM szintetiztor modul hasznlata " "MIDI kimenetre" #: engines/sci/detection.cpp:411 @@ -2178,12 +2178,13 @@ msgid "Choose Spell" msgstr "Vlassz varzslatot" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "gy nz ki egy General MIDI eszkzt hasznlsz,\n" "a jtk csak Roland MT32 MIDI eszkzt tmogat.\n" diff --git a/po/it_IT.po b/po/it_IT.po index 26bf3773f9..d4f8256c83 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2012-06-29 14:33+0100\n" "Last-Translator: Matteo 'Maff' Angelino \n" "Language-Team: Italian\n" @@ -1137,13 +1137,13 @@ msgid "~R~eturn to Launcher" msgstr "~V~ai a elenco giochi" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Salva gioco:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1266,11 +1266,11 @@ msgstr "" "Usa le schermate originali di salvataggio e caricamento, al posto di quelle " "di ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Ripristina gioco:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Ripristina" @@ -1299,12 +1299,12 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Scegli gli effetti sonori digitali al posto di quelli sintetizzati" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "Usa IMF/Yahama FB-01 per output MIDI" +msgid "Use IMF/Yamaha FB-01 for MIDI output" +msgstr "Usa IMF/Yamaha FB-01 per output MIDI" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" "Usa una scheda IBM Music Feature o un modulo synth Yamaha FB-01 FM per " @@ -2194,12 +2194,13 @@ msgid "Choose Spell" msgstr "Scegli incantesimo" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Sembra che tu stia utilizzanto un dispositivo\n" "General MIDI, ma il gioco supporta solo Roland\n" diff --git a/po/nb_NO.po b/po/nb_NO.po index 0975877d65..bc7b1720fa 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2012-07-04 02:19+0100\n" "Last-Translator: Einar Johan Smen \n" "Language-Team: somaen \n" @@ -37,8 +37,7 @@ msgstr "Tilgjengelige motorer:" msgid "Go up" msgstr "G tilbake" -#: gui/browser.cpp:66 -#: gui/browser.cpp:68 +#: gui/browser.cpp:66 gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "G til forrige mappeniv" @@ -47,37 +46,24 @@ msgctxt "lowres" msgid "Go up" msgstr "G tilbake" -#: gui/browser.cpp:69 -#: gui/chooser.cpp:45 -#: gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 -#: gui/massadd.cpp:94 -#: gui/options.cpp:1228 -#: gui/saveload.cpp:64 -#: gui/saveload.cpp:173 -#: gui/themebrowser.cpp:54 -#: engines/engine.cpp:442 -#: engines/scumm/dialogs.cpp:190 -#: engines/sword1/control.cpp:865 -#: engines/parallaction/saveload.cpp:274 +#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 +#: gui/saveload.cpp:64 gui/saveload.cpp:173 gui/themebrowser.cpp:54 +#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:274 #: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Avbryt" -#: gui/browser.cpp:70 -#: gui/chooser.cpp:46 -#: gui/themebrowser.cpp:55 +#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 msgid "Choose" msgstr "Velg" -#: gui/gui-manager.cpp:115 -#: engines/scumm/help.cpp:125 -#: engines/scumm/help.cpp:140 -#: engines/scumm/help.cpp:165 -#: engines/scumm/help.cpp:191 -#: engines/scumm/help.cpp:209 +#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209 #: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Lukk" @@ -86,23 +72,19 @@ msgstr "Lukk" msgid "Mouse click" msgstr "Musklikk" -#: gui/gui-manager.cpp:122 -#: base/main.cpp:300 +#: gui/gui-manager.cpp:122 base/main.cpp:300 msgid "Display keyboard" msgstr "Vis tastatur" -#: gui/gui-manager.cpp:126 -#: base/main.cpp:304 +#: gui/gui-manager.cpp:126 base/main.cpp:304 msgid "Remap keys" msgstr "Omkoble taster" -#: gui/gui-manager.cpp:129 -#: base/main.cpp:307 +#: gui/gui-manager.cpp:129 base/main.cpp:307 msgid "Toggle FullScreen" msgstr "Veksle fullskjerm" -#: gui/KeysDialog.h:36 -#: gui/KeysDialog.cpp:145 +#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Velg en handling for kobling" @@ -110,31 +92,17 @@ msgstr "Velg en handling for kobling" msgid "Map" msgstr "Koble" -#: gui/KeysDialog.cpp:42 -#: gui/launcher.cpp:346 -#: gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 -#: gui/massadd.cpp:91 -#: gui/options.cpp:1229 -#: engines/engine.cpp:361 -#: engines/engine.cpp:372 -#: engines/scumm/dialogs.cpp:192 -#: engines/scumm/scumm.cpp:1775 -#: engines/agos/animation.cpp:561 -#: engines/groovie/script.cpp:420 -#: engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 -#: engines/sword1/animation.cpp:539 -#: engines/sword1/animation.cpp:560 -#: engines/sword1/animation.cpp:570 -#: engines/sword1/animation.cpp:577 -#: engines/sword1/control.cpp:865 -#: engines/sword1/logic.cpp:1633 -#: engines/sword2/animation.cpp:435 -#: engines/sword2/animation.cpp:455 -#: engines/sword2/animation.cpp:465 -#: engines/sword2/animation.cpp:474 -#: engines/parallaction/saveload.cpp:274 +#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 +#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 +#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:561 +#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:274 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -144,16 +112,12 @@ msgstr "OK" msgid "Select an action and click 'Map'" msgstr "Velg en handling, og trykk 'Koble'" -#: gui/KeysDialog.cpp:80 -#: gui/KeysDialog.cpp:102 -#: gui/KeysDialog.cpp:141 +#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Koblet tast : %s" -#: gui/KeysDialog.cpp:82 -#: gui/KeysDialog.cpp:104 -#: gui/KeysDialog.cpp:143 +#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Koblet tast: ingen" @@ -174,11 +138,13 @@ msgstr "Spill" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:191 -#: gui/launcher.cpp:193 -#: gui/launcher.cpp:194 -msgid "Short game identifier used for referring to savegames and running the game from the command line" -msgstr "Kort spill-identifikator, brukt for referere til lagrede spill, og kjre spillet fra kommandolinjen" +#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194 +msgid "" +"Short game identifier used for referring to savegames and running the game " +"from the command line" +msgstr "" +"Kort spill-identifikator, brukt for referere til lagrede spill, og kjre " +"spillet fra kommandolinjen" #: gui/launcher.cpp:193 msgctxt "lowres" @@ -189,9 +155,7 @@ msgstr "ID:" msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:198 -#: gui/launcher.cpp:200 -#: gui/launcher.cpp:201 +#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 msgid "Full title of the game" msgstr "Full spilltittel" @@ -204,17 +168,16 @@ msgstr "Navn:" msgid "Language:" msgstr "Sprk:" -#: gui/launcher.cpp:204 -#: gui/launcher.cpp:205 -msgid "Language of the game. This will not turn your Spanish game version into English" -msgstr "Spillets sprk. Dette vil ikke gjre din spanske spillversjon om til engelsk versjon" +#: gui/launcher.cpp:204 gui/launcher.cpp:205 +msgid "" +"Language of the game. This will not turn your Spanish game version into " +"English" +msgstr "" +"Spillets sprk. Dette vil ikke gjre din spanske spillversjon om til engelsk " +"versjon" -#: gui/launcher.cpp:206 -#: gui/launcher.cpp:220 -#: gui/options.cpp:80 -#: gui/options.cpp:730 -#: gui/options.cpp:743 -#: gui/options.cpp:1199 +#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 +#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 #: audio/null.cpp:40 msgid "" msgstr "" @@ -223,9 +186,7 @@ msgstr "" msgid "Platform:" msgstr "Plattform:" -#: gui/launcher.cpp:216 -#: gui/launcher.cpp:218 -#: gui/launcher.cpp:219 +#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219 msgid "Platform the game was originally designed for" msgstr "Plattform spillet opprinnelig ble designet for" @@ -238,15 +199,11 @@ msgstr "Plattform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:239 -#: gui/options.cpp:1062 -#: gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 msgid "Graphics" msgstr "Grafikk" -#: gui/launcher.cpp:239 -#: gui/options.cpp:1062 -#: gui/options.cpp:1079 +#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 msgid "GFX" msgstr "GFX" @@ -259,8 +216,7 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafikkinstillinger" -#: gui/launcher.cpp:251 -#: gui/options.cpp:1085 +#: gui/launcher.cpp:251 gui/options.cpp:1085 msgid "Audio" msgstr "Lyd" @@ -273,13 +229,11 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lydinstillinger" -#: gui/launcher.cpp:265 -#: gui/options.cpp:1090 +#: gui/launcher.cpp:265 gui/options.cpp:1090 msgid "Volume" msgstr "Volum" -#: gui/launcher.cpp:267 -#: gui/options.cpp:1092 +#: gui/launcher.cpp:267 gui/options.cpp:1092 msgctxt "lowres" msgid "Volume" msgstr "Volum" @@ -293,8 +247,7 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale voluminstillinger" -#: gui/launcher.cpp:280 -#: gui/options.cpp:1100 +#: gui/launcher.cpp:280 gui/options.cpp:1100 msgid "MIDI" msgstr "MIDI" @@ -307,8 +260,7 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI-instillinger" -#: gui/launcher.cpp:294 -#: gui/options.cpp:1106 +#: gui/launcher.cpp:294 gui/options.cpp:1106 msgid "MT-32" msgstr "MT-32" @@ -321,13 +273,11 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32-instillinger" -#: gui/launcher.cpp:308 -#: gui/options.cpp:1113 +#: gui/launcher.cpp:308 gui/options.cpp:1113 msgid "Paths" msgstr "Sti" -#: gui/launcher.cpp:310 -#: gui/options.cpp:1115 +#: gui/launcher.cpp:310 gui/options.cpp:1115 msgctxt "lowres" msgid "Paths" msgstr "Sti" @@ -341,80 +291,54 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spillsti:" -#: gui/launcher.cpp:324 -#: gui/options.cpp:1139 +#: gui/launcher.cpp:324 gui/options.cpp:1139 msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:324 -#: gui/launcher.cpp:326 -#: gui/launcher.cpp:327 +#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327 msgid "Specifies path to additional data used the game" msgstr "Bestemmer sti til ytterligere data brukt av spillet" -#: gui/launcher.cpp:326 -#: gui/options.cpp:1141 +#: gui/launcher.cpp:326 gui/options.cpp:1141 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstrasti:" -#: gui/launcher.cpp:333 -#: gui/options.cpp:1123 +#: gui/launcher.cpp:333 gui/options.cpp:1123 msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:333 -#: gui/launcher.cpp:335 -#: gui/launcher.cpp:336 -#: gui/options.cpp:1123 -#: gui/options.cpp:1125 -#: gui/options.cpp:1126 +#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 +#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 msgid "Specifies where your savegames are put" msgstr "Bestemmer sti til lagrede spill" -#: gui/launcher.cpp:335 -#: gui/options.cpp:1125 +#: gui/launcher.cpp:335 gui/options.cpp:1125 msgctxt "lowres" msgid "Save Path:" msgstr "Lagringssti:" -#: gui/launcher.cpp:354 -#: gui/launcher.cpp:453 -#: gui/launcher.cpp:511 -#: gui/launcher.cpp:565 -#: gui/options.cpp:1134 -#: gui/options.cpp:1142 -#: gui/options.cpp:1151 -#: gui/options.cpp:1258 -#: gui/options.cpp:1264 -#: gui/options.cpp:1272 -#: gui/options.cpp:1302 -#: gui/options.cpp:1308 -#: gui/options.cpp:1315 -#: gui/options.cpp:1408 -#: gui/options.cpp:1411 +#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 +#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 +#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 +#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 +#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 #: gui/options.cpp:1423 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:359 -#: gui/launcher.cpp:459 -#: gui/launcher.cpp:569 -#: gui/options.cpp:1252 -#: gui/options.cpp:1296 -#: gui/options.cpp:1414 +#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 +#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:504 -#: gui/options.cpp:1417 +#: gui/launcher.cpp:504 gui/options.cpp:1417 msgid "Select SoundFont" msgstr "Velg SoundFont" -#: gui/launcher.cpp:523 -#: gui/launcher.cpp:677 +#: gui/launcher.cpp:523 gui/launcher.cpp:677 msgid "Select directory with game data" msgstr "Velg mappe med spilldata" @@ -430,13 +354,11 @@ msgstr "Velg mappe for lagrede spill" msgid "This game ID is already taken. Please choose another one." msgstr "Denne spill-IDen er allerede i bruk. Vennligst velg en annen." -#: gui/launcher.cpp:621 -#: engines/dialogs.cpp:110 +#: gui/launcher.cpp:621 engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~vslutt" -#: gui/launcher.cpp:621 -#: backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Avslutt ScummVM" @@ -444,8 +366,7 @@ msgstr "Avslutt ScummVM" msgid "A~b~out..." msgstr "~O~m..." -#: gui/launcher.cpp:622 -#: backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Om ScummVM" @@ -473,13 +394,11 @@ msgstr "~ msgid "Load savegame for selected game" msgstr "pne lagret spill for det valgte spillet" -#: gui/launcher.cpp:633 -#: gui/launcher.cpp:1120 +#: gui/launcher.cpp:633 gui/launcher.cpp:1120 msgid "~A~dd Game..." msgstr "~L~egg til spill..." -#: gui/launcher.cpp:633 -#: gui/launcher.cpp:640 +#: gui/launcher.cpp:633 gui/launcher.cpp:640 msgid "Hold Shift for Mass Add" msgstr "Hold Shift for legge til flere" @@ -487,8 +406,7 @@ msgstr "Hold Shift for msgid "~E~dit Game..." msgstr "~R~ediger spill..." -#: gui/launcher.cpp:635 -#: gui/launcher.cpp:642 +#: gui/launcher.cpp:635 gui/launcher.cpp:642 msgid "Change game options" msgstr "Endre spillinstillinger" @@ -496,13 +414,11 @@ msgstr "Endre spillinstillinger" msgid "~R~emove Game" msgstr "~F~jern spill" -#: gui/launcher.cpp:637 -#: gui/launcher.cpp:644 +#: gui/launcher.cpp:637 gui/launcher.cpp:644 msgid "Remove game from the list. The game data files stay intact" msgstr "Fjern spill fra listen. Spilldataene forblir intakte" -#: gui/launcher.cpp:640 -#: gui/launcher.cpp:1120 +#: gui/launcher.cpp:640 gui/launcher.cpp:1120 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~L~egg til spill..." @@ -521,36 +437,31 @@ msgstr "~F~jern spill" msgid "Search in game list" msgstr "Sk i spilliste" -#: gui/launcher.cpp:656 -#: gui/launcher.cpp:1167 +#: gui/launcher.cpp:656 gui/launcher.cpp:1167 msgid "Search:" msgstr "Sk:" -#: gui/launcher.cpp:680 -#: engines/dialogs.cpp:114 -#: engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:716 -#: engines/cruise/menu.cpp:214 +#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:214 msgid "Load game:" msgstr "pne spill:" -#: gui/launcher.cpp:680 -#: engines/dialogs.cpp:114 -#: engines/scumm/dialogs.cpp:188 -#: engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:716 -#: engines/cruise/menu.cpp:214 -#: backends/platform/wince/CEActionsPocket.cpp:267 +#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 +#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 +#: engines/cruise/menu.cpp:214 backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "pne" #: gui/launcher.cpp:788 -msgid "Do you really want to run the mass game detector? This could potentially add a huge number of games." -msgstr "Vil du virkelig kjre flerspill-finneren? Dette kan potensielt legge til et stort antall spill." +msgid "" +"Do you really want to run the mass game detector? This could potentially add " +"a huge number of games." +msgstr "" +"Vil du virkelig kjre flerspill-finneren? Dette kan potensielt legge til et " +"stort antall spill." -#: gui/launcher.cpp:789 -#: gui/launcher.cpp:937 +#: gui/launcher.cpp:789 gui/launcher.cpp:937 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -558,8 +469,7 @@ msgstr "Vil du virkelig kj msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:789 -#: gui/launcher.cpp:937 +#: gui/launcher.cpp:789 gui/launcher.cpp:937 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -589,7 +499,8 @@ msgstr "Dette spillet st #: gui/launcher.cpp:1005 msgid "ScummVM could not find any engine capable of running the selected game!" -msgstr "ScummVM kunne ikke finne noen motor som kunne kjre det valgte spillet!" +msgstr "" +"ScummVM kunne ikke finne noen motor som kunne kjre det valgte spillet!" #: gui/launcher.cpp:1119 msgctxt "lowres" @@ -600,8 +511,7 @@ msgstr "Legg til flere..." msgid "Mass Add..." msgstr "Legg til flere..." -#: gui/massadd.cpp:78 -#: gui/massadd.cpp:81 +#: gui/massadd.cpp:78 gui/massadd.cpp:81 msgid "... progress ..." msgstr "... fremdrift ..." @@ -612,7 +522,8 @@ msgstr "S #: gui/massadd.cpp:261 #, c-format msgid "Discovered %d new games, ignored %d previously added games." -msgstr "Fant %d nye spill, ignorerte %d spill som har blitt lagt til tidligere." +msgstr "" +"Fant %d nye spill, ignorerte %d spill som har blitt lagt til tidligere." #: gui/massadd.cpp:265 #, c-format @@ -622,7 +533,8 @@ msgstr "Sjekket %d mapper ..." #: gui/massadd.cpp:268 #, c-format msgid "Discovered %d new games, ignored %d previously added games ..." -msgstr "Fant %d nye spill, ignorerte %d spill som har blitt lagt til tidligere..." +msgstr "" +"Fant %d nye spill, ignorerte %d spill som har blitt lagt til tidligere..." #: gui/options.cpp:78 msgid "Never" @@ -664,11 +576,8 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 -#: gui/options.cpp:474 -#: gui/options.cpp:575 -#: gui/options.cpp:644 -#: gui/options.cpp:852 +#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 +#: gui/options.cpp:644 gui/options.cpp:852 msgctxt "soundfont" msgid "None" msgstr "Ingen" @@ -697,8 +606,7 @@ msgstr "Grafikkmodus:" msgid "Render mode:" msgstr "Tegnemodus:" -#: gui/options.cpp:741 -#: gui/options.cpp:742 +#: gui/options.cpp:741 gui/options.cpp:742 msgid "Special dithering modes supported by some games" msgstr "Spesiel dithering-modus stttet av enkelte spill" @@ -724,14 +632,11 @@ msgstr "Foretrukket enhet:" msgid "Music Device:" msgstr "Musikkenhet:" -#: gui/options.cpp:764 -#: gui/options.cpp:766 +#: gui/options.cpp:764 gui/options.cpp:766 msgid "Specifies preferred sound device or sound card emulator" msgstr "Velger foretrukket lydenhet eller lydkort-emulator" -#: gui/options.cpp:764 -#: gui/options.cpp:766 -#: gui/options.cpp:767 +#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 msgid "Specifies output sound device or sound card emulator" msgstr "Velger ut-lydenhet eller lydkortemulator" @@ -749,8 +654,7 @@ msgstr "Musikkenhet:" msgid "AdLib emulator:" msgstr "AdLib-emulator:" -#: gui/options.cpp:793 -#: gui/options.cpp:794 +#: gui/options.cpp:793 gui/options.cpp:794 msgid "AdLib is used for music in many games" msgstr "AdLib brukes til musikk i mange spill" @@ -758,10 +662,13 @@ msgstr "AdLib brukes til musikk i mange spill" msgid "Output rate:" msgstr "Utrate:" -#: gui/options.cpp:804 -#: gui/options.cpp:805 -msgid "Higher value specifies better sound quality but may be not supported by your soundcard" -msgstr "Hyere verdier gir bedre lydkvalitet, men stttes kanskje ikke av ditt lydkort " +#: gui/options.cpp:804 gui/options.cpp:805 +msgid "" +"Higher value specifies better sound quality but may be not supported by your " +"soundcard" +msgstr "" +"Hyere verdier gir bedre lydkvalitet, men stttes kanskje ikke av ditt " +"lydkort " #: gui/options.cpp:815 msgid "GM Device:" @@ -775,8 +682,7 @@ msgstr "Velger standard lydenhet for General MIDI-utdata" msgid "Don't use General MIDI music" msgstr "Ikke bruk General MIDI-musikk" -#: gui/options.cpp:837 -#: gui/options.cpp:899 +#: gui/options.cpp:837 gui/options.cpp:899 msgid "Use first available device" msgstr "Bruk frste tilgjengelige enhet" @@ -784,9 +690,7 @@ msgstr "Bruk f msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 -#: gui/options.cpp:851 -#: gui/options.cpp:852 +#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "SoundFont stttes ikke av enkelte lydkort, FluidSynth og Timidity" @@ -819,10 +723,13 @@ msgstr "Velger standard lydenhet for Roland MT-32/LAPC1/CM32I/CM64-avspilling" msgid "True Roland MT-32 (disable GM emulation)" msgstr "Ekte Roland MT-32 (deaktiver GM-emulering)" -#: gui/options.cpp:875 -#: gui/options.cpp:877 -msgid "Check if you want to use your real hardware Roland-compatible sound device connected to your computer" -msgstr "Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og vil bruke dette." +#: gui/options.cpp:875 gui/options.cpp:877 +msgid "" +"Check if you want to use your real hardware Roland-compatible sound device " +"connected to your computer" +msgstr "" +"Velg hvis du har et ekte Roland-kompatible lydkort tilkoblet maskinen, og " +"vil bruke dette." #: gui/options.cpp:877 msgctxt "lowres" @@ -845,13 +752,11 @@ msgstr "Ikke bruk Roland MT-32-musikk" msgid "Text and Speech:" msgstr "Tekst og Tale:" -#: gui/options.cpp:920 -#: gui/options.cpp:930 +#: gui/options.cpp:920 gui/options.cpp:930 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:921 -#: gui/options.cpp:931 +#: gui/options.cpp:921 gui/options.cpp:931 msgid "Subtitles" msgstr "Undertekster" @@ -907,9 +812,7 @@ msgstr "Demp alle" msgid "SFX volume:" msgstr "Lydeffektvolum:" -#: gui/options.cpp:962 -#: gui/options.cpp:964 -#: gui/options.cpp:965 +#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 msgid "Special sound effects volume" msgstr "Volum for spesielle lydeffekter" @@ -936,9 +839,7 @@ msgctxt "lowres" msgid "Theme Path:" msgstr "Temasti:" -#: gui/options.cpp:1139 -#: gui/options.cpp:1141 -#: gui/options.cpp:1142 +#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Velger sti for ytterligere data brukt av alle spill eller ScummVM" @@ -1014,26 +915,26 @@ msgid "Select directory for plugins" msgstr "Velg mappe for plugins" #: gui/options.cpp:1450 -msgid "The theme you selected does not support your current language. If you want to use this theme you need to switch to another language first." -msgstr "Temaet du valgte sttter ikke det aktive sprket. Hvis du vil bruke dette temaet, m du bytte til et annet sprk frst." +msgid "" +"The theme you selected does not support your current language. If you want " +"to use this theme you need to switch to another language first." +msgstr "" +"Temaet du valgte sttter ikke det aktive sprket. Hvis du vil bruke dette " +"temaet, m du bytte til et annet sprk frst." -#: gui/saveload.cpp:59 -#: gui/saveload.cpp:257 +#: gui/saveload.cpp:59 gui/saveload.cpp:257 msgid "No date saved" msgstr "Ingen dato lagret" -#: gui/saveload.cpp:60 -#: gui/saveload.cpp:258 +#: gui/saveload.cpp:60 gui/saveload.cpp:258 msgid "No time saved" msgstr "Ingen tid lagret" -#: gui/saveload.cpp:61 -#: gui/saveload.cpp:259 +#: gui/saveload.cpp:61 gui/saveload.cpp:259 msgid "No playtime saved" msgstr "Ingen spilltid lagret" -#: gui/saveload.cpp:68 -#: gui/saveload.cpp:173 +#: gui/saveload.cpp:68 gui/saveload.cpp:173 msgid "Delete" msgstr "Slett" @@ -1053,8 +954,7 @@ msgstr "Tid: " msgid "Playtime: " msgstr "Spilltid: " -#: gui/saveload.cpp:305 -#: gui/saveload.cpp:372 +#: gui/saveload.cpp:305 gui/saveload.cpp:372 msgid "Untitled savestate" msgstr "Ikke navngitt spilltilstand" @@ -1087,10 +987,7 @@ msgstr "Antialiased Tegner (16bpp)" msgid "Antialiased (16bpp)" msgstr "Antialiased (16bpp)" -#: gui/widget.cpp:322 -#: gui/widget.cpp:324 -#: gui/widget.cpp:330 -#: gui/widget.cpp:332 +#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332 msgid "Clear value" msgstr "Tm verdi" @@ -1103,15 +1000,13 @@ msgstr "Motoren st msgid "Menu" msgstr "Meny" -#: base/main.cpp:290 -#: backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Hopp over" -#: base/main.cpp:293 -#: backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" @@ -1199,7 +1094,8 @@ msgstr "Spillet i '%s' ser ut til #: engines/advancedDetector.cpp:325 msgid "Please, report the following data to the ScummVM team along with name" -msgstr "Vennligst rapporter de flgende dataene til ScummVM-teamet sammen med navnet" +msgstr "" +"Vennligst rapporter de flgende dataene til ScummVM-teamet sammen med navnet" #: engines/advancedDetector.cpp:327 msgid "of the game you tried to add and its version/language/etc.:" @@ -1229,29 +1125,23 @@ msgstr "~H~jelp" msgid "~A~bout" msgstr "~O~m" -#: engines/dialogs.cpp:104 -#: engines/dialogs.cpp:180 +#: engines/dialogs.cpp:104 engines/dialogs.cpp:180 msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" -#: engines/dialogs.cpp:106 -#: engines/dialogs.cpp:182 +#: engines/dialogs.cpp:106 engines/dialogs.cpp:182 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" -#: engines/dialogs.cpp:115 -#: engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Lagret spill:" -#: engines/dialogs.cpp:115 -#: engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 -#: engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 +#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1261,22 +1151,30 @@ msgid "Save" msgstr "Lagre" #: engines/dialogs.cpp:144 -msgid "Sorry, this engine does not currently provide in-game help. Please consult the README for basic information, and for instructions on how to obtain further assistance." -msgstr "Beklager, men denne motoren sttter for yeblikket ikke hjelp i spillet. Vennligst se i README-filen for grunnleggende informasjon, og for instruksjoner om hvordan du kan f ytterligere hjelp." +msgid "" +"Sorry, this engine does not currently provide in-game help. Please consult " +"the README for basic information, and for instructions on how to obtain " +"further assistance." +msgstr "" +"Beklager, men denne motoren sttter for yeblikket ikke hjelp i spillet. " +"Vennligst se i README-filen for grunnleggende informasjon, og for " +"instruksjoner om hvordan du kan f ytterligere hjelp." #: engines/dialogs.cpp:228 #, c-format -msgid "Gamestate save failed (%s)! Please consult the README for basic information, and for instructions on how to obtain further assistance." -msgstr "Lagring av spilltilstand feilet (%s)! Vennligst konsulter README-filen for grunnleggende informasjon og instruksjon om hvordan du fr ytterligere hjelp." +msgid "" +"Gamestate save failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." +msgstr "" +"Lagring av spilltilstand feilet (%s)! Vennligst konsulter README-filen for " +"grunnleggende informasjon og instruksjon om hvordan du fr ytterligere hjelp." -#: engines/dialogs.cpp:301 -#: engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:302 -#: engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~A~vbryt" @@ -1326,36 +1224,40 @@ msgstr "" #: engines/engine.cpp:426 #, c-format -msgid "Gamestate load failed (%s)! Please consult the README for basic information, and for instructions on how to obtain further assistance." +msgid "" +"Gamestate load failed (%s)! Please consult the README for basic information, " +"and for instructions on how to obtain further assistance." msgstr "" #: engines/engine.cpp:439 -msgid "WARNING: The game you are about to start is not yet fully supported by ScummVM. As such, it is likely to be unstable, and any saves you make might not work in future versions of ScummVM." -msgstr "ADVARSEL: Spillet du prver starte er ikke fullstendig stttet av ScummVM. Derfor er det sannsynlig at det vil vre ustabilt, og det er ikke sikkert at lagrede spill vil fortsette fungere i fremtidige versjoner av ScummVM." +msgid "" +"WARNING: The game you are about to start is not yet fully supported by " +"ScummVM. As such, it is likely to be unstable, and any saves you make might " +"not work in future versions of ScummVM." +msgstr "" +"ADVARSEL: Spillet du prver starte er ikke fullstendig stttet av ScummVM. " +"Derfor er det sannsynlig at det vil vre ustabilt, og det er ikke sikkert at " +"lagrede spill vil fortsette fungere i fremtidige versjoner av ScummVM." #: engines/engine.cpp:442 msgid "Start anyway" msgstr "Start allikevel" -#: engines/agi/detection.cpp:145 -#: engines/dreamweb/detection.cpp:47 +#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47 #: engines/sci/detection.cpp:390 msgid "Use original save/load screens" msgstr "Bruk originale lagre/laste-skjermer" -#: engines/agi/detection.cpp:146 -#: engines/dreamweb/detection.cpp:48 +#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48 #: engines/sci/detection.cpp:391 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Bruk de originale lagre/laste-skjermene, istedenfor ScummVM-variantene" -#: engines/agi/saveload.cpp:816 -#: engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Gjennopprett spill:" -#: engines/agi/saveload.cpp:816 -#: engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Gjenopprett" @@ -1384,11 +1286,13 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Foretrekk digitale lydeffekter fremfor syntetiske" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "Bruk IMF/Yahama-FB-01 for MIDI-output" +msgid "Use IMF/Yamaha FB-01 for MIDI output" +msgstr "Bruk IMF/Yamaha-FB-01 for MIDI-output" #: engines/sci/detection.cpp:401 -msgid "Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI output" +msgid "" +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " +"output" msgstr "" #: engines/sci/detection.cpp:411 @@ -1404,7 +1308,8 @@ msgid "Use Windows cursors" msgstr "Bruk Windows-muspekere" #: engines/sci/detection.cpp:423 -msgid "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" +msgid "" +"Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "Bruk Windows-muspekerene (mindre, og monokrome) isteden" #: engines/sci/detection.cpp:433 @@ -1412,8 +1317,10 @@ msgid "Use silver cursors" msgstr "Bruk slvmuspekere" #: engines/sci/detection.cpp:434 -msgid "Use the alternate set of silver cursors, instead of the normal golden ones" -msgstr "Bruk det alternative settet med slvmuspekere, istedenfor de normale gylne." +msgid "" +"Use the alternate set of silver cursors, instead of the normal golden ones" +msgstr "" +"Bruk det alternative settet med slvmuspekere, istedenfor de normale gylne." #: engines/scumm/dialogs.cpp:175 #, c-format @@ -1450,8 +1357,7 @@ msgstr "Er du sikker p msgid "Play" msgstr "Spill" -#: engines/scumm/dialogs.cpp:191 -#: engines/scumm/help.cpp:82 +#: engines/scumm/dialogs.cpp:191 engines/scumm/help.cpp:82 #: engines/scumm/help.cpp:84 #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 @@ -1578,16 +1484,11 @@ msgstr "Space" msgid "Pause game" msgstr "Pause spill" -#: engines/scumm/help.cpp:79 -#: engines/scumm/help.cpp:84 -#: engines/scumm/help.cpp:95 -#: engines/scumm/help.cpp:96 -#: engines/scumm/help.cpp:97 -#: engines/scumm/help.cpp:98 -#: engines/scumm/help.cpp:99 -#: engines/scumm/help.cpp:100 -#: engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" @@ -1595,12 +1496,9 @@ msgstr "Ctrl" msgid "Load game state 1-10" msgstr "pne spilltilstand 1-10" -#: engines/scumm/help.cpp:80 -#: engines/scumm/help.cpp:84 -#: engines/scumm/help.cpp:86 -#: engines/scumm/help.cpp:100 -#: engines/scumm/help.cpp:101 -#: engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" @@ -1608,8 +1506,7 @@ msgstr "Alt" msgid "Save game state 1-10" msgstr "Lagre spilltilstand 1-10" -#: engines/scumm/help.cpp:86 -#: engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" @@ -1701,30 +1598,24 @@ msgstr "Spinne drafts p msgid "Main game controls:" msgstr "Hovedkontroller for spill:" -#: engines/scumm/help.cpp:121 -#: engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 #: engines/scumm/help.cpp:161 msgid "Push" msgstr "Dytt" -#: engines/scumm/help.cpp:122 -#: engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 #: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Dra" -#: engines/scumm/help.cpp:123 -#: engines/scumm/help.cpp:138 -#: engines/scumm/help.cpp:163 -#: engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:197 #: engines/scumm/help.cpp:207 msgid "Give" msgstr "Gi" -#: engines/scumm/help.cpp:124 -#: engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 -#: engines/scumm/help.cpp:190 +#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:190 #: engines/scumm/help.cpp:208 msgid "Open" msgstr "pne" @@ -1737,54 +1628,43 @@ msgstr "G msgid "Get" msgstr "F" -#: engines/scumm/help.cpp:128 -#: engines/scumm/help.cpp:152 -#: engines/scumm/help.cpp:170 -#: engines/scumm/help.cpp:198 -#: engines/scumm/help.cpp:213 -#: engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:198 +#: engines/scumm/help.cpp:213 engines/scumm/help.cpp:224 #: engines/scumm/help.cpp:250 msgid "Use" msgstr "Bruk" -#: engines/scumm/help.cpp:129 -#: engines/scumm/help.cpp:141 +#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 msgid "Read" msgstr "Les" -#: engines/scumm/help.cpp:130 -#: engines/scumm/help.cpp:147 +#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 msgid "New kid" msgstr "Bytt unge" -#: engines/scumm/help.cpp:131 -#: engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 #: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Sl p" -#: engines/scumm/help.cpp:132 -#: engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 #: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Sl av" -#: engines/scumm/help.cpp:142 -#: engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 #: engines/scumm/help.cpp:194 msgid "Walk to" msgstr "G til" -#: engines/scumm/help.cpp:143 -#: engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:195 -#: engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:210 #: engines/scumm/help.cpp:227 msgid "Pick up" msgstr "Plukk opp" -#: engines/scumm/help.cpp:144 -#: engines/scumm/help.cpp:169 +#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 msgid "What is" msgstr "Hva er" @@ -1808,13 +1688,11 @@ msgstr "Fiks" msgid "Switch" msgstr "Bytt" -#: engines/scumm/help.cpp:166 -#: engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:228 msgid "Look" msgstr "Kikk" -#: engines/scumm/help.cpp:173 -#: engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:223 msgid "Talk" msgstr "Snakk" @@ -1859,24 +1737,20 @@ msgstr "spill H p msgid "play C major on distaff" msgstr "spill C dur p distaffen" -#: engines/scumm/help.cpp:192 -#: engines/scumm/help.cpp:214 +#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 msgid "puSh" msgstr "Dytt" -#: engines/scumm/help.cpp:193 -#: engines/scumm/help.cpp:215 +#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:215 msgid "pull (Yank)" msgstr "Dra" -#: engines/scumm/help.cpp:196 -#: engines/scumm/help.cpp:212 +#: engines/scumm/help.cpp:196 engines/scumm/help.cpp:212 #: engines/scumm/help.cpp:248 msgid "Talk to" msgstr "Snakk til" -#: engines/scumm/help.cpp:199 -#: engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:199 engines/scumm/help.cpp:211 msgid "Look at" msgstr "Se p" @@ -1908,10 +1782,8 @@ msgstr "Merk neste dialog" msgid "Walk" msgstr "G" -#: engines/scumm/help.cpp:225 -#: engines/scumm/help.cpp:234 -#: engines/scumm/help.cpp:241 -#: engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:225 engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:249 msgid "Inventory" msgstr "Inventar" @@ -1939,8 +1811,7 @@ msgstr "Sl msgid "Kick" msgstr "Spark" -#: engines/scumm/help.cpp:239 -#: engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:239 engines/scumm/help.cpp:247 msgid "Examine" msgstr "Undersk" @@ -1961,38 +1832,31 @@ msgstr "Lagre / msgid "Other game controls:" msgstr "Andre spillkontroller" -#: engines/scumm/help.cpp:257 -#: engines/scumm/help.cpp:267 +#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:267 msgid "Inventory:" msgstr "Inventar:" -#: engines/scumm/help.cpp:258 -#: engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:274 msgid "Scroll list up" msgstr "Bla liste opp" -#: engines/scumm/help.cpp:259 -#: engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 msgid "Scroll list down" msgstr "Bla liste ned" -#: engines/scumm/help.cpp:260 -#: engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:268 msgid "Upper left item" msgstr "vre venstre gjenstand" -#: engines/scumm/help.cpp:261 -#: engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:270 msgid "Lower left item" msgstr "Nedre venstre gjenstand" -#: engines/scumm/help.cpp:262 -#: engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 msgid "Upper right item" msgstr "vre hyre gjenstand" -#: engines/scumm/help.cpp:263 -#: engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:273 msgid "Lower right item" msgstr "Nedre hyre gjenstand" @@ -2004,8 +1868,7 @@ msgstr "Midtre venstre gjenstand" msgid "Middle right item" msgstr "Midtre hyre gjenstand" -#: engines/scumm/help.cpp:279 -#: engines/scumm/help.cpp:284 +#: engines/scumm/help.cpp:279 engines/scumm/help.cpp:284 msgid "Switching characters:" msgstr "Bytte av karakterer:" @@ -2021,8 +1884,7 @@ msgstr "Tredje unge" msgid "Fighting controls (numpad):" msgstr "Kampkontroller (talltastatur)" -#: engines/scumm/help.cpp:295 -#: engines/scumm/help.cpp:296 +#: engines/scumm/help.cpp:295 engines/scumm/help.cpp:296 #: engines/scumm/help.cpp:297 msgid "Step back" msgstr "Bakoversteg" @@ -2114,8 +1976,7 @@ msgid "" "but %s is missing. Using AdLib instead." msgstr "" -#: engines/scumm/scumm.cpp:2278 -#: engines/agos/saveload.cpp:202 +#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:202 #, c-format msgid "" "Failed to save game state to file:\n" @@ -2126,8 +1987,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2285 -#: engines/agos/saveload.cpp:167 +#: engines/scumm/scumm.cpp:2285 engines/agos/saveload.cpp:167 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2138,8 +1998,7 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2297 -#: engines/agos/saveload.cpp:210 +#: engines/scumm/scumm.cpp:2297 engines/agos/saveload.cpp:210 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2151,12 +2010,17 @@ msgstr "" "%s" #: engines/scumm/scumm.cpp:2512 -msgid "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory." -msgstr "Vanligvis, ville Maniac Mansion ha startet n. Men ScummVM sttter ikke det enn. S, for spille Maniac Mansion, g til 'Legg til spill' i ScummVM-hovedmenyen og velg 'Maniac'-undermappa i Tentacle-mappa." +msgid "" +"Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " +"play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " +"directory inside the Tentacle game directory." +msgstr "" +"Vanligvis, ville Maniac Mansion ha startet n. Men ScummVM sttter ikke det " +"enn. S, for spille Maniac Mansion, g til 'Legg til spill' i ScummVM-" +"hovedmenyen og velg 'Maniac'-undermappa i Tentacle-mappa." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 -#: engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 msgid "~Z~ip Mode Activated" msgstr "~Z~ipmodus aktivert" @@ -2186,14 +2050,12 @@ msgstr "~V~anneffekt aktivert" msgid "Cutscene file '%s' not found!" msgstr "" -#: engines/gob/inter_playtoons.cpp:256 -#: engines/gob/inter_v2.cpp:1287 +#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1287 #: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Klarte ikke pne spilltilstand fra fil." -#: engines/gob/inter_v2.cpp:1357 -#: engines/tinsel/saveload.cpp:515 +#: engines/gob/inter_v2.cpp:1357 engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Klarte ikke lagre spilltilstand fra fil." @@ -2313,12 +2175,13 @@ msgid "Choose Spell" msgstr "Velg" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Du ser ut til bruke en General MIDI-enhet,\n" "men spillet ditt sttter bare Roland MT32-MIDI.\n" @@ -2326,13 +2189,11 @@ msgstr "" "General MIDI-instrumentene. Allikevel, kan det\n" "skje at enkelte spor ikke vil spilles riktig." -#: engines/queen/queen.cpp:59 -#: engines/sky/detection.cpp:44 +#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 msgid "Floppy intro" msgstr "Diskett-intro" -#: engines/queen/queen.cpp:60 -#: engines/sky/detection.cpp:45 +#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45 msgid "Use the floppy version's intro (CD version only)" msgstr "Bruk diskettversjonens intro (Kun for CD-versjon)" @@ -2355,33 +2216,36 @@ msgstr "" msgid "PSX stream cutscene '%s' cannot be played in paletted mode" msgstr "" -#: engines/sword1/animation.cpp:560 -#: engines/sword2/animation.cpp:455 +#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" msgstr "" -#: engines/sword1/animation.cpp:570 -#: engines/sword2/animation.cpp:465 +#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "" -#: engines/sword1/animation.cpp:576 -#: engines/sword2/animation.cpp:473 +#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "" #: engines/sword1/control.cpp:863 msgid "" -"ScummVM found that you have old savefiles for Broken Sword 1 that should be converted.\n" -"The old save game format is no longer supported, so you will not be able to load your games if you don't convert them.\n" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be " +"converted.\n" +"The old save game format is no longer supported, so you will not be able to " +"load your games if you don't convert them.\n" "\n" -"Press OK to convert them now, otherwise you will be asked again the next time you start the game.\n" +"Press OK to convert them now, otherwise you will be asked again the next " +"time you start the game.\n" msgstr "" -"ScummVM oppdaget at du har gamle lagrede spill for Broken Sword 1 som br konverteres.\n" -"Det gamle formatet for lagrede spill stttes ikke lengre, s du vil ikke vre i stand til laste de lagrede spillene,\n" +"ScummVM oppdaget at du har gamle lagrede spill for Broken Sword 1 som br " +"konverteres.\n" +"Det gamle formatet for lagrede spill stttes ikke lengre, s du vil ikke " +"vre i stand til laste de lagrede spillene,\n" "med mindre du konverterer dem.\n" -"Trykk OK for konvertere dem n, ellers vil du bli spurt igjen neste gang du starter spillet." +"Trykk OK for konvertere dem n, ellers vil du bli spurt igjen neste gang " +"du starter spillet." #: engines/sword1/control.cpp:1232 #, c-format @@ -2403,7 +2267,8 @@ msgid "This is the end of the Broken Sword 1 Demo" msgstr "Dette er slutten p Broken Sword 1-demoen" #: engines/sword2/animation.cpp:435 -msgid "PSX cutscenes found but ScummVM has been built without RGB color support" +msgid "" +"PSX cutscenes found but ScummVM has been built without RGB color support" msgstr "" #: engines/sword2/sword2.cpp:79 @@ -2431,15 +2296,20 @@ msgstr "Lagrer spill..." #: engines/parallaction/saveload.cpp:272 msgid "" -"ScummVM found that you have old savefiles for Nippon Safes that should be renamed.\n" -"The old names are no longer supported, so you will not be able to load your games if you don't convert them.\n" +"ScummVM found that you have old savefiles for Nippon Safes that should be " +"renamed.\n" +"The old names are no longer supported, so you will not be able to load your " +"games if you don't convert them.\n" "\n" "Press OK to convert them now, otherwise you will be asked next time.\n" msgstr "" -"ScummVM oppdaget at du har gamle lagrede spill for Nippon Safes som br omdpes.\n" -"De gamle navnene stttes ikke lengre, s du vil ikke vre i stand til laste de lagrede spillene,\n" +"ScummVM oppdaget at du har gamle lagrede spill for Nippon Safes som br " +"omdpes.\n" +"De gamle navnene stttes ikke lengre, s du vil ikke vre i stand til " +"laste de lagrede spillene,\n" "med mindre du konverterer dem.\n" -"Trykk OK for konvertere dem n, ellers vil du bli spurt igjen neste gang du starter spillet." +"Trykk OK for konvertere dem n, ellers vil du bli spurt igjen neste gang " +"du starter spillet." #: engines/parallaction/saveload.cpp:319 msgid "ScummVM successfully converted all your savefiles." @@ -2447,11 +2317,13 @@ msgstr "ScummVM konverterte alle de lagrede spillene dine uten problemer." #: engines/parallaction/saveload.cpp:321 msgid "" -"ScummVM printed some warnings in your console window and can't guarantee all your files have been converted.\n" +"ScummVM printed some warnings in your console window and can't guarantee all " +"your files have been converted.\n" "\n" "Please report to the team." msgstr "" -"ScummVM skrev ut noen advarsler i konsollvinduet ditt og kan ikke garantere at alle filene dine har blitt konvertert.\n" +"ScummVM skrev ut noen advarsler i konsollvinduet ditt og kan ikke garantere " +"at alle filene dine har blitt konvertert.\n" "\n" "Vennligst rapporter dette til teamet." @@ -2465,30 +2337,44 @@ msgstr "DOSBox OPL emulator" #: audio/mididrv.cpp:209 #, c-format -msgid "The selected audio device '%s' was not found (e.g. might be turned off or disconnected)." -msgstr "Den valgte lydenheten '%s' ble ikke funnet (den kan f.eks. vre avsltt eller frakoblet)." +msgid "" +"The selected audio device '%s' was not found (e.g. might be turned off or " +"disconnected)." +msgstr "" +"Den valgte lydenheten '%s' ble ikke funnet (den kan f.eks. vre avsltt " +"eller frakoblet)." -#: audio/mididrv.cpp:209 -#: audio/mididrv.cpp:221 -#: audio/mididrv.cpp:257 +#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 #: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Forsker falle tilbake p den neste tilgjengelige enheten..." #: audio/mididrv.cpp:221 #, c-format -msgid "The selected audio device '%s' cannot be used. See log file for more information." -msgstr "Den valgte lydenheten '%s' kan ikke brukes. Se logg-filen for mer informasjon." +msgid "" +"The selected audio device '%s' cannot be used. See log file for more " +"information." +msgstr "" +"Den valgte lydenheten '%s' kan ikke brukes. Se logg-filen for mer " +"informasjon." #: audio/mididrv.cpp:257 #, c-format -msgid "The preferred audio device '%s' was not found (e.g. might be turned off or disconnected)." -msgstr "Den foretrukne lydenheten '%s' ble ikke funnet (den kan f.eks. vre avsltt eller frakoblet)." +msgid "" +"The preferred audio device '%s' was not found (e.g. might be turned off or " +"disconnected)." +msgstr "" +"Den foretrukne lydenheten '%s' ble ikke funnet (den kan f.eks. vre avsltt " +"eller frakoblet)." #: audio/mididrv.cpp:272 #, c-format -msgid "The preferred audio device '%s' cannot be used. See log file for more information." -msgstr "Den foretrukne lydenheten '%s' kan ikke brukes. Se i logg-filen for mer informasjon." +msgid "" +"The preferred audio device '%s' cannot be used. See log file for more " +"information." +msgstr "" +"Den foretrukne lydenheten '%s' kan ikke brukes. Se i logg-filen for mer " +"informasjon." #: audio/null.h:43 msgid "No music" @@ -2843,13 +2729,11 @@ msgstr "GC Pad-aksellerasjon:" msgid "DVD" msgstr "DVD" -#: backends/platform/wii/options.cpp:89 -#: backends/platform/wii/options.cpp:101 +#: backends/platform/wii/options.cpp:89 backends/platform/wii/options.cpp:101 msgid "Status:" msgstr "Status:" -#: backends/platform/wii/options.cpp:90 -#: backends/platform/wii/options.cpp:102 +#: backends/platform/wii/options.cpp:90 backends/platform/wii/options.cpp:102 msgid "Unknown" msgstr "Ukjent" @@ -3027,7 +2911,8 @@ msgstr "Koble handling til h #: backends/platform/wince/wince-sdl.cpp:519 msgid "You must map a key to the 'Right Click' action to play this game" -msgstr "Du m koble en tast til handlingen 'Hyreklikk' for spille dette spillet" +msgstr "" +"Du m koble en tast til handlingen 'Hyreklikk' for spille dette spillet" #: backends/platform/wince/wince-sdl.cpp:528 msgid "Map hide toolbar action" @@ -3035,7 +2920,9 @@ msgstr "Koble skjul-verkt #: backends/platform/wince/wince-sdl.cpp:532 msgid "You must map a key to the 'Hide toolbar' action to play this game" -msgstr "Du m koble en tast til 'Skjul verktylinje'-handlingen for spille dette spillet" +msgstr "" +"Du m koble en tast til 'Skjul verktylinje'-handlingen for spille dette " +"spillet" #: backends/platform/wince/wince-sdl.cpp:541 msgid "Map Zoom Up action (optional)" @@ -3046,8 +2933,11 @@ msgid "Map Zoom Down action (optional)" msgstr "Koble handlingen Zoom Ned (valgfritt)" #: backends/platform/wince/wince-sdl.cpp:552 -msgid "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" -msgstr "Ikke glem koble en tast til handlingen 'Skjul verktylinje' for se hele inventaret" +msgid "" +"Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" +msgstr "" +"Ikke glem koble en tast til handlingen 'Skjul verktylinje' for se hele " +"inventaret" #: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" @@ -3136,19 +3026,19 @@ msgstr "Klikking deaktivert" #~ msgid "Hercules Amber" #~ msgstr "Hercules Oransje" -#~ msgctxt "lowres" +#~ msgctxt "lowres" #~ msgid "Hercules Green" #~ msgstr "Hercules Grnn" -#~ msgctxt "lowres" +#~ msgctxt "lowres" #~ msgid "Hercules Amber" #~ msgstr "Hercules Oransje" #~ msgid "Save game failed!" #~ msgstr "Lagret spill:" -#~ msgctxt "lowres" +#~ msgctxt "lowres" #~ msgid "Add Game..." #~ msgstr "Legg til spill..." diff --git a/po/nn_NO.po b/po/nn_NO.po index fe0c1d1106..a88637b7c0 100644 --- a/po/nn_NO.po +++ b/po/nn_NO.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2011-04-25 23:07+0100\n" "Last-Translator: Einar Johan T. Smen \n" "Language-Team: somaen \n" @@ -1135,13 +1135,13 @@ msgid "~R~eturn to Launcher" msgstr "~T~ilbake til oppstarter" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Lagra spel:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1242,11 +1242,11 @@ msgstr "" msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Gjenopprett spel:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Gjenopprett" @@ -1276,12 +1276,12 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" +msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" @@ -2178,8 +2178,8 @@ msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 diff --git a/po/pl_PL.po b/po/pl_PL.po index da089c5026..5d3655f8b6 100644 --- a/po/pl_PL.po +++ b/po/pl_PL.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2011-10-24 21:14+0100\n" "Last-Translator: Micha Zibkowski \n" "Language-Team: Grajpopolsku.pl \n" @@ -1134,13 +1134,13 @@ msgid "~R~eturn to Launcher" msgstr "~P~owrt do launchera" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Zapis:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1257,11 +1257,11 @@ msgstr "" msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Wznw gr:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Wznw" @@ -1293,12 +1293,12 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" +msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" @@ -2192,12 +2192,13 @@ msgid "Choose Spell" msgstr "Wybierz" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Wyglda na to, e uywasz urzdzenia General MIDI, ale gra obsuguje tylko " "MIDI Roland MT32.\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index cb0c50a7c8..ac60a814e2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2011-10-21 21:30-0300\n" "Last-Translator: Saulo Benigno \n" "Language-Team: ScummBR (www.scummbr.com) \n" @@ -1146,13 +1146,13 @@ msgid "~R~eturn to Launcher" msgstr "~V~oltar ao menu" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Salvar jogo:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1273,11 +1273,11 @@ msgstr "" msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Restaurar jogo:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Restaurar" @@ -1309,12 +1309,12 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" +msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" @@ -2216,12 +2216,13 @@ msgid "Choose Spell" msgstr "Escolher" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Voc parece estar usando um dispositivo General MIDI,\n" "mas, o jogo s suporta Roland MT32 MIDI.\n" diff --git a/po/ru_RU.po b/po/ru_RU.po index 5d5f8dabf4..ec66de6f4f 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2012-02-16 13:09+0200+0200\n" "Last-Translator: Eugene Sandulenko \n" "Language-Team: Russian\n" @@ -1138,13 +1138,13 @@ msgid "~R~eturn to Launcher" msgstr "~~ " #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr " :" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1266,11 +1266,11 @@ msgstr "" msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr " :" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "" @@ -1304,12 +1304,12 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" +msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" @@ -2196,12 +2196,13 @@ msgid "Choose Spell" msgstr " " #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" ", \n" "General MIDI, \n" diff --git a/po/scummvm.pot b/po/scummvm.pot index 86067a3083..8a68e4372b 100644 --- a/po/scummvm.pot +++ b/po/scummvm.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1115,13 +1115,13 @@ msgid "~R~eturn to Launcher" msgstr "" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1220,11 +1220,11 @@ msgstr "" msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "" @@ -1253,12 +1253,12 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" +msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" @@ -2132,8 +2132,8 @@ msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 diff --git a/po/se_SE.po b/po/se_SE.po index fe896842a2..880b198895 100644 --- a/po/se_SE.po +++ b/po/se_SE.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.5.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2012-06-28 15:47+0100\n" "Last-Translator: Hampus Flink \n" "Language-Team: \n" @@ -1137,13 +1137,13 @@ msgid "~R~eturn to Launcher" msgstr "te~r~vnd till launcher" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Spara spelet:" #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1260,11 +1260,11 @@ msgstr "Anv msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Anvnder originalskrmarna fr spara/ladda istllet fr ScummVM:s" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "terstll spel:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "terstll" @@ -1293,12 +1293,12 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "Fredra digitala ljudeffekter istllet fr syntetiserade" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" -msgstr "Anvnd IMF/Yahama FB-01 fr MIDI-uppspelning" +msgid "Use IMF/Yamaha FB-01 for MIDI output" +msgstr "Anvnd IMF/Yamaha FB-01 fr MIDI-uppspelning" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" "Anvnd ett IMB Music Feature-kort eller en Yamaha FB-01 FM synthmodul fr " @@ -2186,12 +2186,13 @@ msgid "Choose Spell" msgstr "Vlj trollformel" #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" "Du verkar anvnda en General MIDI enhet\n" "men ditt spel stder endast Roland MT32 MIDI.\n" diff --git a/po/uk_UA.po b/po/uk_UA.po index cbcf7f670c..7f484fdc06 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" -"POT-Creation-Date: 2012-06-24 18:06+0100\n" +"POT-Creation-Date: 2012-07-08 12:25+0100\n" "PO-Revision-Date: 2012-02-16 13:09+0200\n" "Last-Translator: Eugene Sandulenko\n" "Language-Team: Ukrainian\n" @@ -1136,13 +1136,13 @@ msgid "~R~eturn to Launcher" msgstr "~~. " #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:728 +#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr " : " #: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 #: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 -#: engines/sci/engine/kfile.cpp:728 +#: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 #: backends/platform/wince/CEActionsPocket.cpp:267 @@ -1263,11 +1263,11 @@ msgstr "" msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr " :" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:824 +#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "" @@ -1299,12 +1299,12 @@ msgid "Prefer digital sound effects instead of synthesized ones" msgstr "" #: engines/sci/detection.cpp:400 -msgid "Use IMF/Yahama FB-01 for MIDI output" +msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "" #: engines/sci/detection.cpp:401 msgid "" -"Use an IBM Music Feature card or a Yahama FB-01 FM synth module for MIDI " +"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" @@ -2191,12 +2191,13 @@ msgid "Choose Spell" msgstr " " #: engines/kyra/sound_midi.cpp:475 +#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" "We try to map the Roland MT32 instruments to\n" -"General MIDI ones. After all it might happen\n" -"that a few tracks will not be correctly played." +"General MIDI ones. It is still possible that\n" +"some tracks sound incorrect." msgstr "" ", General\n" "MIDI, Roland MT32\n" -- cgit v1.2.3 From 2675311f2512e44dd4c37ba9ac9d449b9f4c2439 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 8 Jul 2012 12:39:16 +0100 Subject: I18N: Regenerate translations data file --- gui/themes/translations.dat | Bin 337762 -> 334603 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat index 2307ea20ae..df99750170 100644 Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ -- cgit v1.2.3 From 4c43d6d85dc70e1b9b82629f1af1e9a37a136013 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 8 Jul 2012 12:21:26 +0300 Subject: SCI: Add a hack in kGetAngleWorker to fix bug #3540976 kGetAngle(Worker) has been implemented based on behavior observed with a test program created with SCI Studio. However, the return values have subtle differences from the original, which uses atan(). This temporary hack will do for now till the implementation of kGetAngle is done again. A simpler atan2-based implementation has also been added for future reference --- engines/sci/engine/kmath.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/engines/sci/engine/kmath.cpp b/engines/sci/engine/kmath.cpp index 7570856dff..cbfe00d3ca 100644 --- a/engines/sci/engine/kmath.cpp +++ b/engines/sci/engine/kmath.cpp @@ -78,6 +78,25 @@ reg_t kSqrt(EngineState *s, int argc, reg_t *argv) { } uint16 kGetAngleWorker(int16 x1, int16 y1, int16 x2, int16 y2) { + // TODO: This has been implemented based on behavior observed with a test + // program created with SCI Studio. However, the return values have subtle + // differences from the original, which uses atan(). + // The differences in the return values are the cause of bug #3540976 + // and perhaps bug #3037267 as well. + + // HACK: Return the expected value for Longbow, scene 150 (bug #3540976). + // This is a temporary solution, till the function returns the expected + // results. + if (g_sci->getGameId() == GID_LONGBOW && g_sci->getEngineState()->currentRoomNumber() == 150) { + if (x1 == 207 && y1 == 88 && x2 == 107 && y2 == 184) + return 226; + } + +#if 0 + // A simpler atan2-based implementation + return (360 - atan2((double)(x1 - x2), (double)(y1 - y2)) * 57.2958) % 360; +#endif + int16 xRel = x2 - x1; int16 yRel = y1 - y2; // y-axis is mirrored. int16 angle; -- cgit v1.2.3 From 2ef3f5e6957ce072f9bb5df0fe3f65da578b836c Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 8 Jul 2012 15:58:50 +0300 Subject: SCI: Update the virtual file selected in the QFG4 character import screen This makes the character import screen in QFG4 functional, as the virtual file index was never updated --- engines/sci/engine/kgraphics.cpp | 6 ++++-- engines/sci/engine/klists.cpp | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index ec8e0dbf1b..5b483eb4a2 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -950,8 +950,8 @@ reg_t kDrawControl(EngineState *s, int argc, reg_t *argv) { } } if (objName == "savedHeros") { - // Import of QfG character files dialog is shown - // display additional popup information before letting user use it + // Import of QfG character files dialog is shown. + // display additional popup information before letting user use it. reg_t changeDirButton = s->_segMan->findObjectByName("changeDirItem"); if (!changeDirButton.isNull()) { // check if checkDirButton is still enabled, in that case we are called the first time during that room @@ -964,6 +964,8 @@ reg_t kDrawControl(EngineState *s, int argc, reg_t *argv) { "for Quest for Glory 2. Example: 'qfg2-thief.sav'."); } } + + // For the SCI32 version of this, check kListAt(). s->_chosenQfGImportItem = readSelectorValue(s->_segMan, controlObject, SELECTOR(mark)); } diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp index 15d18eb4bb..342fa95eda 100644 --- a/engines/sci/engine/klists.cpp +++ b/engines/sci/engine/klists.cpp @@ -506,6 +506,11 @@ reg_t kListAt(EngineState *s, int argc, reg_t *argv) { curIndex++; } + // Update the virtual file selected in the character import screen of QFG4. + // For the SCI0-SCI1.1 version of this, check kDrawControl(). + if (g_sci->inQfGImportRoom() && !strcmp(s->_segMan->getObjectName(curObject), "SelectorDText")) + s->_chosenQfGImportItem = listIndex; + return curObject; } -- cgit v1.2.3 From 10b3fdf2478dce3712de6213678f54335d5c46a0 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 8 Jul 2012 16:10:40 +0300 Subject: SCI: Show information for correct file naming in the QFG4 import room This information is shown in previous QFG versions, but it had to be placed in a SCI32 graphics function in order to be shown in QFG4 too --- engines/sci/engine/kgraphics.cpp | 3 ++- engines/sci/graphics/frameout.cpp | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 5b483eb4a2..6d938b6d22 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -951,7 +951,8 @@ reg_t kDrawControl(EngineState *s, int argc, reg_t *argv) { } if (objName == "savedHeros") { // Import of QfG character files dialog is shown. - // display additional popup information before letting user use it. + // Display additional popup information before letting user use it. + // For the SCI32 version of this, check kernelAddPlane(). reg_t changeDirButton = s->_segMan->findObjectByName("changeDirItem"); if (!changeDirButton.isNull()) { // check if checkDirButton is still enabled, in that case we are called the first time during that room diff --git a/engines/sci/graphics/frameout.cpp b/engines/sci/graphics/frameout.cpp index b13c7f4dce..cb56e24de9 100644 --- a/engines/sci/graphics/frameout.cpp +++ b/engines/sci/graphics/frameout.cpp @@ -117,6 +117,8 @@ void GfxFrameout::showCurrentScrollText() { } } +extern void showScummVMDialog(const Common::String &message); + void GfxFrameout::kernelAddPlane(reg_t object) { PlaneEntry newPlane; @@ -142,6 +144,19 @@ void GfxFrameout::kernelAddPlane(reg_t object) { _coordAdjuster->setScriptsResolution(tmpRunningWidth, tmpRunningHeight); } + // Import of QfG character files dialog is shown in QFG4. + // Display additional popup information before letting user use it. + // For the SCI0-SCI1.1 version of this, check kDrawControl(). + if (g_sci->inQfGImportRoom() && !strcmp(_segMan->getObjectName(object), "DSPlane")) { + showScummVMDialog("Characters saved inside ScummVM are shown " + "automatically. Character files saved in the original " + "interpreter need to be put inside ScummVM's saved games " + "directory and a prefix needs to be added depending on which " + "game it was saved in: 'qfg1-' for Quest for Glory 1, 'qfg2-' " + "for Quest for Glory 2, 'qfg3-' for Quest for Glory 3. " + "Example: 'qfg2-thief.sav'."); + } + newPlane.object = object; newPlane.priority = readSelectorValue(_segMan, object, SELECTOR(priority)); newPlane.lastPriority = 0xFFFF; // hidden -- cgit v1.2.3 From 3b69816a7d02f5c6ef03efd48062abd532cced18 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 8 Jul 2012 16:15:07 +0300 Subject: SCI: Add another English floppy version of KQ5 (bug #3536863) According to this bug report, there exists another English version with the same file checksums as the vanilla English version, patched to Polish. We need a better way of distinguishing the two versions. Until we do, this is a duplicate entry of the Polish floppy version --- engines/sci/detection_tables.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index 07b4733cfd..8a6184c7e4 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -1238,6 +1238,26 @@ static const struct ADGameDescription SciGameDescriptions[] = { AD_LISTEND}, Common::EN_ANY, Common::kPlatformPC, 0, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, + // King's Quest 5 - English DOS Floppy + // VERSION file reports "0.000.051" + // Supplied by misterhands in bug report #3536863. + // FIXME: According to bug #3536863, there exists another English version + // with the same file checksums as the vanilla English version, patched to + // Polish. We need a better way of distinguishing the two versions. Until + // we do, this is a duplicate entry of the Polish version below. + {"kq5", "", { + {"resource.map", 0, "70010c20138541f89013bb5e1b30f16a", 7998}, + {"resource.000", 0, "a591bd4b879fc832b8095c0b3befe9e2", 276398}, + {"resource.001", 0, "c0f48d4a7ebeaa6aa074fc98d77423e9", 1018560}, + {"resource.002", 0, "7f188a95acdb60bbe32a8379ba299393", 1307048}, + {"resource.003", 0, "0860785af59518b94d54718dddcd6907", 1348500}, + {"resource.004", 0, "c4745dd1e261c22daa6477961d08bf6c", 1239887}, + {"resource.005", 0, "6556ff8e7c4d1acf6a78aea154daa76c", 1287869}, + {"resource.006", 0, "da82e4beb744731d0a151f1d4922fafa", 1170456}, + {"resource.007", 0, "431def14ca29cdb5e6a5e84d3f38f679", 1240176}, + AD_LISTEND}, + Common::EN_ANY, Common::kPlatformPC, 0, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, + // King's Quest 5 - English DOS Floppy (supplied by omer_mor in bug report #3036996) // VERSION file reports "0.000.051" {"kq5", "", { @@ -1356,6 +1376,10 @@ static const struct ADGameDescription SciGameDescriptions[] = { // King's Quest 5 - Polish DOS Floppy (supplied by jacek909 in bug report #2725722, includes english language?!) // SCI interpreter version 1.000.060 + // FIXME: According to bug #3536863, this is actually a patched English version. + // The vanilla English version has the same MD5 checksums. + // We need a better way of detecting this. Until we do, a duplicate English + // entry has been placed above. {"kq5", "", { {"resource.map", 0, "70010c20138541f89013bb5e1b30f16a", 7998}, {"resource.000", 0, "a591bd4b879fc832b8095c0b3befe9e2", 276398}, -- cgit v1.2.3 From ff1828fc7117d1dfcb5ea3dd04baf1ddc9045b3b Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Sun, 8 Jul 2012 20:24:33 +0200 Subject: MOHAWK: Play anims for LiveText items *after* the speech. Another attempt at fixing bug #3541294. --- engines/mohawk/livingbooks.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index f5e5e7d7b4..7f7df66e53 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -3460,6 +3460,12 @@ void LBLiveTextItem::update() { uint16 soundId = _words[_currentWord].soundId; if (soundId && !_vm->_sound->isPlaying(soundId)) { paletteUpdate(_currentWord, false); + + // TODO: check this in RE + LBItem *item = _vm->getItemById(_words[_currentWord].itemId); + if (item) + item->togglePlaying(false); + _currentWord = 0xFFFF; } } @@ -3530,11 +3536,6 @@ void LBLiveTextItem::handleMouseDown(Common::Point pos) { _currentWord = i; _vm->playSound(this, soundId); paletteUpdate(_currentWord, true); - - // TODO: check this in RE - LBItem *item = _vm->getItemById(_words[i].itemId); - if (item) - item->togglePlaying(false); return; } } -- cgit v1.2.3 From bb434d4acddcef722465b19062f8ba5b8da86b63 Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Sun, 8 Jul 2012 20:53:47 +0200 Subject: NEWS: V1 composer games aren't supported yet. --- NEWS | 3 --- 1 file changed, 3 deletions(-) diff --git a/NEWS b/NEWS index e4ea5f3f49..443306fbfd 100644 --- a/NEWS +++ b/NEWS @@ -9,10 +9,7 @@ For a more comprehensive changelog of the latest experimental code, see: - Added support for Dreamweb. - Added support for Geisha. - Added support for Gregory and the Hot Air Balloon. - - Added support for Magic Tales: Baba Yaga and the Magic Geese. - - Added support for Magic Tales: Imo and the King. - Added support for Magic Tales: Liam Finds a Story. - - Added support for Magic Tales: The Little Samurai. - Added support for Once Upon A Time: Little Red Riding Hood - Added support for Sleeping Cub's Test of Courage. - Added support for Soltys. -- cgit v1.2.3 From 50dc5009c85f3713d6917d5aba1cbb1428da1c30 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 8 Jul 2012 21:58:47 +0300 Subject: SCI: Ignore another leftover script from KQ7 in the debugger --- engines/sci/console.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp index 40a6fd1415..564bbbbd79 100644 --- a/engines/sci/console.cpp +++ b/engines/sci/console.cpp @@ -2987,8 +2987,9 @@ void Console::printKernelCallsFound(int kernelFuncNum, bool showFoundScripts) { // Ignore specific leftover scripts, which require other non-existing scripts if ((_engine->getGameId() == GID_HOYLE3 && itr->getNumber() == 995) || (_engine->getGameId() == GID_KQ5 && itr->getNumber() == 980) || - (_engine->getGameId() == GID_SLATER && itr->getNumber() == 947) || - (_engine->getGameId() == GID_MOTHERGOOSE256 && itr->getNumber() == 980)) { + (_engine->getGameId() == GID_KQ7 && itr->getNumber() == 111) || + (_engine->getGameId() == GID_MOTHERGOOSE256 && itr->getNumber() == 980) || + (_engine->getGameId() == GID_SLATER && itr->getNumber() == 947)) { continue; } -- cgit v1.2.3 From 262c7a1fb73cb89a7c2db562374bdc0ce6f85d18 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 8 Jul 2012 21:59:54 +0300 Subject: SCI: Fix a typo and add some comments to kGetAngleWorker() --- engines/sci/engine/kmath.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/engines/sci/engine/kmath.cpp b/engines/sci/engine/kmath.cpp index cbfe00d3ca..05c8845288 100644 --- a/engines/sci/engine/kmath.cpp +++ b/engines/sci/engine/kmath.cpp @@ -77,10 +77,16 @@ reg_t kSqrt(EngineState *s, int argc, reg_t *argv) { return make_reg(0, (int16) sqrt((float) ABS(argv[0].toSint16()))); } +/** + * Returns the angle (in degrees) between the two points determined by (x1, y1) + * and (x2, y2). The angle ranges from 0 to 359 degrees. + * What this function does is pretty simple but apparently the original is not + * accurate. + */ uint16 kGetAngleWorker(int16 x1, int16 y1, int16 x2, int16 y2) { // TODO: This has been implemented based on behavior observed with a test // program created with SCI Studio. However, the return values have subtle - // differences from the original, which uses atan(). + // differences from the original, which uses custom implementation of atan(). // The differences in the return values are the cause of bug #3540976 // and perhaps bug #3037267 as well. @@ -94,7 +100,7 @@ uint16 kGetAngleWorker(int16 x1, int16 y1, int16 x2, int16 y2) { #if 0 // A simpler atan2-based implementation - return (360 - atan2((double)(x1 - x2), (double)(y1 - y2)) * 57.2958) % 360; + return (int16)(360 - atan2((double)(x1 - x2), (double)(y1 - y2)) * 57.2958) % 360; #endif int16 xRel = x2 - x1; @@ -122,6 +128,7 @@ uint16 kGetAngleWorker(int16 x1, int16 y1, int16 x2, int16 y2) { // Convert from grads to degrees by merging grad 0 with grad 1, // grad 10 with grad 11, grad 20 with grad 21, etc. This leads to // "degrees" that equal either one or two grads. + // This subtraction is meant to change from 400 "degrees" into 360 degrees angle -= (angle + 9) / 10; return angle; } -- cgit v1.2.3 From b2fb2730d67deccf819701ae98cb49daddf6ac4f Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 8 Jul 2012 22:00:36 +0300 Subject: SCI: Also set the filename of the videoState struct when playing AVIs --- engines/sci/engine/kvideo.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/engines/sci/engine/kvideo.cpp b/engines/sci/engine/kvideo.cpp index 61d2f935f7..cb2a763da9 100644 --- a/engines/sci/engine/kvideo.cpp +++ b/engines/sci/engine/kvideo.cpp @@ -209,6 +209,8 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) { warning("Failed to open movie file %s", filename.c_str()); delete videoDecoder; videoDecoder = 0; + } else { + s->_videoState.fileName = filename; } break; } -- cgit v1.2.3 From 97fe2682d75a4f5f0320f755aef7b7c950a8de6b Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 8 Jul 2012 22:24:53 +0300 Subject: I18N: Updated Russian and Ukrainian translations --- po/ru_RU.po | 105 +++++++++++++++++++++++++++------------------------------ po/uk_UA.po | 110 ++++++++++++++++++++++++++++-------------------------------- 2 files changed, 101 insertions(+), 114 deletions(-) diff --git a/po/ru_RU.po b/po/ru_RU.po index ec66de6f4f..019acbddbc 100644 --- a/po/ru_RU.po +++ b/po/ru_RU.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-07-08 12:25+0100\n" -"PO-Revision-Date: 2012-02-16 13:09+0200+0200\n" +"PO-Revision-Date: 2012-07-08 22:00+0200+0200\n" "Last-Translator: Eugene Sandulenko \n" "Language-Team: Russian\n" "MIME-Version: 1.0\n" @@ -193,9 +193,8 @@ msgid "Platform:" msgstr ":" #: gui/launcher.cpp:231 -#, fuzzy msgid "Engine" -msgstr "" +msgstr "" #: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 msgid "Graphics" @@ -689,7 +688,7 @@ msgstr "SoundFont:" #: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "" -"SoundFont , Fluidsynth " +"SoundFont , Fluidsynth " "Timidity" #: gui/options.cpp:851 @@ -716,7 +715,7 @@ msgstr " #: gui/options.cpp:870 msgid "Specifies default sound device for Roland MT-32/LAPC1/CM32l/CM64 output" msgstr "" -" Roland MT-32/LAPC1/" +" Roland MT-32/LAPC1/" "CM32l/CM64" #: gui/options.cpp:875 @@ -743,7 +742,7 @@ msgstr " #: gui/options.cpp:880 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" msgstr "" -" General MIDI Roland MT-32" +" General MIDI Roland MT-32" #: gui/options.cpp:889 msgid "Don't use Roland MT-32 music" @@ -922,7 +921,7 @@ msgid "" "The theme you selected does not support your current language. If you want " "to use this theme you need to switch to another language first." msgstr "" -", , . " +", , . " " , ." #: gui/saveload.cpp:59 gui/saveload.cpp:257 @@ -1159,17 +1158,17 @@ msgid "" "the README for basic information, and for instructions on how to obtain " "further assistance." msgstr "" -" , . " +" , . " ", README , " " , ." #: engines/dialogs.cpp:228 -#, fuzzy, c-format +#, c-format msgid "" "Gamestate save failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" -" , . " +" (%s)! " ", README , " " , ." @@ -1233,12 +1232,12 @@ msgstr "" " README." #: engines/engine.cpp:426 -#, fuzzy, c-format +#, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" -" , . " +" (%s)! " ", README , " " , ." @@ -1259,12 +1258,14 @@ msgstr " #: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47 #: engines/sci/detection.cpp:390 msgid "Use original save/load screens" -msgstr "" +msgstr " / " #: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48 #: engines/sci/detection.cpp:391 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" +" " +" ScummVM" #: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" @@ -1272,73 +1273,71 @@ msgstr " #: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore" -msgstr "" +msgstr "" #: engines/dreamweb/detection.cpp:57 -#, fuzzy msgid "Use bright palette mode" -msgstr " " +msgstr " " #: engines/dreamweb/detection.cpp:58 msgid "Display graphics using the game's bright palette" -msgstr "" +msgstr " " #: engines/sci/detection.cpp:370 msgid "EGA undithering" msgstr "EGA " #: engines/sci/detection.cpp:371 -#, fuzzy msgid "Enable undithering in EGA games" -msgstr "" -" EGA , " -"" +msgstr " EGA " #: engines/sci/detection.cpp:380 -#, fuzzy msgid "Prefer digital sound effects" -msgstr " " +msgstr " " #: engines/sci/detection.cpp:381 msgid "Prefer digital sound effects instead of synthesized ones" -msgstr "" +msgstr " " #: engines/sci/detection.cpp:400 msgid "Use IMF/Yamaha FB-01 for MIDI output" -msgstr "" +msgstr " IMF/Yamaha FB-01 MIDI" #: engines/sci/detection.cpp:401 msgid "" "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " "output" msgstr "" +" IBM Music Feature " +"Yamaha FB-01 FM MIDI" #: engines/sci/detection.cpp:411 msgid "Use CD audio" -msgstr "" +msgstr " CD " #: engines/sci/detection.cpp:412 msgid "Use CD audio instead of in-game audio, if available" -msgstr "" +msgstr " CD ( )" #: engines/sci/detection.cpp:422 msgid "Use Windows cursors" -msgstr "" +msgstr " Windows" #: engines/sci/detection.cpp:423 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "" +" Windows ( ) DOS" #: engines/sci/detection.cpp:433 -#, fuzzy msgid "Use silver cursors" -msgstr " " +msgstr " " #: engines/sci/detection.cpp:434 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" +" " #: engines/scumm/dialogs.cpp:175 #, c-format @@ -2091,61 +2090,59 @@ msgstr " #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 msgid "Studio audience" -msgstr "" +msgstr " " #: engines/kyra/detection.cpp:63 msgid "Enable studio audience" -msgstr "" +msgstr " " #. I18N: This option allows the user to skip text and cutscenes. #: engines/kyra/detection.cpp:73 msgid "Skip support" -msgstr "" +msgstr " " #: engines/kyra/detection.cpp:74 msgid "Allow text and cutscenes to be skipped" -msgstr "" +msgstr " " #. I18N: Helium mode makes people sound like they've inhaled Helium. #: engines/kyra/detection.cpp:84 msgid "Helium mode" -msgstr "" +msgstr " " #: engines/kyra/detection.cpp:85 -#, fuzzy msgid "Enable helium mode" -msgstr " Roland GS" +msgstr " " #. I18N: When enabled, this option makes scrolling smoother when #. changing from one screen to another. #: engines/kyra/detection.cpp:99 msgid "Smooth scrolling" -msgstr "" +msgstr " " #: engines/kyra/detection.cpp:100 msgid "Enable smooth scrolling when walking" -msgstr "" +msgstr " " #. I18N: When enabled, this option changes the cursor when it floats to the #. edge of the screen to a directional arrow. The player can then click to #. walk towards that direction. #: engines/kyra/detection.cpp:112 -#, fuzzy msgid "Floating cursors" -msgstr " " +msgstr " " #: engines/kyra/detection.cpp:113 msgid "Enable floating cursors" -msgstr "" +msgstr " " #. I18N: HP stands for Hit Points #: engines/kyra/detection.cpp:127 msgid "HP bar graphs" -msgstr "" +msgstr " " #: engines/kyra/detection.cpp:128 msgid "Enable hit point bar graphs" -msgstr "" +msgstr " " #: engines/kyra/lol.cpp:478 msgid "Attack 1" @@ -2196,7 +2193,6 @@ msgid "Choose Spell" msgstr " " #: engines/kyra/sound_midi.cpp:475 -#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2213,11 +2209,11 @@ msgstr "" #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 msgid "Floppy intro" -msgstr "" +msgstr " " #: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45 msgid "Use the floppy version's intro (CD version only)" -msgstr "" +msgstr " ( CD )" #: engines/sky/compact.cpp:130 msgid "" @@ -2238,7 +2234,7 @@ msgstr "" #: engines/sword1/animation.cpp:539 #, c-format msgid "PSX stream cutscene '%s' cannot be played in paletted mode" -msgstr "" +msgstr " PSX '%s' " #: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" @@ -2293,19 +2289,18 @@ msgid "This is the end of the Broken Sword 1 Demo" msgstr " 1" #: engines/sword2/animation.cpp:435 -#, fuzzy msgid "" "PSX cutscenes found but ScummVM has been built without RGB color support" msgstr "" -" DXA, ScummVM zlib" +" PSX, ScummVM RGB " #: engines/sword2/sword2.cpp:79 msgid "Show object labels" -msgstr "" +msgstr " " #: engines/sword2/sword2.cpp:80 msgid "Show labels for objects on mouse hover" -msgstr "" +msgstr " " #: engines/parallaction/saveload.cpp:133 #, c-format @@ -2334,7 +2329,7 @@ msgid "" "Press OK to convert them now, otherwise you will be asked next time.\n" msgstr "" "ScummVM Nippon Safes, " -" . , " +" . , " " , .\n" "\n" " , , " @@ -2351,7 +2346,7 @@ msgid "" "\n" "Please report to the team." msgstr "" -"ScummVM , " +"ScummVM " " .\n" "\n" ", ScummVM." @@ -2455,7 +2450,7 @@ msgstr " ( #: backends/keymapper/remap-dialog.cpp:106 msgid " (Blocked)" -msgstr "" +msgstr " ()" #: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" diff --git a/po/uk_UA.po b/po/uk_UA.po index 7f484fdc06..38855dcb11 100644 --- a/po/uk_UA.po +++ b/po/uk_UA.po @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-07-08 12:25+0100\n" -"PO-Revision-Date: 2012-02-16 13:09+0200\n" -"Last-Translator: Eugene Sandulenko\n" +"PO-Revision-Date: 2012-06-29 20:19+0200\n" +"Last-Translator: lubomyr \n" "Language-Team: Ukrainian\n" +"Language: Ukrainian\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-5\n" "Content-Transfer-Encoding: 8bit\n" -"Language: Ukrainian\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%" -"10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: gui/about.cpp:91 #, c-format @@ -194,9 +194,8 @@ msgid "Platform:" msgstr ":" #: gui/launcher.cpp:231 -#, fuzzy msgid "Engine" -msgstr "" +msgstr "" #: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 msgid "Graphics" @@ -1162,14 +1161,13 @@ msgstr "" "." #: engines/dialogs.cpp:228 -#, fuzzy, c-format +#, c-format msgid "" "Gamestate save failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" -", . -, " -"README , , " -"." +" (%s)!. -, README " +" , , ." #: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 @@ -1230,14 +1228,13 @@ msgstr "" " README ." #: engines/engine.cpp:426 -#, fuzzy, c-format +#, c-format msgid "" "Gamestate load failed (%s)! Please consult the README for basic information, " "and for instructions on how to obtain further assistance." msgstr "" -", . -, " -"README , , " -"." +" (%s)! . -, README " +" , , ." #: engines/engine.cpp:439 msgid "" @@ -1256,12 +1253,13 @@ msgstr " #: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47 #: engines/sci/detection.cpp:390 msgid "Use original save/load screens" -msgstr "" +msgstr " . / " #: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48 #: engines/sci/detection.cpp:391 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "" +" / , ScummVM" #: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 msgid "Restore game:" @@ -1272,35 +1270,32 @@ msgid "Restore" msgstr "" #: engines/dreamweb/detection.cpp:57 -#, fuzzy msgid "Use bright palette mode" -msgstr " " +msgstr " " #: engines/dreamweb/detection.cpp:58 msgid "Display graphics using the game's bright palette" -msgstr "" +msgstr " " #: engines/sci/detection.cpp:370 msgid "EGA undithering" msgstr "EGA " #: engines/sci/detection.cpp:371 -#, fuzzy msgid "Enable undithering in EGA games" -msgstr " EGA " +msgstr " - EGA " #: engines/sci/detection.cpp:380 -#, fuzzy msgid "Prefer digital sound effects" -msgstr " " +msgstr " " #: engines/sci/detection.cpp:381 msgid "Prefer digital sound effects instead of synthesized ones" -msgstr "" +msgstr " , " #: engines/sci/detection.cpp:400 msgid "Use IMF/Yamaha FB-01 for MIDI output" -msgstr "" +msgstr " IMF/Yahama FB-01 MIDI " #: engines/sci/detection.cpp:401 msgid "" @@ -1310,30 +1305,31 @@ msgstr "" #: engines/sci/detection.cpp:411 msgid "Use CD audio" -msgstr "" +msgstr " CD " #: engines/sci/detection.cpp:412 msgid "Use CD audio instead of in-game audio, if available" -msgstr "" +msgstr " CD - , " #: engines/sci/detection.cpp:422 msgid "Use Windows cursors" -msgstr "" +msgstr " Windows " #: engines/sci/detection.cpp:423 msgid "" "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" -msgstr "" +msgstr " Windows ( ), DOS" #: engines/sci/detection.cpp:433 -#, fuzzy msgid "Use silver cursors" -msgstr " " +msgstr " " #: engines/sci/detection.cpp:434 msgid "" "Use the alternate set of silver cursors, instead of the normal golden ones" msgstr "" +" , " +"" #: engines/scumm/dialogs.cpp:175 #, c-format @@ -2086,52 +2082,50 @@ msgstr " #. Malcolm makes a joke. #: engines/kyra/detection.cpp:62 msgid "Studio audience" -msgstr "" +msgstr " " #: engines/kyra/detection.cpp:63 msgid "Enable studio audience" -msgstr "" +msgstr " " #. I18N: This option allows the user to skip text and cutscenes. #: engines/kyra/detection.cpp:73 msgid "Skip support" -msgstr "" +msgstr " " #: engines/kyra/detection.cpp:74 msgid "Allow text and cutscenes to be skipped" -msgstr "" +msgstr " " #. I18N: Helium mode makes people sound like they've inhaled Helium. #: engines/kyra/detection.cpp:84 msgid "Helium mode" -msgstr "" +msgstr " " #: engines/kyra/detection.cpp:85 -#, fuzzy msgid "Enable helium mode" -msgstr " Roland GS" +msgstr " " #. I18N: When enabled, this option makes scrolling smoother when #. changing from one screen to another. #: engines/kyra/detection.cpp:99 msgid "Smooth scrolling" -msgstr "" +msgstr " " #: engines/kyra/detection.cpp:100 msgid "Enable smooth scrolling when walking" -msgstr "" +msgstr " " #. I18N: When enabled, this option changes the cursor when it floats to the #. edge of the screen to a directional arrow. The player can then click to #. walk towards that direction. #: engines/kyra/detection.cpp:112 -#, fuzzy msgid "Floating cursors" -msgstr " " +msgstr " " #: engines/kyra/detection.cpp:113 msgid "Enable floating cursors" -msgstr "" +msgstr " " #. I18N: HP stands for Hit Points #: engines/kyra/detection.cpp:127 @@ -2191,7 +2185,6 @@ msgid "Choose Spell" msgstr " " #: engines/kyra/sound_midi.cpp:475 -#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2207,11 +2200,11 @@ msgstr "" #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 msgid "Floppy intro" -msgstr "" +msgstr " " #: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45 msgid "Use the floppy version's intro (CD version only)" -msgstr "" +msgstr " ( CD )" #: engines/sky/compact.cpp:130 msgid "" @@ -2232,7 +2225,7 @@ msgstr "" #: engines/sword1/animation.cpp:539 #, c-format msgid "PSX stream cutscene '%s' cannot be played in paletted mode" -msgstr "" +msgstr " PSX '%s' " #: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" @@ -2286,18 +2279,17 @@ msgid "This is the end of the Broken Sword 1 Demo" msgstr " Broken Sword 1" #: engines/sword2/animation.cpp:435 -#, fuzzy msgid "" "PSX cutscenes found but ScummVM has been built without RGB color support" -msgstr " DXA, ScummVM zlib" +msgstr " PSX , ScummVM RGB " #: engines/sword2/sword2.cpp:79 msgid "Show object labels" -msgstr "" +msgstr " '" #: engines/sword2/sword2.cpp:80 msgid "Show labels for objects on mouse hover" -msgstr "" +msgstr " ' " #: engines/parallaction/saveload.cpp:133 #, c-format @@ -2362,7 +2354,7 @@ msgid "" "The selected audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" -" %s (, " +" '%s' (, " " )." #: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 @@ -2376,7 +2368,7 @@ msgid "" "The selected audio device '%s' cannot be used. See log file for more " "information." msgstr "" -" %s . " +" '%s' . " " ." #: audio/mididrv.cpp:257 @@ -2385,7 +2377,7 @@ msgid "" "The preferred audio device '%s' was not found (e.g. might be turned off or " "disconnected)." msgstr "" -" %s (, " +" '%s' (, " " )." #: audio/mididrv.cpp:272 @@ -2394,7 +2386,7 @@ msgid "" "The preferred audio device '%s' cannot be used. See log file for more " "information." msgstr "" -" %s . " +" '%s' . " " ." #: audio/null.h:43 @@ -2447,7 +2439,7 @@ msgstr " ( #: backends/keymapper/remap-dialog.cpp:106 msgid " (Blocked)" -msgstr "" +msgstr " ()" #: backends/keymapper/remap-dialog.cpp:119 msgid " (Global)" @@ -2867,11 +2859,11 @@ msgstr " #: backends/platform/wince/CEActionsPocket.cpp:52 msgid "Zoom up" -msgstr ". " +msgstr ". " #: backends/platform/wince/CEActionsPocket.cpp:53 msgid "Zoom down" -msgstr ". " +msgstr ". " #: backends/platform/wince/CEActionsPocket.cpp:55 #: backends/platform/wince/CEActionsSmartphone.cpp:49 @@ -2940,7 +2932,7 @@ msgstr " msgid "You must map a key to the 'Hide toolbar' action to play this game" msgstr "" " ' .', " -" " +" " #: backends/platform/wince/wince-sdl.cpp:541 msgid "Map Zoom Up action (optional)" -- cgit v1.2.3 From a4b0c0e2db36353ac037dc60a639bf59611bedda Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 8 Jul 2012 22:26:08 +0300 Subject: I18N: Updated translations.dat --- gui/themes/translations.dat | Bin 334603 -> 340460 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat index df99750170..97d69b400c 100644 Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ -- cgit v1.2.3 From 6387e3bca73dd8b2dacab15a84a4a3b8d6c13c10 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 8 Jul 2012 22:30:05 +0300 Subject: RELEASE: This is 1.6.0git --- backends/platform/psp/README.PSP | 2 +- base/internal_version.h | 2 +- dists/android/AndroidManifest.xml | 2 +- dists/android/plugin-manifest.xml | 2 +- dists/gph/README-GPH | 2 +- dists/gph/scummvm.ini | 2 +- dists/iphone/Info.plist | 4 ++-- dists/irix/scummvm.spec | 2 +- dists/macosx/Info.plist | 6 +++--- dists/openpandora/PXML.xml | 8 ++++---- dists/openpandora/README-OPENPANDORA | 2 +- dists/openpandora/README-PND.txt | 2 +- dists/openpandora/index.html | 4 ++-- dists/redhat/scummvm-tools.spec | 2 +- dists/redhat/scummvm.spec | 2 +- dists/scummvm.rc | 8 ++++---- dists/slackware/scummvm.SlackBuild | 2 +- dists/wii/meta.xml | 2 +- dists/win32/scummvm.nsi | 4 ++-- 19 files changed, 30 insertions(+), 30 deletions(-) diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP index bc0bd35a6e..969459dc5b 100644 --- a/backends/platform/psp/README.PSP +++ b/backends/platform/psp/README.PSP @@ -1,4 +1,4 @@ -ScummVM-PSP 1.5.0git README +ScummVM-PSP 1.6.0git README ============================================================================== Installation diff --git a/base/internal_version.h b/base/internal_version.h index 5392012169..40ed67ceec 100644 --- a/base/internal_version.h +++ b/base/internal_version.h @@ -16,4 +16,4 @@ #define SCUMMVM_REVISION #endif -#define SCUMMVM_VERSION "1.5.0git" SCUMMVM_REVISION +#define SCUMMVM_VERSION "1.6.0git" SCUMMVM_REVISION diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml index e7778fdf61..a3c02474eb 100644 --- a/dists/android/AndroidManifest.xml +++ b/dists/android/AndroidManifest.xml @@ -4,7 +4,7 @@ diff --git a/dists/android/plugin-manifest.xml b/dists/android/plugin-manifest.xml index 51b39be3b1..7855c330c6 100644 --- a/dists/android/plugin-manifest.xml +++ b/dists/android/plugin-manifest.xml @@ -3,7 +3,7 @@ diff --git a/dists/gph/README-GPH b/dists/gph/README-GPH index 29f0175306..974c2cf266 100644 --- a/dists/gph/README-GPH +++ b/dists/gph/README-GPH @@ -1,4 +1,4 @@ -ScummVM 1.5.0git - GPH DEVICE SPECIFIC README +ScummVM 1.6.0git - GPH DEVICE SPECIFIC README ------------------------------------------------------------------------ diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini index 952cd0de24..7d9d85fcc2 100644 --- a/dists/gph/scummvm.ini +++ b/dists/gph/scummvm.ini @@ -1,5 +1,5 @@ [info] -name="ScummVM 1.5.0git" +name="ScummVM 1.6.0git" path="/scummvm/scummvm.gpe" icon="/scummvm/scummvm.png" title="/scummvm/scummvmb.png" diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist index e25cee51ea..2f6ba85b00 100644 --- a/dists/iphone/Info.plist +++ b/dists/iphone/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.0git + 1.6.0git CFBundleSignature ???? CFBundleVersion - 1.5.0git + 1.6.0git CFBundleIconFile icon.png CFBundleIconFiles diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec index 2e099d94a8..bbdf31cc2c 100644 --- a/dists/irix/scummvm.spec +++ b/dists/irix/scummvm.spec @@ -1,5 +1,5 @@ product scummvm - id "ScummVM 1.5.0git" + id "ScummVM 1.6.0git" image sw id "software" version 18 diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist index 94adc00a9b..d8c28f6a08 100644 --- a/dists/macosx/Info.plist +++ b/dists/macosx/Info.plist @@ -28,7 +28,7 @@ CFBundleExecutable scummvm CFBundleGetInfoString - 1.5.0git, Copyright 2001-2012 The ScummVM team + 1.6.0git, Copyright 2001-2012 The ScummVM team CFBundleIconFile scummvm.icns CFBundleIdentifier @@ -40,9 +40,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.5.0git + 1.6.0git CFBundleVersion - 1.5.0git + 1.6.0git NSPrincipalClass NSApplication NSHumanReadableCopyright diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml index 896210bf01..b759c311ba 100644 --- a/dists/openpandora/PXML.xml +++ b/dists/openpandora/PXML.xml @@ -4,11 +4,11 @@ - + - ScummVM 1.5.0git + ScummVM 1.6.0git - ScummVM 1.5.0git + ScummVM 1.6.0git @@ -25,7 +25,7 @@ - + ScummVM diff --git a/dists/openpandora/README-OPENPANDORA b/dists/openpandora/README-OPENPANDORA index b3947975c0..e3c7c9d631 100644 --- a/dists/openpandora/README-OPENPANDORA +++ b/dists/openpandora/README-OPENPANDORA @@ -1,4 +1,4 @@ -ScummVM 1.5.0git - OPENPANDORA SPECIFIC README +ScummVM 1.6.0git - OPENPANDORA SPECIFIC README ------------------------------------------------------------------------ Please refer to the: diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt index 240936f755..594ad293ed 100644 --- a/dists/openpandora/README-PND.txt +++ b/dists/openpandora/README-PND.txt @@ -1,4 +1,4 @@ -ScummVM 1.5.0git - OPENPANDORA README - HOW TO INSTALL +ScummVM 1.6.0git - OPENPANDORA README - HOW TO INSTALL ------------------------------------------------------------------------ Please refer to the: diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html index d7238c1889..5da951546c 100644 --- a/dists/openpandora/index.html +++ b/dists/openpandora/index.html @@ -5,7 +5,7 @@

-

ScummVM 1.5.0git: OpenPandora Specific Documentation

+

ScummVM 1.6.0git: OpenPandora Specific Documentation

ScummVM OpenPandora README
@@ -13,7 +13,7 @@ ScummVM OpenPandora WiKi

-

ScummVM 1.5.0git: General Documentation

+

ScummVM 1.6.0git: General Documentation

ScummVM website
diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec index 99add8ba85..2f65931a70 100644 --- a/dists/redhat/scummvm-tools.spec +++ b/dists/redhat/scummvm-tools.spec @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm-tools -Version : 1.5.0git +Version : 1.6.0git Release : 1 Summary : ScummVM-related tools Group : Interpreters diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec index 2ccccae79d..d80404a3c6 100644 --- a/dists/redhat/scummvm.spec +++ b/dists/redhat/scummvm.spec @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm -Version : 1.5.0git +Version : 1.6.0git Release : 1 Summary : Graphic adventure game interpreter Group : Interpreters diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 6f24b8797d..4a67100f9f 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -49,8 +49,8 @@ pred.dic FILE "dists/pred.dic" #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,0,0 - PRODUCTVERSION 1,5,0,0 + FILEVERSION 1,6,0,0 + PRODUCTVERSION 1,6,0,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK #ifdef _DEBUG FILEFLAGS VS_FF_DEBUG @@ -67,13 +67,13 @@ BEGIN BEGIN VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0" VALUE "FileDescription", "http://www.scummvm.org/\0" - VALUE "FileVersion", "1.5.0git\0" + VALUE "FileVersion", "1.6.0git\0" VALUE "InternalName", "scummvm\0" VALUE "LegalCopyright", "Copyright 2001-2012 The ScummVM Team\0" VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0" VALUE "OriginalFilename", "scummvm.exe\0" VALUE "ProductName", "ScummVM\0" - VALUE "ProductVersion", "1.5.0git\0" + VALUE "ProductVersion", "1.6.0git\0" END END diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild index 4ccc2a8995..076a1d20ea 100755 --- a/dists/slackware/scummvm.SlackBuild +++ b/dists/slackware/scummvm.SlackBuild @@ -9,7 +9,7 @@ if [ "$TMP" = "" ]; then fi PKG=$TMP/package-scummvm -VERSION=1.5.0git +VERSION=1.6.0git ARCH=i486 BUILD=1 diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml index e843d36e79..5a4c46e144 100644 --- a/dists/wii/meta.xml +++ b/dists/wii/meta.xml @@ -2,7 +2,7 @@ ScummVM The ScummVM Team - 1.5.0git@REVISION@ + 1.6.0git@REVISION@ @TIMESTAMP@ Point & Click Adventures ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed! diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi index 7ff174befb..795eb660b6 100644 --- a/dists/win32/scummvm.nsi +++ b/dists/win32/scummvm.nsi @@ -72,7 +72,7 @@ Name ScummVM # General Symbol Definitions ######################################################################################### !define REGKEY "Software\$(^Name)\$(^Name)" -!define VERSION "1.5.0git" +!define VERSION "1.6.0git" !define COMPANY "ScummVM Team" !define URL "http://scummvm.org/" !define DESCRIPTION "ScummVM Installer. Look! A three headed monkey (TM)!" @@ -92,7 +92,7 @@ XPStyle on #TargetMinimalOS 5.0 ; Minimal version of windows for installer: Windows 2000 or more recent ; (will build unicode installer with NSIS 2.50+) -VIProductVersion 1.5.0.0 +VIProductVersion 1.6.0.0 VIAddVersionKey ProductName $(^Name) VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}" -- cgit v1.2.3 From ccd1553f60680daf49f9237b718e9013cc3c3f97 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 8 Jul 2012 22:39:18 +0200 Subject: NEWS: Remove OpenGL entry in 1.5.0 news section. --- NEWS | 3 --- 1 file changed, 3 deletions(-) diff --git a/NEWS b/NEWS index 443306fbfd..40d98f294f 100644 --- a/NEWS +++ b/NEWS @@ -30,9 +30,6 @@ For a more comprehensive changelog of the latest experimental code, see: - Improved predictive dialog look. - Various GUI improvements. - SDL ports: - - Added support for OpenGL (GSoC Task). - Broken Sword 1: - Fixed incorrect sound effects in the DOS/Windows demo. - Added support for PlayStation videos. -- cgit v1.2.3 From 4635d83864b651292e7c7eb9be0687c0c742f061 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 8 Jul 2012 22:55:53 +0100 Subject: I18N: Update Swedish translation from patch #3541394 --- po/se_SE.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/se_SE.po b/po/se_SE.po index 880b198895..8388e55370 100644 --- a/po/se_SE.po +++ b/po/se_SE.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ScummVM 1.5.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-07-08 12:25+0100\n" -"PO-Revision-Date: 2012-06-28 15:47+0100\n" +"PO-Revision-Date: 2012-07-08 18:03+0100\n" "Last-Translator: Hampus Flink \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -2186,7 +2186,6 @@ msgid "Choose Spell" msgstr "Vlj trollformel" #: engines/kyra/sound_midi.cpp:475 -#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2194,10 +2193,10 @@ msgid "" "General MIDI ones. It is still possible that\n" "some tracks sound incorrect." msgstr "" -"Du verkar anvnda en General MIDI enhet\n" +"Du verkar anvnda en General MIDI-enhet,\n" "men ditt spel stder endast Roland MT32 MIDI.\n" -"Vi frsker kartlgga Roland MT32 instrument fr\n" -"General MIDI instrument. Det kan trots allt hnda\n" +"Vi frsker kartlgga Roland MT32-instrumenten till\n" +"General MIDI-instrument. Det kan trots allt hnda\n" "att ett ftal ljudspr inte spelas korrekt." #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 -- cgit v1.2.3 From c40294fdcc64c2e78f0f5ef95e074b6ebf1070c6 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 8 Jul 2012 22:56:49 +0100 Subject: I18N: Update Spanish translation from patch #3541399 --- po/es_ES.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/es_ES.po b/po/es_ES.po index fffd190695..8e23894dcf 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ScummVM 1.4.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-07-08 12:25+0100\n" -"PO-Revision-Date: 2012-06-22 17:44+0100\n" +"PO-Revision-Date: 2012-07-08 18:19+0100\n" "Last-Translator: Toms Maidagan\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -2190,7 +2190,6 @@ msgid "Choose Spell" msgstr "Elegir hechizo" #: engines/kyra/sound_midi.cpp:475 -#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2198,11 +2197,11 @@ msgid "" "General MIDI ones. It is still possible that\n" "some tracks sound incorrect." msgstr "" -"Ests usando un dispositivo General Midi, pero el\n" +"Ests usando un dispositivo General MIDI, pero el\n" "juego solo es compatible con MIDI Roland MT32.\n" "Intentamos adaptar los instrumentos Roland MT32\n" "a los de General MIDI, pero es posible que algunas\n" -"de las pistas no se reproduzcan correctamente." +"de las pistas no suenen correctamente." #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 msgid "Floppy intro" -- cgit v1.2.3 From d2db9c1253580646e2b8f15eec7dc3b423292399 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 8 Jul 2012 22:58:06 +0100 Subject: I18N: Regenerate translations data file --- gui/themes/translations.dat | Bin 340460 -> 340940 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat index 97d69b400c..934aaeaebe 100644 Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ -- cgit v1.2.3 From 078c09c13e5ffa2266bccfd85c38a93d730a02e6 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Mon, 9 Jul 2012 01:27:39 +0300 Subject: SCI: Update comments in kGetAngleWorker() --- engines/sci/engine/kmath.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/engines/sci/engine/kmath.cpp b/engines/sci/engine/kmath.cpp index 05c8845288..a643fbe37a 100644 --- a/engines/sci/engine/kmath.cpp +++ b/engines/sci/engine/kmath.cpp @@ -89,6 +89,9 @@ uint16 kGetAngleWorker(int16 x1, int16 y1, int16 x2, int16 y2) { // differences from the original, which uses custom implementation of atan(). // The differences in the return values are the cause of bug #3540976 // and perhaps bug #3037267 as well. + // The results of this function match the expected results of SCI0, but not + // SCI1 (hence the bug in Longbow). We need to find the point in history + // when this function was changed. // HACK: Return the expected value for Longbow, scene 150 (bug #3540976). // This is a temporary solution, till the function returns the expected @@ -128,7 +131,6 @@ uint16 kGetAngleWorker(int16 x1, int16 y1, int16 x2, int16 y2) { // Convert from grads to degrees by merging grad 0 with grad 1, // grad 10 with grad 11, grad 20 with grad 21, etc. This leads to // "degrees" that equal either one or two grads. - // This subtraction is meant to change from 400 "degrees" into 360 degrees angle -= (angle + 9) / 10; return angle; } -- cgit v1.2.3 From b8354e27ae1c81578d9ac279dcba9bf09ccec058 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Mon, 9 Jul 2012 01:31:25 +0300 Subject: TINSEL: Fix bug #3541230 - "DW: PSX version locks up after using the book" Removed the superfluous MIDI offset storing code. Now, the MIDI buffer is re-read when the music loops. This removes a static variable and also fixes another bug in the SEQ decoder. --- engines/tinsel/music.cpp | 95 ++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 52 deletions(-) diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index fa5334a033..a226feb656 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -140,7 +140,6 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { } // the index and length of the last tune loaded - static uint32 dwLastMidiIndex = 0; // FIXME: Avoid non-const global vars uint32 dwSeqLen = 0; // length of the sequence // Support for external music from the music enhancement project @@ -181,61 +180,53 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { if (dwFileOffset == 0) return true; - if (dwFileOffset != dwLastMidiIndex) { - Common::File midiStream; - - // open MIDI sequence file in binary mode - if (!midiStream.open(MIDI_FILE)) - error(CANNOT_FIND_FILE, MIDI_FILE); - - // update index of last tune loaded - dwLastMidiIndex = dwFileOffset; - - // move to correct position in the file - midiStream.seek(dwFileOffset, SEEK_SET); - - // read the length of the sequence - dwSeqLen = midiStream.readUint32LE(); - - // make sure buffer is large enough for this sequence - assert(dwSeqLen > 0 && dwSeqLen <= g_midiBuffer.size); - - // stop any currently playing tune - _vm->_midiMusic->stop(); - - // read the sequence - if (midiStream.read(g_midiBuffer.pDat, dwSeqLen) != dwSeqLen) - error(FILE_IS_CORRUPT, MIDI_FILE); - - midiStream.close(); - - // WORKAROUND for bug #2820054 "DW1: No intro music at first start on Wii", - // which actually affects all ports, since it's specific to the GRA version. - // - // The GRA version does not seem to set the channel volume at all for the first - // intro track, thus we need to do that here. We only initialize the channels - // used in that sequence. And we are using 127 as default channel volume. - // - // Only in the GRA version dwFileOffset can be "38888", just to be sure, we - // check for the SCN files feature flag not being set though. - if (_vm->getGameID() == GID_DW1 && dwFileOffset == 38888 && !(_vm->getFeatures() & GF_SCNFILES)) { - _vm->_midiMusic->send(0x7F07B0 | 3); - _vm->_midiMusic->send(0x7F07B0 | 5); - _vm->_midiMusic->send(0x7F07B0 | 8); - _vm->_midiMusic->send(0x7F07B0 | 10); - _vm->_midiMusic->send(0x7F07B0 | 13); - } + Common::File midiStream; + + // open MIDI sequence file in binary mode + if (!midiStream.open(MIDI_FILE)) + error(CANNOT_FIND_FILE, MIDI_FILE); - _vm->_midiMusic->playMIDI(dwSeqLen, bLoop); + // move to correct position in the file + midiStream.seek(dwFileOffset, SEEK_SET); - // Store the length - //dwLastSeqLen = dwSeqLen; - } else { - // dwFileOffset == dwLastMidiIndex - _vm->_midiMusic->stop(); - _vm->_midiMusic->playMIDI(dwSeqLen, bLoop); + // read the length of the sequence + dwSeqLen = midiStream.readUint32LE(); + + // make sure buffer is large enough for this sequence + assert(dwSeqLen > 0 && dwSeqLen <= g_midiBuffer.size); + + // stop any currently playing tune + _vm->_midiMusic->stop(); + + // read the sequence. This needs to be read again before playSEQ() is + // called even if the music is restarting, as playSEQ() reads the file + // name off the buffer itself. However, that function adds SMF headers + // to the buffer, thus if it's read again, the SMF headers will be read + // and the filename will always be 'MThd'. + if (midiStream.read(g_midiBuffer.pDat, dwSeqLen) != dwSeqLen) + error(FILE_IS_CORRUPT, MIDI_FILE); + + midiStream.close(); + + // WORKAROUND for bug #2820054 "DW1: No intro music at first start on Wii", + // which actually affects all ports, since it's specific to the GRA version. + // + // The GRA version does not seem to set the channel volume at all for the first + // intro track, thus we need to do that here. We only initialize the channels + // used in that sequence. And we are using 127 as default channel volume. + // + // Only in the GRA version dwFileOffset can be "38888", just to be sure, we + // check for the SCN files feature flag not being set though. + if (_vm->getGameID() == GID_DW1 && dwFileOffset == 38888 && !(_vm->getFeatures() & GF_SCNFILES)) { + _vm->_midiMusic->send(0x7F07B0 | 3); + _vm->_midiMusic->send(0x7F07B0 | 5); + _vm->_midiMusic->send(0x7F07B0 | 8); + _vm->_midiMusic->send(0x7F07B0 | 10); + _vm->_midiMusic->send(0x7F07B0 | 13); } + _vm->_midiMusic->playMIDI(dwSeqLen, bLoop); + return true; } -- cgit v1.2.3 From bed2eb20cdcfccc3bf1e9b24f7466b678332d601 Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Mon, 9 Jul 2012 09:11:31 +0200 Subject: MOHAWK: Restart anims when LiveText plays them. --- engines/mohawk/livingbooks.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index 7f7df66e53..a0671d18d5 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -3464,7 +3464,7 @@ void LBLiveTextItem::update() { // TODO: check this in RE LBItem *item = _vm->getItemById(_words[_currentWord].itemId); if (item) - item->togglePlaying(false); + item->togglePlaying(false, true); _currentWord = 0xFFFF; } -- cgit v1.2.3 From 19bd379e8bcceb3287673cbfd0388b733ced778f Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 9 Jul 2012 12:38:50 +0100 Subject: I18N: Update Hungarian translation from patch #3541507 --- po/hu_HU.po | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/po/hu_HU.po b/po/hu_HU.po index 29ad6c3aeb..828659dea6 100644 --- a/po/hu_HU.po +++ b/po/hu_HU.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-07-08 12:25+0100\n" -"PO-Revision-Date: 2012-06-25 06:21+0100\n" +"PO-Revision-Date: 2012-07-09 05:58+0100\n" "Last-Translator: George Kormendi \n" "Language-Team: Hungarian\n" "MIME-Version: 1.0\n" @@ -2178,7 +2178,6 @@ msgid "Choose Spell" msgstr "Vlassz varzslatot" #: engines/kyra/sound_midi.cpp:475 -#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2186,11 +2185,11 @@ msgid "" "General MIDI ones. It is still possible that\n" "some tracks sound incorrect." msgstr "" -"gy nz ki egy General MIDI eszkzt hasznlsz,\n" -"a jtk csak Roland MT32 MIDI eszkzt tmogat.\n" -"Cserld ki Roland MT32 hangszerekre\n" -"a General MIDI-t. Klnben nhny\n" -"svot nem lehet rendesen lejtszani." +"gy tnik, egy General MIDI eszkzt hasznlsz,\n" +"de a jtk csak Roland MT32 MIDI eszkzt tmogat.\n" +"Megprbljuk lecserlni a Roland MT32 hangszereket\n" +"General MIDIre. Tovbbra is lehetsges hogy\n" +"nhny hangsv helytelenl hangzik." #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 msgid "Floppy intro" -- cgit v1.2.3 From 9a90f316dc29a37234a46457b4593aaddc24fa4c Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 9 Jul 2012 12:39:41 +0100 Subject: I18N: Update Italian translation This was sent by Matteo by email. --- po/it_IT.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/it_IT.po b/po/it_IT.po index d4f8256c83..164171ce8f 100644 --- a/po/it_IT.po +++ b/po/it_IT.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-07-08 12:25+0100\n" -"PO-Revision-Date: 2012-06-29 14:33+0100\n" +"PO-Revision-Date: 2012-07-09 09:30+0100\n" "Last-Translator: Matteo 'Maff' Angelino \n" "Language-Team: Italian\n" "MIME-Version: 1.0\n" @@ -2194,7 +2194,6 @@ msgid "Choose Spell" msgstr "Scegli incantesimo" #: engines/kyra/sound_midi.cpp:475 -#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2206,7 +2205,7 @@ msgstr "" "General MIDI, ma il gioco supporta solo Roland\n" "MT32 MIDI. Tenteremo di mappare gli strumenti\n" "Roland MT32 in quelli General MIDI. Alcune tracce\n" -"potrebbero non essere riprodotte correttamente." +"potrebbero avere un suono non corretto." #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 msgid "Floppy intro" -- cgit v1.2.3 From 1153133627d2d3c4a7cc02963051992bbfc00345 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Mon, 9 Jul 2012 12:40:09 +0100 Subject: I18N: Regenerate translations data file --- gui/themes/translations.dat | Bin 340940 -> 341409 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat index 934aaeaebe..9735e99fca 100644 Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ -- cgit v1.2.3 From bc0bd33d4dfd448db989e84bcc67e54183b21e39 Mon Sep 17 00:00:00 2001 From: Steffen Nyeland Date: Mon, 9 Jul 2012 20:30:32 +0200 Subject: Updated da_DA file --- po/da_DA.po | 769 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 438 insertions(+), 331 deletions(-) diff --git a/po/da_DA.po b/po/da_DA.po index d3a39db440..c2d55f82cd 100644 --- a/po/da_DA.po +++ b/po/da_DA.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: ScummVM 1.3.0svn\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-07-08 12:25+0100\n" -"PO-Revision-Date: 2012-06-29 19:45+0100\n" +"PO-Revision-Date: 2012-07-09 20:27+0100\n" "Last-Translator: Steffen Nyeland \n" "Language-Team: Steffen Nyeland \n" "MIME-Version: 1.0\n" @@ -35,7 +35,8 @@ msgstr "Tilg msgid "Go up" msgstr "G op" -#: gui/browser.cpp:66 gui/browser.cpp:68 +#: gui/browser.cpp:66 +#: gui/browser.cpp:68 msgid "Go to previous directory level" msgstr "G til forrige biblioteks niveau" @@ -44,24 +45,37 @@ msgctxt "lowres" msgid "Go up" msgstr "G op" -#: gui/browser.cpp:69 gui/chooser.cpp:45 gui/KeysDialog.cpp:43 -#: gui/launcher.cpp:345 gui/massadd.cpp:94 gui/options.cpp:1228 -#: gui/saveload.cpp:64 gui/saveload.cpp:173 gui/themebrowser.cpp:54 -#: engines/engine.cpp:442 engines/scumm/dialogs.cpp:190 -#: engines/sword1/control.cpp:865 engines/parallaction/saveload.cpp:274 +#: gui/browser.cpp:69 +#: gui/chooser.cpp:45 +#: gui/KeysDialog.cpp:43 +#: gui/launcher.cpp:345 +#: gui/massadd.cpp:94 +#: gui/options.cpp:1228 +#: gui/saveload.cpp:64 +#: gui/saveload.cpp:173 +#: gui/themebrowser.cpp:54 +#: engines/engine.cpp:442 +#: engines/scumm/dialogs.cpp:190 +#: engines/sword1/control.cpp:865 +#: engines/parallaction/saveload.cpp:274 #: backends/platform/wii/options.cpp:48 #: backends/events/default/default-events.cpp:191 #: backends/events/default/default-events.cpp:213 msgid "Cancel" msgstr "Fortryd" -#: gui/browser.cpp:70 gui/chooser.cpp:46 gui/themebrowser.cpp:55 +#: gui/browser.cpp:70 +#: gui/chooser.cpp:46 +#: gui/themebrowser.cpp:55 msgid "Choose" msgstr "Vlg" -#: gui/gui-manager.cpp:115 engines/scumm/help.cpp:125 -#: engines/scumm/help.cpp:140 engines/scumm/help.cpp:165 -#: engines/scumm/help.cpp:191 engines/scumm/help.cpp:209 +#: gui/gui-manager.cpp:115 +#: engines/scumm/help.cpp:125 +#: engines/scumm/help.cpp:140 +#: engines/scumm/help.cpp:165 +#: engines/scumm/help.cpp:191 +#: engines/scumm/help.cpp:209 #: backends/keymapper/remap-dialog.cpp:52 msgid "Close" msgstr "Luk" @@ -70,19 +84,23 @@ msgstr "Luk" msgid "Mouse click" msgstr "Muse klik" -#: gui/gui-manager.cpp:122 base/main.cpp:300 +#: gui/gui-manager.cpp:122 +#: base/main.cpp:300 msgid "Display keyboard" msgstr "Vis tastatur" -#: gui/gui-manager.cpp:126 base/main.cpp:304 +#: gui/gui-manager.cpp:126 +#: base/main.cpp:304 msgid "Remap keys" msgstr "Kortlg taster" -#: gui/gui-manager.cpp:129 base/main.cpp:307 +#: gui/gui-manager.cpp:129 +#: base/main.cpp:307 msgid "Toggle FullScreen" msgstr "Skift fuldskrm" -#: gui/KeysDialog.h:36 gui/KeysDialog.cpp:145 +#: gui/KeysDialog.h:36 +#: gui/KeysDialog.cpp:145 msgid "Choose an action to map" msgstr "Vlg en handling at kortlgge" @@ -90,17 +108,31 @@ msgstr "V msgid "Map" msgstr "Kortlg" -#: gui/KeysDialog.cpp:42 gui/launcher.cpp:346 gui/launcher.cpp:1001 -#: gui/launcher.cpp:1005 gui/massadd.cpp:91 gui/options.cpp:1229 -#: engines/engine.cpp:361 engines/engine.cpp:372 engines/scumm/dialogs.cpp:192 -#: engines/scumm/scumm.cpp:1775 engines/agos/animation.cpp:561 -#: engines/groovie/script.cpp:420 engines/sky/compact.cpp:131 -#: engines/sky/compact.cpp:141 engines/sword1/animation.cpp:539 -#: engines/sword1/animation.cpp:560 engines/sword1/animation.cpp:570 -#: engines/sword1/animation.cpp:577 engines/sword1/control.cpp:865 -#: engines/sword1/logic.cpp:1633 engines/sword2/animation.cpp:435 -#: engines/sword2/animation.cpp:455 engines/sword2/animation.cpp:465 -#: engines/sword2/animation.cpp:474 engines/parallaction/saveload.cpp:274 +#: gui/KeysDialog.cpp:42 +#: gui/launcher.cpp:346 +#: gui/launcher.cpp:1001 +#: gui/launcher.cpp:1005 +#: gui/massadd.cpp:91 +#: gui/options.cpp:1229 +#: engines/engine.cpp:361 +#: engines/engine.cpp:372 +#: engines/scumm/dialogs.cpp:192 +#: engines/scumm/scumm.cpp:1775 +#: engines/agos/animation.cpp:561 +#: engines/groovie/script.cpp:420 +#: engines/sky/compact.cpp:131 +#: engines/sky/compact.cpp:141 +#: engines/sword1/animation.cpp:539 +#: engines/sword1/animation.cpp:560 +#: engines/sword1/animation.cpp:570 +#: engines/sword1/animation.cpp:577 +#: engines/sword1/control.cpp:865 +#: engines/sword1/logic.cpp:1633 +#: engines/sword2/animation.cpp:435 +#: engines/sword2/animation.cpp:455 +#: engines/sword2/animation.cpp:465 +#: engines/sword2/animation.cpp:474 +#: engines/parallaction/saveload.cpp:274 #: backends/platform/wii/options.cpp:47 #: backends/platform/wince/CELauncherDialog.cpp:54 msgid "OK" @@ -110,12 +142,16 @@ msgstr "OK" msgid "Select an action and click 'Map'" msgstr "Vlg en handling og klik 'Kortlg'" -#: gui/KeysDialog.cpp:80 gui/KeysDialog.cpp:102 gui/KeysDialog.cpp:141 +#: gui/KeysDialog.cpp:80 +#: gui/KeysDialog.cpp:102 +#: gui/KeysDialog.cpp:141 #, c-format msgid "Associated key : %s" msgstr "Tilknyttet tast : %s" -#: gui/KeysDialog.cpp:82 gui/KeysDialog.cpp:104 gui/KeysDialog.cpp:143 +#: gui/KeysDialog.cpp:82 +#: gui/KeysDialog.cpp:104 +#: gui/KeysDialog.cpp:143 #, c-format msgid "Associated key : none" msgstr "Tilknyttet tast : ingen" @@ -136,13 +172,11 @@ msgstr "Spil" msgid "ID:" msgstr "ID:" -#: gui/launcher.cpp:191 gui/launcher.cpp:193 gui/launcher.cpp:194 -msgid "" -"Short game identifier used for referring to savegames and running the game " -"from the command line" -msgstr "" -"Kort spil identifikator til brug for gemmer, og for at kre spillet fra " -"kommandolinien" +#: gui/launcher.cpp:191 +#: gui/launcher.cpp:193 +#: gui/launcher.cpp:194 +msgid "Short game identifier used for referring to savegames and running the game from the command line" +msgstr "Kort spil identifikator til brug for gemmer, og for at kre spillet fra kommandolinien" #: gui/launcher.cpp:193 msgctxt "lowres" @@ -153,7 +187,9 @@ msgstr "ID:" msgid "Name:" msgstr "Navn:" -#: gui/launcher.cpp:198 gui/launcher.cpp:200 gui/launcher.cpp:201 +#: gui/launcher.cpp:198 +#: gui/launcher.cpp:200 +#: gui/launcher.cpp:201 msgid "Full title of the game" msgstr "Fuld titel p spillet" @@ -166,16 +202,17 @@ msgstr "Navn:" msgid "Language:" msgstr "Sprog:" -#: gui/launcher.cpp:204 gui/launcher.cpp:205 -msgid "" -"Language of the game. This will not turn your Spanish game version into " -"English" -msgstr "" -"Spillets sprog. Dette vil ikke ndre din spanske version af spillet til " -"engelsk" +#: gui/launcher.cpp:204 +#: gui/launcher.cpp:205 +msgid "Language of the game. This will not turn your Spanish game version into English" +msgstr "Spillets sprog. Dette vil ikke ndre din spanske version af spillet til engelsk" -#: gui/launcher.cpp:206 gui/launcher.cpp:220 gui/options.cpp:80 -#: gui/options.cpp:730 gui/options.cpp:743 gui/options.cpp:1199 +#: gui/launcher.cpp:206 +#: gui/launcher.cpp:220 +#: gui/options.cpp:80 +#: gui/options.cpp:730 +#: gui/options.cpp:743 +#: gui/options.cpp:1199 #: audio/null.cpp:40 msgid "" msgstr "" @@ -184,7 +221,9 @@ msgstr "" msgid "Platform:" msgstr "Platform:" -#: gui/launcher.cpp:216 gui/launcher.cpp:218 gui/launcher.cpp:219 +#: gui/launcher.cpp:216 +#: gui/launcher.cpp:218 +#: gui/launcher.cpp:219 msgid "Platform the game was originally designed for" msgstr "Platform som spillet oprindeligt var designet til" @@ -197,11 +236,15 @@ msgstr "Platform:" msgid "Engine" msgstr "Motor" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 +#: gui/options.cpp:1062 +#: gui/options.cpp:1079 msgid "Graphics" msgstr "Grafik" -#: gui/launcher.cpp:239 gui/options.cpp:1062 gui/options.cpp:1079 +#: gui/launcher.cpp:239 +#: gui/options.cpp:1062 +#: gui/options.cpp:1079 msgid "GFX" msgstr "GFX" @@ -214,7 +257,8 @@ msgctxt "lowres" msgid "Override global graphic settings" msgstr "Overstyr globale grafik indstillinger" -#: gui/launcher.cpp:251 gui/options.cpp:1085 +#: gui/launcher.cpp:251 +#: gui/options.cpp:1085 msgid "Audio" msgstr "Lyd" @@ -227,11 +271,13 @@ msgctxt "lowres" msgid "Override global audio settings" msgstr "Overstyr globale lyd indstillinger" -#: gui/launcher.cpp:265 gui/options.cpp:1090 +#: gui/launcher.cpp:265 +#: gui/options.cpp:1090 msgid "Volume" msgstr "Lydstyrke" -#: gui/launcher.cpp:267 gui/options.cpp:1092 +#: gui/launcher.cpp:267 +#: gui/options.cpp:1092 msgctxt "lowres" msgid "Volume" msgstr "Lydstyrke" @@ -245,7 +291,8 @@ msgctxt "lowres" msgid "Override global volume settings" msgstr "Overstyr globale lydstyrke indstillinger" -#: gui/launcher.cpp:280 gui/options.cpp:1100 +#: gui/launcher.cpp:280 +#: gui/options.cpp:1100 msgid "MIDI" msgstr "MIDI" @@ -258,7 +305,8 @@ msgctxt "lowres" msgid "Override global MIDI settings" msgstr "Overstyr globale MIDI indstillinger" -#: gui/launcher.cpp:294 gui/options.cpp:1106 +#: gui/launcher.cpp:294 +#: gui/options.cpp:1106 msgid "MT-32" msgstr "MT-32" @@ -271,11 +319,13 @@ msgctxt "lowres" msgid "Override global MT-32 settings" msgstr "Overstyr globale MT-32 indstillinger" -#: gui/launcher.cpp:308 gui/options.cpp:1113 +#: gui/launcher.cpp:308 +#: gui/options.cpp:1113 msgid "Paths" msgstr "Stier" -#: gui/launcher.cpp:310 gui/options.cpp:1115 +#: gui/launcher.cpp:310 +#: gui/options.cpp:1115 msgctxt "lowres" msgid "Paths" msgstr "Stier" @@ -289,54 +339,80 @@ msgctxt "lowres" msgid "Game Path:" msgstr "Spil sti:" -#: gui/launcher.cpp:324 gui/options.cpp:1139 +#: gui/launcher.cpp:324 +#: gui/options.cpp:1139 msgid "Extra Path:" msgstr "Ekstra sti:" -#: gui/launcher.cpp:324 gui/launcher.cpp:326 gui/launcher.cpp:327 +#: gui/launcher.cpp:324 +#: gui/launcher.cpp:326 +#: gui/launcher.cpp:327 msgid "Specifies path to additional data used the game" msgstr "Angiver sti til ekstra data der bruges i spillet" -#: gui/launcher.cpp:326 gui/options.cpp:1141 +#: gui/launcher.cpp:326 +#: gui/options.cpp:1141 msgctxt "lowres" msgid "Extra Path:" msgstr "Ekstra sti:" -#: gui/launcher.cpp:333 gui/options.cpp:1123 +#: gui/launcher.cpp:333 +#: gui/options.cpp:1123 msgid "Save Path:" msgstr "Gemme sti:" -#: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 -#: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 +#: gui/launcher.cpp:333 +#: gui/launcher.cpp:335 +#: gui/launcher.cpp:336 +#: gui/options.cpp:1123 +#: gui/options.cpp:1125 +#: gui/options.cpp:1126 msgid "Specifies where your savegames are put" msgstr "Angiver hvor dine gemmer bliver lagt" -#: gui/launcher.cpp:335 gui/options.cpp:1125 +#: gui/launcher.cpp:335 +#: gui/options.cpp:1125 msgctxt "lowres" msgid "Save Path:" msgstr "Gemme sti:" -#: gui/launcher.cpp:354 gui/launcher.cpp:453 gui/launcher.cpp:511 -#: gui/launcher.cpp:565 gui/options.cpp:1134 gui/options.cpp:1142 -#: gui/options.cpp:1151 gui/options.cpp:1258 gui/options.cpp:1264 -#: gui/options.cpp:1272 gui/options.cpp:1302 gui/options.cpp:1308 -#: gui/options.cpp:1315 gui/options.cpp:1408 gui/options.cpp:1411 +#: gui/launcher.cpp:354 +#: gui/launcher.cpp:453 +#: gui/launcher.cpp:511 +#: gui/launcher.cpp:565 +#: gui/options.cpp:1134 +#: gui/options.cpp:1142 +#: gui/options.cpp:1151 +#: gui/options.cpp:1258 +#: gui/options.cpp:1264 +#: gui/options.cpp:1272 +#: gui/options.cpp:1302 +#: gui/options.cpp:1308 +#: gui/options.cpp:1315 +#: gui/options.cpp:1408 +#: gui/options.cpp:1411 #: gui/options.cpp:1423 msgctxt "path" msgid "None" msgstr "Ingen" -#: gui/launcher.cpp:359 gui/launcher.cpp:459 gui/launcher.cpp:569 -#: gui/options.cpp:1252 gui/options.cpp:1296 gui/options.cpp:1414 +#: gui/launcher.cpp:359 +#: gui/launcher.cpp:459 +#: gui/launcher.cpp:569 +#: gui/options.cpp:1252 +#: gui/options.cpp:1296 +#: gui/options.cpp:1414 #: backends/platform/wii/options.cpp:56 msgid "Default" msgstr "Standard" -#: gui/launcher.cpp:504 gui/options.cpp:1417 +#: gui/launcher.cpp:504 +#: gui/options.cpp:1417 msgid "Select SoundFont" msgstr "Vlg SoundFont" -#: gui/launcher.cpp:523 gui/launcher.cpp:677 +#: gui/launcher.cpp:523 +#: gui/launcher.cpp:677 msgid "Select directory with game data" msgstr "Vlg bibliotek med spil data" @@ -352,11 +428,13 @@ msgstr "V msgid "This game ID is already taken. Please choose another one." msgstr "Dette spil ID er allerede i brug. Vlg venligst et andet." -#: gui/launcher.cpp:621 engines/dialogs.cpp:110 +#: gui/launcher.cpp:621 +#: engines/dialogs.cpp:110 msgid "~Q~uit" msgstr "~A~fslut" -#: gui/launcher.cpp:621 backends/platform/sdl/macosx/appmenu_osx.mm:96 +#: gui/launcher.cpp:621 +#: backends/platform/sdl/macosx/appmenu_osx.mm:96 msgid "Quit ScummVM" msgstr "Slut ScummVM" @@ -364,7 +442,8 @@ msgstr "Slut ScummVM" msgid "A~b~out..." msgstr "~O~m..." -#: gui/launcher.cpp:622 backends/platform/sdl/macosx/appmenu_osx.mm:70 +#: gui/launcher.cpp:622 +#: backends/platform/sdl/macosx/appmenu_osx.mm:70 msgid "About ScummVM" msgstr "Om ScummVM" @@ -392,11 +471,13 @@ msgstr "Ind~l~ msgid "Load savegame for selected game" msgstr "Indls gemmer for det valgte spil" -#: gui/launcher.cpp:633 gui/launcher.cpp:1120 +#: gui/launcher.cpp:633 +#: gui/launcher.cpp:1120 msgid "~A~dd Game..." msgstr "~T~ilfj spil..." -#: gui/launcher.cpp:633 gui/launcher.cpp:640 +#: gui/launcher.cpp:633 +#: gui/launcher.cpp:640 msgid "Hold Shift for Mass Add" msgstr "Hold Skift for at tilfje flere" @@ -404,7 +485,8 @@ msgstr "Hold Skift for at tilf msgid "~E~dit Game..." msgstr "~R~ediger spil..." -#: gui/launcher.cpp:635 gui/launcher.cpp:642 +#: gui/launcher.cpp:635 +#: gui/launcher.cpp:642 msgid "Change game options" msgstr "ndre spil indstillinger" @@ -412,11 +494,13 @@ msgstr " msgid "~R~emove Game" msgstr "~F~jern spil" -#: gui/launcher.cpp:637 gui/launcher.cpp:644 +#: gui/launcher.cpp:637 +#: gui/launcher.cpp:644 msgid "Remove game from the list. The game data files stay intact" msgstr "Fjerner spil fra listen. Spillets data filer forbliver uberrt" -#: gui/launcher.cpp:640 gui/launcher.cpp:1120 +#: gui/launcher.cpp:640 +#: gui/launcher.cpp:1120 msgctxt "lowres" msgid "~A~dd Game..." msgstr "~T~ilfj spil..." @@ -435,31 +519,36 @@ msgstr "~F~jern spil" msgid "Search in game list" msgstr "Sg i spil liste" -#: gui/launcher.cpp:656 gui/launcher.cpp:1167 +#: gui/launcher.cpp:656 +#: gui/launcher.cpp:1167 msgid "Search:" msgstr "Sg:" -#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/mohawk/myst.cpp:255 -#: engines/mohawk/riven.cpp:716 engines/cruise/menu.cpp:214 +#: gui/launcher.cpp:680 +#: engines/dialogs.cpp:114 +#: engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:716 +#: engines/cruise/menu.cpp:214 msgid "Load game:" msgstr "Indls spil:" -#: gui/launcher.cpp:680 engines/dialogs.cpp:114 engines/scumm/dialogs.cpp:188 -#: engines/mohawk/myst.cpp:255 engines/mohawk/riven.cpp:716 -#: engines/cruise/menu.cpp:214 backends/platform/wince/CEActionsPocket.cpp:267 +#: gui/launcher.cpp:680 +#: engines/dialogs.cpp:114 +#: engines/scumm/dialogs.cpp:188 +#: engines/mohawk/myst.cpp:255 +#: engines/mohawk/riven.cpp:716 +#: engines/cruise/menu.cpp:214 +#: backends/platform/wince/CEActionsPocket.cpp:267 #: backends/platform/wince/CEActionsSmartphone.cpp:231 msgid "Load" msgstr "Indls" #: gui/launcher.cpp:788 -msgid "" -"Do you really want to run the mass game detector? This could potentially add " -"a huge number of games." -msgstr "" -"Vil du virkelig kre fler spils detektoren? Dette kunne potentielt tilfje " -"et stort antal spil." +msgid "Do you really want to run the mass game detector? This could potentially add a huge number of games." +msgstr "Vil du virkelig kre fler spils detektoren? Dette kunne potentielt tilfje et stort antal spil." -#: gui/launcher.cpp:789 gui/launcher.cpp:937 +#: gui/launcher.cpp:789 +#: gui/launcher.cpp:937 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -467,7 +556,8 @@ msgstr "" msgid "Yes" msgstr "Ja" -#: gui/launcher.cpp:789 gui/launcher.cpp:937 +#: gui/launcher.cpp:789 +#: gui/launcher.cpp:937 #: backends/events/symbiansdl/symbiansdl-events.cpp:184 #: backends/platform/wince/CEActionsPocket.cpp:326 #: backends/platform/wince/CEActionsSmartphone.cpp:287 @@ -497,8 +587,7 @@ msgstr "Dette spil underst #: gui/launcher.cpp:1005 msgid "ScummVM could not find any engine capable of running the selected game!" -msgstr "" -"ScummVM kunne ikke finde en motor, istand til at afvikle det valgte spil!" +msgstr "ScummVM kunne ikke finde en motor, istand til at afvikle det valgte spil!" #: gui/launcher.cpp:1119 msgctxt "lowres" @@ -509,7 +598,8 @@ msgstr "Tilf msgid "Mass Add..." msgstr "Tilfj flere..." -#: gui/massadd.cpp:78 gui/massadd.cpp:81 +#: gui/massadd.cpp:78 +#: gui/massadd.cpp:81 msgid "... progress ..." msgstr "... fremskridt ..." @@ -572,8 +662,11 @@ msgstr "44 kHz" msgid "48 kHz" msgstr "48 kHz" -#: gui/options.cpp:248 gui/options.cpp:474 gui/options.cpp:575 -#: gui/options.cpp:644 gui/options.cpp:852 +#: gui/options.cpp:248 +#: gui/options.cpp:474 +#: gui/options.cpp:575 +#: gui/options.cpp:644 +#: gui/options.cpp:852 msgctxt "soundfont" msgid "None" msgstr "Ingen" @@ -602,7 +695,8 @@ msgstr "Grafik tilstand:" msgid "Render mode:" msgstr "Rendere tilstand:" -#: gui/options.cpp:741 gui/options.cpp:742 +#: gui/options.cpp:741 +#: gui/options.cpp:742 msgid "Special dithering modes supported by some games" msgstr "Speciel farvereduceringstilstand understttet a nogle spil" @@ -628,11 +722,14 @@ msgstr "Foretruk. enhed:" msgid "Music Device:" msgstr "Musik enhed:" -#: gui/options.cpp:764 gui/options.cpp:766 +#: gui/options.cpp:764 +#: gui/options.cpp:766 msgid "Specifies preferred sound device or sound card emulator" msgstr "Angiver foretukket lyd enhed eller lydkort emulator" -#: gui/options.cpp:764 gui/options.cpp:766 gui/options.cpp:767 +#: gui/options.cpp:764 +#: gui/options.cpp:766 +#: gui/options.cpp:767 msgid "Specifies output sound device or sound card emulator" msgstr "Angiver lyd udgangsenhed eller lydkorts emulator" @@ -650,7 +747,8 @@ msgstr "Musik enhed:" msgid "AdLib emulator:" msgstr "AdLib emulator:" -#: gui/options.cpp:793 gui/options.cpp:794 +#: gui/options.cpp:793 +#: gui/options.cpp:794 msgid "AdLib is used for music in many games" msgstr "AdLib bliver brugt til musik i mange spil" @@ -658,13 +756,10 @@ msgstr "AdLib bliver brugt til musik i mange spil" msgid "Output rate:" msgstr "Udgangsfrekvens:" -#: gui/options.cpp:804 gui/options.cpp:805 -msgid "" -"Higher value specifies better sound quality but may be not supported by your " -"soundcard" -msgstr "" -"Hjere vrdi angiver bedre lyd kvalitet, men understttes mske ikke af dit " -"lydkort" +#: gui/options.cpp:804 +#: gui/options.cpp:805 +msgid "Higher value specifies better sound quality but may be not supported by your soundcard" +msgstr "Hjere vrdi angiver bedre lyd kvalitet, men understttes mske ikke af dit lydkort" #: gui/options.cpp:815 msgid "GM Device:" @@ -672,13 +767,14 @@ msgstr "GM enhed:" #: gui/options.cpp:815 msgid "Specifies default sound device for General MIDI output" -msgstr "Angiver standard lyd enhed for General MIDI-udgang" +msgstr "Angiver standard lyd enhed for Generel MIDI-udgang" #: gui/options.cpp:826 msgid "Don't use General MIDI music" -msgstr "Brug ikke General MIDI musik" +msgstr "Brug ikke Generel MIDI musik" -#: gui/options.cpp:837 gui/options.cpp:899 +#: gui/options.cpp:837 +#: gui/options.cpp:899 msgid "Use first available device" msgstr "Brug frste tilgngelig enhed" @@ -686,7 +782,9 @@ msgstr "Brug f msgid "SoundFont:" msgstr "SoundFont:" -#: gui/options.cpp:849 gui/options.cpp:851 gui/options.cpp:852 +#: gui/options.cpp:849 +#: gui/options.cpp:851 +#: gui/options.cpp:852 msgid "SoundFont is supported by some audio cards, Fluidsynth and Timidity" msgstr "SoundFont er understttet af nogle lydkort, Fluidsynth og Timidity" @@ -719,13 +817,10 @@ msgstr "Angiver standard lyd enhed for Roland MT-32/LAPC1/CM32I/CM64 udgang" msgid "True Roland MT-32 (disable GM emulation)" msgstr "gte Roland MT-32 (undlad GM emulering)" -#: gui/options.cpp:875 gui/options.cpp:877 -msgid "" -"Check if you want to use your real hardware Roland-compatible sound device " -"connected to your computer" -msgstr "" -"Kontroller om du vil bruge din rigtige hardware Roland-kompatible lyd enhed " -"tilsluttet til din computer" +#: gui/options.cpp:875 +#: gui/options.cpp:877 +msgid "Check if you want to use your real hardware Roland-compatible sound device connected to your computer" +msgstr "Kontroller om du vil bruge din rigtige hardware Roland-kompatible lyd enhed tilsluttet til din computer" #: gui/options.cpp:877 msgctxt "lowres" @@ -738,7 +833,7 @@ msgstr "Aktiv #: gui/options.cpp:880 msgid "Turns off General MIDI mapping for games with Roland MT-32 soundtrack" -msgstr "Sluk for General MIDI kortlgning for spil med Roland MT-32 lydspor" +msgstr "Sluk for Generel MIDI kortlgning for spil med Roland MT-32 lydspor" #: gui/options.cpp:889 msgid "Don't use Roland MT-32 music" @@ -748,11 +843,13 @@ msgstr "Brug ikke Roland MT-32 musik" msgid "Text and Speech:" msgstr "Tekst og tale:" -#: gui/options.cpp:920 gui/options.cpp:930 +#: gui/options.cpp:920 +#: gui/options.cpp:930 msgid "Speech" msgstr "Tale" -#: gui/options.cpp:921 gui/options.cpp:931 +#: gui/options.cpp:921 +#: gui/options.cpp:931 msgid "Subtitles" msgstr "Undertekster" @@ -808,7 +905,9 @@ msgstr "Mute alle" msgid "SFX volume:" msgstr "SFX lydstyrke:" -#: gui/options.cpp:962 gui/options.cpp:964 gui/options.cpp:965 +#: gui/options.cpp:962 +#: gui/options.cpp:964 +#: gui/options.cpp:965 msgid "Special sound effects volume" msgstr "Lydstyrke for specielle lydeffekter" @@ -835,7 +934,9 @@ msgctxt "lowres" msgid "Theme Path:" msgstr "Tema sti:" -#: gui/options.cpp:1139 gui/options.cpp:1141 gui/options.cpp:1142 +#: gui/options.cpp:1139 +#: gui/options.cpp:1141 +#: gui/options.cpp:1142 msgid "Specifies path to additional data used by all games or ScummVM" msgstr "Angiver sti til ekstra data brugt af alle spil eller ScummVM" @@ -911,26 +1012,26 @@ msgid "Select directory for plugins" msgstr "Vlg bibliotek for plugins" #: gui/options.cpp:1450 -msgid "" -"The theme you selected does not support your current language. If you want " -"to use this theme you need to switch to another language first." -msgstr "" -"Temaet du valgte understtter ikke dit aktuelle sprog. Hvis du nsker at " -"bruge dette tema, skal du skifte til et andet sprog frst." +msgid "The theme you selected does not support your current language. If you want to use this theme you need to switch to another language first." +msgstr "Temaet du valgte understtter ikke dit aktuelle sprog. Hvis du nsker at bruge dette tema, skal du skifte til et andet sprog frst." -#: gui/saveload.cpp:59 gui/saveload.cpp:257 +#: gui/saveload.cpp:59 +#: gui/saveload.cpp:257 msgid "No date saved" msgstr "Ingen dato gemt" -#: gui/saveload.cpp:60 gui/saveload.cpp:258 +#: gui/saveload.cpp:60 +#: gui/saveload.cpp:258 msgid "No time saved" msgstr "Intet tidspunkt gemt" -#: gui/saveload.cpp:61 gui/saveload.cpp:259 +#: gui/saveload.cpp:61 +#: gui/saveload.cpp:259 msgid "No playtime saved" msgstr "Ingen spilletid gemt" -#: gui/saveload.cpp:68 gui/saveload.cpp:173 +#: gui/saveload.cpp:68 +#: gui/saveload.cpp:173 msgid "Delete" msgstr "Slet" @@ -950,7 +1051,8 @@ msgstr "Tid:" msgid "Playtime: " msgstr "Spilletid:" -#: gui/saveload.cpp:305 gui/saveload.cpp:372 +#: gui/saveload.cpp:305 +#: gui/saveload.cpp:372 msgid "Untitled savestate" msgstr "Unavngivet gemmetilstand" @@ -983,7 +1085,10 @@ msgstr "Antialias renderer (16bpp)" msgid "Antialiased (16bpp)" msgstr "Antialias (16bpp)" -#: gui/widget.cpp:322 gui/widget.cpp:324 gui/widget.cpp:330 gui/widget.cpp:332 +#: gui/widget.cpp:322 +#: gui/widget.cpp:324 +#: gui/widget.cpp:330 +#: gui/widget.cpp:332 msgid "Clear value" msgstr "Slet vrdi" @@ -996,13 +1101,15 @@ msgstr "Motor underst msgid "Menu" msgstr "Menu" -#: base/main.cpp:290 backends/platform/symbian/src/SymbianActions.cpp:45 +#: base/main.cpp:290 +#: backends/platform/symbian/src/SymbianActions.cpp:45 #: backends/platform/wince/CEActionsPocket.cpp:45 #: backends/platform/wince/CEActionsSmartphone.cpp:46 msgid "Skip" msgstr "Spring over" -#: base/main.cpp:293 backends/platform/symbian/src/SymbianActions.cpp:50 +#: base/main.cpp:293 +#: backends/platform/symbian/src/SymbianActions.cpp:50 #: backends/platform/wince/CEActionsPocket.cpp:42 msgid "Pause" msgstr "Pause" @@ -1090,8 +1197,7 @@ msgstr "Spillet i '%s' ser ud til at v #: engines/advancedDetector.cpp:325 msgid "Please, report the following data to the ScummVM team along with name" -msgstr "" -"Venligst, rapportere flgende data til ScummVM holdet sammen med navnet" +msgstr "Venligst, rapportere flgende data til ScummVM holdet sammen med navnet" #: engines/advancedDetector.cpp:327 msgid "of the game you tried to add and its version/language/etc.:" @@ -1121,22 +1227,28 @@ msgstr "H~j~ msgid "~A~bout" msgstr "~O~m" -#: engines/dialogs.cpp:104 engines/dialogs.cpp:180 +#: engines/dialogs.cpp:104 +#: engines/dialogs.cpp:180 msgid "~R~eturn to Launcher" msgstr "~R~etur til spiloversigt" -#: engines/dialogs.cpp:106 engines/dialogs.cpp:182 +#: engines/dialogs.cpp:106 +#: engines/dialogs.cpp:182 msgctxt "lowres" msgid "~R~eturn to Launcher" msgstr "~R~etur til oversigt" -#: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/cruise/menu.cpp:212 engines/sci/engine/kfile.cpp:735 +#: engines/dialogs.cpp:115 +#: engines/agi/saveload.cpp:803 +#: engines/cruise/menu.cpp:212 +#: engines/sci/engine/kfile.cpp:735 msgid "Save game:" msgstr "Gemmer:" -#: engines/dialogs.cpp:115 engines/agi/saveload.cpp:803 -#: engines/scumm/dialogs.cpp:187 engines/cruise/menu.cpp:212 +#: engines/dialogs.cpp:115 +#: engines/agi/saveload.cpp:803 +#: engines/scumm/dialogs.cpp:187 +#: engines/cruise/menu.cpp:212 #: engines/sci/engine/kfile.cpp:735 #: backends/platform/symbian/src/SymbianActions.cpp:44 #: backends/platform/wince/CEActionsPocket.cpp:43 @@ -1147,30 +1259,22 @@ msgid "Save" msgstr "Gem" #: engines/dialogs.cpp:144 -msgid "" -"Sorry, this engine does not currently provide in-game help. Please consult " -"the README for basic information, and for instructions on how to obtain " -"further assistance." -msgstr "" -"Beklager, denne motor leverer i jeblikket ikke spil hjlp. Se venligst " -"README for grundlggende oplysninger, og for at f instruktioner om, hvordan " -"man fr yderligere hjlp." +msgid "Sorry, this engine does not currently provide in-game help. Please consult the README for basic information, and for instructions on how to obtain further assistance." +msgstr "Beklager, denne motor leverer i jeblikket ikke spil hjlp. Se venligst README for grundlggende oplysninger, og for at f instruktioner om, hvordan man fr yderligere hjlp." #: engines/dialogs.cpp:228 #, c-format -msgid "" -"Gamestate save failed (%s)! Please consult the README for basic information, " -"and for instructions on how to obtain further assistance." -msgstr "" -"Gem af spiltilstand fejlede (%s)! Se venligst README for grundlggende " -"oplysninger, og for at f instruktioner om, hvordan man fr yderligere hjlp." +msgid "Gamestate save failed (%s)! Please consult the README for basic information, and for instructions on how to obtain further assistance." +msgstr "Gem af spiltilstand fejlede (%s)! Se venligst README for grundlggende oplysninger, og for at f instruktioner om, hvordan man fr yderligere hjlp." -#: engines/dialogs.cpp:301 engines/mohawk/dialogs.cpp:109 +#: engines/dialogs.cpp:301 +#: engines/mohawk/dialogs.cpp:109 #: engines/mohawk/dialogs.cpp:174 msgid "~O~K" msgstr "~O~K" -#: engines/dialogs.cpp:302 engines/mohawk/dialogs.cpp:110 +#: engines/dialogs.cpp:302 +#: engines/mohawk/dialogs.cpp:110 #: engines/mohawk/dialogs.cpp:175 msgid "~C~ancel" msgstr "~F~ortryd" @@ -1225,43 +1329,36 @@ msgstr "" #: engines/engine.cpp:426 #, c-format -msgid "" -"Gamestate load failed (%s)! Please consult the README for basic information, " -"and for instructions on how to obtain further assistance." -msgstr "" -"Indlsning af spiltilstand fejlede (%s)! Se venligst README for " -"grundlggende oplysninger, og for at f instruktioner om, hvordan man fr " -"yderligere hjlp." +msgid "Gamestate load failed (%s)! Please consult the README for basic information, and for instructions on how to obtain further assistance." +msgstr "Indlsning af spiltilstand fejlede (%s)! Se venligst README for grundlggende oplysninger, og for at f instruktioner om, hvordan man fr yderligere hjlp." #: engines/engine.cpp:439 -msgid "" -"WARNING: The game you are about to start is not yet fully supported by " -"ScummVM. As such, it is likely to be unstable, and any saves you make might " -"not work in future versions of ScummVM." -msgstr "" -"ADVARSEL: Spillet du er ved at starte endnu ikke er fuldt understttet af " -"ScummVM. Sledes, er det sandsynligt, at det er ustabilt, og alle gemmer du " -"foretager fungerer muligvis ikke i fremtidige versioner af ScummVM." +msgid "WARNING: The game you are about to start is not yet fully supported by ScummVM. As such, it is likely to be unstable, and any saves you make might not work in future versions of ScummVM." +msgstr "ADVARSEL: Spillet du er ved at starte endnu ikke er fuldt understttet af ScummVM. Sledes, er det sandsynligt, at det er ustabilt, og alle gemmer du foretager fungerer muligvis ikke i fremtidige versioner af ScummVM." #: engines/engine.cpp:442 msgid "Start anyway" msgstr "Start alligevel" -#: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47 +#: engines/agi/detection.cpp:145 +#: engines/dreamweb/detection.cpp:47 #: engines/sci/detection.cpp:390 msgid "Use original save/load screens" msgstr "Brug original gem/indls skrme" -#: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48 +#: engines/agi/detection.cpp:146 +#: engines/dreamweb/detection.cpp:48 #: engines/sci/detection.cpp:391 msgid "Use the original save/load screens, instead of the ScummVM ones" msgstr "Brug de originale gem/indls skrme, istedet for dem fra ScummVM" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 +#: engines/agi/saveload.cpp:816 +#: engines/sci/engine/kfile.cpp:831 msgid "Restore game:" msgstr "Gendan spil:" -#: engines/agi/saveload.cpp:816 engines/sci/engine/kfile.cpp:831 +#: engines/agi/saveload.cpp:816 +#: engines/sci/engine/kfile.cpp:831 msgid "Restore" msgstr "Gendan" @@ -1294,12 +1391,8 @@ msgid "Use IMF/Yamaha FB-01 for MIDI output" msgstr "Brug IMF/Yamaha FB-01 til MIDI-udgang" #: engines/sci/detection.cpp:401 -msgid "" -"Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI " -"output" -msgstr "" -"Bruge et IBM Musik Feature-kort eller et Yamaha FB-01 FM synth modul til " -"MIDI-udgang" +msgid "Use an IBM Music Feature card or a Yamaha FB-01 FM synth module for MIDI output" +msgstr "Bruge et IBM Musik Feature-kort eller et Yamaha FB-01 FM synth modul til MIDI-udgang" #: engines/sci/detection.cpp:411 msgid "Use CD audio" @@ -1314,8 +1407,7 @@ msgid "Use Windows cursors" msgstr "Brug Windows markr" #: engines/sci/detection.cpp:423 -msgid "" -"Use the Windows cursors (smaller and monochrome) instead of the DOS ones" +msgid "Use the Windows cursors (smaller and monochrome) instead of the DOS ones" msgstr "Brug Windows-markrer (mindre og monokrome) i stedet for dem fra DOS" #: engines/sci/detection.cpp:433 @@ -1323,10 +1415,8 @@ msgid "Use silver cursors" msgstr "Brug slv markr" #: engines/sci/detection.cpp:434 -msgid "" -"Use the alternate set of silver cursors, instead of the normal golden ones" -msgstr "" -"Brug det alternative st af slv markrer, i stedet for de normale gyldne" +msgid "Use the alternate set of silver cursors, instead of the normal golden ones" +msgstr "Brug det alternative st af slv markrer, i stedet for de normale gyldne" #: engines/scumm/dialogs.cpp:175 #, c-format @@ -1363,7 +1453,8 @@ msgstr "Er du sikker p msgid "Play" msgstr "Spil" -#: engines/scumm/dialogs.cpp:191 engines/scumm/help.cpp:82 +#: engines/scumm/dialogs.cpp:191 +#: engines/scumm/help.cpp:82 #: engines/scumm/help.cpp:84 #: backends/platform/symbian/src/SymbianActions.cpp:52 #: backends/platform/wince/CEActionsPocket.cpp:44 @@ -1490,11 +1581,16 @@ msgstr "Mellemrum" msgid "Pause game" msgstr "Pause spil" -#: engines/scumm/help.cpp:79 engines/scumm/help.cpp:84 -#: engines/scumm/help.cpp:95 engines/scumm/help.cpp:96 -#: engines/scumm/help.cpp:97 engines/scumm/help.cpp:98 -#: engines/scumm/help.cpp:99 engines/scumm/help.cpp:100 -#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:79 +#: engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:95 +#: engines/scumm/help.cpp:96 +#: engines/scumm/help.cpp:97 +#: engines/scumm/help.cpp:98 +#: engines/scumm/help.cpp:99 +#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:102 msgid "Ctrl" msgstr "Ctrl" @@ -1502,9 +1598,12 @@ msgstr "Ctrl" msgid "Load game state 1-10" msgstr "Indls spil tilstand 1-10" -#: engines/scumm/help.cpp:80 engines/scumm/help.cpp:84 -#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:100 -#: engines/scumm/help.cpp:101 engines/scumm/help.cpp:102 +#: engines/scumm/help.cpp:80 +#: engines/scumm/help.cpp:84 +#: engines/scumm/help.cpp:86 +#: engines/scumm/help.cpp:100 +#: engines/scumm/help.cpp:101 +#: engines/scumm/help.cpp:102 msgid "Alt" msgstr "Alt" @@ -1512,7 +1611,8 @@ msgstr "Alt" msgid "Save game state 1-10" msgstr "Gem spil tilstand 1-10" -#: engines/scumm/help.cpp:86 engines/scumm/help.cpp:89 +#: engines/scumm/help.cpp:86 +#: engines/scumm/help.cpp:89 msgid "Enter" msgstr "Enter" @@ -1604,24 +1704,30 @@ msgstr "Spind ordspil p msgid "Main game controls:" msgstr "Vigtigste spilstyring:" -#: engines/scumm/help.cpp:121 engines/scumm/help.cpp:136 +#: engines/scumm/help.cpp:121 +#: engines/scumm/help.cpp:136 #: engines/scumm/help.cpp:161 msgid "Push" msgstr "Skub" -#: engines/scumm/help.cpp:122 engines/scumm/help.cpp:137 +#: engines/scumm/help.cpp:122 +#: engines/scumm/help.cpp:137 #: engines/scumm/help.cpp:162 msgid "Pull" msgstr "Trk" -#: engines/scumm/help.cpp:123 engines/scumm/help.cpp:138 -#: engines/scumm/help.cpp:163 engines/scumm/help.cpp:197 +#: engines/scumm/help.cpp:123 +#: engines/scumm/help.cpp:138 +#: engines/scumm/help.cpp:163 +#: engines/scumm/help.cpp:197 #: engines/scumm/help.cpp:207 msgid "Give" msgstr "Giv" -#: engines/scumm/help.cpp:124 engines/scumm/help.cpp:139 -#: engines/scumm/help.cpp:164 engines/scumm/help.cpp:190 +#: engines/scumm/help.cpp:124 +#: engines/scumm/help.cpp:139 +#: engines/scumm/help.cpp:164 +#: engines/scumm/help.cpp:190 #: engines/scumm/help.cpp:208 msgid "Open" msgstr "bn" @@ -1634,43 +1740,54 @@ msgstr "G msgid "Get" msgstr "Tag" -#: engines/scumm/help.cpp:128 engines/scumm/help.cpp:152 -#: engines/scumm/help.cpp:170 engines/scumm/help.cpp:198 -#: engines/scumm/help.cpp:213 engines/scumm/help.cpp:224 +#: engines/scumm/help.cpp:128 +#: engines/scumm/help.cpp:152 +#: engines/scumm/help.cpp:170 +#: engines/scumm/help.cpp:198 +#: engines/scumm/help.cpp:213 +#: engines/scumm/help.cpp:224 #: engines/scumm/help.cpp:250 msgid "Use" msgstr "Brug" -#: engines/scumm/help.cpp:129 engines/scumm/help.cpp:141 +#: engines/scumm/help.cpp:129 +#: engines/scumm/help.cpp:141 msgid "Read" msgstr "Ls" -#: engines/scumm/help.cpp:130 engines/scumm/help.cpp:147 +#: engines/scumm/help.cpp:130 +#: engines/scumm/help.cpp:147 msgid "New kid" msgstr "Nyt barn" -#: engines/scumm/help.cpp:131 engines/scumm/help.cpp:153 +#: engines/scumm/help.cpp:131 +#: engines/scumm/help.cpp:153 #: engines/scumm/help.cpp:171 msgid "Turn on" msgstr "Tnd" -#: engines/scumm/help.cpp:132 engines/scumm/help.cpp:154 +#: engines/scumm/help.cpp:132 +#: engines/scumm/help.cpp:154 #: engines/scumm/help.cpp:172 msgid "Turn off" msgstr "Sluk" -#: engines/scumm/help.cpp:142 engines/scumm/help.cpp:167 +#: engines/scumm/help.cpp:142 +#: engines/scumm/help.cpp:167 #: engines/scumm/help.cpp:194 msgid "Walk to" msgstr "G til" -#: engines/scumm/help.cpp:143 engines/scumm/help.cpp:168 -#: engines/scumm/help.cpp:195 engines/scumm/help.cpp:210 +#: engines/scumm/help.cpp:143 +#: engines/scumm/help.cpp:168 +#: engines/scumm/help.cpp:195 +#: engines/scumm/help.cpp:210 #: engines/scumm/help.cpp:227 msgid "Pick up" msgstr "Tag op" -#: engines/scumm/help.cpp:144 engines/scumm/help.cpp:169 +#: engines/scumm/help.cpp:144 +#: engines/scumm/help.cpp:169 msgid "What is" msgstr "Hvad er" @@ -1694,11 +1811,13 @@ msgstr "Lav" msgid "Switch" msgstr "Skift" -#: engines/scumm/help.cpp:166 engines/scumm/help.cpp:228 +#: engines/scumm/help.cpp:166 +#: engines/scumm/help.cpp:228 msgid "Look" msgstr "Se" -#: engines/scumm/help.cpp:173 engines/scumm/help.cpp:223 +#: engines/scumm/help.cpp:173 +#: engines/scumm/help.cpp:223 msgid "Talk" msgstr "Tal" @@ -1743,20 +1862,24 @@ msgstr "spil H p msgid "play C major on distaff" msgstr "spil C-dur p rok" -#: engines/scumm/help.cpp:192 engines/scumm/help.cpp:214 +#: engines/scumm/help.cpp:192 +#: engines/scumm/help.cpp:214 msgid "puSh" msgstr "Skub" -#: engines/scumm/help.cpp:193 engines/scumm/help.cpp:215 +#: engines/scumm/help.cpp:193 +#: engines/scumm/help.cpp:215 msgid "pull (Yank)" msgstr "trk (Y)" -#: engines/scumm/help.cpp:196 engines/scumm/help.cpp:212 +#: engines/scumm/help.cpp:196 +#: engines/scumm/help.cpp:212 #: engines/scumm/help.cpp:248 msgid "Talk to" msgstr "Tal til" -#: engines/scumm/help.cpp:199 engines/scumm/help.cpp:211 +#: engines/scumm/help.cpp:199 +#: engines/scumm/help.cpp:211 msgid "Look at" msgstr "Lur p" @@ -1788,8 +1911,10 @@ msgstr "Fremh msgid "Walk" msgstr "G" -#: engines/scumm/help.cpp:225 engines/scumm/help.cpp:234 -#: engines/scumm/help.cpp:241 engines/scumm/help.cpp:249 +#: engines/scumm/help.cpp:225 +#: engines/scumm/help.cpp:234 +#: engines/scumm/help.cpp:241 +#: engines/scumm/help.cpp:249 msgid "Inventory" msgstr "Oversigt" @@ -1817,7 +1942,8 @@ msgstr "Slag" msgid "Kick" msgstr "Spark" -#: engines/scumm/help.cpp:239 engines/scumm/help.cpp:247 +#: engines/scumm/help.cpp:239 +#: engines/scumm/help.cpp:247 msgid "Examine" msgstr "Undersg" @@ -1838,31 +1964,38 @@ msgstr "Gem / Indl msgid "Other game controls:" msgstr "Andre spil kontroller" -#: engines/scumm/help.cpp:257 engines/scumm/help.cpp:267 +#: engines/scumm/help.cpp:257 +#: engines/scumm/help.cpp:267 msgid "Inventory:" msgstr "Oversigt:" -#: engines/scumm/help.cpp:258 engines/scumm/help.cpp:274 +#: engines/scumm/help.cpp:258 +#: engines/scumm/help.cpp:274 msgid "Scroll list up" msgstr "Rul liste op" -#: engines/scumm/help.cpp:259 engines/scumm/help.cpp:275 +#: engines/scumm/help.cpp:259 +#: engines/scumm/help.cpp:275 msgid "Scroll list down" msgstr "Rul liste ned" -#: engines/scumm/help.cpp:260 engines/scumm/help.cpp:268 +#: engines/scumm/help.cpp:260 +#: engines/scumm/help.cpp:268 msgid "Upper left item" msgstr "verste venstre punkt" -#: engines/scumm/help.cpp:261 engines/scumm/help.cpp:270 +#: engines/scumm/help.cpp:261 +#: engines/scumm/help.cpp:270 msgid "Lower left item" msgstr "Nederste hjre punkt" -#: engines/scumm/help.cpp:262 engines/scumm/help.cpp:271 +#: engines/scumm/help.cpp:262 +#: engines/scumm/help.cpp:271 msgid "Upper right item" msgstr "verste hjre punkt" -#: engines/scumm/help.cpp:263 engines/scumm/help.cpp:273 +#: engines/scumm/help.cpp:263 +#: engines/scumm/help.cpp:273 msgid "Lower right item" msgstr "Nederste venstre punkt" @@ -1874,7 +2007,8 @@ msgstr "Midterste h msgid "Middle right item" msgstr "Midterste hjre punkt" -#: engines/scumm/help.cpp:279 engines/scumm/help.cpp:284 +#: engines/scumm/help.cpp:279 +#: engines/scumm/help.cpp:284 msgid "Switching characters:" msgstr "Skift personer:" @@ -1890,7 +2024,8 @@ msgstr "Tredie barn" msgid "Fighting controls (numpad):" msgstr "Kamp kontroller (numtast):" -#: engines/scumm/help.cpp:295 engines/scumm/help.cpp:296 +#: engines/scumm/help.cpp:295 +#: engines/scumm/help.cpp:296 #: engines/scumm/help.cpp:297 msgid "Step back" msgstr "Skridt tilbage" @@ -1984,7 +2119,8 @@ msgstr "" "Indbygget MIDI understttelse krver Roland opgradering fra LucasArts,\n" "men %s mangler. Bruger AdLib i stedet." -#: engines/scumm/scumm.cpp:2278 engines/agos/saveload.cpp:202 +#: engines/scumm/scumm.cpp:2278 +#: engines/agos/saveload.cpp:202 #, c-format msgid "" "Failed to save game state to file:\n" @@ -1995,7 +2131,8 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2285 engines/agos/saveload.cpp:167 +#: engines/scumm/scumm.cpp:2285 +#: engines/agos/saveload.cpp:167 #, c-format msgid "" "Failed to load game state from file:\n" @@ -2006,7 +2143,8 @@ msgstr "" "\n" "%s" -#: engines/scumm/scumm.cpp:2297 engines/agos/saveload.cpp:210 +#: engines/scumm/scumm.cpp:2297 +#: engines/agos/saveload.cpp:210 #, c-format msgid "" "Successfully saved game state in file:\n" @@ -2018,17 +2156,12 @@ msgstr "" "%s" #: engines/scumm/scumm.cpp:2512 -msgid "" -"Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To " -"play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' " -"directory inside the Tentacle game directory." -msgstr "" -"Normalt ville Maniac Mansion begynde nu. Men ScummVM kan ikke gre det " -"endnu. For at spille det, g til 'Tilfj spil' i ScummVM start-menuen og " -"vlg 'Maniac' mappen inde i Tentacle spillets mappe." +msgid "Usually, Maniac Mansion would start now. But ScummVM doesn't do that yet. To play it, go to 'Add Game' in the ScummVM start menu and select the 'Maniac' directory inside the Tentacle game directory." +msgstr "Normalt ville Maniac Mansion begynde nu. Men ScummVM kan ikke gre det endnu. For at spille det, g til 'Tilfj spil' i ScummVM start-menuen og vlg 'Maniac' mappen inde i Tentacle spillets mappe." #. I18N: Option for fast scene switching -#: engines/mohawk/dialogs.cpp:92 engines/mohawk/dialogs.cpp:171 +#: engines/mohawk/dialogs.cpp:92 +#: engines/mohawk/dialogs.cpp:171 msgid "~Z~ip Mode Activated" msgstr "~Z~ip tilstand aktiveret" @@ -2058,12 +2191,14 @@ msgstr "~V~andeffekter aktiveret" msgid "Cutscene file '%s' not found!" msgstr "Filmsekvens fil '%s' ikke fundet!" -#: engines/gob/inter_playtoons.cpp:256 engines/gob/inter_v2.cpp:1287 +#: engines/gob/inter_playtoons.cpp:256 +#: engines/gob/inter_v2.cpp:1287 #: engines/tinsel/saveload.cpp:502 msgid "Failed to load game state from file." msgstr "Mislykkedes at indlse spil tilstand fra fil." -#: engines/gob/inter_v2.cpp:1357 engines/tinsel/saveload.cpp:515 +#: engines/gob/inter_v2.cpp:1357 +#: engines/tinsel/saveload.cpp:515 msgid "Failed to save game state to file." msgstr "Mislykkedes at gemme spil tilstand til fil." @@ -2182,7 +2317,6 @@ msgid "Choose Spell" msgstr "Vlg magi" #: engines/kyra/sound_midi.cpp:475 -#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2190,17 +2324,19 @@ msgid "" "General MIDI ones. It is still possible that\n" "some tracks sound incorrect." msgstr "" -"Det lader til at du en General MIDI-enhed,\n" +"Det lader til at du bruger en Generel MIDI-enhed,\n" "men dit spil kun understtter Roland MT32 MIDI.\n" "Vi forsger at kortlgge Roland MT32 instrumenterne til\n" -"dem i General MIDI. Trods det kan det ske\n" -"at nogle spor ikke vil blive korrekt afspillet." +"dem i Generel MIDI. Trods det kan det ske\n" +"at nogle stykker ikke lyder korrekt." -#: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 +#: engines/queen/queen.cpp:59 +#: engines/sky/detection.cpp:44 msgid "Floppy intro" msgstr "Diskette intro" -#: engines/queen/queen.cpp:60 engines/sky/detection.cpp:45 +#: engines/queen/queen.cpp:60 +#: engines/sky/detection.cpp:45 msgid "Use the floppy version's intro (CD version only)" msgstr "Brug diskette versionens intro (kun CD version)" @@ -2225,37 +2361,33 @@ msgstr "" msgid "PSX stream cutscene '%s' cannot be played in paletted mode" msgstr "PSX stream filmsekvens '%s' kan ikke afspilles i palette tilstand" -#: engines/sword1/animation.cpp:560 engines/sword2/animation.cpp:455 +#: engines/sword1/animation.cpp:560 +#: engines/sword2/animation.cpp:455 msgid "DXA cutscenes found but ScummVM has been built without zlib support" -msgstr "" -"DXA filmsekvenser fundet, men ScummVM er bygget uden zlib understttelse" +msgstr "DXA filmsekvenser fundet, men ScummVM er bygget uden zlib understttelse" -#: engines/sword1/animation.cpp:570 engines/sword2/animation.cpp:465 +#: engines/sword1/animation.cpp:570 +#: engines/sword2/animation.cpp:465 msgid "MPEG2 cutscenes are no longer supported" msgstr "MPEG2 filmsekvenser understttes ikke lngere" -#: engines/sword1/animation.cpp:576 engines/sword2/animation.cpp:473 +#: engines/sword1/animation.cpp:576 +#: engines/sword2/animation.cpp:473 #, c-format msgid "Cutscene '%s' not found" msgstr "Filmsekvens '%s' ikke fundet" #: engines/sword1/control.cpp:863 msgid "" -"ScummVM found that you have old savefiles for Broken Sword 1 that should be " -"converted.\n" -"The old save game format is no longer supported, so you will not be able to " -"load your games if you don't convert them.\n" +"ScummVM found that you have old savefiles for Broken Sword 1 that should be converted.\n" +"The old save game format is no longer supported, so you will not be able to load your games if you don't convert them.\n" "\n" -"Press OK to convert them now, otherwise you will be asked again the next " -"time you start the game.\n" +"Press OK to convert them now, otherwise you will be asked again the next time you start the game.\n" msgstr "" -"ScummVM har konstateret, at du har gamle gemmer for Broken Sword 1, der skal " -"konverteres.\n" -"Det gamle gemte spil format understttes ikke lngere, s vil du ikke vre i " -"stand til at indlse dine spil, hvis du ikke konvertere dem.\n" +"ScummVM har konstateret, at du har gamle gemmer for Broken Sword 1, der skal konverteres.\n" +"Det gamle gemte spil format understttes ikke lngere, s vil du ikke vre i stand til at indlse dine spil, hvis du ikke konvertere dem.\n" "\n" -"Tryk p OK for at konvertere dem nu, ellers vil du blive spurgt igen, nste " -"gang du starter spillet.\n" +"Tryk p OK for at konvertere dem nu, ellers vil du blive spurgt igen, nste gang du starter spillet.\n" #: engines/sword1/control.cpp:1232 #, c-format @@ -2279,10 +2411,8 @@ msgid "This is the end of the Broken Sword 1 Demo" msgstr "Dette er slutningen af Broken Sword 1 demoen" #: engines/sword2/animation.cpp:435 -msgid "" -"PSX cutscenes found but ScummVM has been built without RGB color support" -msgstr "" -"PSX filmsekvenser fundet, men ScummVM er bygget uden RGB farve understttelse" +msgid "PSX cutscenes found but ScummVM has been built without RGB color support" +msgstr "PSX filmsekvenser fundet, men ScummVM er bygget uden RGB farve understttelse" #: engines/sword2/sword2.cpp:79 msgid "Show object labels" @@ -2311,17 +2441,13 @@ msgstr "Gemmer spil..." #: engines/parallaction/saveload.cpp:272 msgid "" -"ScummVM found that you have old savefiles for Nippon Safes that should be " -"renamed.\n" -"The old names are no longer supported, so you will not be able to load your " -"games if you don't convert them.\n" +"ScummVM found that you have old savefiles for Nippon Safes that should be renamed.\n" +"The old names are no longer supported, so you will not be able to load your games if you don't convert them.\n" "\n" "Press OK to convert them now, otherwise you will be asked next time.\n" msgstr "" -"ScummVM har konstateret, at du har gamle gemmer for Nippon Safes, der skal " -"omdbes.\n" -"De gamle navne er ikke lngere understttet, s du vil ikke vre i stand til " -"at indlse dine spil, hvis du ikke konvertere dem.\n" +"ScummVM har konstateret, at du har gamle gemmer for Nippon Safes, der skal omdbes.\n" +"De gamle navne er ikke lngere understttet, s du vil ikke vre i stand til at indlse dine spil, hvis du ikke konvertere dem.\n" "\n" "Tryk p OK for at konvertere dem nu, ellers vil du blive spurgt nste gang.\n" @@ -2331,13 +2457,11 @@ msgstr "ScummVM konverterede med succes alle dine gemmer." #: engines/parallaction/saveload.cpp:321 msgid "" -"ScummVM printed some warnings in your console window and can't guarantee all " -"your files have been converted.\n" +"ScummVM printed some warnings in your console window and can't guarantee all your files have been converted.\n" "\n" "Please report to the team." msgstr "" -"ScummVM udskrev nogle advarsler i dit konsol vindue, og kan ikke garantere " -"at alle dine filer er blevet konverteret.\n" +"ScummVM udskrev nogle advarsler i dit konsol vindue, og kan ikke garantere at alle dine filer er blevet konverteret.\n" "\n" "Venligst rapportr til holdet." @@ -2351,43 +2475,30 @@ msgstr "DOSBox OPL emulator" #: audio/mididrv.cpp:209 #, c-format -msgid "" -"The selected audio device '%s' was not found (e.g. might be turned off or " -"disconnected)." -msgstr "" -"Den valgte lydenhed '%s' blev ikke fundet (kan f.eks vre slukket eller " -"afbrudt)." +msgid "The selected audio device '%s' was not found (e.g. might be turned off or disconnected)." +msgstr "Den valgte lydenhed '%s' blev ikke fundet (kan f.eks vre slukket eller afbrudt)." -#: audio/mididrv.cpp:209 audio/mididrv.cpp:221 audio/mididrv.cpp:257 +#: audio/mididrv.cpp:209 +#: audio/mididrv.cpp:221 +#: audio/mididrv.cpp:257 #: audio/mididrv.cpp:272 msgid "Attempting to fall back to the next available device..." msgstr "Forsger at falde tilbage til den nste tilgngelig enhed..." #: audio/mididrv.cpp:221 #, c-format -msgid "" -"The selected audio device '%s' cannot be used. See log file for more " -"information." -msgstr "" -"Den valgte lydenhed '%s' kan ikke bruges. Se log filen for mere information." +msgid "The selected audio device '%s' cannot be used. See log file for more information." +msgstr "Den valgte lydenhed '%s' kan ikke bruges. Se log filen for mere information." #: audio/mididrv.cpp:257 #, c-format -msgid "" -"The preferred audio device '%s' was not found (e.g. might be turned off or " -"disconnected)." -msgstr "" -"Den foretrukne lydenhed '%s' blev ikke fundet (kan f.eks vre slukket eller " -"afbrudt)." +msgid "The preferred audio device '%s' was not found (e.g. might be turned off or disconnected)." +msgstr "Den foretrukne lydenhed '%s' blev ikke fundet (kan f.eks vre slukket eller afbrudt)." #: audio/mididrv.cpp:272 #, c-format -msgid "" -"The preferred audio device '%s' cannot be used. See log file for more " -"information." -msgstr "" -"Den foretrukne lydenhed '%s' kan ikke bruges. Se log filen for mere " -"information." +msgid "The preferred audio device '%s' cannot be used. See log file for more information." +msgstr "Den foretrukne lydenhed '%s' kan ikke bruges. Se log filen for mere information." #: audio/null.h:43 msgid "No music" @@ -2740,11 +2851,13 @@ msgstr "GC Pad acceleration:" msgid "DVD" msgstr "DVD" -#: backends/platform/wii/options.cpp:89 backends/platform/wii/options.cpp:101 +#: backends/platform/wii/options.cpp:89 +#: backends/platform/wii/options.cpp:101 msgid "Status:" msgstr "Status:" -#: backends/platform/wii/options.cpp:90 backends/platform/wii/options.cpp:102 +#: backends/platform/wii/options.cpp:90 +#: backends/platform/wii/options.cpp:102 msgid "Unknown" msgstr "Ukendt" @@ -2922,8 +3035,7 @@ msgstr "Tildel h #: backends/platform/wince/wince-sdl.cpp:519 msgid "You must map a key to the 'Right Click' action to play this game" -msgstr "" -"Du skal tildele en tast til 'Hjreklik' handlingen for at spille dette spil" +msgstr "Du skal tildele en tast til 'Hjreklik' handlingen for at spille dette spil" #: backends/platform/wince/wince-sdl.cpp:528 msgid "Map hide toolbar action" @@ -2931,9 +3043,7 @@ msgstr "Tildel \"skjul v #: backends/platform/wince/wince-sdl.cpp:532 msgid "You must map a key to the 'Hide toolbar' action to play this game" -msgstr "" -"Du skal tildele en tast til 'Skjul vrktjslinje' handlingen for at spille " -"dette spil" +msgstr "Du skal tildele en tast til 'Skjul vrktjslinje' handlingen for at spille dette spil" #: backends/platform/wince/wince-sdl.cpp:541 msgid "Map Zoom Up action (optional)" @@ -2944,11 +3054,8 @@ msgid "Map Zoom Down action (optional)" msgstr "Tildel Forstr handling (valgfri)" #: backends/platform/wince/wince-sdl.cpp:552 -msgid "" -"Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" -msgstr "" -"Glem ikke at tildele en tast til 'Skjul vrktjslinje' handling for at se " -"hele oversigten" +msgid "Don't forget to map a key to 'Hide Toolbar' action to see the whole inventory" +msgstr "Glem ikke at tildele en tast til 'Skjul vrktjslinje' handling for at se hele oversigten" #: backends/events/default/default-events.cpp:191 msgid "Do you really want to return to the Launcher?" @@ -3037,20 +3144,20 @@ msgstr "Klik deaktiveret" #~ msgid "Hercules Amber" #~ msgstr "Hercules brun" - #~ msgctxt "lowres" + #~ msgid "Hercules Green" #~ msgstr "Hercules grn" - #~ msgctxt "lowres" + #~ msgid "Hercules Amber" #~ msgstr "Hercules brun" #, fuzzy #~ msgid "Save game failed!" #~ msgstr "Gemmer:" - #~ msgctxt "lowres" + #~ msgid "Add Game..." #~ msgstr "Tilfj spil..." -- cgit v1.2.3 From 3de8c4b07d6f15fe6e9ca4bcb8da92532ebf5692 Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Tue, 10 Jul 2012 22:15:31 -0500 Subject: NEWS: Mention Maemo port changes --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 40d98f294f..43e755f4ac 100644 --- a/NEWS +++ b/NEWS @@ -62,6 +62,10 @@ For a more comprehensive changelog of the latest experimental code, see: - Added aspect ratio correction feature. - Implemented 16 bits per pixel support for games. + Maemo port: + - Added support for Nokia 770 running OS2008 HE. + - Added configurable keymap. + Windows port: - Changed default savegames location for Windows NT4/2000/XP/Vista/7. (The migration batch file can be used to copy savegames from the old -- cgit v1.2.3 From 14832eae7f8787da83cd39214aa386e8136fdf1a Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Tue, 10 Jul 2012 22:58:41 -0500 Subject: MAEMO: Update debian/changelog --- backends/platform/maemo/debian/changelog | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/backends/platform/maemo/debian/changelog b/backends/platform/maemo/debian/changelog index 8a9d8ee3c3..f3e4c4eadb 100644 --- a/backends/platform/maemo/debian/changelog +++ b/backends/platform/maemo/debian/changelog @@ -1,8 +1,20 @@ -scummvm (1.5.0~git) unstable; urgency=low +scummvm (1.6.0~git) unstable; urgency=low * Development snapshot - -- Tarek Soliman Tue, 15 Nov 2011 14:56:57 -0600 + -- Tarek Soliman Tue, 10 Jul 2012 23:02:00 -0500 + +scummvm (1.5.0) unstable; urgency=low + + * 1.5.0 release + + -- Tarek Soliman Tue, 10 Jul 2012 22:57:32 -0500 + +scummvm (1.4.1) unstable; urgency=low + + * 1.4.1 release + + -- Tarek Soliman Wed, 11 Jan 2012 17:17:26 -0600 scummvm (1.4.0) unstable; urgency=low -- cgit v1.2.3 From 108e709b9bf78df2672f8a8bf0547a0966bfc246 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 11 Jul 2012 21:20:52 +1000 Subject: TSAGE: Fix for bug #3541354 - Nico shooting player after being tied up --- engines/tsage/blue_force/blueforce_scenes9.cpp | 73 +++++++++++++------------- engines/tsage/globals.cpp | 4 +- engines/tsage/globals.h | 2 +- 3 files changed, 40 insertions(+), 39 deletions(-) diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp index 2178f31b30..1cb8191640 100644 --- a/engines/tsage/blue_force/blueforce_scenes9.cpp +++ b/engines/tsage/blue_force/blueforce_scenes9.cpp @@ -794,12 +794,12 @@ bool Scene910::Lyle::startAction(CursorType action, Event &event) { Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene; if (action == CURSOR_USE) { - if (BF_GLOBALS._v4CEE2 == 0) + if (BF_GLOBALS._nico910State == 0) return NamedObject::startAction(action, event); else return false; } else if (action == CURSOR_TALK) { - if ((BF_GLOBALS._hiddenDoorStatus != 0) || (BF_GLOBALS._v4CEE2 != 0)) { + if ((BF_GLOBALS._hiddenDoorStatus != 0) || (BF_GLOBALS._nico910State != 0)) { scene->_stripManager.start(9100 + _field90, &BF_GLOBALS._stripProxy); if (_field90 < 1) _field90++; @@ -833,7 +833,7 @@ bool Scene910::Nico::startAction(CursorType action, Event &event) { return true; break; case CURSOR_TALK: - if (BF_GLOBALS._v4CEE2 >= 4) + if (BF_GLOBALS._nico910State >= 4) return NamedObject::startAction(action, event); if (BF_GLOBALS._v4CEE6 < 4) @@ -847,8 +847,8 @@ bool Scene910::Nico::startAction(CursorType action, Event &event) { return true; break; case INV_COLT45: - if (BF_GLOBALS._v4CEE2 > 1) { - if (BF_GLOBALS._v4CEE2 != 4) { + if (BF_GLOBALS._nico910State > 1) { + if (BF_GLOBALS._nico910State != 4) { if ((BF_GLOBALS.getFlag(gunDrawn)) && (BF_GLOBALS.getFlag(fGunLoaded)) && (BF_GLOBALS.getHasBullets())) { if (scene->_field2DE0 == 0) { BF_GLOBALS._player.disableControl(); @@ -880,7 +880,7 @@ bool Scene910::Nico::startAction(CursorType action, Event &event) { break; case INV_BADGE: case INV_ID: - if (BF_GLOBALS._v4CEE2 >= 4) + if (BF_GLOBALS._nico910State >= 4) return NamedObject::startAction(action, event); if (BF_GLOBALS._v4CEE6 < 4) @@ -895,11 +895,12 @@ bool Scene910::Nico::startAction(CursorType action, Event &event) { return true; break; case INV_YELLOW_CORD: - if (BF_GLOBALS._v4CEE2 < 4) { + if (BF_GLOBALS._nico910State < 4) { BF_GLOBALS._player.disableControl(); scene->_yellowCord.fixPriority(121); scene->_sceneSubMode = 10; scene->_sceneMode = 9123; + BF_GLOBALS._nico910State = 3; if (BF_GLOBALS._player._visage == 1911) scene->setAction(&scene->_sequenceManager1, scene, 9123, &BF_GLOBALS._player, NULL); else @@ -995,7 +996,7 @@ bool Scene910::Stuart::startAction(CursorType action, Event &event) { return true; } else { BF_GLOBALS._player.disableControl(); - if (BF_GLOBALS._v4CEE2 == 4) { + if (BF_GLOBALS._nico910State == 4) { scene->_sceneSubMode = 11; scene->_sceneMode = 9123; if (BF_GLOBALS._player._visage == 1911) @@ -1136,7 +1137,7 @@ bool Scene910::BreakerBox::startAction(CursorType action, Event &event) { SceneItem::display2(910, 62); return true; } else if (scene->_sceneMode != 9120) { - if (BF_GLOBALS._v4CEE2 == 1) { + if (BF_GLOBALS._nico910State == 1) { BF_GLOBALS._player.disableControl(); scene->_sceneMode = 9118; scene->setAction(&scene->_sequenceManager1, scene, 9118, &BF_GLOBALS._player, &scene->_nico, NULL); @@ -1291,7 +1292,7 @@ bool Scene910::Object13::startAction(CursorType action, Event &event) { switch (_state) { case 1: - if (BF_GLOBALS._v4CEE2 < 1) { + if (BF_GLOBALS._nico910State < 1) { if (_frame == 2) { if (!BF_GLOBALS.getFlag(fGotPointsForClosingDoor)) { T2_GLOBALS._uiElements.addScore(30); @@ -1299,7 +1300,7 @@ bool Scene910::Object13::startAction(CursorType action, Event &event) { } scene->_sceneMode = 0; if (BF_GLOBALS._dayNumber == 5) { - if (BF_GLOBALS._v4CEE2 == 0) { + if (BF_GLOBALS._nico910State == 0) { scene->_breakerBoxInset.remove(); // _objectList.draw(); BF_GLOBALS._player.disableControl(); @@ -1309,7 +1310,7 @@ bool Scene910::Object13::startAction(CursorType action, Event &event) { scene->_nico.postInit(); scene->_sceneMode = 9129; scene->setAction(&scene->_sequenceManager1, scene, 9129, &BF_GLOBALS._player, &scene->_nico, NULL); - } else if (BF_GLOBALS._v4CEE2 == 2) { + } else if (BF_GLOBALS._nico910State == 2) { scene->_breakerBoxInset.remove(); // _objectList.draw(); BF_GLOBALS._player.disableControl(); @@ -1612,7 +1613,7 @@ bool Scene910::BlackPlug::startAction(CursorType action, Event &event) { SET_EXT_FGCOLOR, 13, LIST_END); return true; } - if (BF_GLOBALS._v4CEE2 == 3) { + if (BF_GLOBALS._nico910State == 3) { SceneItem::display(910, 84, SET_WIDTH, 312, SET_X, GLOBALS._sceneManager._scene->_sceneBounds.left + 4, SET_Y, GLOBALS._sceneManager._scene->_sceneBounds.top + UI_INTERFACE_Y + 2, @@ -1830,7 +1831,7 @@ bool Scene910::Generator::startAction(CursorType action, Event &event) { SET_Y, GLOBALS._sceneManager._scene->_sceneBounds.top + UI_INTERFACE_Y + 2, SET_FONT, 4, SET_BG_COLOR, 1, SET_FG_COLOR, 19, SET_EXT_BGCOLOR, 9, SET_EXT_FGCOLOR, 13, LIST_END); - else if (BF_GLOBALS._v4CEE2 == 1) { + else if (BF_GLOBALS._nico910State == 1) { BF_GLOBALS._player.disableControl(); scene->_sceneMode = 9118; scene->setAction(&scene->_sequenceManager1, scene, 9118, &BF_GLOBALS._player, &scene->_nico, NULL); @@ -1869,7 +1870,7 @@ bool Scene910::Item2::startAction(CursorType action, Event &event) { bool Scene910::Item3::startAction(CursorType action, Event &event) { Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene; - if ((action == CURSOR_TALK) && (BF_GLOBALS._v4CEE2 == 4) && (BF_GLOBALS._v4CEE4 == 0)) { + if ((action == CURSOR_TALK) && (BF_GLOBALS._nico910State == 4) && (BF_GLOBALS._v4CEE4 == 0)) { BF_GLOBALS._player.disableControl(); scene->_sceneMode = 15; scene->_stripManager.start(9102, scene); @@ -1907,7 +1908,7 @@ bool Scene910::Item15::startAction(CursorType action, Event &event) { bool Scene910::Item16::startAction(CursorType action, Event &event) { Scene910 *scene = (Scene910 *)BF_GLOBALS._sceneManager._scene; - if ((BF_GLOBALS._hiddenDoorStatus == 0) || (BF_GLOBALS._v4CEE2 != 0)) + if ((BF_GLOBALS._hiddenDoorStatus == 0) || (BF_GLOBALS._nico910State != 0)) return false; if (BF_GLOBALS._player._visage == 1911) { @@ -2016,7 +2017,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) { if (BF_GLOBALS._dayNumber < 5) _item17.setDetails(Rect(0, 149, 29, 167), 910, -1, -1, -1, 1, NULL); - if (BF_GLOBALS._v4CEE2 == 0) + if (BF_GLOBALS._nico910State == 0) _item16.setDetails(Rect(265, 18, 319, 102), 910, -1, -1, -1, 1, NULL); _breakerBox.setDetails(910, 6, -1, -1, 1, (SceneItem *)NULL); @@ -2048,7 +2049,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) { || (BF_GLOBALS._sceneManager._previousScene == 190) || (BF_GLOBALS._sceneManager._previousScene == 300)) { BF_GLOBALS._sceneManager._previousScene = 900; - BF_GLOBALS._v4CEE2 = 0; + BF_GLOBALS._nico910State = 0; BF_GLOBALS._v4CEE4 = 0; } @@ -2142,7 +2143,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) { _nico.setPosition(Common::Point(262, 124)); _nico.setStrip(6); BF_GLOBALS._v4CEE6 = 0; - BF_GLOBALS._v4CEE2 = 1; + BF_GLOBALS._nico910State = 1; _nico.setDetails(910, 63, 64, 67, 5, &_item4); BF_GLOBALS._v4CECA = 2; if (BF_GLOBALS._v4CECC == 0) @@ -2157,7 +2158,7 @@ void Scene910::postInit(SceneObjectList *OwnerList) { BF_GLOBALS._player.disableControl(); } - if ((BF_GLOBALS._dayNumber == 5) && (BF_GLOBALS._v4CEE2 == 0)){ + if ((BF_GLOBALS._dayNumber == 5) && (BF_GLOBALS._nico910State == 0)){ _shadow.postInit(); _shadow.setAction(&_action2); } @@ -2297,7 +2298,7 @@ void Scene910::signal() { case 13: BF_GLOBALS._player.disableControl(); BF_GLOBALS._player.setAction(&_sequenceManager2, NULL, 9117, &_nico, NULL); - BF_GLOBALS._v4CEE2 = 2; + BF_GLOBALS._nico910State = 2; // No break on purpose case 15: _stuart.postInit(); @@ -2314,7 +2315,7 @@ void Scene910::signal() { _lyle._field90 = 1; _sceneMode = 10; addFader((const byte *)&black, 2, this); - BF_GLOBALS._v4CEE2 = 1; + BF_GLOBALS._nico910State = 1; BF_GLOBALS._walkRegions.disableRegion(16); BF_GLOBALS._walkRegions.disableRegion(14); BF_GLOBALS._sceneItems.remove(&_item16); @@ -2324,7 +2325,7 @@ void Scene910::signal() { BF_GLOBALS._player._frame = 1; if (_field2DE2 == 0) { _field2DE2 = 1; - if (BF_GLOBALS._v4CEE2 == 4) { + if (BF_GLOBALS._nico910State == 4) { _sceneMode = 9149; setAction(&_sequenceManager1, this, 9149, &BF_GLOBALS._player, NULL); } else { @@ -2452,7 +2453,7 @@ void Scene910::signal() { break; case 9114: _fakeWall.hide(); - if ((BF_GLOBALS._dayNumber == 5) && (BF_GLOBALS._v4CEE2 == 0)) { + if ((BF_GLOBALS._dayNumber == 5) && (BF_GLOBALS._nico910State == 0)) { BF_GLOBALS._player.disableControl(); _nico.postInit(); _nico.setDetails(910, 63, 64, 65, 5, &_item4); @@ -2496,7 +2497,7 @@ void Scene910::signal() { case 9121: _item3.setDetails(7, 910, 96, 60, 61, 3); BF_GLOBALS._v4CEE4 = 2; - if (BF_GLOBALS._v4CEE2 == 4) { + if (BF_GLOBALS._nico910State == 4) { _sceneMode = 20; _stripManager.start(9115, this); } else { @@ -2527,7 +2528,7 @@ void Scene910::signal() { setAction(&_sequenceManager1, this, 9111, &BF_GLOBALS._player, &_blackCord, NULL); break; case 5: - switch (BF_GLOBALS._v4CEE2 - 1) { + switch (BF_GLOBALS._nico910State - 1) { case 0: _sceneMode = 9118; setAction(&_sequenceManager1, this, 9118, &BF_GLOBALS._player, &_nico, NULL); @@ -2598,7 +2599,7 @@ void Scene910::signal() { break; case 9125: BF_GLOBALS.setFlag(fBackupAt340); - BF_GLOBALS._v4CEE2 = 4; + BF_GLOBALS._nico910State = 4; _stuart.postInit(); _nico.setDetails(910, 72, 73, 74, 3, (SceneItem *)NULL); _stuart.setDetails(910, 66, 67, 68, 5, &_nico); @@ -2645,7 +2646,7 @@ void Scene910::signal() { } _lyle.setAction(&_sequenceManager2, NULL, 9131, &_lyle, NULL); BF_GLOBALS._walkRegions.enableRegion(16); - if (BF_GLOBALS._v4CEE2 == 4) + if (BF_GLOBALS._nico910State == 4) BF_INVENTORY.setObjectScene(INV_YELLOW_CORD, 0); else BF_INVENTORY.setObjectScene(INV_HALF_YELLOW_CORD, 910); @@ -2679,7 +2680,7 @@ void Scene910::signal() { } break; case 9143: - if (BF_GLOBALS._v4CEE2 == 0) { + if (BF_GLOBALS._nico910State == 0) { BF_GLOBALS._v51C44 = 1; BF_GLOBALS._sceneManager.changeScene(920); } else { @@ -2730,7 +2731,7 @@ void Scene910::process(Event &event) { if (_item17._bounds.contains(event.mousePos)) { GfxSurface surface = _cursorVisage.getFrame(EXITFRAME_SW); BF_GLOBALS._events.setCursor(surface); - } else if ((BF_GLOBALS._hiddenDoorStatus == 0) || (BF_GLOBALS._v4CEE2 != 0)) { + } else if ((BF_GLOBALS._hiddenDoorStatus == 0) || (BF_GLOBALS._nico910State != 0)) { CursorType cursorId = BF_GLOBALS._events.getCursor(); BF_GLOBALS._events.setCursor(cursorId); } else if (!_item16._bounds.contains(event.mousePos)) { @@ -2755,7 +2756,7 @@ void Scene910::process(Event &event) { _sceneMode = 9123; setAction(&_sequenceManager1, this, 9123, &BF_GLOBALS._player, NULL); event.handled = true; - } else if (BF_GLOBALS._v4CEE2 <= 1) { + } else if (BF_GLOBALS._nico910State <= 1) { if (BF_GLOBALS.getFlag(fCanDrawGun)) { BF_GLOBALS._player.addMover(NULL); BF_GLOBALS._player.disableControl(); @@ -2776,7 +2777,7 @@ void Scene910::process(Event &event) { event.handled = true; break; case CURSOR_WALK: - if (BF_GLOBALS._v4CEE2 == 1) { + if (BF_GLOBALS._nico910State == 1) { BF_GLOBALS._player.disableControl(); if (BF_GLOBALS._player._visage == 1911) { BF_GLOBALS._player.disableControl(); @@ -2826,7 +2827,7 @@ void Scene910::dispatch() { _sceneSubMode = 3; _sceneMode = 9123; setAction(&_sequenceManager1, this, 9123, &BF_GLOBALS._player, NULL); - } else if (BF_GLOBALS._v4CEE2 == 0) { + } else if (BF_GLOBALS._nico910State == 0) { _sceneMode = 9143; setAction(&_sequenceManager1, this, 9143, &BF_GLOBALS._player, NULL); } else { @@ -2840,7 +2841,7 @@ void Scene910::dispatch() { } } - if ((BF_GLOBALS._dayNumber == 5) && (BF_GLOBALS._player._position.x > 250) && (_sceneMode != 9135) && (_sceneMode != 11) && (BF_GLOBALS._hiddenDoorStatus != 0) && (BF_GLOBALS._v4CEE2 == 0)) { + if ((BF_GLOBALS._dayNumber == 5) && (BF_GLOBALS._player._position.x > 250) && (_sceneMode != 9135) && (_sceneMode != 11) && (BF_GLOBALS._hiddenDoorStatus != 0) && (BF_GLOBALS._nico910State == 0)) { BF_GLOBALS._player.disableControl(); _shadow.remove(); _nico.remove(); @@ -2853,7 +2854,7 @@ void Scene910::dispatch() { } void Scene910::checkGun() { - if ((BF_GLOBALS._dayNumber == 5) && (BF_GLOBALS._v4CEE2 == 0) && (BF_GLOBALS._hiddenDoorStatus != 0)) + if ((BF_GLOBALS._dayNumber == 5) && (BF_GLOBALS._nico910State == 0) && (BF_GLOBALS._hiddenDoorStatus != 0)) SceneItem::display(910, 70, SET_WIDTH, 312, SET_X, GLOBALS._sceneManager._scene->_sceneBounds.left + 4, SET_Y, GLOBALS._sceneManager._scene->_sceneBounds.top + UI_INTERFACE_Y + 2, @@ -2900,7 +2901,7 @@ void Scene910::closeHiddenDoor() { setAction(&_sequenceManager1, this, 9115, &_fakeWall, &_object5, NULL); } - if ((BF_GLOBALS._dayNumber == 5) && (BF_GLOBALS._v4CEE2 == 0)) { + if ((BF_GLOBALS._dayNumber == 5) && (BF_GLOBALS._nico910State == 0)) { // _objectList.draw(); if (BF_GLOBALS._sceneObjects->contains(&_breakerBoxInset)) _breakerBoxInset.remove(); diff --git a/engines/tsage/globals.cpp b/engines/tsage/globals.cpp index 59eb59b194..de9463268b 100644 --- a/engines/tsage/globals.cpp +++ b/engines/tsage/globals.cpp @@ -247,7 +247,7 @@ void BlueForceGlobals::synchronize(Serializer &s) { for (int i = 0; i < 18; i++) s.syncAsByte(_breakerBoxStatusArr[i]); s.syncAsSint16LE(_hiddenDoorStatus); - s.syncAsSint16LE(_v4CEE2); + s.syncAsSint16LE(_nico910State); s.syncAsSint16LE(_v4CEE4); s.syncAsSint16LE(_v4CEE6); s.syncAsSint16LE(_v4CEE8); @@ -320,7 +320,7 @@ void BlueForceGlobals::reset() { _breakerBoxStatusArr[16] = 3; _breakerBoxStatusArr[17] = 0; _hiddenDoorStatus = 0; - _v4CEE2 = 0; + _nico910State = 0; _v4CEE4 = 0; _v4CEE6 = 0; _v4CEE8 = 0; diff --git a/engines/tsage/globals.h b/engines/tsage/globals.h index 45226c921b..d190b6a2a4 100644 --- a/engines/tsage/globals.h +++ b/engines/tsage/globals.h @@ -200,7 +200,7 @@ public: int _v4CECC; int8 _breakerBoxStatusArr[18]; int _hiddenDoorStatus; - int _v4CEE2; + int _nico910State; int _v4CEE4; int _v4CEE6; int _v4CEE8; -- cgit v1.2.3 From ee818634abbf7c63c8b494f3b57f67b42cd3648a Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Wed, 11 Jul 2012 21:41:20 +1000 Subject: TINSEL: Added MD5 detection entries for Discworld 1 Polish translation --- engines/tinsel/detection_tables.h | 56 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h index b6b19f6ee7..ef562a5e08 100644 --- a/engines/tinsel/detection_tables.h +++ b/engines/tinsel/detection_tables.h @@ -218,6 +218,41 @@ static const TinselGameDescription gameDescriptions[] = { TINSEL_V1, }, + { // Polish fan translation CD V1 version, with *.gra files (same as the floppy one, with english.smp) + { + "dw", + "CD", + { + {"dw.gra", 0, "ef05bbd2a754bd11a2e87bcd84ab5ccf", 781864}, + {"english.smp", 0, NULL, -1}, + }, + Common::EN_ANY, + Common::kPlatformPC, + ADGF_NO_FLAGS, + GUIO_NONE + }, + GID_DW1, + 0, + GF_CD | GF_ENHANCED_AUDIO_SUPPORT, + TINSEL_V1, + }, + + { // Polish fan translaction floppy V1 version, with *.gra files + { + "dw", + "Floppy", + AD_ENTRY1s("dw.gra", "ef05bbd2a754bd11a2e87bcd84ab5ccf", 781864), + Common::EN_ANY, + Common::kPlatformPC, + ADGF_NO_FLAGS, + GUIO_NOSPEECH + }, + GID_DW1, + 0, + GF_FLOPPY | GF_ENHANCED_AUDIO_SUPPORT, + TINSEL_V1, + }, + { // Italian CD with english speech and *.gra files. // Note: It contains only italian subtitles, but inside english.txt { @@ -520,6 +555,27 @@ static const TinselGameDescription gameDescriptions[] = { TINSEL_V2, }, + { // Polish fan translaction Discworld 1 + { + "dw", + "CD", + { + {"dw.scn", 0, "fa169d2c98660215ebd84b49c1899eef", 776396}, + {"english.txt", 0, "c1a53eb7ec812689dab70e2bb22cf2ab", 224151}, + {"english.smp", 0, NULL, -1}, + {NULL, 0, NULL, 0} + }, + Common::PL_POL, + Common::kPlatformPC, + ADGF_NO_FLAGS, + GUIO_NONE + }, + GID_DW1, + 0, + GF_CD | GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, + TINSEL_V1, + }, + { // European/Australian Discworld 2 release { "dw2", -- cgit v1.2.3 From e8d115247f5c9dabc0736fc0097a39be6f4cdb85 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Fri, 13 Jul 2012 21:39:26 +0100 Subject: I18N: Update Czech translation and README from patch #3541613 --- doc/cz/PrectiMe | 53 +++++++++++++++++++++++++++++++++++++++++++++++------ po/cs_CZ.po | 25 ++++++++++++------------- 2 files changed, 59 insertions(+), 19 deletions(-) diff --git a/doc/cz/PrectiMe b/doc/cz/PrectiMe index 4cb362ab3c..153ef09dcd 100644 --- a/doc/cz/PrectiMe +++ b/doc/cz/PrectiMe @@ -53,7 +53,9 @@ Obsah: * 7.7 Podpora MIDI serveru TiMidity++ * 7.8 Použití komprimovaných zvukových souborů (MP3, Ogg Vorbis, Flac) * 7.9 Výstupní vzorkovací kmitočet -8.0) Soubor s nastavením +8.0) Soubor s nastavením + * 8.1 Rozpoznávaná klíčová slova nastavení + * 8.2 Vlastní herní volby, které mohou být přepínány pomoci grafického rozhraní 9.0) Sestavení @@ -179,13 +181,18 @@ Hry AGOS od Adventuresoft/Horrorsoft: The Feeble Files [feeble] Hry GOB od Coktel Vision: + Bambou le sauveur de la jungle [bambou] Bargon Attack [bargon] + Fascination [fascination] + Geisha [geisha] Gobliiins [gob1] Gobliins 2 [gob2] Goblins 3 [gob3] Lost in Time [lostintime] + Once Upon A Time: Little Red Riding Hood [littlered] The Bizarre Adventures of Woodruff and the Schnibble [woodruff] + Urban Runner [urban] Ween: The Prophecy [ween] Hry MADE od Activision: @@ -216,6 +223,7 @@ Další hry: Hry SCUMM od Humongous Entertainment: Backyard Baseball [baseball] Backyard Baseball 2001 [baseball2001] + Backyard Baseball 2003 [baseball2003] Backyard Football [football] Big Thinkers First Grade [thinker1] Big Thinkers Kindergarten [thinkerk] @@ -284,7 +292,6 @@ Hry Living Books: Následující hry by měly jít spustit, ale zatím nejsou úplně hratelné. Hrajte je pouze na vlastní riziko a prosíme, abyste pro tyto hry nenahlašovali chyby. Pokud chcete mít nejnovější zprávy o kompatibilitách her, navštivte naší stránku a prohlédněte si tabulku kompatibilit. - Backyard Baseball 2003 [baseball2003] Backyard Football 2002 [football2002] Backyard Soccer [soccer] Backyard Soccer MLS [soccermls] @@ -1478,6 +1485,8 @@ Vzorový soubor s nastavením vypadá takto: path=C:\amiga_mi2\ music_driver=windows +8.1) Rozpoznávaná klíčová slova nastavení +---- ------------------------------------ Jsou rozpoznávána následující klíčová slova: path řetězec Cesta, kde jsou umístěny datové soubory hry @@ -1494,7 +1503,6 @@ Jsou rozpoznávána následující klíčová slova: talkspeed číslo Zpoždění textu v hrách SCUMM, nebo rychlost textu v jiných hrách. fullscreen boolean Režim celé obrazovky aspect_ratio boolean Povolit korekci poměru stran - disable_dithering boolean Odstranit artefakty chvění v některých hrách EGA gfx_mode řetězec Grafický režim (normální, 2x, 3x, 2xsai, super2xsai, supereagle, advmame2x, advmame3x,hq2x, hq3x, tv2x, dotmatrix) confirm_exit boolean Zeptat se uživatele na potvrzení před ukončením (pouze jádro SDL). console boolean Povolit okno konzole (výchozí: zapnuto) (pouze Windows). @@ -1518,6 +1526,16 @@ Jsou rozpoznávána následující klíčová slova: alt_intro boolean Použít alternativní úvod pro CD verze Beneath a Steel Sky a Flight of the Amazon Queen boot_param číslo Předá toto číslo zaváděcímu skriptu +Hry Sierra používající jádro AGI přidávají následující nestandardní klíčové slovo: + +originalsaveload boolean Pokud true, jsou použity původní obrazovky nahrávání/uložení místo vylepšených ze ScummVM + +Hry Sierra používající jádro SCI přidávají následující nestandardní klíčová slova: + + disable_dithering boolean Odstranit artefakty chvění v některých hrách EGA + prefer_digitalsfx boolean Pokud true, jsou upřednostňovány digitální zvukové efekty před syntetizovanými + originalsaveload boolean Pokud true, jsou použity původní obrazovky nahrávání/uložení místo vylepšených ze ScummVM + native_fb01 bool Pokud true, je ovladač hudby pro kartu IBM Music Feature nebo modul syntetizátoru Yahama FB-01 FM použit jako výstup MIDI Broken Sword II přidává následující nestandardní klíčová slova: gfx_details číslo Nastavení grafických detailů (0-3) @@ -1526,16 +1544,25 @@ Broken Sword II přidává následující nestandardní klíčová slova: reverse_stereo boolean Pokud true, kanály stereo jsou obráceny sfx_mute boolean Pokud true, zvukové efekty jsou ztlumeny -Flight of the Amazon Queen přidává následující nestandardní klíčová slova +Flight of the Amazon Queen přidává následující nestandardní klíčová slova: music_mute boolean Pokud true, hudba je ztlumena sfx_mute boolean Pokud true, zvukové efekty jsou ztlumeny -King's Quest VI Windows přidává následující nestandardní klíčová slova: +Jones in the Fast Lane přidává následující nestandardní klíčové slovo: + + music_mute boolean Pokud true, je použito CD audio místo zvuků ve hře + +King's Quest VI Windows přidává následující nestandardní klíčové slovo: windows_cursors boolean Pokud true, jsou použity původní černobílé kurzory místo kurzorů z DOS. Pokud false, jsou ve verzi Windows použity kurzory DOS, zvětšené, aby se shodovaly se zbytkem zvětšené grafiky -Space Qust IV CD přidává následující nestandardní klíčové slovo: +Lands of Lore: The Throne of Chaos přidává následující nestandardní klíčová slova: + + smooth_scrolling boolean Pokud true, je posunování při změně z jedné obrazovky na druhou plynulejší + floating_cursors boolean Pokud true, je kurzor změněn na směrovou šipku při najetí na okraj obrazovky. Hráč pak může kliknout pro pohyb v tomto směru. + +Space Quest IV CD přidává následující nestandardní klíčové slovo: silver_cursors boolean Pokud true, je místo původních zlatých kurzorů použita alternativní sada stříbrných @@ -1548,10 +1575,23 @@ The Legend of Kyrandia přidává následující nestandardní klíčové slovo: walkspeed celé číslo Rychlost chůze (0-4) +The Legend of Kyrandia: Malcolm's Revenge přidává následující nestandardní klíčová slova: + + studio_audience boolean Pokud true, je slyšet potlesk a smích kdykoliv Malcolm provede něco vtipného + skip_support boolean Pokud true, hráč může přeskakovat text a scény hry + helium_mode boolean Pokud true, lidé znějí tak, jakoby se nadýchali hélia + The 7th Guest přidává následující nestandardní klíčové slovo: t7g_speed řetězec Rychlost přehrávání videa (normal - normální, tweaked - upravená, im_an_ios - jsem na ios) +8.2) Vlastní herní volby, které mohou být přepínány pomoci grafického +---- ---------------------------------------------------------------- +rozhraní +-------- +Mnoho vlastních herních voleb v předchozí části může být přepnuto přes grafické rozhraní. Pokud je takováto volba pro určitou hru dostupná, objeví se karta "Jádro" při přidávání nebo úpravě nastavení této hry. +Pokud vlastní možnosti nejsou zobrazeny, musí být konkrétní hry spuštěny jednou nebo znovu přidány do seznamu her spouštěče ScummVM. Toto aktualizuje nastavení každé položky, čímž umožní zobrazení vlastních voleb. + 9.0) Sestavení: ---- ---------- Pro aktuální přehled o tom, jak ScummVM sestavit pro různé platformy, prohlédněte si, prosím, naší Wiki, zvláště tuto stránku: @@ -1624,3 +1664,4 @@ http://www.scummvm.org/ ------------------------------------------------------------------------ + diff --git a/po/cs_CZ.po b/po/cs_CZ.po index 6bf4e77206..a2d640651c 100644 --- a/po/cs_CZ.po +++ b/po/cs_CZ.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: ScummVM 1.4.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-07-08 12:25+0100\n" -"PO-Revision-Date: 2012-05-22 21:02+0100\n" +"PO-Revision-Date: 2012-07-08 18:03+0100\n" "Last-Translator: Zbynk Schwarz \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -27,7 +27,7 @@ msgstr "(sestaveno %s)" #: gui/about.cpp:98 msgid "Features compiled in:" -msgstr "Zakompilovan Funkce:" +msgstr "Zakompilovan funkce:" #: gui/about.cpp:107 msgid "Available engines:" @@ -309,7 +309,7 @@ msgstr "Cesta pro ulo #: gui/launcher.cpp:333 gui/launcher.cpp:335 gui/launcher.cpp:336 #: gui/options.cpp:1123 gui/options.cpp:1125 gui/options.cpp:1126 msgid "Specifies where your savegames are put" -msgstr "Stanovuje, kam jsou umstny Vae uloen hry" +msgstr "Stanovuje, kam jsou umstny vae uloen hry" #: gui/launcher.cpp:335 gui/options.cpp:1125 msgctxt "lowres" @@ -726,7 +726,7 @@ msgid "" "connected to your computer" msgstr "" "Zakrtnte, pokud chcete pout prav hardwarov zazen kompatibiln s " -"Roland, pipojen k Vaemu potai" +"Roland, pipojen k vaemu potai" #: gui/options.cpp:877 msgctxt "lowres" @@ -2180,7 +2180,6 @@ msgid "Choose Spell" msgstr "Zvolit Kouzlo" #: engines/kyra/sound_midi.cpp:475 -#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2189,10 +2188,10 @@ msgid "" "some tracks sound incorrect." msgstr "" "Zd se, e pouvte zazen General MIDI,\n" -"ale Vae hra podporuje pouze Roland MT32 MIDI.\n" +"ale vae hra podporuje pouze Roland MT32 MIDI.\n" "Sname se mapovat nstroje Roland MT32 na\n" -"ty od General MIDI. Po tomto se me stt,\n" -"e pr stop nebude sprvn pehrno." +"ty od General MIDI. Je stle mon, e\n" +"nkter stopy nebudou znt sprvn." #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 msgid "Floppy intro" @@ -2249,7 +2248,7 @@ msgstr "" "ScummVM zjistil, e mte star uloen pozice pro Broken Sword 1, kter by " "mly bt pevedeny.\n" "Star formt uloench her ji nen podporovn, take pokud je nepevedete, " -"nebudete moci Vae hry nast.\n" +"nebudete moci vae hry nast.\n" "\n" "Stisknte OK, abyste je pevedli te, jinak budete podni znovu, pi " "sputn tto hry.\n" @@ -2317,13 +2316,13 @@ msgstr "" "ScummVM zjistil, e mte star uloen pozice pro Nippon Safes, kter by " "mly bt pejmenovny.\n" "Star nzvy ji nejsou podporovny, take pokud je nepevedete, nebudete " -"moci Vae hry nast.\n" +"moci vae hry nast.\n" "\n" "Stisknte OK, abyste je pevedli te, jinak budete podni pt.\n" #: engines/parallaction/saveload.cpp:319 msgid "ScummVM successfully converted all your savefiles." -msgstr "ScummVM spn pevedl vechny Vae uloen pozice. " +msgstr "ScummVM spn pevedl vechny vae uloen pozice. " #: engines/parallaction/saveload.cpp:321 msgid "" @@ -2332,8 +2331,8 @@ msgid "" "\n" "Please report to the team." msgstr "" -"ScummVM vytiskl nkter varovn ve Vaem okn konzole a neme zaruit, e " -"vechny Vae soubory byly pevedeny.\n" +"ScummVM vytiskl nkter varovn ve vaem okn konzole a neme zaruit, e " +"vechny vae soubory byly pevedeny.\n" "\n" "Prosm nahlaste to tmu" -- cgit v1.2.3 From 9fa92e95e7367d2e99be387f471ed213689292df Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Fri, 13 Jul 2012 21:39:54 +0100 Subject: I18N: Update French translation --- po/fr_FR.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/fr_FR.po b/po/fr_FR.po index e153beb3a5..4631d4c91a 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -2200,7 +2200,6 @@ msgid "Choose Spell" msgstr "Choisir un Sort" #: engines/kyra/sound_midi.cpp:475 -#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2209,10 +2208,10 @@ msgid "" "some tracks sound incorrect." msgstr "" "Il semble que vous utilisiez un priphrique General MIDI,\n" -"mais ce jeu ne support que le MIDI Roland MT32.\n" -"Nous essayons d'associer les instruments Roland MT32 auxinstruments General " -"MIDI. Mais il est possible que quelquespistes ne soient pas joues " -"correctement." +"mais ce jeu ne support que le MIDI Roland MT32. Nous essayons\n" +"d'associer les instruments Roland MT32 aux instruments General\n" +"MIDI. Cependant il est possible que quelques pistes ne soient\n " +"pas joues correctement." #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 msgid "Floppy intro" -- cgit v1.2.3 From 856f9326179e186f08abc0163039f51ad31e9afb Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Fri, 13 Jul 2012 21:47:17 +0100 Subject: I18N: Regenerate translations data file --- gui/themes/translations.dat | Bin 341409 -> 342141 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat index 9735e99fca..0e32008bd9 100644 Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ -- cgit v1.2.3 From e10b59b62492c67fc7eeb6eccd39f0b75722338d Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sat, 14 Jul 2012 05:04:00 +0300 Subject: TINSEL: Cleanup --- engines/tinsel/handle.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/engines/tinsel/handle.cpp b/engines/tinsel/handle.cpp index c3089db990..14d588dcec 100644 --- a/engines/tinsel/handle.cpp +++ b/engines/tinsel/handle.cpp @@ -99,14 +99,16 @@ void SetupHandleTable() { MEMHANDLE *pH; TinselFile f; - if (f.open(TinselV1PSX? PSX_INDEX_FILENAME : INDEX_FILENAME)) { + const char *indexFileName = TinselV1PSX ? PSX_INDEX_FILENAME : INDEX_FILENAME; + + if (f.open(indexFileName)) { // get size of index file len = f.size(); if (len > 0) { if ((len % RECORD_SIZE) != 0) { // index file is corrupt - error(FILE_IS_CORRUPT, TinselV1PSX? PSX_INDEX_FILENAME : INDEX_FILENAME); + error(FILE_IS_CORRUPT, indexFileName); } // calc number of handles @@ -132,16 +134,16 @@ void SetupHandleTable() { if (f.eos() || f.err()) { // index file is corrupt - error(FILE_IS_CORRUPT, (TinselV1PSX? PSX_INDEX_FILENAME : INDEX_FILENAME)); + error(FILE_IS_CORRUPT, indexFileName); } // close the file f.close(); } else { // index file is corrupt - error(FILE_IS_CORRUPT, (TinselV1PSX? PSX_INDEX_FILENAME : INDEX_FILENAME)); + error(FILE_IS_CORRUPT, indexFileName); } } else { // cannot find the index file - error(CANNOT_FIND_FILE, (TinselV1PSX? PSX_INDEX_FILENAME : INDEX_FILENAME)); + error(CANNOT_FIND_FILE, indexFileName); } // allocate memory nodes and load all permanent graphics -- cgit v1.2.3 From 0c84dc1ec94771e5bb4ea68049b0cd94d86fb789 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Tue, 10 Jul 2012 23:39:54 -0400 Subject: CREATE_PROJECT: Add Visual Studio 2012 project --- devtools/create_project/msvc11/create_project.sln | 20 ++++ .../create_project/msvc11/create_project.vcxproj | 129 +++++++++++++++++++++ .../msvc11/create_project.vcxproj.filters | 71 ++++++++++++ 3 files changed, 220 insertions(+) create mode 100644 devtools/create_project/msvc11/create_project.sln create mode 100644 devtools/create_project/msvc11/create_project.vcxproj create mode 100644 devtools/create_project/msvc11/create_project.vcxproj.filters diff --git a/devtools/create_project/msvc11/create_project.sln b/devtools/create_project/msvc11/create_project.sln new file mode 100644 index 0000000000..1552c9f502 --- /dev/null +++ b/devtools/create_project/msvc11/create_project.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "create_project", "create_project.vcxproj", "{CF177559-077D-4A08-AABE-BE0FD35F6C63}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.ActiveCfg = Debug|Win32 + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Debug|Win32.Build.0 = Debug|Win32 + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.ActiveCfg = Release|Win32 + {CF177559-077D-4A08-AABE-BE0FD35F6C63}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/devtools/create_project/msvc11/create_project.vcxproj b/devtools/create_project/msvc11/create_project.vcxproj new file mode 100644 index 0000000000..5947211e35 --- /dev/null +++ b/devtools/create_project/msvc11/create_project.vcxproj @@ -0,0 +1,129 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {CF177559-077D-4A08-AABE-BE0FD35F6C63} + create_project + $(VCTargetsPath11) + + + + Application + MultiByte + true + v110 + + + Application + MultiByte + v110 + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + $(SolutionDir)$(Configuration)\ + $(Configuration)\ + + + + Disabled + true + EnableFastChecks + MultiThreadedDebugDLL + Level4 + EditAndContinue + false + 4003;4512;4127 + + + Rpcrt4.lib;%(AdditionalDependencies) + true + MachineX86 + false + + + @echo off +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" + + + + + MaxSpeed + true + MultiThreadedDLL + true + Level3 + ProgramDatabase + 4003;4512;4127 + + + Rpcrt4.lib;%(AdditionalDependencies) + true + true + true + MachineX86 + + + @echo off +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\codeblocks\" +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/devtools/create_project/msvc11/create_project.vcxproj.filters b/devtools/create_project/msvc11/create_project.vcxproj.filters new file mode 100644 index 0000000000..b4f0b18774 --- /dev/null +++ b/devtools/create_project/msvc11/create_project.vcxproj.filters @@ -0,0 +1,71 @@ + + + + + {2e3580c8-ec3a-4c81-8351-b668c668db2a} + + + {31aaf58c-d3cb-4ed6-8eca-163b4a9b31a6} + + + {f980f6fb-41b6-4161-b035-58b200c85cad} + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + scripts + + + scripts + + + scripts + + + scripts + + + -- cgit v1.2.3 From 4e0f6d346fe3c05157fa89c7881c2050e497763a Mon Sep 17 00:00:00 2001 From: Littleboy Date: Wed, 11 Jul 2012 00:43:54 -0400 Subject: CREATE_PROJECT: Properly disable Edit and Continue in Debug mode --- devtools/create_project/msbuild.cpp | 8 ++++---- devtools/create_project/visualstudio.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index dfd3f1d1c7..a82140c2d3 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -249,11 +249,11 @@ void MSBuildProvider::outputProjectSettings(std::ofstream &project, const std::s // Compile configuration if (setup.devTools || name == setup.projectName || name == "sword25" || name == "grim") { project << "\t\t\tfalse\n"; - } else { - if (name == "scummvm" && !isRelease) - project << "\t\t\tProgramDatabase\n"; - if (warningsIterator != _projectWarnings.end()) + if (name == setup.projectName && !isRelease) + project << "\t\t\tProgramDatabase\n"; + } else { + if (warningsIterator != _projectWarnings.end()) project << "\t\t\t" << warnings << ";%(DisableSpecificWarnings)\n"; } diff --git a/devtools/create_project/visualstudio.cpp b/devtools/create_project/visualstudio.cpp index 62b30ddcd0..c301e78ad1 100644 --- a/devtools/create_project/visualstudio.cpp +++ b/devtools/create_project/visualstudio.cpp @@ -110,7 +110,7 @@ void VisualStudioProvider::createProjectFile(const std::string &name, const std: std::string toolConfig; toolConfig = (!warnings.empty() ? "DisableSpecificWarnings=\"" + warnings + "\"" : ""); - toolConfig += (name == "scummvm" ? "DebugInformationFormat=\"3\" " : ""); + toolConfig += (name == setup.projectName ? "DebugInformationFormat=\"3\" " : ""); toolConfig += (name == "sword25" ? "DisableLanguageExtensions=\"false\" " : ""); toolConfig += (name == "grim" ? "DisableLanguageExtensions=\"false\" " : ""); -- cgit v1.2.3 From d86c0a44f8452261e7d1e330edf2449642b056fd Mon Sep 17 00:00:00 2001 From: Littleboy Date: Wed, 11 Jul 2012 01:08:22 -0400 Subject: CREATE_PROJECT: Add support for Visual Studio 2012 project creation --- devtools/README | 2 +- devtools/create_project/create_project.cpp | 3 +- devtools/create_project/msbuild.cpp | 24 ++++-- .../create_project/msvc11/create_project.vcxproj | 2 + dists/msvc11/create_msvc11.bat | 95 ++++++++++++++++++++++ dists/msvc11/readme.txt | 6 ++ 6 files changed, 122 insertions(+), 10 deletions(-) create mode 100644 dists/msvc11/create_msvc11.bat create mode 100644 dists/msvc11/readme.txt diff --git a/devtools/README b/devtools/README index 7db5259e7c..c7f08d6dfa 100644 --- a/devtools/README +++ b/devtools/README @@ -65,7 +65,7 @@ create_lure (dreammaster) create_project (LordHoto, Littleboy) -------------- - Creates project files for Visual Studio 2005, 2008, 2010, Xcode and + Creates project files for Visual Studio 2005, 2008, 2010, 2012, Xcode and Code::Blocks out of the configure / Makefile based build system. It also offers a way to enable or disable certain engines and the use of external libraries similar to configure. Run the tool without diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index df220f0934..c96b83414a 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -221,7 +221,7 @@ int main(int argc, char *argv[]) { msvcVersion = atoi(argv[++i]); - if (msvcVersion != 8 && msvcVersion != 9 && msvcVersion != 10) { + if (msvcVersion != 8 && msvcVersion != 9 && msvcVersion != 10 && msvcVersion != 11) { std::cerr << "ERROR: Unsupported version: \"" << msvcVersion << "\" passed to \"--msvc-version\"!\n"; return -1; } @@ -643,6 +643,7 @@ void displayHelp(const char *exe) { " 8 stands for \"Visual Studio 2005\"\n" " 9 stands for \"Visual Studio 2008\"\n" " 10 stands for \"Visual Studio 2010\"\n" + " 11 stands for \"Visual Studio 2012\"\n" " The default is \"9\", thus \"Visual Studio 2008\"\n" " --build-events Run custom build events as part of the build\n" " (default: false)\n" diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index a82140c2d3..90a5e3c15b 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -46,7 +46,13 @@ const char *MSBuildProvider::getPropertiesExtension() { } int MSBuildProvider::getVisualStudioVersion() { - return 2010; + if (_version == 10) + return 2010; + + if (_version == 11) + return 2012; + + error("Unsupported version passed to getVisualStudioVersion"); } namespace { @@ -58,9 +64,10 @@ inline void outputConfiguration(std::ostream &project, const std::string &config "\t\t\n"; } -inline void outputConfigurationType(const BuildSetup &setup, std::ostream &project, const std::string &name, const std::string &config) { +inline void outputConfigurationType(const BuildSetup &setup, std::ostream &project, const std::string &name, const std::string &config, int version) { project << "\t\n" "\t\t" << ((name == setup.projectName || setup.devTools) ? "Application" : "StaticLibrary") << "\n" + "\t\tv" << version << "0" "\t\n"; } @@ -98,17 +105,18 @@ void MSBuildProvider::createProjectFile(const std::string &name, const std::stri "\t\t{" << uuid << "}\n" "\t\t" << name << "\n" "\t\tWin32Proj\n" + "\t\t$(VCTargetsPath11)\n" "\t\n"; // Shared configuration project << "\t\n"; - outputConfigurationType(setup, project, name, "Release|Win32"); - outputConfigurationType(setup, project, name, "Analysis|Win32"); - outputConfigurationType(setup, project, name, "Debug|Win32"); - outputConfigurationType(setup, project, name, "Release|x64"); - outputConfigurationType(setup, project, name, "Analysis|x64"); - outputConfigurationType(setup, project, name, "Debug|x64"); + outputConfigurationType(setup, project, name, "Release|Win32", _version); + outputConfigurationType(setup, project, name, "Analysis|Win32", _version); + outputConfigurationType(setup, project, name, "Debug|Win32", _version); + outputConfigurationType(setup, project, name, "Release|x64", _version); + outputConfigurationType(setup, project, name, "Analysis|x64", _version); + outputConfigurationType(setup, project, name, "Debug|x64", _version); project << "\t\n" "\t\n" diff --git a/devtools/create_project/msvc11/create_project.vcxproj b/devtools/create_project/msvc11/create_project.vcxproj index 5947211e35..c87461c049 100644 --- a/devtools/create_project/msvc11/create_project.vcxproj +++ b/devtools/create_project/msvc11/create_project.vcxproj @@ -63,6 +63,7 @@ @echo off +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" @@ -89,6 +90,7 @@ xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\iphone\" @echo off +xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc11\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc10\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc9\" xcopy /Y "$(TargetPath)" "$(SolutionDir)\..\..\..\dists\msvc8\" diff --git a/dists/msvc11/create_msvc11.bat b/dists/msvc11/create_msvc11.bat new file mode 100644 index 0000000000..b6a5413e3b --- /dev/null +++ b/dists/msvc11/create_msvc11.bat @@ -0,0 +1,95 @@ +@echo off + +echo. +echo Automatic creation of the MSVC11 project files +echo. + +if "%~1"=="/stable" goto stable +if "%~1"=="/STABLE" goto stable +if "%~1"=="/all" goto all +if "%~1"=="/ALL" goto all +if "%~1"=="/tools" goto tools +if "%~1"=="/TOOLS" goto tools +if "%~1"=="/clean" goto clean_check +if "%~1"=="/CLEAN" goto clean_check +if "%~1"=="/help" goto command_help +if "%~1"=="/HELP" goto command_help +if "%~1"=="/?" goto command_help + +if "%~1"=="" goto check_tool + +echo Invalid command parameter: %~1 +echo. + +:command_help +echo Valid command parameters are: +echo stable Generated stable engines project files +echo all Generate all engines project files +echo tools Generate project files for the devtools +echo clean Clean generated project files +echo help Show help message +goto done + +:check_tool +if not exist create_project.exe goto no_tool + +:question +echo. +set batchanswer=S +set /p batchanswer="Enable stable engines only, or all engines? (S/a)" +if "%batchanswer%"=="s" goto stable +if "%batchanswer%"=="S" goto stable +if "%batchanswer%"=="a" goto all +if "%batchanswer%"=="A" goto all +goto question + +:no_tool +echo create_project.exe not found in the current folder. +echo You need to build it first and copy it in this +echo folder +goto done + +:all +echo. +echo Creating project files with all engines enabled (stable and unstable) +echo. +create_project ..\.. --enable-all-engines --msvc --msvc-version 11 --build-events +goto done + +:stable +echo. +echo Creating normal project files, with only the stable engines enabled +echo. +create_project ..\.. --msvc --msvc-version 11 +goto done + +:tools +echo. +echo Creating tools project files +echo. +create_project ..\.. --tools --msvc --msvc-version 11 +goto done + +:clean_check +echo. +set cleananswer=N +set /p cleananswer="This will remove all project files. Are you sure you want to continue? (N/y)" +if "%cleananswer%"=="n" goto done +if "%cleananswer%"=="N" goto done +if "%cleananswer%"=="y" goto clean +if "%cleananswer%"=="Y" goto clean +goto clean_check + +:clean +echo. +echo Removing all project files +del /Q *.vcxproj* > NUL 2>&1 +del /Q *.props > NUL 2>&1 +del /Q *.sln* > NUL 2>&1 +del /Q scummvm* > NUL 2>&1 +del /Q devtools* > NUL 2>&1 +goto done + +:done +echo. +pause diff --git a/dists/msvc11/readme.txt b/dists/msvc11/readme.txt new file mode 100644 index 0000000000..fa91a8cc12 --- /dev/null +++ b/dists/msvc11/readme.txt @@ -0,0 +1,6 @@ +The Visual Studio project files can now be created automatically from the GCC +files using the create_project tool inside the /devtools/create_project folder. + +To create the default project files, build create_project.exe, copy it inside +this folder and run the create_msvc11.bat file for a default build. You can run +create_project.exe with no parameters to check the possible command-line options -- cgit v1.2.3 From 4e832ff947dcb998d76a33ccf86682e75c237fe1 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Wed, 11 Jul 2012 01:19:55 -0400 Subject: CREATE_PROJECT: Add freetype dll to copied files in postbuild script --- devtools/create_project/scripts/postbuild.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/devtools/create_project/scripts/postbuild.cmd b/devtools/create_project/scripts/postbuild.cmd index dd52c0217c..d78119d058 100644 --- a/devtools/create_project/scripts/postbuild.cmd +++ b/devtools/create_project/scripts/postbuild.cmd @@ -24,6 +24,7 @@ echo Copying data files echo. xcopy /F /Y "%~4/lib/%~3/SDL.dll" "%~2" 1>NUL 2>&1 +xcopy /F /Y "%~4/lib/%~3/freetype6.dll" "%~2" 1>NUL 2>&1 xcopy /F /Y "%~1/backends/vkeybd/packs/vkeybd_default.zip" "%~2" 1>NUL 2>&1 if "%~5"=="0" goto done -- cgit v1.2.3 From 339fb6968ea00e9c07e27eb7bd16560020d2ed98 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Wed, 11 Jul 2012 01:20:19 -0400 Subject: BACKENDS: Silence warning about ARRAYSIZE in windows-saves --- backends/saves/windows/windows-saves.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backends/saves/windows/windows-saves.cpp b/backends/saves/windows/windows-saves.cpp index 87348c3416..d520632394 100644 --- a/backends/saves/windows/windows-saves.cpp +++ b/backends/saves/windows/windows-saves.cpp @@ -26,8 +26,12 @@ #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER) +#if defined(ARRAYSIZE) +#undef ARRAYSIZE +#endif #define WIN32_LEAN_AND_MEAN #include +#undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one... #include "common/config-manager.h" #include "common/savefile.h" -- cgit v1.2.3 From 51352b32f15d9a919e9b7a7d3b5a92e31384e9f4 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Sat, 14 Jul 2012 12:34:12 -0400 Subject: CREATE_PROJECT: Disable SAFESEH in debug mode (for edit and continue) --- devtools/create_project/msbuild.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devtools/create_project/msbuild.cpp b/devtools/create_project/msbuild.cpp index 90a5e3c15b..c797770955 100644 --- a/devtools/create_project/msbuild.cpp +++ b/devtools/create_project/msbuild.cpp @@ -67,7 +67,7 @@ inline void outputConfiguration(std::ostream &project, const std::string &config inline void outputConfigurationType(const BuildSetup &setup, std::ostream &project, const std::string &name, const std::string &config, int version) { project << "\t\n" "\t\t" << ((name == setup.projectName || setup.devTools) ? "Application" : "StaticLibrary") << "\n" - "\t\tv" << version << "0" + "\t\tv" << version << "0\n" "\t\n"; } @@ -403,6 +403,7 @@ void MSBuildProvider::createBuildProp(const BuildSetup &setup, bool isRelease, b "\t\t\n" "\t\t\n" "\t\t\ttrue\n" + "\t\t\tfalse\n" "\t\t\tlibcmt.lib;%(IgnoreSpecificDefaultLibraries)\n"; } -- cgit v1.2.3 From 732a2c80ddde4cf0ffd1b1742f514ae940c5301d Mon Sep 17 00:00:00 2001 From: Littleboy Date: Sat, 14 Jul 2012 13:23:54 -0400 Subject: LASTEXPRESS: Remove duplicated include statements --- engines/lastexpress/data/animation.cpp | 2 -- engines/lastexpress/data/scene.cpp | 1 - engines/lastexpress/data/sequence.cpp | 1 - engines/lastexpress/data/snd.cpp | 2 -- engines/lastexpress/data/subtitle.cpp | 1 - engines/lastexpress/debug.cpp | 4 ---- engines/lastexpress/entities/abbot.cpp | 2 -- engines/lastexpress/entities/alexei.cpp | 3 --- engines/lastexpress/entities/alouan.cpp | 3 --- engines/lastexpress/entities/anna.cpp | 2 -- engines/lastexpress/entities/august.cpp | 2 -- engines/lastexpress/entities/boutarel.cpp | 2 -- engines/lastexpress/entities/chapters.cpp | 2 -- engines/lastexpress/entities/cooks.cpp | 2 -- engines/lastexpress/entities/coudert.cpp | 2 -- engines/lastexpress/entities/entity.cpp | 4 ---- engines/lastexpress/entities/entity39.cpp | 1 - engines/lastexpress/entities/francois.cpp | 1 - engines/lastexpress/entities/gendarmes.cpp | 1 - engines/lastexpress/entities/hadija.cpp | 3 --- engines/lastexpress/entities/ivo.cpp | 3 --- engines/lastexpress/entities/kahina.cpp | 2 -- engines/lastexpress/entities/kronos.cpp | 2 -- engines/lastexpress/entities/mahmud.cpp | 2 -- engines/lastexpress/entities/max.cpp | 2 -- engines/lastexpress/entities/mertens.cpp | 2 -- engines/lastexpress/entities/milos.cpp | 2 -- engines/lastexpress/entities/mmeboutarel.cpp | 2 -- engines/lastexpress/entities/pascale.cpp | 14 ++++++-------- engines/lastexpress/entities/rebecca.cpp | 2 -- engines/lastexpress/entities/salko.cpp | 2 -- engines/lastexpress/entities/servers0.cpp | 3 --- engines/lastexpress/entities/servers1.cpp | 3 --- engines/lastexpress/entities/sophie.cpp | 3 --- engines/lastexpress/entities/tables.cpp | 2 -- engines/lastexpress/entities/tatiana.cpp | 2 -- engines/lastexpress/entities/train.cpp | 2 -- engines/lastexpress/entities/vassili.cpp | 2 -- engines/lastexpress/entities/verges.cpp | 2 -- engines/lastexpress/entities/vesna.cpp | 3 --- engines/lastexpress/entities/yasmin.cpp | 2 -- engines/lastexpress/fight/fight.cpp | 1 - engines/lastexpress/game/action.cpp | 3 --- engines/lastexpress/game/beetle.cpp | 1 - engines/lastexpress/game/entities.cpp | 4 ---- engines/lastexpress/game/inventory.cpp | 2 -- engines/lastexpress/game/logic.cpp | 3 --- engines/lastexpress/game/object.cpp | 1 - engines/lastexpress/game/savegame.cpp | 2 -- engines/lastexpress/game/savepoint.cpp | 1 - engines/lastexpress/game/scenes.cpp | 4 ---- engines/lastexpress/lastexpress.cpp | 2 -- engines/lastexpress/menu/menu.cpp | 2 -- engines/lastexpress/resource.cpp | 1 - engines/lastexpress/sound/entry.cpp | 3 --- engines/lastexpress/sound/queue.cpp | 1 - engines/lastexpress/sound/sound.cpp | 1 - 57 files changed, 6 insertions(+), 126 deletions(-) diff --git a/engines/lastexpress/data/animation.cpp b/engines/lastexpress/data/animation.cpp index 9d0ed532f2..12968520bb 100644 --- a/engines/lastexpress/data/animation.cpp +++ b/engines/lastexpress/data/animation.cpp @@ -32,10 +32,8 @@ #include "common/events.h" #include "common/rational.h" -#include "common/rect.h" #include "common/stream.h" #include "common/system.h" -#include "common/textconsole.h" #include "engines/engine.h" diff --git a/engines/lastexpress/data/scene.cpp b/engines/lastexpress/data/scene.cpp index 8f279ffbb3..79683d8067 100644 --- a/engines/lastexpress/data/scene.cpp +++ b/engines/lastexpress/data/scene.cpp @@ -28,7 +28,6 @@ #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" -#include "common/textconsole.h" #include "common/stream.h" namespace LastExpress { diff --git a/engines/lastexpress/data/sequence.cpp b/engines/lastexpress/data/sequence.cpp index a62348f6c0..e1e0d9bee8 100644 --- a/engines/lastexpress/data/sequence.cpp +++ b/engines/lastexpress/data/sequence.cpp @@ -27,7 +27,6 @@ #include "lastexpress/debug.h" #include "common/stream.h" -#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp index a9bee6155d..5010d6e763 100644 --- a/engines/lastexpress/data/snd.cpp +++ b/engines/lastexpress/data/snd.cpp @@ -28,11 +28,9 @@ #include "lastexpress/debug.h" #include "audio/decoders/adpcm_intern.h" -#include "audio/audiostream.h" #include "common/debug.h" #include "common/memstream.h" #include "common/system.h" -#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/data/subtitle.cpp b/engines/lastexpress/data/subtitle.cpp index 0be832cbdd..9918cf7689 100644 --- a/engines/lastexpress/data/subtitle.cpp +++ b/engines/lastexpress/data/subtitle.cpp @@ -32,7 +32,6 @@ #include "common/debug.h" #include "common/rect.h" #include "common/stream.h" -#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/debug.cpp b/engines/lastexpress/debug.cpp index dc2807db63..f64b172f73 100644 --- a/engines/lastexpress/debug.cpp +++ b/engines/lastexpress/debug.cpp @@ -28,7 +28,6 @@ #include "lastexpress/data/cursor.h" #include "lastexpress/data/scene.h" #include "lastexpress/data/sequence.h" -#include "lastexpress/data/snd.h" #include "lastexpress/data/subtitle.h" #include "lastexpress/fight/fight.h" @@ -44,15 +43,12 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" #include "common/debug-channels.h" -#include "common/events.h" #include "common/md5.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/abbot.cpp b/engines/lastexpress/entities/abbot.cpp index 301c52e142..a0aeb05f7f 100644 --- a/engines/lastexpress/entities/abbot.cpp +++ b/engines/lastexpress/entities/abbot.cpp @@ -34,9 +34,7 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/alexei.cpp b/engines/lastexpress/entities/alexei.cpp index 54c2d87b89..b0f9dd6a42 100644 --- a/engines/lastexpress/entities/alexei.cpp +++ b/engines/lastexpress/entities/alexei.cpp @@ -31,9 +31,6 @@ #include "lastexpress/game/scenes.h" #include "lastexpress/game/state.h" -#include "lastexpress/sound/sound.h" - -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/alouan.cpp b/engines/lastexpress/entities/alouan.cpp index cd79870559..3ae38dcf27 100644 --- a/engines/lastexpress/entities/alouan.cpp +++ b/engines/lastexpress/entities/alouan.cpp @@ -28,9 +28,6 @@ #include "lastexpress/game/savepoint.h" #include "lastexpress/game/state.h" -#include "lastexpress/sound/sound.h" - -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/anna.cpp b/engines/lastexpress/entities/anna.cpp index b13aa21f6d..e4a25be380 100644 --- a/engines/lastexpress/entities/anna.cpp +++ b/engines/lastexpress/entities/anna.cpp @@ -34,9 +34,7 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp index cfde8a2d6f..c9e89ab95b 100644 --- a/engines/lastexpress/entities/august.cpp +++ b/engines/lastexpress/entities/august.cpp @@ -36,9 +36,7 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/boutarel.cpp b/engines/lastexpress/entities/boutarel.cpp index 315b12a69e..bba07f5aa4 100644 --- a/engines/lastexpress/entities/boutarel.cpp +++ b/engines/lastexpress/entities/boutarel.cpp @@ -32,9 +32,7 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/chapters.cpp b/engines/lastexpress/entities/chapters.cpp index 4ef2dc50e8..b9384cbab9 100644 --- a/engines/lastexpress/entities/chapters.cpp +++ b/engines/lastexpress/entities/chapters.cpp @@ -63,11 +63,9 @@ #include "lastexpress/game/state.h" #include "lastexpress/menu/menu.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/entities/cooks.cpp b/engines/lastexpress/entities/cooks.cpp index 42e888cc7c..d962d21f8a 100644 --- a/engines/lastexpress/entities/cooks.cpp +++ b/engines/lastexpress/entities/cooks.cpp @@ -29,9 +29,7 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/coudert.cpp b/engines/lastexpress/entities/coudert.cpp index c3e7e37b88..e735f50d52 100644 --- a/engines/lastexpress/entities/coudert.cpp +++ b/engines/lastexpress/entities/coudert.cpp @@ -32,9 +32,7 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp index e136ca4776..dbce2246d0 100644 --- a/engines/lastexpress/entities/entity.cpp +++ b/engines/lastexpress/entities/entity.cpp @@ -33,11 +33,7 @@ #include "lastexpress/game/state.h" #include "lastexpress/game/savegame.h" #include "lastexpress/game/savepoint.h" -#include "lastexpress/game/state.h" - -#include "lastexpress/sound/sound.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/entity39.cpp b/engines/lastexpress/entities/entity39.cpp index e786d153a0..1786cd2201 100644 --- a/engines/lastexpress/entities/entity39.cpp +++ b/engines/lastexpress/entities/entity39.cpp @@ -28,7 +28,6 @@ #include "lastexpress/game/savepoint.h" #include "lastexpress/game/state.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/francois.cpp b/engines/lastexpress/entities/francois.cpp index 46cd790ffb..3cbfc68734 100644 --- a/engines/lastexpress/entities/francois.cpp +++ b/engines/lastexpress/entities/francois.cpp @@ -32,7 +32,6 @@ #include "lastexpress/sound/queue.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/gendarmes.cpp b/engines/lastexpress/entities/gendarmes.cpp index daa50956d3..6f08c4cd62 100644 --- a/engines/lastexpress/entities/gendarmes.cpp +++ b/engines/lastexpress/entities/gendarmes.cpp @@ -31,7 +31,6 @@ #include "lastexpress/game/state.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/hadija.cpp b/engines/lastexpress/entities/hadija.cpp index 8ec972b939..09c80247d4 100644 --- a/engines/lastexpress/entities/hadija.cpp +++ b/engines/lastexpress/entities/hadija.cpp @@ -28,10 +28,7 @@ #include "lastexpress/game/savepoint.h" #include "lastexpress/game/state.h" -#include "lastexpress/sound/sound.h" - #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/ivo.cpp b/engines/lastexpress/entities/ivo.cpp index f2261b438c..a097251f0d 100644 --- a/engines/lastexpress/entities/ivo.cpp +++ b/engines/lastexpress/entities/ivo.cpp @@ -32,10 +32,7 @@ #include "lastexpress/game/scenes.h" #include "lastexpress/game/state.h" -#include "lastexpress/sound/sound.h" - #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/kahina.cpp b/engines/lastexpress/entities/kahina.cpp index 2918b1e8bd..8916f14911 100644 --- a/engines/lastexpress/entities/kahina.cpp +++ b/engines/lastexpress/entities/kahina.cpp @@ -32,10 +32,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/kronos.cpp b/engines/lastexpress/entities/kronos.cpp index 134dce9c81..c9fe0dcde1 100644 --- a/engines/lastexpress/entities/kronos.cpp +++ b/engines/lastexpress/entities/kronos.cpp @@ -39,10 +39,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/mahmud.cpp b/engines/lastexpress/entities/mahmud.cpp index 0e67b45cd2..a6fbd1a443 100644 --- a/engines/lastexpress/entities/mahmud.cpp +++ b/engines/lastexpress/entities/mahmud.cpp @@ -34,10 +34,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/max.cpp b/engines/lastexpress/entities/max.cpp index eacc38bf60..7911a5e5b6 100644 --- a/engines/lastexpress/entities/max.cpp +++ b/engines/lastexpress/entities/max.cpp @@ -31,10 +31,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp index d88962fce2..e465bac3c9 100644 --- a/engines/lastexpress/entities/mertens.cpp +++ b/engines/lastexpress/entities/mertens.cpp @@ -32,10 +32,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/milos.cpp b/engines/lastexpress/entities/milos.cpp index ff3d2b6744..2e0da272ba 100644 --- a/engines/lastexpress/entities/milos.cpp +++ b/engines/lastexpress/entities/milos.cpp @@ -36,10 +36,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/mmeboutarel.cpp b/engines/lastexpress/entities/mmeboutarel.cpp index 9ca10ca374..a72bd1578b 100644 --- a/engines/lastexpress/entities/mmeboutarel.cpp +++ b/engines/lastexpress/entities/mmeboutarel.cpp @@ -31,10 +31,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/pascale.cpp b/engines/lastexpress/entities/pascale.cpp index a191273702..1f8504c566 100644 --- a/engines/lastexpress/entities/pascale.cpp +++ b/engines/lastexpress/entities/pascale.cpp @@ -30,10 +30,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { @@ -186,7 +184,7 @@ IMPLEMENT_FUNCTION(9, Pascale, sitSophieAndRebecca) case kActionExitCompartment: CALLBACK_ACTION(); - break; + break; case kActionDefault: getEntities()->drawSequenceLeft(kEntityPascale, "012C1"); @@ -298,7 +296,7 @@ IMPLEMENT_FUNCTION(12, Pascale, chapter1) case kActionNone: setup_chapter1Handler(); - break; + break; case kActionDefault: getSavePoints()->addData(kEntityPascale, kAction239072064, 0); @@ -648,7 +646,7 @@ IMPLEMENT_FUNCTION(21, Pascale, chapter3) case kActionNone: setup_chapter3Handler(); - break; + break; case kActionDefault: getEntities()->clearSequences(kEntityPascale); @@ -685,7 +683,7 @@ label_callback: setCallback(2); setup_welcomeSophieAndRebecca(); } - break; + break; case kActionCallback: if (getCallback() == 1) @@ -771,7 +769,7 @@ IMPLEMENT_FUNCTION(25, Pascale, chapter4) case kActionNone: setup_chapter4Handler(); - break; + break; case kActionDefault: getEntities()->clearSequences(kEntityPascale); @@ -1090,7 +1088,7 @@ IMPLEMENT_FUNCTION(31, Pascale, chapter5) case kActionNone: setup_chapter5Handler(); - break; + break; case kActionDefault: getEntities()->clearSequences(kEntityPascale); diff --git a/engines/lastexpress/entities/rebecca.cpp b/engines/lastexpress/entities/rebecca.cpp index b1a176b47e..a5f2d66793 100644 --- a/engines/lastexpress/entities/rebecca.cpp +++ b/engines/lastexpress/entities/rebecca.cpp @@ -30,10 +30,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/salko.cpp b/engines/lastexpress/entities/salko.cpp index 63d995dc42..c95269fc90 100644 --- a/engines/lastexpress/entities/salko.cpp +++ b/engines/lastexpress/entities/salko.cpp @@ -33,10 +33,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/servers0.cpp b/engines/lastexpress/entities/servers0.cpp index 989bddd662..60f5295fc6 100644 --- a/engines/lastexpress/entities/servers0.cpp +++ b/engines/lastexpress/entities/servers0.cpp @@ -28,10 +28,7 @@ #include "lastexpress/game/savepoint.h" #include "lastexpress/game/state.h" -#include "lastexpress/sound/sound.h" - #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/servers1.cpp b/engines/lastexpress/entities/servers1.cpp index 995fbbc01b..76a35a4071 100644 --- a/engines/lastexpress/entities/servers1.cpp +++ b/engines/lastexpress/entities/servers1.cpp @@ -28,10 +28,7 @@ #include "lastexpress/game/savepoint.h" #include "lastexpress/game/state.h" -#include "lastexpress/sound/sound.h" - #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/sophie.cpp b/engines/lastexpress/entities/sophie.cpp index 57bd491949..65c718a8c4 100644 --- a/engines/lastexpress/entities/sophie.cpp +++ b/engines/lastexpress/entities/sophie.cpp @@ -27,9 +27,6 @@ #include "lastexpress/game/savepoint.h" #include "lastexpress/game/state.h" -#include "lastexpress/sound/sound.h" - -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/tables.cpp b/engines/lastexpress/entities/tables.cpp index 06ea4c597c..4f8d2b954d 100644 --- a/engines/lastexpress/entities/tables.cpp +++ b/engines/lastexpress/entities/tables.cpp @@ -29,10 +29,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp index c8901b3e30..b97538818f 100644 --- a/engines/lastexpress/entities/tatiana.cpp +++ b/engines/lastexpress/entities/tatiana.cpp @@ -35,10 +35,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/train.cpp b/engines/lastexpress/entities/train.cpp index bced1da62b..1a1b6efaa7 100644 --- a/engines/lastexpress/entities/train.cpp +++ b/engines/lastexpress/entities/train.cpp @@ -32,10 +32,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/vassili.cpp b/engines/lastexpress/entities/vassili.cpp index 22f41afa92..5079fdb252 100644 --- a/engines/lastexpress/entities/vassili.cpp +++ b/engines/lastexpress/entities/vassili.cpp @@ -35,10 +35,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/verges.cpp b/engines/lastexpress/entities/verges.cpp index 8246f85145..d4b2a1716e 100644 --- a/engines/lastexpress/entities/verges.cpp +++ b/engines/lastexpress/entities/verges.cpp @@ -32,10 +32,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/vesna.cpp b/engines/lastexpress/entities/vesna.cpp index 7a1f1d3195..b5ffd9c979 100644 --- a/engines/lastexpress/entities/vesna.cpp +++ b/engines/lastexpress/entities/vesna.cpp @@ -32,10 +32,7 @@ #include "lastexpress/game/scenes.h" #include "lastexpress/game/state.h" -#include "lastexpress/sound/sound.h" - #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/entities/yasmin.cpp b/engines/lastexpress/entities/yasmin.cpp index 45e5e11568..d2e8cd6b68 100644 --- a/engines/lastexpress/entities/yasmin.cpp +++ b/engines/lastexpress/entities/yasmin.cpp @@ -28,10 +28,8 @@ #include "lastexpress/game/savepoint.h" #include "lastexpress/game/state.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" namespace LastExpress { diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp index b832d46a60..be1653092f 100644 --- a/engines/lastexpress/fight/fight.cpp +++ b/engines/lastexpress/fight/fight.cpp @@ -40,7 +40,6 @@ #include "lastexpress/sound/queue.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/game/action.cpp b/engines/lastexpress/game/action.cpp index 98d74dd1a7..0ce75f16a4 100644 --- a/engines/lastexpress/game/action.cpp +++ b/engines/lastexpress/game/action.cpp @@ -29,7 +29,6 @@ #include "lastexpress/entities/abbot.h" #include "lastexpress/entities/anna.h" -#include "lastexpress/entities/entity.h" #include "lastexpress/game/beetle.h" #include "lastexpress/game/entities.h" @@ -42,9 +41,7 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/game/beetle.cpp b/engines/lastexpress/game/beetle.cpp index ab707ddae9..f95947617a 100644 --- a/engines/lastexpress/game/beetle.cpp +++ b/engines/lastexpress/game/beetle.cpp @@ -27,7 +27,6 @@ #include "lastexpress/game/scenes.h" #include "lastexpress/game/state.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/game/entities.cpp b/engines/lastexpress/game/entities.cpp index f27087a609..f2201ac9a7 100644 --- a/engines/lastexpress/game/entities.cpp +++ b/engines/lastexpress/game/entities.cpp @@ -27,8 +27,6 @@ #include "lastexpress/data/sequence.h" // Entities -#include "lastexpress/entities/entity.h" - #include "lastexpress/entities/abbot.h" #include "lastexpress/entities/alexei.h" #include "lastexpress/entities/alouan.h" @@ -71,10 +69,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp index e417b1ec0d..7b803bb1ca 100644 --- a/engines/lastexpress/game/inventory.cpp +++ b/engines/lastexpress/game/inventory.cpp @@ -33,10 +33,8 @@ #include "lastexpress/menu/menu.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/game/logic.cpp b/engines/lastexpress/game/logic.cpp index aeac8cff98..5f220479d1 100644 --- a/engines/lastexpress/game/logic.cpp +++ b/engines/lastexpress/game/logic.cpp @@ -36,7 +36,6 @@ // Game #include "lastexpress/game/action.h" #include "lastexpress/game/beetle.h" -#include "lastexpress/game/entities.h" #include "lastexpress/game/inventory.h" #include "lastexpress/game/object.h" #include "lastexpress/game/savegame.h" @@ -47,10 +46,8 @@ #include "lastexpress/menu/menu.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/game/object.cpp b/engines/lastexpress/game/object.cpp index d9e9e4279a..91dcfcfb4a 100644 --- a/engines/lastexpress/game/object.cpp +++ b/engines/lastexpress/game/object.cpp @@ -26,7 +26,6 @@ #include "lastexpress/game/scenes.h" #include "lastexpress/game/state.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/game/savegame.cpp b/engines/lastexpress/game/savegame.cpp index 9c464feb6e..76cfe9525f 100644 --- a/engines/lastexpress/game/savegame.cpp +++ b/engines/lastexpress/game/savegame.cpp @@ -34,10 +34,8 @@ #include "lastexpress/debug.h" #include "lastexpress/lastexpress.h" -#include "lastexpress/helpers.h" #include "common/file.h" -#include "common/system.h" namespace LastExpress { diff --git a/engines/lastexpress/game/savepoint.cpp b/engines/lastexpress/game/savepoint.cpp index 64ae26c2be..0b5ff42679 100644 --- a/engines/lastexpress/game/savepoint.cpp +++ b/engines/lastexpress/game/savepoint.cpp @@ -26,7 +26,6 @@ #include "lastexpress/game/logic.h" #include "lastexpress/game/state.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" diff --git a/engines/lastexpress/game/scenes.cpp b/engines/lastexpress/game/scenes.cpp index b886951e0b..254b0fdb58 100644 --- a/engines/lastexpress/game/scenes.cpp +++ b/engines/lastexpress/game/scenes.cpp @@ -22,8 +22,6 @@ #include "lastexpress/game/scenes.h" -#include "lastexpress/data/scene.h" - #include "lastexpress/game/action.h" #include "lastexpress/game/beetle.h" #include "lastexpress/game/entities.h" @@ -34,10 +32,8 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp index 250fa0f2d0..cc3795651d 100644 --- a/engines/lastexpress/lastexpress.cpp +++ b/engines/lastexpress/lastexpress.cpp @@ -32,10 +32,8 @@ #include "lastexpress/menu/menu.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/resource.h" #include "common/config-manager.h" diff --git a/engines/lastexpress/menu/menu.cpp b/engines/lastexpress/menu/menu.cpp index f1a8bebe94..3254bed130 100644 --- a/engines/lastexpress/menu/menu.cpp +++ b/engines/lastexpress/menu/menu.cpp @@ -41,10 +41,8 @@ #include "lastexpress/menu/trainline.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" diff --git a/engines/lastexpress/resource.cpp b/engines/lastexpress/resource.cpp index ee4885e34e..bbbd139b97 100644 --- a/engines/lastexpress/resource.cpp +++ b/engines/lastexpress/resource.cpp @@ -31,7 +31,6 @@ #include "common/debug.h" #include "common/file.h" -#include "common/textconsole.h" namespace LastExpress { diff --git a/engines/lastexpress/sound/entry.cpp b/engines/lastexpress/sound/entry.cpp index 44cc68a57b..85bb8eb479 100644 --- a/engines/lastexpress/sound/entry.cpp +++ b/engines/lastexpress/sound/entry.cpp @@ -27,14 +27,11 @@ #include "lastexpress/game/state.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/sound/sound.h" #include "lastexpress/graphics.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" -#include "common/stream.h" namespace LastExpress { diff --git a/engines/lastexpress/sound/queue.cpp b/engines/lastexpress/sound/queue.cpp index 33b4c06793..cfbb3091a4 100644 --- a/engines/lastexpress/sound/queue.cpp +++ b/engines/lastexpress/sound/queue.cpp @@ -27,7 +27,6 @@ #include "lastexpress/sound/entry.h" -#include "lastexpress/helpers.h" #include "lastexpress/lastexpress.h" namespace LastExpress { diff --git a/engines/lastexpress/sound/sound.cpp b/engines/lastexpress/sound/sound.cpp index 2f7bb4a601..17d51fe9f4 100644 --- a/engines/lastexpress/sound/sound.cpp +++ b/engines/lastexpress/sound/sound.cpp @@ -33,7 +33,6 @@ #include "lastexpress/sound/entry.h" #include "lastexpress/sound/queue.h" -#include "lastexpress/helpers.h" #include "lastexpress/graphics.h" #include "lastexpress/lastexpress.h" #include "lastexpress/resource.h" -- cgit v1.2.3 From 0635d99ec74ad431146e14aba4ad07a5f9e7e221 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Sat, 14 Jul 2012 14:02:44 -0400 Subject: LASTEXPRESS: Cleanup - Add missing initializer/destructors - Add some const modifiers - Remove some unneeded casts - Use enumeration values in switch constructs --- engines/lastexpress/data/cursor.cpp | 2 +- engines/lastexpress/data/scene.cpp | 12 ++++++------ engines/lastexpress/data/snd.cpp | 9 ++++++++- engines/lastexpress/data/subtitle.cpp | 2 +- engines/lastexpress/detection.cpp | 3 ++- engines/lastexpress/fight/fight.cpp | 5 +++++ engines/lastexpress/fight/fighter.cpp | 27 ++++++++++++++++++--------- engines/lastexpress/fight/fighter.h | 3 --- engines/lastexpress/game/inventory.cpp | 14 +++++++------- engines/lastexpress/game/inventory.h | 12 ++++++------ engines/lastexpress/lastexpress.cpp | 13 ++++++------- engines/lastexpress/resource.cpp | 5 +---- engines/lastexpress/resource.h | 2 +- engines/lastexpress/sound/entry.cpp | 19 +++++++++++++++++-- engines/lastexpress/sound/queue.cpp | 13 ++++++++----- engines/lastexpress/sound/sound.cpp | 22 +++++++++++----------- 16 files changed, 98 insertions(+), 65 deletions(-) diff --git a/engines/lastexpress/data/cursor.cpp b/engines/lastexpress/data/cursor.cpp index 205c46f667..d176d963d1 100644 --- a/engines/lastexpress/data/cursor.cpp +++ b/engines/lastexpress/data/cursor.cpp @@ -128,7 +128,7 @@ Common::Rect Icon::draw(Graphics::Surface *surface) { for (int i = 0; i < 32; i++) { // Adjust brightness - if (_brightnessIndex == -1) + if (_brightnessIndex == -1 || _brightnessIndex >= ARRAYSIZE(brigthnessData)) *s = *image; else *s = (*image & brigthnessData[_brightnessIndex]) >> _brightnessIndex; diff --git a/engines/lastexpress/data/scene.cpp b/engines/lastexpress/data/scene.cpp index 79683d8067..fdb1ac6d46 100644 --- a/engines/lastexpress/data/scene.cpp +++ b/engines/lastexpress/data/scene.cpp @@ -121,7 +121,7 @@ bool SceneHotspot::isInside(const Common::Point &point) { // Scene Scene::~Scene() { // Free the hotspots - for (int i = 0; i < (int)_hotspots.size(); i++) + for (uint i = 0; i < _hotspots.size(); i++) delete _hotspots[i]; } @@ -171,7 +171,7 @@ bool Scene::checkHotSpot(const Common::Point &coord, SceneHotspot **hotspot) { bool found = false; int _location = 0; - for (int i = 0; i < (int)_hotspots.size(); i++) { + for (uint i = 0; i < _hotspots.size(); i++) { if (_hotspots[i]->isInside(coord)) { if (_location <= _hotspots[i]->location) { _location = _hotspots[i]->location; @@ -223,7 +223,7 @@ Common::String Scene::toString() { // Hotspots if (_hotspots.size() != 0) { output += "\nHotspots:\n"; - for (int i = 0; i < (int)_hotspots.size(); i++) + for (uint i = 0; i < _hotspots.size(); i++) output += _hotspots[i]->toString() + "\n"; } @@ -240,7 +240,7 @@ SceneLoader::~SceneLoader() { void SceneLoader::clear() { // Remove all scenes - for (int i = 0; i < (int)_scenes.size(); i++) + for (uint i = 0; i < _scenes.size(); i++) delete _scenes[i]; _scenes.clear(); @@ -291,9 +291,9 @@ Scene *SceneLoader::get(SceneIndex index) { return NULL; // Load the hotspots if needed - _scenes[(int)index]->loadHotspots(_stream); + _scenes[(uint)index]->loadHotspots(_stream); - return _scenes[(int)index]; + return _scenes[(uint)index]; } } // End of namespace LastExpress diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp index 5010d6e763..6d64f6b82c 100644 --- a/engines/lastexpress/data/snd.cpp +++ b/engines/lastexpress/data/snd.cpp @@ -356,6 +356,8 @@ public: Audio::ADPCMStream(stream, disposeAfterUse, size, 44100, 1, blockSize) { _currentFilterId = -1; _nextFilterId = filterId; + _stepAdjust1 = 0; + _stepAdjust2 = 0; } int readBuffer(int16 *buffer, const int numSamples) { @@ -453,7 +455,9 @@ void SimpleSound::play(Audio::AudioStream *as) { ////////////////////////////////////////////////////////////////////////// StreamedSound::StreamedSound() : _as(NULL), _loaded(false) {} -StreamedSound::~StreamedSound() {} +StreamedSound::~StreamedSound() { + _as = NULL; +} bool StreamedSound::load(Common::SeekableReadStream *stream, int32 filterId) { if (!stream) @@ -482,6 +486,9 @@ bool StreamedSound::isFinished() { } void StreamedSound::setFilterId(int32 filterId) { + if (_as == NULL) + return; + ((LastExpress_ADPCMStream *)_as)->setFilterId(filterId); } diff --git a/engines/lastexpress/data/subtitle.cpp b/engines/lastexpress/data/subtitle.cpp index 9918cf7689..a9a8284588 100644 --- a/engines/lastexpress/data/subtitle.cpp +++ b/engines/lastexpress/data/subtitle.cpp @@ -150,7 +150,7 @@ SubtitleManager::~SubtitleManager() { } void SubtitleManager::reset() { - for (int i = 0; i < (int)_subtitles.size(); i++) + for (uint i = 0; i < _subtitles.size(); i++) delete _subtitles[i]; _subtitles.clear(); diff --git a/engines/lastexpress/detection.cpp b/engines/lastexpress/detection.cpp index 82a6520522..2fdeef910a 100644 --- a/engines/lastexpress/detection.cpp +++ b/engines/lastexpress/detection.cpp @@ -173,7 +173,7 @@ static const ADGameDescription gameDescriptions[] = { ADGF_UNSTABLE, GUIO1(GUIO_NOASPECT) }, - + // The Last Express (Russian) // expressw.exe 1999-04-05 15:33:56 // express.exe ??? @@ -211,6 +211,7 @@ public: return "LastExpress Engine (C) 1997 Smoking Car Productions"; } +protected: bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const; }; diff --git a/engines/lastexpress/fight/fight.cpp b/engines/lastexpress/fight/fight.cpp index be1653092f..22d9da80be 100644 --- a/engines/lastexpress/fight/fight.cpp +++ b/engines/lastexpress/fight/fight.cpp @@ -52,6 +52,8 @@ Fight::FightData::FightData() { index = 0; isFightRunning = false; + + memset(&sequences, 0, sizeof(sequences)); } Fight::FightData::~FightData() { @@ -398,6 +400,9 @@ end_load: } void Fight::setOpponents() { + if (!_data) + error("[Fight::setOpponents] Data not initialized"); + _data->player->setOpponent(_data->opponent); _data->opponent->setOpponent(_data->player); diff --git a/engines/lastexpress/fight/fighter.cpp b/engines/lastexpress/fight/fighter.cpp index bae7728a2b..4b1cddabd4 100644 --- a/engines/lastexpress/fight/fighter.cpp +++ b/engines/lastexpress/fight/fighter.cpp @@ -53,20 +53,20 @@ Fighter::Fighter(LastExpressEngine *engine) : _engine(engine) { } Fighter::~Fighter() { - clearSequences(); -} - -////////////////////////////////////////////////////////////////////////// -// Cleanup -////////////////////////////////////////////////////////////////////////// -void Fighter::clearSequences() { // The original game resets the function pointers to default values, just before deleting the struct getScenes()->removeAndRedraw(&_frame, false); // Free sequences - for (int i = 0; i < (int)_sequences.size(); i++) + for (uint i = 0; i < _sequences.size(); i++) SAFE_DELETE(_sequences[i]); + + // Zero-out passed pointers + _sequence = NULL; + _opponent = NULL; + _fight = NULL; + + _engine = NULL; } ////////////////////////////////////////////////////////////////////////// @@ -113,6 +113,9 @@ void Fighter::draw() { // Processing ////////////////////////////////////////////////////////////////////////// void Fighter::process() { + if (!_fight) + error("[Fighter::handleAction] Fighter not initialized properly"); + if (!_sequence) { if (_frame) { getScenes()->removeFromQueue(_frame); @@ -188,6 +191,9 @@ void Fighter::process() { // Default actions ////////////////////////////////////////////////////////////////////////// void Fighter::handleAction(FightAction action) { + if (!_opponent || !_fight) + error("[Fighter::handleAction] Fighter not initialized properly"); + switch (action) { default: return; @@ -243,7 +249,10 @@ void Opponent::update() { // Helpers ////////////////////////////////////////////////////////////////////////// bool Fighter::checkFrame(uint32 val) { - return (_frame->getInfo()->field_33 & val); + if (!_frame) + error("[Fighter::checkFrame] Invalid current frame"); + + return (bool)(_frame->getInfo()->field_33 & val); } } // End of namespace LastExpress diff --git a/engines/lastexpress/fight/fighter.h b/engines/lastexpress/fight/fighter.h index e37fe49d86..dad95af186 100644 --- a/engines/lastexpress/fight/fighter.h +++ b/engines/lastexpress/fight/fighter.h @@ -99,9 +99,6 @@ protected: void draw(); void process(); - // Cleanup - void clearSequences(); - // Helpers bool checkFrame(uint32 val); }; diff --git a/engines/lastexpress/game/inventory.cpp b/engines/lastexpress/game/inventory.cpp index 7b803bb1ca..bb382ea38e 100644 --- a/engines/lastexpress/game/inventory.cpp +++ b/engines/lastexpress/game/inventory.cpp @@ -259,7 +259,7 @@ void Inventory::handleMouseEvent(const Common::Event &ev) { // Change item highlight on list if (getFlags()->mouseLeftPressed) { - uint32 index = ev.mouse.y / 40; + uint32 index = (unsigned) (int) ev.mouse.y / 40; if (_highlightedItemIndex && _highlightedItemIndex != index) drawHighlight(_highlightedItemIndex, true); @@ -416,12 +416,12 @@ void Inventory::show() { drawEgg(); } -void Inventory::setPortrait(InventoryItem item) { +void Inventory::setPortrait(InventoryItem item) const { getProgress().portrait = item; drawItem((CursorStyle)getProgress().portrait, 0, 0); } -void Inventory::showHourGlass(){ +void Inventory::showHourGlass() const { if (!getMenu()->isShown()) drawItem(kCursorHourGlass, 608, 448); @@ -611,7 +611,7 @@ void Inventory::examine(InventoryItem item) { } } -void Inventory::drawEgg() { +void Inventory::drawEgg() const { if (!getMenu()->isShown()) drawItem((CursorStyle)(getMenu()->getGameId() + 39), 608, 448, _eggHightlighted ? 0 : 1); @@ -652,7 +652,7 @@ void Inventory::drawBlinkingEgg() { askForRedraw(); } -void Inventory::drawItem(CursorStyle id, uint16 x, uint16 y, int16 brightnessIndex) { +void Inventory::drawItem(CursorStyle id, uint16 x, uint16 y, int16 brightnessIndex) const { Icon icon(id); icon.setPosition(x, y); @@ -676,7 +676,7 @@ void Inventory::drawSelectedItem() { } } -void Inventory::clearSelectedItem() { +void Inventory::clearSelectedItem() const { _engine->getGraphicsManager()->clear(GraphicsManager::kBackgroundInventory, Common::Rect(44, 0, 44 + 32, 32)); } @@ -731,7 +731,7 @@ void Inventory::drawHighlight(uint32 currentIndex, bool reset) { } } -uint32 Inventory::getItemIndex(uint32 currentIndex) { +uint32 Inventory::getItemIndex(uint32 currentIndex) const { uint32 count = 0; for (uint32 i = 1; i < ARRAYSIZE(_entries); i++) { diff --git a/engines/lastexpress/game/inventory.h b/engines/lastexpress/game/inventory.h index b1995adce3..15dd29053d 100644 --- a/engines/lastexpress/game/inventory.h +++ b/engines/lastexpress/game/inventory.h @@ -107,9 +107,9 @@ public: // UI Control void show(); void blinkEgg(bool enabled); - void showHourGlass(); - void setPortrait(InventoryItem item); - void drawEgg(); + void showHourGlass() const; + void setPortrait(InventoryItem item) const; + void drawEgg() const; void drawBlinkingEgg(); // Handle inventory UI events. @@ -168,14 +168,14 @@ private: void close(); void examine(InventoryItem item); void drawHighlight(uint32 currentIndex, bool reset); - uint32 getItemIndex(uint32 currentIndex); + uint32 getItemIndex(uint32 currentIndex) const; bool isItemSceneParameter(InventoryItem item) const; - void drawItem(CursorStyle id, uint16 x, uint16 y, int16 brighnessIndex = -1); + void drawItem(CursorStyle id, uint16 x, uint16 y, int16 brighnessIndex = -1) const; void drawSelectedItem(); - void clearSelectedItem(); + void clearSelectedItem() const; }; } // End of namespace LastExpress diff --git a/engines/lastexpress/lastexpress.cpp b/engines/lastexpress/lastexpress.cpp index cc3795651d..74d1969e01 100644 --- a/engines/lastexpress/lastexpress.cpp +++ b/engines/lastexpress/lastexpress.cpp @@ -52,18 +52,17 @@ const char *g_entityNames[] = { "Player", "Anna", "August", "Mertens", "Coudert" namespace LastExpress { LastExpressEngine::LastExpressEngine(OSystem *syst, const ADGameDescription *gd) : - Engine(syst), _gameDescription(gd), - _debugger(NULL), _cursor(NULL), - _font(NULL), _logic(NULL), _menu(NULL), - _frameCounter(0), _lastFrameCount(0), + Engine(syst), _gameDescription(gd), + _debugger(NULL), _random("lastexpress"), _cursor(NULL), + _font(NULL), _logic(NULL), _menu(NULL), + _frameCounter(0), _lastFrameCount(0), _graphicsMan(NULL), _resMan(NULL), _sceneMan(NULL), _soundMan(NULL), _eventMouse(NULL), _eventTick(NULL), - _eventMouseBackup(NULL), _eventTickBackup(NULL), - _random("lastexpress") + _eventMouseBackup(NULL), _eventTickBackup(NULL) { // Setup mixer - syncSoundSettings(); + Engine::syncSoundSettings(); // Adding the default directories const Common::FSNode gameDataDir(ConfMan.get("path")); diff --git a/engines/lastexpress/resource.cpp b/engines/lastexpress/resource.cpp index bbbd139b97..1d010355ac 100644 --- a/engines/lastexpress/resource.cpp +++ b/engines/lastexpress/resource.cpp @@ -128,13 +128,10 @@ bool ResourceManager::loadArchive(const Common::String &name) { // Get a stream to file in the archive // - same as createReadStreamForMember except it checks if the file exists and will assert / output a debug message if not -Common::SeekableReadStream *ResourceManager::getFileStream(const Common::String &name) { +Common::SeekableReadStream *ResourceManager::getFileStream(const Common::String &name) const { // Check if the file exits in the archive if (!hasFile(name)) { -//#ifdef _DEBUG -// error("[ResourceManager::getFileStream] Cannot open file: %s", name.c_str()); -//#endif debugC(2, kLastExpressDebugResource, "Error opening file: %s", name.c_str()); return NULL; } diff --git a/engines/lastexpress/resource.h b/engines/lastexpress/resource.h index f2f5d63bce..90ac9b87ad 100644 --- a/engines/lastexpress/resource.h +++ b/engines/lastexpress/resource.h @@ -42,7 +42,7 @@ public: // Loading bool loadArchive(ArchiveIndex type); static bool isArchivePresent(ArchiveIndex type); - Common::SeekableReadStream *getFileStream(const Common::String &name); + Common::SeekableReadStream *getFileStream(const Common::String &name) const; // Archive functions bool hasFile(const Common::String &name) const; diff --git a/engines/lastexpress/sound/entry.cpp b/engines/lastexpress/sound/entry.cpp index 85bb8eb479..3d2b05895f 100644 --- a/engines/lastexpress/sound/entry.cpp +++ b/engines/lastexpress/sound/entry.cpp @@ -44,6 +44,8 @@ namespace LastExpress { SoundEntry::SoundEntry(LastExpressEngine *engine) : _engine(engine) { _type = kSoundTypeNone; + _currentDataPtr = NULL; + _blockCount = 0; _time = 0; @@ -68,7 +70,13 @@ SoundEntry::~SoundEntry() { // Entries that have been queued will have their streamed disposed automatically if (!_soundStream) SAFE_DELETE(_stream); - delete _soundStream; + + SAFE_DELETE(_soundStream); + + free(_currentDataPtr); + + _subtitle = NULL; + _stream = NULL; // Zero passed pointers _engine = NULL; @@ -274,7 +282,7 @@ bool SoundEntry::updateSound() { int l = strlen(sub) + 1; if (l - 1 > 4) - sub[l - 1 - 4] = 0; + sub[l - (1 + 4)] = 0; showSubtitle(sub); } } else { @@ -390,6 +398,10 @@ SubtitleEntry::SubtitleEntry(LastExpressEngine *engine) : _engine(engine) { SubtitleEntry::~SubtitleEntry() { SAFE_DELETE(_data); + + // Zero-out passed pointers + _sound = NULL; + _engine = NULL; } void SubtitleEntry::load(Common::String filename, SoundEntry *soundEntry) { @@ -420,6 +432,9 @@ void SubtitleEntry::loadData() { } void SubtitleEntry::setupAndDraw() { + if (!_sound) + error("[SubtitleEntry::setupAndDraw] Sound entry not initialized"); + if (!_data) { _data = new SubtitleManager(_engine->getFont()); _data->load(getArchive(_filename)); diff --git a/engines/lastexpress/sound/queue.cpp b/engines/lastexpress/sound/queue.cpp index cfbb3091a4..5f3ab96d81 100644 --- a/engines/lastexpress/sound/queue.cpp +++ b/engines/lastexpress/sound/queue.cpp @@ -38,6 +38,7 @@ SoundQueue::SoundQueue(LastExpressEngine *engine) : _engine(engine) { _subtitlesFlag = 0; _currentSubtitle = NULL; + _soundCacheData = NULL; } SoundQueue::~SoundQueue() { @@ -50,6 +51,7 @@ SoundQueue::~SoundQueue() { _subtitles.clear(); _currentSubtitle = NULL; + SAFE_DELETE(_soundCacheData); // Zero passed pointers _engine = NULL; @@ -133,7 +135,7 @@ void SoundQueue::updateQueue() { // Original update the current entry, loading another set of samples to be decoded - getFlags()->flag_3 = 0; + getFlags()->flag_3 = false; --_flag; } @@ -339,13 +341,14 @@ void SoundQueue::updateSubtitles() { return; } + if (!subtitle) + return; + if (_subtitlesFlag & 1) subtitle->drawOnScreen(); - if (subtitle) { - subtitle->loadData(); - subtitle->setupAndDraw(); - } + subtitle->loadData(); + subtitle->setupAndDraw(); } ////////////////////////////////////////////////////////////////////////// diff --git a/engines/lastexpress/sound/sound.cpp b/engines/lastexpress/sound/sound.cpp index 17d51fe9f4..4f6a7b8f93 100644 --- a/engines/lastexpress/sound/sound.cpp +++ b/engines/lastexpress/sound/sound.cpp @@ -1329,23 +1329,23 @@ void SoundManager::playLoopingSound(int param) { } } else { switch (getEntityData(kEntityPlayer)->car) { - case 1: - case 6: + case kCarBaggageRear: + case kCarBaggage: partNumber = 4; break; - case 2: - case 3: - case 4: - case 5: + case kCarKronos: + case kCarGreenSleeping: + case kCarRedSleeping: + case kCarRestaurant: partNumber = 1; break; - case 7: + case kCarCoalTender: partNumber = 5; break; - case 8: + case kCarLocomotive: partNumber = 99; break; - case 9: + case kCar9: partNumber = 3; break; default: @@ -1356,13 +1356,13 @@ void SoundManager::playLoopingSound(int param) { } if (partNumber != 99) - sprintf(tmp, "LOOP%d%c.SND", partNumber, _engine->getRandom().getRandomNumber(numLoops[partNumber] - 1) + 'A'); + sprintf(tmp, "LOOP%d%c.SND", partNumber, (char)(_engine->getRandom().getRandomNumber(numLoops[partNumber] - 1) + 'A')); } if (getFlags()->flag_3) fnameLen = 5; - if (!entry || scumm_strnicmp(entry->getName2().c_str(), tmp, fnameLen)) { + if (!entry || scumm_strnicmp(entry->getName2().c_str(), tmp, (uint)fnameLen)) { _loopingSoundDuration = _engine->getRandom().getRandomNumber(319) + 260; if (partNumber != 99) { -- cgit v1.2.3 From 13c00d40486201989463d337d5c09720f10a0aeb Mon Sep 17 00:00:00 2001 From: Littleboy Date: Sat, 14 Jul 2012 14:26:22 -0400 Subject: LASTEXPRESS: Fix sound in animated sequences --- engines/lastexpress/data/snd.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp index 6d64f6b82c..3deb2d6300 100644 --- a/engines/lastexpress/data/snd.cpp +++ b/engines/lastexpress/data/snd.cpp @@ -486,7 +486,7 @@ bool StreamedSound::isFinished() { } void StreamedSound::setFilterId(int32 filterId) { - if (_as == NULL) + if (!_as) return; ((LastExpress_ADPCMStream *)_as)->setFilterId(filterId); @@ -526,6 +526,7 @@ void AppendableSound::queueBuffer(Common::SeekableReadStream *bufferIn) { // Setup the ADPCM decoder uint32 sizeIn = (uint32)bufferIn->size(); Audio::AudioStream *adpcm = makeDecoder(bufferIn, sizeIn); + ((LastExpress_ADPCMStream *)adpcm)->setFilterId(1); // Queue the stream _as->queueAudioStream(adpcm); -- cgit v1.2.3 From 4cee0836c9d4dda646f1e76a3440ffb73499dbb5 Mon Sep 17 00:00:00 2001 From: Littleboy Date: Sat, 14 Jul 2012 14:32:51 -0400 Subject: LASTEXPRESS: Replace CALLBACK_ACTION macro by member function --- engines/lastexpress/entities/abbot.cpp | 6 +- engines/lastexpress/entities/alexei.cpp | 12 +-- engines/lastexpress/entities/anna.cpp | 30 +++--- engines/lastexpress/entities/august.cpp | 48 ++++----- engines/lastexpress/entities/boutarel.cpp | 16 +-- engines/lastexpress/entities/chapters.cpp | 6 +- engines/lastexpress/entities/cooks.cpp | 12 +-- engines/lastexpress/entities/coudert.cpp | 110 ++++++++++---------- engines/lastexpress/entities/entity.cpp | 39 ++++--- engines/lastexpress/entities/entity.h | 7 +- engines/lastexpress/entities/entity_intern.h | 17 +-- engines/lastexpress/entities/francois.cpp | 24 ++--- engines/lastexpress/entities/gendarmes.cpp | 16 +-- engines/lastexpress/entities/ivo.cpp | 8 +- engines/lastexpress/entities/kahina.cpp | 42 ++++---- engines/lastexpress/entities/mahmud.cpp | 10 +- engines/lastexpress/entities/max.cpp | 4 +- engines/lastexpress/entities/mertens.cpp | 150 +++++++++++++-------------- engines/lastexpress/entities/milos.cpp | 28 ++--- engines/lastexpress/entities/mmeboutarel.cpp | 8 +- engines/lastexpress/entities/pascale.cpp | 30 +++--- engines/lastexpress/entities/rebecca.cpp | 14 +-- engines/lastexpress/entities/salko.cpp | 4 +- engines/lastexpress/entities/servers0.cpp | 22 ++-- engines/lastexpress/entities/servers1.cpp | 12 +-- engines/lastexpress/entities/sophie.cpp | 2 +- engines/lastexpress/entities/tatiana.cpp | 18 ++-- engines/lastexpress/entities/train.cpp | 2 +- engines/lastexpress/entities/verges.cpp | 38 +++---- engines/lastexpress/entities/vesna.cpp | 8 +- engines/lastexpress/entities/yasmin.cpp | 6 +- 31 files changed, 377 insertions(+), 372 deletions(-) diff --git a/engines/lastexpress/entities/abbot.cpp b/engines/lastexpress/entities/abbot.cpp index a0aeb05f7f..eef64bdf07 100644 --- a/engines/lastexpress/entities/abbot.cpp +++ b/engines/lastexpress/entities/abbot.cpp @@ -768,7 +768,7 @@ IMPLEMENT_FUNCTION(29, Abbot, function29) getSavePoints()->push(kEntityAbbot, kEntityBoutarel, kAction122358304); getEntities()->drawSequenceLeft(kEntityAbbot, "508B"); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1285,7 +1285,7 @@ IMPLEMENT_FUNCTION_II(40, Abbot, function40, CarIndex, EntityPosition) case kActionNone: if (getEntities()->updateEntity(kEntityAbbot, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); } else if (!getEvent(kEventAbbotInvitationDrink) && getEntities()->isDistanceBetweenEntities(kEntityAbbot, kEntityPlayer, 1000) && !getEntities()->isInsideCompartments(kEntityPlayer) @@ -1300,7 +1300,7 @@ IMPLEMENT_FUNCTION_II(40, Abbot, function40, CarIndex, EntityPosition) case kActionDefault: if (getEntities()->updateEntity(kEntityAbbot, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: diff --git a/engines/lastexpress/entities/alexei.cpp b/engines/lastexpress/entities/alexei.cpp index b0f9dd6a42..437c31c476 100644 --- a/engines/lastexpress/entities/alexei.cpp +++ b/engines/lastexpress/entities/alexei.cpp @@ -204,7 +204,7 @@ IMPLEMENT_FUNCTION(13, Alexei, function13) getData()->entityPosition = kPosition_7500; getEntities()->clearSequences(kEntityAlexei); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -239,7 +239,7 @@ IMPLEMENT_FUNCTION(14, Alexei, function14) getObjects()->update(kObjectCompartment2, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand); getEntities()->exitCompartment(kEntityAlexei, kObjectCompartment2, true); - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -289,7 +289,7 @@ IMPLEMENT_FUNCTION(15, Alexei, function15) getData()->location = kLocationInsideCompartment; getEntities()->drawSequenceLeft(kEntityAlexei, "103B"); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -309,7 +309,7 @@ IMPLEMENT_FUNCTION_IS(16, Alexei, function16, TimeValue) getObjects()->update(kObjectCompartment2, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand); getObjects()->update(kObjectHandleInsideBathroom, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -1375,7 +1375,7 @@ label_callback_3: case 2: case 5: - CALLBACK_ACTION(); + callbackAction(); break; case 3: @@ -1445,7 +1445,7 @@ IMPLEMENT_FUNCTION(36, Alexei, function36) break; case 4: - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/anna.cpp b/engines/lastexpress/entities/anna.cpp index e4a25be380..806beaee9d 100644 --- a/engines/lastexpress/entities/anna.cpp +++ b/engines/lastexpress/entities/anna.cpp @@ -225,7 +225,7 @@ IMPLEMENT_FUNCTION(12, Anna, function12) case kActionEndSound: if (params->param2) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -287,7 +287,7 @@ IMPLEMENT_FUNCTION(12, Anna, function12) getObjects()->update(kObjectCompartmentF, kEntityAnna, kObjectLocation1, kCursorHandKnock, kCursorHand); getObjects()->update(kObject53, kEntityAnna, kObjectLocation1, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -422,7 +422,7 @@ IMPLEMENT_FUNCTION_IS(15, Anna, function15, TimeValue) getObjects()->update(kObjectCompartmentF, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand); getObjects()->update(kObject53, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -575,7 +575,7 @@ IMPLEMENT_FUNCTION_II(17, Anna, function17, uint32, uint32) if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) { getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); } break; @@ -613,7 +613,7 @@ IMPLEMENT_FUNCTION_II(17, Anna, function17, uint32, uint32) } if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -662,7 +662,7 @@ IMPLEMENT_FUNCTION_I(18, Anna, function18, TimeValue) case kActionNone: if (params->param1 && params->param1 < getState()->time && getEntities()->isSomebodyInsideRestaurantOrSalon()) { getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); break; } @@ -755,7 +755,7 @@ IMPLEMENT_FUNCTION_I(18, Anna, function18, TimeValue) case kAction259136835: case kAction268773672: getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -1664,7 +1664,7 @@ IMPLEMENT_FUNCTION_II(39, Anna, function39, CarIndex, EntityPosition) if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) { getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); } break; @@ -1685,7 +1685,7 @@ IMPLEMENT_FUNCTION_II(39, Anna, function39, CarIndex, EntityPosition) if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) { getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); } break; @@ -1983,7 +1983,7 @@ IMPLEMENT_FUNCTION_I(45, Anna, function45, bool) case 2: getEntities()->exitCompartment(kEntityAnna, kObjectCompartmentF, true); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2193,7 +2193,7 @@ IMPLEMENT_FUNCTION(49, Anna, leaveTableWithAugust) getSavePoints()->push(kEntityAnna, kEntityTables3, kActionDrawTablesWithChairs, "010M"); getEntities()->clearSequences(kEntityAugust); - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -3038,7 +3038,7 @@ IMPLEMENT_FUNCTION(60, Anna, function60) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityAnna); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -3531,7 +3531,7 @@ IMPLEMENT_FUNCTION(71, Anna, function71) getEntities()->exitCompartment(kEntityAnna, kObjectCompartmentF); getData()->entityPosition = kPosition_4070; - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -3587,7 +3587,7 @@ IMPLEMENT_FUNCTION_II(72, Anna, function72, CarIndex, EntityPosition) if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) { getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); } break; @@ -3600,7 +3600,7 @@ IMPLEMENT_FUNCTION_II(72, Anna, function72, CarIndex, EntityPosition) case kActionDefault: if (getEntities()->updateEntity(kEntityAnna, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); } else if (!getEvent(kEventAnnaTired)) getData()->inventoryItem = kItemInvalid; break; diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp index c9e89ab95b..86c02e4301 100644 --- a/engines/lastexpress/entities/august.cpp +++ b/engines/lastexpress/entities/august.cpp @@ -148,7 +148,7 @@ IMPLEMENT_FUNCTION_END IMPLEMENT_FUNCTION_SI(7, August, enterExitCompartment3, ObjectIndex) if (savepoint.action == kAction4) { getEntities()->exitCompartment(kEntityAugust, (ObjectIndex)params->param4); - CALLBACK_ACTION(); + callbackAction(); return; } @@ -175,7 +175,7 @@ IMPLEMENT_FUNCTION_IIS(10, August, callSavepointNoDrawing, EntityIndex, ActionIn if (!params->param6) getSavePoints()->call(kEntityAugust, (EntityIndex)params->param1, (ActionIndex)params->param2, (char *)¶ms->seq); - CALLBACK_ACTION(); + callbackAction(); break; case kAction10: @@ -231,7 +231,7 @@ IMPLEMENT_FUNCTION_I(17, August, function17, TimeValue) case kActionNone: if (params->param1 < getState()->time && !params->param2) { params->param2 = 1; - CALLBACK_ACTION(); + callbackAction(); break; } @@ -260,7 +260,7 @@ IMPLEMENT_FUNCTION_I(17, August, function17, TimeValue) case 1: if (ENTITY_PARAM(0, 1)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -270,7 +270,7 @@ IMPLEMENT_FUNCTION_I(17, August, function17, TimeValue) case 2: case 3: if (ENTITY_PARAM(0, 1)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -287,7 +287,7 @@ IMPLEMENT_FUNCTION_I(17, August, function17, TimeValue) case 5: if (ENTITY_PARAM(0, 1)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -306,7 +306,7 @@ IMPLEMENT_FUNCTION_II(18, August, updateEntity2, CarIndex, EntityPosition) case kActionNone: if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); } else if (getEntities()->isDistanceBetweenEntities(kEntityAugust, kEntityPlayer, 1000) && !getEntities()->isInGreenCarEntrance(kEntityPlayer) && !getEntities()->isInsideCompartments(kEntityPlayer) @@ -314,14 +314,14 @@ IMPLEMENT_FUNCTION_II(18, August, updateEntity2, CarIndex, EntityPosition) if (getData()->car == kCarGreenSleeping || getData()->car == kCarRedSleeping) { ENTITY_PARAM(0, 1) = 1; - CALLBACK_ACTION(); + callbackAction(); } } break; case kActionDefault: if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -405,7 +405,7 @@ IMPLEMENT_FUNCTION_II(19, August, function19, bool, bool) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityAugust); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -501,7 +501,7 @@ IMPLEMENT_FUNCTION_I(20, August, function20, bool) getObjects()->update(kObjectCompartment3, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand); getEntities()->exitCompartment(kEntityAugust, kObjectCompartment3, true); - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -518,7 +518,7 @@ IMPLEMENT_FUNCTION_I(21, August, function21, TimeValue) getObjects()->update(kObjectCompartment3, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -784,7 +784,7 @@ IMPLEMENT_FUNCTION_I(23, August, function23, TimeValue) } else { getEntities()->exitCompartment(kEntityAugust, kObjectCompartment1, true); getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -865,7 +865,7 @@ label_callback_9: if (params->param8 >= 3) { getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -957,7 +957,7 @@ label_callback_9: case 2: getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; case 3: @@ -984,7 +984,7 @@ label_callback_9: getScenes()->loadScene(kScene41); - CALLBACK_ACTION(); + callbackAction(); break; case 5: @@ -1026,7 +1026,7 @@ label_callback_9: case 12: getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case 13: @@ -1054,7 +1054,7 @@ label_callback_9: getScenes()->loadScene(kScene41); - CALLBACK_ACTION(); + callbackAction(); break; case 15: @@ -1094,7 +1094,7 @@ IMPLEMENT_FUNCTION(24, August, dinner) getScenes()->loadSceneFromPosition(kCarRestaurant, 61); - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -2108,7 +2108,7 @@ IMPLEMENT_FUNCTION_II(41, August, function41, CarIndex, EntityPosition) getData()->inventoryItem = kItemNone; if (getEntities()->updateEntity(kEntityAugust, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -2145,7 +2145,7 @@ IMPLEMENT_FUNCTION_II(41, August, function41, CarIndex, EntityPosition) case kActionDefault: if (getEntities()->updateEntity(kEntityAugust, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -2170,7 +2170,7 @@ IMPLEMENT_FUNCTION_III(42, August, function42, CarIndex, EntityPosition, bool) if (getEntities()->updateEntity(kEntityAugust, (CarIndex)params->param1, (EntityPosition)params->param2)) { getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); } break; @@ -2189,7 +2189,7 @@ IMPLEMENT_FUNCTION_III(42, August, function42, CarIndex, EntityPosition, bool) case kActionDefault: if (getEntities()->updateEntity(kEntityAugust, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -2471,7 +2471,7 @@ IMPLEMENT_FUNCTION(47, August, function47) break; case 5: - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/boutarel.cpp b/engines/lastexpress/entities/boutarel.cpp index bba07f5aa4..95ec37bf50 100644 --- a/engines/lastexpress/entities/boutarel.cpp +++ b/engines/lastexpress/entities/boutarel.cpp @@ -229,7 +229,7 @@ IMPLEMENT_FUNCTION_I(11, Boutarel, function11, bool) case 7: getData()->location = kLocationInsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -247,7 +247,7 @@ IMPLEMENT_FUNCTION(12, Boutarel, enterTableWithMmeBoutarel) getSavePoints()->push(kEntityBoutarel, kEntityTables2, kAction136455232); getData()->location = kLocationInsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -274,7 +274,7 @@ IMPLEMENT_FUNCTION(13, Boutarel, leaveTableWithMmeBoutarel) getSavePoints()->push(kEntityBoutarel, kEntityTables2, kActionDrawTablesWithChairs, "008F"); getEntities()->clearSequences(kEntityMmeBoutarel); - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -356,7 +356,7 @@ IMPLEMENT_FUNCTION_I(14, Boutarel, function14, bool) getEntities()->clearSequences(kEntityBoutarel); getData()->location = kLocationInsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -414,7 +414,7 @@ IMPLEMENT_FUNCTION_IS(15, Boutarel, function15, bool) case 5: getData()->location = kLocationInsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -462,7 +462,7 @@ IMPLEMENT_FUNCTION_IS(16, Boutarel, function16, bool) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityBoutarel); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -509,7 +509,7 @@ IMPLEMENT_FUNCTION_I(18, Boutarel, function18, TimeValue) getObjects()->update(kObjectCompartmentC, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); getObjects()->update(kObject50, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -680,7 +680,7 @@ IMPLEMENT_FUNCTION(20, Boutarel, function20) case 4: getSavePoints()->push(kEntityBoutarel, kEntityCooks, kAction224849280); - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/chapters.cpp b/engines/lastexpress/entities/chapters.cpp index b9384cbab9..eab4dfe2c1 100644 --- a/engines/lastexpress/entities/chapters.cpp +++ b/engines/lastexpress/entities/chapters.cpp @@ -150,7 +150,7 @@ IMPLEMENT_FUNCTION(5, Chapters, resetMainEntities) RESET_ENTITY_STATE(kEntityVesna, Vesna, setup_reset); RESET_ENTITY_STATE(kEntityYasmin, Yasmin, setup_reset); - CALLBACK_ACTION(); + callbackAction(); IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// @@ -189,7 +189,7 @@ IMPLEMENT_FUNCTION(6, Chapters, chapter1End) getScenes()->loadScene(kScene41); - CALLBACK_ACTION(); + callbackAction(); } else { getSound()->playSound(kEntityPlayer, "LIB014"); getSound()->playSound(kEntityPlayer, "LIB015", kFlagDefault, 15); @@ -1813,7 +1813,7 @@ void Chapters::enterExitHelper(bool isEnteringStation) { ENTITY_PARAM(0, 3) = 1; } - CALLBACK_ACTION(); + callbackAction(); } } // End of namespace LastExpress diff --git a/engines/lastexpress/entities/cooks.cpp b/engines/lastexpress/entities/cooks.cpp index d962d21f8a..63494e6062 100644 --- a/engines/lastexpress/entities/cooks.cpp +++ b/engines/lastexpress/entities/cooks.cpp @@ -94,7 +94,7 @@ IMPLEMENT_FUNCTION(3, Cooks, function3) case kActionDrawScene: if (!getEntities()->isInKitchen(kEntityPlayer)) { getEntities()->clearSequences(kEntityCooks); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -106,7 +106,7 @@ IMPLEMENT_FUNCTION(3, Cooks, function3) if (!getEntities()->hasValidFrame(kEntityCooks)) { getSound()->playSound(kEntityCooks, "LIB015"); getEntities()->clearSequences(kEntityCooks); - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -120,7 +120,7 @@ IMPLEMENT_FUNCTION(3, Cooks, function3) if (params->param1 && !getEntities()->hasValidFrame(kEntityCooks)) { getSound()->playSound(kEntityCooks, "LIB015"); getEntities()->clearSequences(kEntityCooks); - CALLBACK_ACTION(); + callbackAction(); } break; @@ -180,7 +180,7 @@ IMPLEMENT_FUNCTION(4, Cooks, function4) case kActionDrawScene: if (!getEntities()->isInKitchen(kEntityPlayer)) { getEntities()->clearSequences(kEntityCooks); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -192,7 +192,7 @@ IMPLEMENT_FUNCTION(4, Cooks, function4) if (!getEntities()->hasValidFrame(kEntityCooks)) { getSound()->playSound(kEntityCooks, "LIB015"); getEntities()->clearSequences(kEntityCooks); - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -206,7 +206,7 @@ IMPLEMENT_FUNCTION(4, Cooks, function4) if (params->param1 && !getEntities()->hasValidFrame(kEntityCooks)) { getSound()->playSound(kEntityCooks, "LIB015"); getEntities()->clearSequences(kEntityCooks); - CALLBACK_ACTION(); + callbackAction(); } break; diff --git a/engines/lastexpress/entities/coudert.cpp b/engines/lastexpress/entities/coudert.cpp index e735f50d52..dc7beb3167 100644 --- a/engines/lastexpress/entities/coudert.cpp +++ b/engines/lastexpress/entities/coudert.cpp @@ -128,7 +128,7 @@ IMPLEMENT_FUNCTION_S(2, Coudert, bloodJacket) break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -173,7 +173,7 @@ IMPLEMENT_FUNCTION(4, Coudert, callbackActionOnDirection) case kActionNone: if (getData()->direction != kDirectionRight) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -181,7 +181,7 @@ IMPLEMENT_FUNCTION(4, Coudert, callbackActionOnDirection) break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -225,7 +225,7 @@ IMPLEMENT_FUNCTION_S(6, Coudert, playSound) break; case kActionEndSound: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -254,7 +254,7 @@ IMPLEMENT_FUNCTION_NOSETUP(7, Coudert, playSound16) break; case kActionEndSound: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -294,7 +294,7 @@ IMPLEMENT_FUNCTION_II(9, Coudert, updateEntity, CarIndex, EntityPosition) if (getEntities()->updateEntity(kEntityCoudert, (CarIndex)params->param1, (EntityPosition)params->param2)) { getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -330,7 +330,7 @@ IMPLEMENT_FUNCTION_II(9, Coudert, updateEntity, CarIndex, EntityPosition) params->param3 = kItemInvalid; if (getEntities()->updateEntity(kEntityCoudert, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -367,7 +367,7 @@ IMPLEMENT_FUNCTION_I(10, Coudert, updateFromTime, uint32) UPDATE_PARAM(params->param2, getState()->time, params->param1); - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -390,7 +390,7 @@ IMPLEMENT_FUNCTION_I(11, Coudert, updateFromTicks, uint32) UPDATE_PARAM(params->param2, getState()->timeTicks, params->param1); - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -410,7 +410,7 @@ IMPLEMENT_FUNCTION_I(12, Coudert, excuseMe, EntityIndex) return; if (getSoundQueue()->isBuffered(kEntityCoudert)) { - CALLBACK_ACTION(); + callbackAction(); return; } @@ -450,7 +450,7 @@ IMPLEMENT_FUNCTION_I(12, Coudert, excuseMe, EntityIndex) getSound()->playSound(kEntityCoudert, "JAC1112E"); } - CALLBACK_ACTION(); + callbackAction(); IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// @@ -559,7 +559,7 @@ IMPLEMENT_FUNCTION_II(13, Coudert, function13, bool, EntityIndex) case 5: case 6: case 7: - CALLBACK_ACTION(); + callbackAction(); break; case 9: @@ -627,7 +627,7 @@ IMPLEMENT_FUNCTION_I(14, Coudert, function14, EntityIndex) break; case 5: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -704,7 +704,7 @@ IMPLEMENT_FUNCTION_I(15, Coudert, function15, bool) break; case 5: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -722,7 +722,7 @@ IMPLEMENT_FUNCTION(16, Coudert, function16) ENTITY_PARAM(2, 1) = 0; getInventory()->setLocationAndProcess(kItem5, kObjectLocation1); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -741,7 +741,7 @@ IMPLEMENT_FUNCTION(16, Coudert, function16) if (!getEntities()->isPlayerPosition(kCarRedSleeping, 2)) getData()->entityPosition = kPosition_2088; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -759,7 +759,7 @@ IMPLEMENT_FUNCTION_I(17, Coudert, function17, bool) if (ENTITY_PARAM(2, 1)) { ENTITY_PARAM(2, 1) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } @@ -787,7 +787,7 @@ IMPLEMENT_FUNCTION_I(17, Coudert, function17, bool) case 1: case 2: case 3: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -815,7 +815,7 @@ IMPLEMENT_FUNCTION(18, Coudert, function18) getEntities()->drawSequenceLeft(kEntityCoudert, "627K"); getScenes()->loadSceneFromItemPosition(kItem5); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -847,7 +847,7 @@ IMPLEMENT_FUNCTION(18, Coudert, function18) break; case 2: - CALLBACK_ACTION(); + callbackAction(); break; case 3: @@ -855,7 +855,7 @@ IMPLEMENT_FUNCTION(18, Coudert, function18) ENTITY_PARAM(0, 1) = 0; getSavePoints()->push(kEntityCoudert, kEntityCoudert, kActionDrawScene); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -874,14 +874,14 @@ IMPLEMENT_FUNCTION_I(19, Coudert, function19, bool) || ENTITY_PARAM(2, 4) || ENTITY_PARAM(2, 6)) { getInventory()->setLocationAndProcess(kItem5, kObjectLocation1); ENTITY_PARAM(2, 1) = 1; - CALLBACK_ACTION(); + callbackAction(); break; } if (ENTITY_PARAM(0, 3) || ENTITY_PARAM(0, 5) || ENTITY_PARAM(0, 4)) { getScenes()->loadSceneFromItemPosition(kItem5); ENTITY_PARAM(2, 1) = 1; - CALLBACK_ACTION(); + callbackAction(); break; } @@ -901,7 +901,7 @@ IMPLEMENT_FUNCTION_I(19, Coudert, function19, bool) getEntities()->drawSequenceLeft(kEntityCoudert, ENTITY_PARAM(0, 2) ? "627B" : "627E"); ENTITY_PARAM(0, 1) = 0; - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -928,7 +928,7 @@ IMPLEMENT_FUNCTION_II(20, Coudert, function20, ObjectIndex, ObjectIndex) if (params->param2) getObjects()->update((ObjectIndex)params->param2, (EntityIndex)params->param7, (ObjectLocation)params->param8, (CursorStyle)CURRENT_PARAM(1, 1), (CursorStyle)CURRENT_PARAM(1, 2)); - CALLBACK_ACTION(); + callbackAction(); break; case kActionKnock: @@ -1042,7 +1042,7 @@ IMPLEMENT_FUNCTION(21, Coudert, function21) case 5: getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -1071,7 +1071,7 @@ IMPLEMENT_FUNCTION(21, Coudert, function21) getData()->location = kLocationOutsideCompartment; getSavePoints()->push(kEntityCoudert, kEntityIvo, kAction123852928); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1143,7 +1143,7 @@ IMPLEMENT_FUNCTION(22, Coudert, function22) case 5: getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -1172,7 +1172,7 @@ IMPLEMENT_FUNCTION(22, Coudert, function22) getData()->location = kLocationOutsideCompartment; getSavePoints()->push(kEntityCoudert, kEntityMilos, kAction123852928); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1223,7 +1223,7 @@ IMPLEMENT_FUNCTION(23, Coudert, function23) case 3: getEntities()->exitCompartment(kEntityCoudert, kObjectCompartmentF, true); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1294,7 +1294,7 @@ IMPLEMENT_FUNCTION(25, Coudert, function25) getData()->location = kLocationOutsideCompartment; getSavePoints()->push(kEntityCoudert, kEntityRebecca, kAction123852928); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1355,7 +1355,7 @@ IMPLEMENT_FUNCTION(26, Coudert, function26) case 5: getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -1373,7 +1373,7 @@ IMPLEMENT_FUNCTION(26, Coudert, function26) getData()->location = kLocationOutsideCompartment; getSavePoints()->push(kEntityCoudert, kEntityMmeBoutarel, kAction123852928); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1444,7 +1444,7 @@ IMPLEMENT_FUNCTION(27, Coudert, function27) case 5: getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -1471,7 +1471,7 @@ IMPLEMENT_FUNCTION(27, Coudert, function27) getData()->location = kLocationOutsideCompartment; getSavePoints()->push(kEntityCoudert, kEntityBoutarel, kAction123852928); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1513,7 +1513,7 @@ IMPLEMENT_FUNCTION_I(30, Coudert, function30, ObjectIndex) case kActionDefault: switch (parameters->param1) { default: - CALLBACK_ACTION(); + callbackAction(); // Stop processing here return; @@ -1613,7 +1613,7 @@ IMPLEMENT_FUNCTION_I(30, Coudert, function30, ObjectIndex) break; case 6: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1652,7 +1652,7 @@ IMPLEMENT_FUNCTION_I(31, Coudert, function31, uint32) case 2: case 3: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1697,7 +1697,7 @@ IMPLEMENT_FUNCTION(32, Coudert, function32) break; case 5: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1724,7 +1724,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33) setup_updateEntity(kCarRedSleeping, kPosition_540); } } else { - CALLBACK_ACTION(); + callbackAction(); } break; @@ -1761,7 +1761,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33) case 4: ENTITY_PARAM(2, 6) = 0; - CALLBACK_ACTION(); + callbackAction(); break; case 5: @@ -1806,7 +1806,7 @@ IMPLEMENT_FUNCTION(33, Coudert, function33) case 10: ENTITY_PARAM(2, 6) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1880,7 +1880,7 @@ IMPLEMENT_FUNCTION_I(34, Coudert, function34, bool) break; case 7: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1949,7 +1949,7 @@ IMPLEMENT_FUNCTION_I(35, Coudert, function35, bool) break; case 4: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2172,7 +2172,7 @@ IMPLEMENT_FUNCTION(39, Coudert, function39) getSavePoints()->push(kEntityCoudert, kEntityVerges, kAction167854368); ENTITY_PARAM(2, 2) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2534,7 +2534,7 @@ IMPLEMENT_FUNCTION(41, Coudert, function41) case 18: getSavePoints()->push(kEntityCoudert, kEntityMilos, kAction208228224); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -3049,7 +3049,7 @@ IMPLEMENT_FUNCTION(46, Coudert, function46) break; case 11: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -3114,7 +3114,7 @@ IMPLEMENT_FUNCTION_I(47, Coudert, function47, bool) break; case 7: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -3162,7 +3162,7 @@ IMPLEMENT_FUNCTION(48, Coudert, function48) break; case 5: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -3259,7 +3259,7 @@ IMPLEMENT_FUNCTION(49, Coudert, function49) break; case 11: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -3345,7 +3345,7 @@ IMPLEMENT_FUNCTION(50, Coudert, function50) break; case 9: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -3694,7 +3694,7 @@ IMPLEMENT_FUNCTION(54, Coudert, function54) break; case 3: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -3762,7 +3762,7 @@ IMPLEMENT_FUNCTION(55, Coudert, function55) break; case 7: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -3866,7 +3866,7 @@ IMPLEMENT_FUNCTION(56, Coudert, function56) break; case 16: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -4166,7 +4166,7 @@ void Coudert::visitCompartment(const SavePoint &savepoint, EntityPosition positi case 6: getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/entity.cpp b/engines/lastexpress/entities/entity.cpp index dbce2246d0..7fdfd53d2f 100644 --- a/engines/lastexpress/entities/entity.cpp +++ b/engines/lastexpress/entities/entity.cpp @@ -242,12 +242,12 @@ void Entity::savegame(const SavePoint &savepoint) { break; case kActionNone: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: getSaveLoad()->saveGame((SavegameType)params->param1, _entityIndex, (EventIndex)params->param2); - CALLBACK_ACTION(); + callbackAction(); break; } } @@ -260,7 +260,7 @@ void Entity::playSound(const SavePoint &savepoint, bool resetItem, SoundFlag fla break; case kActionEndSound: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -280,7 +280,7 @@ void Entity::draw(const SavePoint &savepoint, bool handleExcuseMe) { break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionExcuseMeCath: @@ -304,7 +304,7 @@ void Entity::draw2(const SavePoint &savepoint) { break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -323,7 +323,7 @@ void Entity::updateFromTicks(const SavePoint &savepoint) { case kActionNone: UPDATE_PARAM(params->param2, getState()->timeTicks, params->param1) - CALLBACK_ACTION(); + callbackAction(); break; } } @@ -337,7 +337,7 @@ void Entity::updateFromTime(const SavePoint &savepoint) { case kActionNone: UPDATE_PARAM(params->param2, getState()->time, params->param1) - CALLBACK_ACTION(); + callbackAction(); break; } } @@ -348,12 +348,12 @@ void Entity::callbackActionOnDirection(const SavePoint &savepoint) { break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: if (getData()->direction != kDirectionRight) - CALLBACK_ACTION(); + callbackAction(); break; } } @@ -366,7 +366,7 @@ void Entity::callbackActionRestaurantOrSalon(const SavePoint &savepoint) { case kActionNone: case kActionDefault: if (getEntities()->isSomebodyInsideRestaurantOrSalon()) - CALLBACK_ACTION(); + callbackAction(); break; } } @@ -391,7 +391,7 @@ void Entity::updateEntity(const SavePoint &savepoint, bool handleExcuseMe) { case kActionNone: case kActionDefault: if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; } } @@ -406,7 +406,7 @@ void Entity::callSavepoint(const SavePoint &savepoint, bool handleExcuseMe) { case kActionExitCompartment: if (!CURRENT_PARAM(1, 1)) getSavePoints()->call(_entityIndex, (EntityIndex)params->param4, (ActionIndex)params->param5, (char *)¶ms->seq2); - CALLBACK_ACTION(); + callbackAction(); break; case kActionExcuseMeCath: @@ -444,7 +444,7 @@ void Entity::enterExitCompartment(const SavePoint &savepoint, EntityPosition pos if (updateLocation) getData()->location = kLocationInsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -473,7 +473,7 @@ void Entity::updatePosition(const SavePoint &savepoint, bool handleExcuseMe) { case kActionExitCompartment: getEntities()->updatePositionExit(_entityIndex, (CarIndex)params->param4, (Position)params->param5); - CALLBACK_ACTION(); + callbackAction(); break; case kActionExcuseMeCath: @@ -490,4 +490,15 @@ void Entity::updatePosition(const SavePoint &savepoint, bool handleExcuseMe) { } } +void Entity::callbackAction() { + if (getData()->currentCall == 0) + error("[Entity::callbackAction] currentCall is already 0, cannot proceed"); + + getData()->currentCall--; + + getSavePoints()->setCallback(_entityIndex, _callbacks[_data->getCurrentCallback()]); + + getSavePoints()->call(_entityIndex, _entityIndex, kActionCallback); +} + } // End of namespace LastExpress diff --git a/engines/lastexpress/entities/entity.h b/engines/lastexpress/entities/entity.h index 039f461c7b..3fd2009313 100644 --- a/engines/lastexpress/entities/entity.h +++ b/engines/lastexpress/entities/entity.h @@ -784,13 +784,18 @@ protected: /** * Updates the position * - * @param savepoint The savepoint + * @param savepoint The savepoint * - Sequence name * - CarIndex * - Position * @param handleExcuseMe true to handle excuseMe actions */ void updatePosition(const SavePoint &savepoint, bool handleExcuseMe = false); + + /** + * Store the current callback information and perform the callback action + */ + void callbackAction(); }; diff --git a/engines/lastexpress/entities/entity_intern.h b/engines/lastexpress/entities/entity_intern.h index 2da0da15b3..c21f2c14e2 100644 --- a/engines/lastexpress/entities/entity_intern.h +++ b/engines/lastexpress/entities/entity_intern.h @@ -378,7 +378,7 @@ void class::setup_##name() { \ #define TIME_CHECK_CALLBACK_ACTION(timeValue, parameter) \ if (getState()->time > timeValue && !parameter) { \ parameter = 1; \ - CALLBACK_ACTION(); \ + callbackAction(); \ break; \ } @@ -408,17 +408,6 @@ void class::setup_##name() { \ } \ } -////////////////////////////////////////////////////////////////////////// -// Callback action -////////////////////////////////////////////////////////////////////////// -#define CALLBACK_ACTION() { \ - if (getData()->currentCall == 0) \ - error("[CALLBACK_ACTION] currentCall is already 0, cannot proceed"); \ - getData()->currentCall--; \ - getSavePoints()->setCallback(_entityIndex, _callbacks[_data->getCurrentCallback()]); \ - getSavePoints()->call(_entityIndex, _entityIndex, kActionCallback); \ - } - ////////////////////////////////////////////////////////////////////////// // Param update ////////////////////////////////////////////////////////////////////////// @@ -486,7 +475,7 @@ void class::setup_##name() { \ case 2: \ getData()->entityPosition = positionFrom; \ getEntities()->clearSequences(_entityIndex); \ - CALLBACK_ACTION(); \ + callbackAction(); \ } \ break; \ } @@ -516,7 +505,7 @@ void class::setup_##name() { \ case 3: \ getData()->location = kLocationInsideCompartment; \ getEntities()->clearSequences(_entityIndex); \ - CALLBACK_ACTION(); \ + callbackAction(); \ break; \ } \ break; \ diff --git a/engines/lastexpress/entities/francois.cpp b/engines/lastexpress/entities/francois.cpp index 3cbfc68734..b99dbe466b 100644 --- a/engines/lastexpress/entities/francois.cpp +++ b/engines/lastexpress/entities/francois.cpp @@ -113,7 +113,7 @@ IMPLEMENT_FUNCTION_II(8, Francois, updateEntity, CarIndex, EntityPosition) case kActionNone: if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); } else { if (!getEntities()->isDistanceBetweenEntities(kEntityFrancois, kEntityPlayer, 2000) || !getInventory()->hasItem(kItemFirebird) @@ -168,7 +168,7 @@ IMPLEMENT_FUNCTION_II(8, Francois, updateEntity, CarIndex, EntityPosition) case kActionDefault: if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -224,7 +224,7 @@ IMPLEMENT_FUNCTION(9, Francois, function9) case 2: getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -262,7 +262,7 @@ IMPLEMENT_FUNCTION(10, Francois, function10) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityFrancois); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -441,7 +441,7 @@ label_callback: break; case 5: - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -464,7 +464,7 @@ label_callback: getData()->field_4A3 = 30; getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); break; case kAction205346192: @@ -523,7 +523,7 @@ IMPLEMENT_FUNCTION(12, Francois, function12) break; case 7: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -608,7 +608,7 @@ IMPLEMENT_FUNCTION(13, Francois, function13) break; case 11: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -707,7 +707,7 @@ IMPLEMENT_FUNCTION_IIS(14, Francois, function14, ObjectIndex, EntityPosition) break; case 13: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -763,7 +763,7 @@ IMPLEMENT_FUNCTION(15, Francois, function15) case 7: if (!getEntities()->isInsideCompartment(kEntityMmeBoutarel, kCarRedSleeping, kPosition_5790)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -772,7 +772,7 @@ IMPLEMENT_FUNCTION(15, Francois, function15) break; case 8: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -829,7 +829,7 @@ IMPLEMENT_FUNCTION(16, Francois, function16) getData()->entityPosition = kPosition_5790; getData()->location = kLocationInsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/gendarmes.cpp b/engines/lastexpress/entities/gendarmes.cpp index 6f08c4cd62..877c0c29b3 100644 --- a/engines/lastexpress/entities/gendarmes.cpp +++ b/engines/lastexpress/entities/gendarmes.cpp @@ -194,7 +194,7 @@ IMPLEMENT_FUNCTION_IISS(9, Gendarmes, function9, CarIndex, EntityPosition) break; case 1: - CALLBACK_ACTION(); + callbackAction(); break; case 2: @@ -232,7 +232,7 @@ IMPLEMENT_FUNCTION_IISS(9, Gendarmes, function9, CarIndex, EntityPosition) case 6: getData()->location = kLocationOutsideCompartment; getEntities()->exitCompartment(kEntityGendarmes, (ObjectIndex)parameters2->param5); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -270,7 +270,7 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje if (!params->param4 && getEntities()->isOutsideAlexeiWindow()) { getObjects()->update((ObjectIndex)params->param3, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); } else { if (getEntities()->isOutsideAlexeiWindow()) getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49); @@ -321,7 +321,7 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje getLogic()->gameOver(kSavegameTypeIndex, 1, kSceneGameOverBloodJacket, true); getObjects()->update((ObjectIndex)params->param3, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; case 4: @@ -329,7 +329,7 @@ IMPLEMENT_FUNCTION_III(10, Gendarmes, function10, CarIndex, EntityPosition, Obje getLogic()->gameOver(kSavegameTypeIndex, 1, kSceneGameOverPolice1, true); getObjects()->update((ObjectIndex)params->param3, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; case 5: @@ -557,7 +557,7 @@ void Gendarmes::arrest(const SavePoint &savepoint, bool shouldPlaySound, SoundFl if (shouldUpdateEntity) { EXPOSE_PARAMS(EntityData::EntityParametersIIII); if (getEntities()->updateEntity(kEntityGendarmes, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); break; } } @@ -581,7 +581,7 @@ void Gendarmes::arrest(const SavePoint &savepoint, bool shouldPlaySound, SoundFl break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -598,7 +598,7 @@ void Gendarmes::arrest(const SavePoint &savepoint, bool shouldPlaySound, SoundFl if (shouldUpdateEntity) { EXPOSE_PARAMS(EntityData::EntityParametersIIII); if (getEntities()->updateEntity(kEntityGendarmes, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); break; } } diff --git a/engines/lastexpress/entities/ivo.cpp b/engines/lastexpress/entities/ivo.cpp index a097251f0d..cb0fb92b74 100644 --- a/engines/lastexpress/entities/ivo.cpp +++ b/engines/lastexpress/entities/ivo.cpp @@ -181,7 +181,7 @@ IMPLEMENT_FUNCTION(11, Ivo, function11) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityIvo); - CALLBACK_ACTION(); + callbackAction(); break; case 4: @@ -190,7 +190,7 @@ IMPLEMENT_FUNCTION(11, Ivo, function11) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityIvo); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -207,7 +207,7 @@ IMPLEMENT_FUNCTION(12, Ivo, sitAtTableWithSalko) getEntities()->clearSequences(kEntitySalko); getSavePoints()->push(kEntityIvo, kEntityTables2, kAction136455232); - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -228,7 +228,7 @@ IMPLEMENT_FUNCTION(13, Ivo, leaveTableWithSalko) getSavePoints()->push(kEntityIvo, kEntityTables2, kActionDrawTablesWithChairs, "009E"); getEntities()->clearSequences(kEntitySalko); - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: diff --git a/engines/lastexpress/entities/kahina.cpp b/engines/lastexpress/entities/kahina.cpp index 8916f14911..0c4045097a 100644 --- a/engines/lastexpress/entities/kahina.cpp +++ b/engines/lastexpress/entities/kahina.cpp @@ -88,7 +88,7 @@ IMPLEMENT_FUNCTION_END IMPLEMENT_FUNCTION_I(4, Kahina, updateFromTime, uint32) if (savepoint.action == kAction137503360) { ENTITY_PARAM(0, 2) = 1; - CALLBACK_ACTION(); + callbackAction(); } Entity::updateFromTime(savepoint); @@ -109,7 +109,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue) if (params->param1 < getState()->time && !params->param2) { params->param2 = 1; - CALLBACK_ACTION(); + callbackAction(); break; } @@ -139,7 +139,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue) case 1: if (ENTITY_PARAM(0, 1) || ENTITY_PARAM(0, 2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -149,7 +149,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue) case 2: case 3: if (ENTITY_PARAM(0, 1) || ENTITY_PARAM(0, 2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -161,7 +161,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue) case 4: if (ENTITY_PARAM(0, 2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -171,7 +171,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue) case 5: if (ENTITY_PARAM(0, 1) || ENTITY_PARAM(0, 2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -183,7 +183,7 @@ IMPLEMENT_FUNCTION_I(6, Kahina, function6, TimeValue) case kAction137503360: ENTITY_PARAM(0, 2) = 1; - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -196,12 +196,12 @@ IMPLEMENT_FUNCTION_II(7, Kahina, updateEntity2, CarIndex, EntityPosition) case kActionNone: if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: if (getEntities()->updateEntity(_entityIndex, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); } else if (getEntities()->isDistanceBetweenEntities(kEntityKahina, kEntityPlayer, 1000) && !getEntities()->isInGreenCarEntrance(kEntityPlayer) && !getEntities()->isInsideCompartments(kEntityPlayer) @@ -209,14 +209,14 @@ IMPLEMENT_FUNCTION_II(7, Kahina, updateEntity2, CarIndex, EntityPosition) if (getData()->car == kCarGreenSleeping || getData()->car == kCarRedSleeping) { ENTITY_PARAM(0, 1) = 1; - CALLBACK_ACTION(); + callbackAction(); } } break; case kAction137503360: ENTITY_PARAM(0, 2) = 1; - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -370,12 +370,12 @@ IMPLEMENT_FUNCTION(14, Kahina, function14) case kActionExitCompartment: getEntities()->exitCompartment(kEntityKahina, kObjectCompartmentF); - CALLBACK_ACTION(); + callbackAction(); break; case kAction4: getEntities()->exitCompartment(kEntityKahina, kObjectCompartmentF); - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -540,7 +540,7 @@ IMPLEMENT_FUNCTION(15, Kahina, function15) case 17: getEntities()->clearSequences(kEntityKahina); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -727,7 +727,7 @@ IMPLEMENT_FUNCTION_II(19, Kahina, function19, CarIndex, EntityPosition) RESET_ENTITY_STATE(kEntityKahina, Kahina, setup_function22); if (getEntities()->updateEntity(kEntityKahina, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; case kActionExcuseMeCath: @@ -743,7 +743,7 @@ IMPLEMENT_FUNCTION_II(19, Kahina, function19, CarIndex, EntityPosition) case kActionDefault: if (getEntities()->updateEntity(kEntityKahina, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -1123,7 +1123,7 @@ IMPLEMENT_FUNCTION(23, Kahina, function23) case 7: getEntities()->clearSequences(kEntityKahina); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1260,7 +1260,7 @@ IMPLEMENT_FUNCTION(25, Kahina, function25) getProgress().field_78 = 1; ENTITY_PARAM(0, 3) = 0; - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -1301,7 +1301,7 @@ IMPLEMENT_FUNCTION(25, Kahina, function25) case 13: getEntities()->clearSequences(kEntityKahina); - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -1385,7 +1385,7 @@ IMPLEMENT_FUNCTION(26, Kahina, function26) getInventory()->setLocationAndProcess(kItemBriefcase, kObjectLocation2); getProgress().field_78 = 1; - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -1427,7 +1427,7 @@ IMPLEMENT_FUNCTION(26, Kahina, function26) case 9: getEntities()->clearSequences(kEntityKahina); - CALLBACK_ACTION(); + callbackAction(); break; case 6: diff --git a/engines/lastexpress/entities/mahmud.cpp b/engines/lastexpress/entities/mahmud.cpp index a6fbd1a443..ebe754bfa4 100644 --- a/engines/lastexpress/entities/mahmud.cpp +++ b/engines/lastexpress/entities/mahmud.cpp @@ -93,7 +93,7 @@ IMPLEMENT_FUNCTION_SIII(4, Mahmud, enterExitCompartment2, ObjectIndex, uint32, O case kActionExitCompartment: getEntities()->exitCompartment(kEntityMahmud, (ObjectIndex)params->param4); - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -265,7 +265,7 @@ IMPLEMENT_FUNCTION_II(10, Mahmud, function10, ObjectIndex, bool) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityMahmud); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -390,7 +390,7 @@ IMPLEMENT_FUNCTION(11, Mahmud, function11) getEntities()->clearSequences(kEntityMahmud); getObjects()->update(kObjectCompartment4, kEntityMahmud, kObjectLocation3, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -469,7 +469,7 @@ IMPLEMENT_FUNCTION(12, Mahmud, function12) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityMahmud); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -535,7 +535,7 @@ IMPLEMENT_FUNCTION(13, Mahmud, function13) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityMahmud); - CALLBACK_ACTION(); + callbackAction(); break; } diff --git a/engines/lastexpress/entities/max.cpp b/engines/lastexpress/entities/max.cpp index 7911a5e5b6..cecfe64dc6 100644 --- a/engines/lastexpress/entities/max.cpp +++ b/engines/lastexpress/entities/max.cpp @@ -184,7 +184,7 @@ IMPLEMENT_FUNCTION(7, Max, function7) case kAction101687594: getEntities()->clearSequences(kEntityMax); - CALLBACK_ACTION(); + callbackAction(); break; case kAction122358304: @@ -193,7 +193,7 @@ IMPLEMENT_FUNCTION(7, Max, function7) getObjects()->update(kObjectCompartmentF, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); getObjects()->update(kObject53, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; case kAction158007856: diff --git a/engines/lastexpress/entities/mertens.cpp b/engines/lastexpress/entities/mertens.cpp index e465bac3c9..5672fe4d49 100644 --- a/engines/lastexpress/entities/mertens.cpp +++ b/engines/lastexpress/entities/mertens.cpp @@ -119,7 +119,7 @@ IMPLEMENT_FUNCTION_S(2, Mertens, bloodJacket) break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -168,7 +168,7 @@ IMPLEMENT_FUNCTION_SI(4, Mertens, enterExitCompartment2, ObjectIndex) case kAction4: getEntities()->exitCompartment(kEntityMertens, (ObjectIndex)params->param4); - CALLBACK_ACTION(); + callbackAction(); return; case kActionCallback: @@ -195,7 +195,7 @@ IMPLEMENT_FUNCTION_SIII(5, Mertens, enterExitCompartment3, ObjectIndex, EntityPo case kActionExitCompartment: getEntities()->exitCompartment(_entityIndex, (ObjectIndex)params->param4); getData()->entityPosition = (EntityPosition)params->param5; - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -227,7 +227,7 @@ IMPLEMENT_FUNCTION(6, Mertens, callbackActionOnDirection) case kActionNone: if (getData()->direction != kDirectionRight) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -235,7 +235,7 @@ IMPLEMENT_FUNCTION(6, Mertens, callbackActionOnDirection) break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -258,7 +258,7 @@ IMPLEMENT_FUNCTION_S(7, Mertens, playSound) break; case kActionEndSound: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -285,7 +285,7 @@ IMPLEMENT_FUNCTION_S(8, Mertens, playSound16) break; case kActionEndSound: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -331,7 +331,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition) || getEntities()->checkFields10(kEntityPlayer)) { if (getEntities()->updateEntity(kEntityMertens, (CarIndex)params->param1, (EntityPosition)params->param2)) { getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -362,7 +362,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition) if (getEntities()->updateEntity(kEntityMertens, (CarIndex)params->param1, (EntityPosition)params->param2)) { getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); } break; @@ -393,7 +393,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition) params->param3 = 1; if (getEntities()->updateEntity(kEntityMertens, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -426,7 +426,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition) getEntities()->updateEntity(kEntityMertens, kCarGreenSleeping, kPosition_2000); getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition + 750)); - CALLBACK_ACTION(); + callbackAction(); break; case 3: @@ -442,7 +442,7 @@ IMPLEMENT_FUNCTION_II(10, Mertens, updateEntity, CarIndex, EntityPosition) getEntities()->updateEntity(kEntityMertens, kCarGreenSleeping, kPosition_2000); getEntities()->loadSceneFromEntityPosition(getData()->car, (EntityPosition)(getData()->entityPosition + 750)); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -484,7 +484,7 @@ IMPLEMENT_FUNCTION_I(11, Mertens, function11, uint32) UPDATE_PARAM(params->param2, getState()->time, params->param1) - CALLBACK_ACTION(); + callbackAction(); break; case kActionCallback: @@ -504,7 +504,7 @@ IMPLEMENT_FUNCTION_I(12, Mertens, bonsoir, EntityIndex) return; if (getSoundQueue()->isBuffered(kEntityMertens)) { - CALLBACK_ACTION(); + callbackAction(); return; } @@ -538,7 +538,7 @@ IMPLEMENT_FUNCTION_I(12, Mertens, bonsoir, EntityIndex) getSound()->playSound(kEntityMertens, "CON1112G"); } - CALLBACK_ACTION(); + callbackAction(); IMPLEMENT_FUNCTION_END ////////////////////////////////////////////////////////////////////////// @@ -638,7 +638,7 @@ IMPLEMENT_FUNCTION_II(13, Mertens, function13, bool, bool) case 6: case 9: case 10: - CALLBACK_ACTION(); + callbackAction(); break; case 7: @@ -717,7 +717,7 @@ IMPLEMENT_FUNCTION_I(14, Mertens, function14, EntityIndex) break; case 5: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -781,7 +781,7 @@ IMPLEMENT_FUNCTION_I(15, Mertens, function15, bool) break; case 6: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -858,7 +858,7 @@ IMPLEMENT_FUNCTION_I(16, Mertens, function16, bool) break; case 6: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -886,7 +886,7 @@ IMPLEMENT_FUNCTION(17, Mertens, function17) getScenes()->loadSceneFromItemPosition(kItem7); ENTITY_PARAM(2, 1) = 1; - CALLBACK_ACTION(); + callbackAction(); break; } @@ -924,7 +924,7 @@ IMPLEMENT_FUNCTION(17, Mertens, function17) break; case 2: - CALLBACK_ACTION(); + callbackAction(); break; case 3: @@ -942,7 +942,7 @@ IMPLEMENT_FUNCTION(17, Mertens, function17) getSavePoints()->push(kEntityMertens, kEntityMertens, kActionDrawScene); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -968,7 +968,7 @@ IMPLEMENT_FUNCTION(18, Mertens, function18) getInventory()->setLocationAndProcess(kItem7, kObjectLocation1); ENTITY_PARAM(2, 1) = 1; - CALLBACK_ACTION(); + callbackAction(); break; } @@ -976,7 +976,7 @@ IMPLEMENT_FUNCTION(18, Mertens, function18) getScenes()->loadSceneFromItemPosition(kItem7); ENTITY_PARAM(2, 1) = 1; - CALLBACK_ACTION(); + callbackAction(); break; } @@ -1007,7 +1007,7 @@ IMPLEMENT_FUNCTION(18, Mertens, function18) ENTITY_PARAM(0, 1) = 0; getData()->inventoryItem = kItemNone; - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -1023,7 +1023,7 @@ IMPLEMENT_FUNCTION(19, Mertens, function19) if (ENTITY_PARAM(2, 1)) { getInventory()->setLocationAndProcess(kItem7, kObjectLocation1); ENTITY_PARAM(2, 1) = 0; - CALLBACK_ACTION(); + callbackAction(); } else { setCallback(1); setup_bloodJacket("601C"); @@ -1037,7 +1037,7 @@ IMPLEMENT_FUNCTION(19, Mertens, function19) if (!getEntities()->isPlayerPosition(kCarGreenSleeping, 2)) getData()->entityPosition = kPosition_2088; - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -1055,7 +1055,7 @@ IMPLEMENT_FUNCTION(20, Mertens, function20) if (ENTITY_PARAM(2, 1)) { ENTITY_PARAM(2, 1) = 0; - CALLBACK_ACTION(); + callbackAction(); } else { setCallback(1); setup_bloodJacket("601C"); @@ -1064,7 +1064,7 @@ IMPLEMENT_FUNCTION(20, Mertens, function20) case kActionCallback: if (getCallback() == 1) - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -1090,7 +1090,7 @@ IMPLEMENT_FUNCTION_II(21, Mertens, function21, ObjectIndex, ObjectIndex) if (params->param2) getObjects()->update((ObjectIndex)params->param2, (EntityIndex)params->param8, (ObjectLocation)CURRENT_PARAM(1, 1), (CursorStyle)CURRENT_PARAM(1, 2), (CursorStyle)CURRENT_PARAM(1, 3)); - CALLBACK_ACTION(); + callbackAction(); break; case kActionKnock: @@ -1220,7 +1220,7 @@ IMPLEMENT_FUNCTION(22, Mertens, function22) break; case 9: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1289,7 +1289,7 @@ IMPLEMENT_FUNCTION(23, Mertens, function23) case 6: getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1349,7 +1349,7 @@ IMPLEMENT_FUNCTION(24, Mertens, function24) case 5: getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -1378,7 +1378,7 @@ IMPLEMENT_FUNCTION(24, Mertens, function24) break; case 9: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1456,7 +1456,7 @@ IMPLEMENT_FUNCTION(25, Mertens, function25) case 5: getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -1490,7 +1490,7 @@ IMPLEMENT_FUNCTION(25, Mertens, function25) break; case 9: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1545,7 +1545,7 @@ IMPLEMENT_FUNCTION_I(26, Mertens, function26, bool) case 2: getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; case 3: @@ -1611,7 +1611,7 @@ IMPLEMENT_FUNCTION_I(26, Mertens, function26, bool) getData()->location = kLocationOutsideCompartment; getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1626,7 +1626,7 @@ IMPLEMENT_FUNCTION_I(27, Mertens, tylerCompartment, MertensActionType) case kActionNone: if (getProgress().field_14 == 29) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -1678,7 +1678,7 @@ label_callback11: getSound()->playSound(kEntityPlayer, "LIB015"); getScenes()->loadScene(kScene41); - CALLBACK_ACTION(); + callbackAction(); break; } } else { @@ -1736,7 +1736,7 @@ label_callback11: getSound()->playSound(kEntityPlayer, "LIB015"); getScenes()->loadScene(kScene41); - CALLBACK_ACTION(); + callbackAction(); break; } } else { @@ -1761,7 +1761,7 @@ label_callback11: default: getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; case 1: @@ -1819,7 +1819,7 @@ label_callback11: getSound()->playSound(kEntityPlayer, "LIB015"); getScenes()->loadScene(kScene41); - CALLBACK_ACTION(); + callbackAction(); break; } } else { @@ -1928,7 +1928,7 @@ label_callback11: getData()->location = kLocationOutsideCompartment; getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; case 8: @@ -1955,7 +1955,7 @@ label_callback11: case 19: case 22: case 28: - CALLBACK_ACTION(); + callbackAction(); break; case 15: @@ -1967,7 +1967,7 @@ label_callback11: getSound()->playSound(kEntityPlayer, "LIB015"); getScenes()->loadScene(kScene41); - CALLBACK_ACTION(); + callbackAction(); break; case 16: @@ -1979,27 +1979,27 @@ label_callback11: getSound()->playSound(kEntityPlayer, "LIB015"); getScenes()->loadScene(kScene41); - CALLBACK_ACTION(); + callbackAction(); break; case 23: getProgress().eventMertensAugustWaiting = true; getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; case 24: getProgress().eventMertensKronosInvitation = true; getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; case 25: getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2051,7 +2051,7 @@ IMPLEMENT_FUNCTION_S(28, Mertens, function28) break; case 4: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2113,7 +2113,7 @@ IMPLEMENT_FUNCTION_SS(29, Mertens, function29) break; case 4: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2138,14 +2138,14 @@ IMPLEMENT_FUNCTION_I(30, Mertens, function30, MertensActionType) case kActionDefault: switch (params->param1) { default: - CALLBACK_ACTION(); + callbackAction(); return; case 1: params->param2 = kPosition_8200; if (getProgress().field_14) { - CALLBACK_ACTION(); + callbackAction(); return; } @@ -2271,7 +2271,7 @@ IMPLEMENT_FUNCTION_I(30, Mertens, function30, MertensActionType) break; case 9: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2310,7 +2310,7 @@ IMPLEMENT_FUNCTION_I(31, Mertens, function31, MertensActionType) case 2: case 3: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2358,7 +2358,7 @@ IMPLEMENT_FUNCTION(32, Mertens, function32) break; case 5: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2380,7 +2380,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33) setCallback(ENTITY_PARAM(0, 8) ? 1 : 3); setup_updateEntity(kCarGreenSleeping, ENTITY_PARAM(0, 8) ? kPosition_1500 : kPosition_540); } else { - CALLBACK_ACTION(); + callbackAction(); } break; @@ -2399,7 +2399,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33) case 2: ENTITY_PARAM(1, 8) = 0; - CALLBACK_ACTION(); + callbackAction(); break; case 3: @@ -2478,7 +2478,7 @@ IMPLEMENT_FUNCTION(33, Mertens, function33) break; } - CALLBACK_ACTION(); + callbackAction(); break; case 12: @@ -2491,13 +2491,13 @@ IMPLEMENT_FUNCTION(33, Mertens, function33) break; } - CALLBACK_ACTION(); + callbackAction(); break; case 13: ENTITY_PARAM(2, 2) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2546,7 +2546,7 @@ IMPLEMENT_FUNCTION(35, Mertens, function35) case kActionDefault: if (getProgress().field_14 == 29) { - CALLBACK_ACTION(); + callbackAction(); break; } else { getProgress().field_14 = 3; @@ -2587,7 +2587,7 @@ IMPLEMENT_FUNCTION(35, Mertens, function35) break; case 4: - CALLBACK_ACTION(); + callbackAction(); break; case 5: @@ -2609,7 +2609,7 @@ IMPLEMENT_FUNCTION(35, Mertens, function35) break; case 7: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2624,7 +2624,7 @@ IMPLEMENT_FUNCTION(36, Mertens, function36) case kActionDefault: if (getProgress().field_14 == 29) { - CALLBACK_ACTION(); + callbackAction(); } else { getProgress().field_14 = 3; @@ -2710,7 +2710,7 @@ IMPLEMENT_FUNCTION(36, Mertens, function36) case 6: case 9: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2765,7 +2765,7 @@ IMPLEMENT_FUNCTION(37, Mertens, function37) break; case 4: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2789,12 +2789,12 @@ IMPLEMENT_FUNCTION(38, Mertens, function38) case kActionDefault: if (!ENTITY_PARAM(0, 4)) { - CALLBACK_ACTION(); + callbackAction(); break; } if (getProgress().field_14 == 29) { - CALLBACK_ACTION(); + callbackAction(); } else { setCallback(1); setup_updateEntity(kCarGreenSleeping, kPosition_8200); @@ -2808,7 +2808,7 @@ IMPLEMENT_FUNCTION(38, Mertens, function38) case 1: if (!ENTITY_PARAM(0, 4)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -2818,7 +2818,7 @@ IMPLEMENT_FUNCTION(38, Mertens, function38) case 2: ENTITY_PARAM(0, 4) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2892,7 +2892,7 @@ IMPLEMENT_FUNCTION(39, Mertens, function39) break; case 10: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -2938,7 +2938,7 @@ IMPLEMENT_FUNCTION(40, Mertens, function40) case 5: ENTITY_PARAM(0, 6) = 1; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -3911,7 +3911,7 @@ IMPLEMENT_FUNCTION(49, Mertens, function49) break; case 11: - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/milos.cpp b/engines/lastexpress/entities/milos.cpp index 2e0da272ba..21f3b06896 100644 --- a/engines/lastexpress/entities/milos.cpp +++ b/engines/lastexpress/entities/milos.cpp @@ -133,7 +133,7 @@ IMPLEMENT_FUNCTION_II(10, Milos, enterCompartmentDialog, CarIndex, EntityPositio case kActionNone: case kActionDefault: if (getEntities()->updateEntity(kEntityMilos, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; case kActionExcuseMeCath: @@ -171,7 +171,7 @@ IMPLEMENT_FUNCTION_I(11, Milos, function11, TimeValue) if (!params->param5 && params->param1 < getState()->time && !params->param7) { params->param7 = 1; - CALLBACK_ACTION(); + callbackAction(); break; } @@ -392,7 +392,7 @@ IMPLEMENT_FUNCTION(13, Milos, function13) getEntities()->clearSequences(kEntityIvo); getEntities()->clearSequences(kEntitySalko); - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -420,7 +420,7 @@ IMPLEMENT_FUNCTION(14, Milos, function14) getEntities()->exitCompartment(kEntityMilos, kObjectCompartment1, true); getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -472,7 +472,7 @@ IMPLEMENT_FUNCTION(14, Milos, function14) getObjects()->update(kObjectCompartment1, kEntityPlayer, getObjects()->get(kObjectCompartment1).location, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } } else { @@ -591,7 +591,7 @@ label_callback_12: getData()->location = kLocationOutsideCompartment; getObjects()->update(kObjectCompartment1, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; case 2: @@ -631,7 +631,7 @@ label_callback_12: getScenes()->loadScene(kScene41); getData()->location = kLocationOutsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -1384,7 +1384,7 @@ IMPLEMENT_FUNCTION_I(26, Milos, function26, TimeValue) case kActionNone: if (params->param1 < getState()->time && !params->param2) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -1413,7 +1413,7 @@ IMPLEMENT_FUNCTION_I(26, Milos, function26, TimeValue) case 1: if (ENTITY_PARAM(0, 2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -1423,7 +1423,7 @@ IMPLEMENT_FUNCTION_I(26, Milos, function26, TimeValue) case 2: case 3: if (ENTITY_PARAM(0, 2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -1440,7 +1440,7 @@ IMPLEMENT_FUNCTION_I(26, Milos, function26, TimeValue) case 5: if (ENTITY_PARAM(0, 2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -1459,7 +1459,7 @@ IMPLEMENT_FUNCTION_II(27, Milos, function27, CarIndex, EntityPosition) case kActionNone: if (getEntities()->updateEntity(kEntityMilos, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -1470,14 +1470,14 @@ IMPLEMENT_FUNCTION_II(27, Milos, function27, CarIndex, EntityPosition) if (getData()->car == kCarRedSleeping || getData()->car == kCarGreenSleeping) { ENTITY_PARAM(0, 2) = 1; - CALLBACK_ACTION(); + callbackAction(); } } break; case kActionDefault: if (getEntities()->updateEntity(kEntityMilos, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END diff --git a/engines/lastexpress/entities/mmeboutarel.cpp b/engines/lastexpress/entities/mmeboutarel.cpp index a72bd1578b..ace8637556 100644 --- a/engines/lastexpress/entities/mmeboutarel.cpp +++ b/engines/lastexpress/entities/mmeboutarel.cpp @@ -122,7 +122,7 @@ IMPLEMENT_FUNCTION_S(8, MmeBoutarel, function8) if (!getEntities()->isPlayerPosition(kCarRedSleeping, 2)) getData()->entityPosition = kPosition_2088; - CALLBACK_ACTION(); + callbackAction(); } break; @@ -209,7 +209,7 @@ IMPLEMENT_FUNCTION(9, MmeBoutarel, function9) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityMmeBoutarel); - CALLBACK_ACTION(); + callbackAction(); break; case 5: @@ -218,7 +218,7 @@ IMPLEMENT_FUNCTION(9, MmeBoutarel, function9) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityMmeBoutarel); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -310,7 +310,7 @@ IMPLEMENT_FUNCTION(11, MmeBoutarel, function11) break; case 4: - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/pascale.cpp b/engines/lastexpress/entities/pascale.cpp index 1f8504c566..6620634ade 100644 --- a/engines/lastexpress/entities/pascale.cpp +++ b/engines/lastexpress/entities/pascale.cpp @@ -169,7 +169,7 @@ IMPLEMENT_FUNCTION(8, Pascale, welcomeSophieAndRebecca) getData()->entityPosition = kPosition_5900; ENTITY_PARAM(0, 4) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -183,7 +183,7 @@ IMPLEMENT_FUNCTION(9, Pascale, sitSophieAndRebecca) break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -215,7 +215,7 @@ IMPLEMENT_FUNCTION(10, Pascale, welcomeCath) getScenes()->loadSceneFromPosition(kCarRestaurant, 69); } - CALLBACK_ACTION(); + callbackAction(); break; case kAction4: @@ -237,7 +237,7 @@ IMPLEMENT_FUNCTION(10, Pascale, welcomeCath) getScenes()->loadSceneFromPosition(kCarRestaurant, 69); - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -281,7 +281,7 @@ IMPLEMENT_FUNCTION(11, Pascale, function11) getEntities()->clearSequences(kEntityPascale); getData()->entityPosition = kPosition_5900; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -364,7 +364,7 @@ IMPLEMENT_FUNCTION(13, Pascale, getMessageFromAugustToTyler) getSavePoints()->push(kEntityPascale, kEntityVerges, kActionDeliverMessageToTyler); ENTITY_PARAM(0, 1) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -380,7 +380,7 @@ IMPLEMENT_FUNCTION(14, Pascale, sitAnna) case kActionExitCompartment: getEntities()->updatePositionExit(kEntityPascale, kCarRestaurant, 62); - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -431,7 +431,7 @@ IMPLEMENT_FUNCTION(15, Pascale, welcomeAnna) getData()->entityPosition = kPosition_5900; ENTITY_PARAM(0, 2) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -484,7 +484,7 @@ IMPLEMENT_FUNCTION(16, Pascale, serveTatianaVassili) getData()->entityPosition = kPosition_5900; ENTITY_PARAM(0, 3) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -725,7 +725,7 @@ IMPLEMENT_FUNCTION(23, Pascale, function23) ENTITY_PARAM(0, 7) = 0; getEntities()->clearSequences(kEntityPascale); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -746,7 +746,7 @@ IMPLEMENT_FUNCTION(24, Pascale, welcomeAbbot) break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kAction10: @@ -951,7 +951,7 @@ IMPLEMENT_FUNCTION(27, Pascale, function27) ENTITY_PARAM(1, 1) = 0; ENTITY_PARAM(1, 2) = 1; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -997,7 +997,7 @@ IMPLEMENT_FUNCTION(28, Pascale, messageFromAnna) getData()->entityPosition = kPosition_5900; ENTITY_PARAM(1, 2) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1035,7 +1035,7 @@ IMPLEMENT_FUNCTION(29, Pascale, function29) case 2: getData()->entityPosition = kPosition_850; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1073,7 +1073,7 @@ IMPLEMENT_FUNCTION(30, Pascale, function30) case 2: getData()->entityPosition = kPosition_5900; - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/rebecca.cpp b/engines/lastexpress/entities/rebecca.cpp index a5f2d66793..4f7be385ce 100644 --- a/engines/lastexpress/entities/rebecca.cpp +++ b/engines/lastexpress/entities/rebecca.cpp @@ -177,7 +177,7 @@ IMPLEMENT_FUNCTION(15, Rebecca, function15) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityRebecca); - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -259,7 +259,7 @@ IMPLEMENT_FUNCTION_I(16, Rebecca, function16, bool) getSavePoints()->push(kEntityRebecca, kEntityTables3, kAction136455232); getData()->location = kLocationInsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -332,7 +332,7 @@ IMPLEMENT_FUNCTION_I(17, Rebecca, function17, bool) case 5: getData()->location = kLocationInsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -341,7 +341,7 @@ IMPLEMENT_FUNCTION_I(17, Rebecca, function17, bool) getData()->location = kLocationInsideCompartment; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -395,7 +395,7 @@ IMPLEMENT_FUNCTION(18, Rebecca, function18) case 2: case 3: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -471,7 +471,7 @@ IMPLEMENT_FUNCTION(19, Rebecca, function19) case 5: case 6: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -491,7 +491,7 @@ IMPLEMENT_FUNCTION_I(20, Rebecca, function20, TimeValue) getObjects()->update(kObjectCompartmentE, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); getObjects()->update(kObject52, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } diff --git a/engines/lastexpress/entities/salko.cpp b/engines/lastexpress/entities/salko.cpp index c95269fc90..70a26b515a 100644 --- a/engines/lastexpress/entities/salko.cpp +++ b/engines/lastexpress/entities/salko.cpp @@ -135,7 +135,7 @@ IMPLEMENT_FUNCTION_II(7, Salko, function7, CarIndex, EntityPosition) break; case kAction123668192: - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -388,7 +388,7 @@ label_callback3: getData()->entityPosition = kPosition_2740; getEntities()->clearSequences(kEntitySalko); - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/servers0.cpp b/engines/lastexpress/entities/servers0.cpp index 60f5295fc6..56fc0e6056 100644 --- a/engines/lastexpress/entities/servers0.cpp +++ b/engines/lastexpress/entities/servers0.cpp @@ -110,11 +110,11 @@ IMPLEMENT_FUNCTION_NOSETUP(5, Servers0, callbackActionOnDirection) case kActionNone: if (getData()->direction != kDirectionRight) - CALLBACK_ACTION(); + callbackAction(); break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionExcuseMeCath: @@ -160,7 +160,7 @@ IMPLEMENT_FUNCTION(7, Servers0, function7) case 2: getEntities()->clearSequences(kEntityServers0); getData()->entityPosition = kPosition_5900; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -217,7 +217,7 @@ IMPLEMENT_FUNCTION(9, Servers0, function9) ENTITY_PARAM(2, 2) = 0; ENTITY_PARAM(1, 6) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -483,7 +483,7 @@ IMPLEMENT_FUNCTION(25, Servers0, function25) getEntities()->clearSequences(kEntityServers0); ENTITY_PARAM(1, 3) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -644,7 +644,7 @@ IMPLEMENT_FUNCTION(29, Servers0, augustAnnaDateOrder) getEntities()->clearSequences(kEntityServers0); ENTITY_PARAM(1, 5) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -690,7 +690,7 @@ IMPLEMENT_FUNCTION(30, Servers0, function30) getEntities()->clearSequences(kEntityServers0); ENTITY_PARAM(2, 4) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -856,7 +856,7 @@ IMPLEMENT_FUNCTION(33, Servers0, augustOrderSteak) getEntities()->clearSequences(kEntityServers0); ENTITY_PARAM(1, 7) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -899,7 +899,7 @@ IMPLEMENT_FUNCTION(34, Servers0, augustServeDuck) getEntities()->clearSequences(kEntityServers0); ENTITY_PARAM(1, 8) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -969,7 +969,7 @@ void Servers0::handleServer(const SavePoint &savepoint, const char *name, Entity getSavePoints()->push(kEntityServers0, entity, action); *parameter = 0; - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -1024,7 +1024,7 @@ void Servers0::serveTable(const SavePoint &savepoint, const char *seq1, EntityIn getEntities()->clearSequences(kEntityServers0); *parameter = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/servers1.cpp b/engines/lastexpress/entities/servers1.cpp index 76a35a4071..24bf678f3a 100644 --- a/engines/lastexpress/entities/servers1.cpp +++ b/engines/lastexpress/entities/servers1.cpp @@ -140,7 +140,7 @@ IMPLEMENT_FUNCTION(7, Servers1, function7) getData()->entityPosition = kPosition_5900; ENTITY_PARAM(1, 2) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -216,7 +216,7 @@ IMPLEMENT_FUNCTION(9, Servers1, function9) getData()->entityPosition = kPosition_5900; ENTITY_PARAM(0, 1) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -262,7 +262,7 @@ IMPLEMENT_FUNCTION(10, Servers1, function10) getData()->entityPosition = kPosition_5900; ENTITY_PARAM(0, 2) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -466,7 +466,7 @@ IMPLEMENT_FUNCTION(20, Servers1, function20) getEntities()->drawSequenceLeft(kEntityServers1, "BLANK"); ENTITY_PARAM(0, 7) = 0; - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -702,7 +702,7 @@ void Servers1::serveTable(const SavePoint &savepoint, const char *seq1, EntityIn if (parameter2 != NULL) *parameter2 = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -772,7 +772,7 @@ void Servers1::serveSalon(const SavePoint &savepoint, const char *seq1, const ch getData()->entityPosition = kPosition_5900; *parameter = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/sophie.cpp b/engines/lastexpress/entities/sophie.cpp index 65c718a8c4..c2f25b7eb1 100644 --- a/engines/lastexpress/entities/sophie.cpp +++ b/engines/lastexpress/entities/sophie.cpp @@ -120,7 +120,7 @@ IMPLEMENT_FUNCTION_II(2, Sophie, updateEntity, CarIndex, EntityPosition) break; case kAction123668192: - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp index b97538818f..3b9cc6d322 100644 --- a/engines/lastexpress/entities/tatiana.cpp +++ b/engines/lastexpress/entities/tatiana.cpp @@ -190,7 +190,7 @@ IMPLEMENT_FUNCTION(14, Tatiana, function14) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityTatiana); - CALLBACK_ACTION(); + callbackAction(); } break; @@ -226,7 +226,7 @@ IMPLEMENT_FUNCTION(15, Tatiana, function15) getEntities()->exitCompartment(kEntityTatiana, kObjectCompartmentB, true); getObjects()->update(kObjectCompartmentB, kEntityPlayer, kObjectLocation1, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -244,7 +244,7 @@ IMPLEMENT_FUNCTION_I(16, Tatiana, function16, uint32) getObjects()->update(kObjectCompartmentB, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); getObjects()->update(kObject49, kEntityPlayer, kObjectLocationNone, kCursorHandKnock, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } @@ -384,14 +384,14 @@ IMPLEMENT_FUNCTION(18, Tatiana, function18) getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction157159392); getEntities()->clearSequences(kEntityTatiana); - CALLBACK_ACTION(); + callbackAction(); } break; case kActionExitCompartment: getSavePoints()->push(kEntityTatiana, kEntityAlexei, kAction188784532); - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -1533,7 +1533,7 @@ IMPLEMENT_FUNCTION(40, Tatiana, function40) if (getEntities()->isInsideTrainCar(kEntityPlayer, kCarKronos) || getData()->car != getEntityData(kEntityPlayer)->car || getEntities()->updateEntity(kEntityTatiana, kCarKronos, kPosition_9270)) - CALLBACK_ACTION(); + callbackAction(); break; case kActionExcuseMe: @@ -1545,7 +1545,7 @@ IMPLEMENT_FUNCTION(40, Tatiana, function40) case kActionDefault: if (getEntities()->updateEntity(kEntityTatiana, kCarKronos, kPosition_9270)) - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -1593,7 +1593,7 @@ IMPLEMENT_FUNCTION(41, Tatiana, function41) } getEntities()->clearSequences(kEntityTatiana); - CALLBACK_ACTION(); + callbackAction(); } break; @@ -1627,7 +1627,7 @@ IMPLEMENT_FUNCTION(41, Tatiana, function41) case 6: getEntities()->clearSequences(kEntityTatiana); - CALLBACK_ACTION(); + callbackAction(); break; case 4: diff --git a/engines/lastexpress/entities/train.cpp b/engines/lastexpress/entities/train.cpp index 1a1b6efaa7..0830dffbef 100644 --- a/engines/lastexpress/entities/train.cpp +++ b/engines/lastexpress/entities/train.cpp @@ -550,7 +550,7 @@ void Train::handleCompartmentAction() { ENTITY_PARAM(0, 8) = params->param1; - CALLBACK_ACTION(); + callbackAction(); } ////////////////////////////////////////////////////////////////////////// diff --git a/engines/lastexpress/entities/verges.cpp b/engines/lastexpress/entities/verges.cpp index d4b2a1716e..bdd758a5be 100644 --- a/engines/lastexpress/entities/verges.cpp +++ b/engines/lastexpress/entities/verges.cpp @@ -100,11 +100,11 @@ IMPLEMENT_FUNCTION(3, Verges, callbackActionOnDirection) case kActionNone: if (getData()->direction != kDirectionRight) - CALLBACK_ACTION(); + callbackAction(); break; case kActionExitCompartment: - CALLBACK_ACTION(); + callbackAction(); break; case kActionExcuseMeCath: @@ -217,7 +217,7 @@ switch (savepoint.action) { break; case 6: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -239,7 +239,7 @@ IMPLEMENT_FUNCTION_IIS(10, Verges, function10, CarIndex, EntityPosition) } if (getEntities()->updateEntity(kEntityVerges, (CarIndex)params->param1, (EntityPosition)params->param2)) { - CALLBACK_ACTION(); + callbackAction(); break; } @@ -264,7 +264,7 @@ IMPLEMENT_FUNCTION_IIS(10, Verges, function10, CarIndex, EntityPosition) } if (getEntities()->updateEntity(kEntityVerges, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -335,7 +335,7 @@ IMPLEMENT_FUNCTION(11, Verges, function11) getObjects()->update(kObject104, kEntityVerges, kObjectLocationNone, kCursorNormal, kCursorHand); getObjects()->update(kObject105, kEntityVerges, kObjectLocationNone, kCursorNormal, kCursorHand); - CALLBACK_ACTION(); + callbackAction(); break; } } @@ -395,7 +395,7 @@ IMPLEMENT_FUNCTION(12, Verges, function12) getData()->entityPosition = kPosition_850; getEntities()->clearSequences(kEntityVerges); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -436,7 +436,7 @@ IMPLEMENT_FUNCTION_I(13, Verges, function13, bool) getEntities()->clearSequences(kEntityVerges); getScenes()->loadSceneFromPosition(kCarBaggage, 91); - CALLBACK_ACTION(); + callbackAction(); } break; } @@ -460,7 +460,7 @@ IMPLEMENT_FUNCTION_IS(15, Verges, function15, EntityIndex) if (!getEntities()->isPlayerPosition(kCarGreenSleeping, 2) && !getEntities()->isPlayerPosition(kCarRedSleeping, 2)) getData()->entityPosition = kPosition_2088; - CALLBACK_ACTION(); + callbackAction(); } break; @@ -497,7 +497,7 @@ IMPLEMENT_FUNCTION_ISS(16, Verges, function16, EntityIndex) if (!getEntities()->isPlayerPosition(kCarGreenSleeping, 2) && !getEntities()->isPlayerPosition(kCarRedSleeping, 2)) getData()->entityPosition = kPosition_2088; - CALLBACK_ACTION(); + callbackAction(); } break; @@ -557,7 +557,7 @@ IMPLEMENT_FUNCTION(17, Verges, function17) case 4: ENTITY_PARAM(0, 3) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -649,7 +649,7 @@ IMPLEMENT_FUNCTION(22, Verges, function22) break; case 5: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -695,7 +695,7 @@ IMPLEMENT_FUNCTION(24, Verges, policeGettingOffTrain) break; case kActionEndSound: - CALLBACK_ACTION(); + callbackAction(); break; case kActionDefault: @@ -816,7 +816,7 @@ IMPLEMENT_FUNCTION(25, Verges, function25) case 11: ENTITY_PARAM(0, 7) = 0; - CALLBACK_ACTION(); + callbackAction(); break; case 6: @@ -1222,7 +1222,7 @@ IMPLEMENT_FUNCTION_S(30, Verges, function30) break; case 4: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1264,7 +1264,7 @@ IMPLEMENT_FUNCTION(31, Verges, function31) getProgress().field_48 = 1; ENTITY_PARAM(0, 4) = 0; - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1341,7 +1341,7 @@ IMPLEMENT_FUNCTION(32, Verges, function32) break; case 6: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1546,7 +1546,7 @@ IMPLEMENT_FUNCTION(35, Verges, function35) break; case 6: - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -1885,7 +1885,7 @@ void Verges::talk(const SavePoint &savepoint, const char *sound1, const char *so break; case 6: - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/vesna.cpp b/engines/lastexpress/entities/vesna.cpp index b5ffd9c979..b0ee9bcbc1 100644 --- a/engines/lastexpress/entities/vesna.cpp +++ b/engines/lastexpress/entities/vesna.cpp @@ -131,7 +131,7 @@ IMPLEMENT_FUNCTION_II(7, Vesna, updateEntity2, CarIndex, EntityPosition) break; case kAction123668192: - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -242,7 +242,7 @@ IMPLEMENT_FUNCTION(11, Vesna, function11) case kAction55996766: case kAction101687594: - CALLBACK_ACTION(); + callbackAction(); break; } IMPLEMENT_FUNCTION_END @@ -455,7 +455,7 @@ IMPLEMENT_FUNCTION(18, Vesna, function18) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityVesna); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -708,7 +708,7 @@ IMPLEMENT_FUNCTION(21, Vesna, function21) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityVesna); - CALLBACK_ACTION(); + callbackAction(); break; } break; diff --git a/engines/lastexpress/entities/yasmin.cpp b/engines/lastexpress/entities/yasmin.cpp index d2e8cd6b68..ebf90744f5 100644 --- a/engines/lastexpress/entities/yasmin.cpp +++ b/engines/lastexpress/entities/yasmin.cpp @@ -130,7 +130,7 @@ IMPLEMENT_FUNCTION(6, Yasmin, function6) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityYasmin); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -170,7 +170,7 @@ IMPLEMENT_FUNCTION(7, Yasmin, function7) getData()->location = kLocationInsideCompartment; getEntities()->clearSequences(kEntityYasmin); - CALLBACK_ACTION(); + callbackAction(); break; } break; @@ -470,7 +470,7 @@ IMPLEMENT_FUNCTION(21, Yasmin, function21) case kActionNone: case kActionDefault: if (getEntities()->updateEntity(kEntityYasmin, (CarIndex)params->param1, (EntityPosition)params->param2)) - CALLBACK_ACTION(); + callbackAction(); break; case kActionExcuseMeCath: -- cgit v1.2.3 From 67751f77c8abae0f6326cb0daec67cd6dd272c7d Mon Sep 17 00:00:00 2001 From: Littleboy Date: Sat, 14 Jul 2012 16:33:41 -0400 Subject: CREATE_PROJECT: Output Groups and File references in XCode provider --- devtools/create_project/create_project.cpp | 26 ++++++++------------- devtools/create_project/create_project.h | 8 +++++++ devtools/create_project/xcode.cpp | 36 ++++++++++++++++++++++++------ 3 files changed, 46 insertions(+), 24 deletions(-) diff --git a/devtools/create_project/create_project.cpp b/devtools/create_project/create_project.cpp index c96b83414a..8499fec400 100644 --- a/devtools/create_project/create_project.cpp +++ b/devtools/create_project/create_project.cpp @@ -75,14 +75,6 @@ namespace { */ std::string unifyPath(const std::string &path); -/** - * Returns the last path component. - * - * @param path Path string. - * @return Last path component. - */ -std::string getLastPathComponent(const std::string &path); - /** * Display the help text for the program. * @@ -606,14 +598,6 @@ std::string unifyPath(const std::string &path) { return result; } -std::string getLastPathComponent(const std::string &path) { - std::string::size_type pos = path.find_last_of('/'); - if (pos == std::string::npos) - return path; - else - return path.substr(pos + 1); -} - void displayHelp(const char *exe) { using std::cout; @@ -1001,7 +985,7 @@ bool isInList(const std::string &dir, const std::string &fileName, const StringL continue; } - const std::string lastPathComponent = getLastPathComponent(*i); + const std::string lastPathComponent = ProjectProvider::getLastPathComponent(*i); if (extensionName == "o") { return false; } else if (!producesObjectFile(fileName) && extensionName != "h") { @@ -1304,6 +1288,14 @@ std::string ProjectProvider::createUUID() const { #endif } +std::string ProjectProvider::getLastPathComponent(const std::string &path) { + std::string::size_type pos = path.find_last_of('/'); + if (pos == std::string::npos) + return path; + else + return path.substr(pos + 1); +} + void ProjectProvider::addFilesToProject(const std::string &dir, std::ofstream &projectFile, const StringList &includeList, const StringList &excludeList, const std::string &filePrefix) { diff --git a/devtools/create_project/create_project.h b/devtools/create_project/create_project.h index 8719143f4a..b4eda8f8d2 100644 --- a/devtools/create_project/create_project.h +++ b/devtools/create_project/create_project.h @@ -317,6 +317,14 @@ public: */ void createProject(const BuildSetup &setup); + /** + * Returns the last path component. + * + * @param path Path string. + * @return Last path component. + */ + static std::string getLastPathComponent(const std::string &path); + protected: const int _version; ///< Target project version StringList &_globalWarnings; ///< Global warnings diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index 9784bb0bf5..0574814e02 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -202,18 +202,38 @@ void XCodeProvider::writeFileListToProject(const FileNode &dir, std::ofstream &p // Init root group _groups.comment = "PBXGroup"; - Object *group = new Object(this, "PBXGroup", "PBXGroup", "PBXGroup", "", ""); - //Property children; - //children.flags = SettingsAsList; - //group->properties["children"] = children; - group->addProperty("children", "", "", SettingsNoValue|SettingsAsList); + // Create group + std::string name = getLastPathComponent(dir.name); + Object *group = new Object(this, "PBXGroup_" + name , "PBXGroup", "PBXGroup", "", name); + + // List of children + Property children; + children.hasOrder = true; + children.flags = SettingsAsList; + group->addProperty("name", name, "", SettingsNoValue|SettingsQuoteVariable); group->addProperty("sourceTree", "", "", SettingsNoValue|SettingsQuoteVariable); - _groups.add(group); + int order = 0; + for (FileNode::NodeList::const_iterator i = dir.children.begin(); i != dir.children.end(); ++i) { + const FileNode *node = *i; + + std::string id = "FileReference_" + node->name; + FileProperty property = FileProperty(node->name, node->name, node->name, ""); + + ADD_SETTING_ORDER_NOVALUE(children, getHash(id), node->name, order++); + ADD_BUILD_FILE(id, node->name, node->name + " in Sources"); + ADD_FILE_REFERENCE(node->name, property); + + // Process child nodes + if (!node->children.empty()) + writeFileListToProject(*node, projectFile, indentation + 1, duplicate, objPrefix + node->name + '_', filePrefix + node->name + '/'); + } - // TODO Add files + group->properties["children"] = children; + + _groups.add(group); } ////////////////////////////////////////////////////////////////////////// @@ -717,6 +737,7 @@ void XCodeProvider::setupBuildConfiguration() { ADD_SETTING_QUOTE(scummvmSimulator_Debug, "FRAMEWORK_SEARCH_PATHS", "$(inherited)"); ADD_SETTING_LIST(scummvmSimulator_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, SettingsNoQuote|SettingsAsList, 5); ADD_SETTING(scummvmSimulator_Debug, "SDKROOT", "iphonesimulator3.2"); + ADD_SETTING_QUOTE(scummvmSimulator_Debug, "VALID_ARCHS", "i386 x86_64"); REMOVE_SETTING(scummvmSimulator_Debug, "TARGETED_DEVICE_FAMILY"); scummvmSimulator_Debug_Object->addProperty("name", "Debug", "", SettingsNoValue); @@ -726,6 +747,7 @@ void XCodeProvider::setupBuildConfiguration() { Object *scummvmSimulator_Release_Object = new Object(this, "XCBuildConfiguration_" PROJECT_DESCRIPTION "-Simulator_Release", _targets[2] /* ScummVM-Simulator */, "XCBuildConfiguration", "PBXNativeTarget", "Release"); Property scummvmSimulator_Release(scummvmSimulator_Debug); ADD_SETTING(scummvmSimulator_Release, "COPY_PHASE_STRIP", "YES"); + ADD_SETTING(scummvmSimulator_Release, "GCC_OPTIMIZATION_LEVEL", "3"); REMOVE_SETTING(scummvmSimulator_Release, "GCC_DYNAMIC_NO_PIC"); ADD_SETTING(scummvmSimulator_Release, "WRAPPER_EXTENSION", "app"); -- cgit v1.2.3 From 2c5cf9f860ffe5264268379ce6e0c0aa5ff25c0e Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 01:32:11 +0300 Subject: SCI: Properly detect the Polish version of KQ5 Thanks to jacek909 for the extra MD5 checksums of the Polish version. This fixes bugs #2725722 (Polish version checksums) and #3536863 (SCI: KQ5 Floppy English detected as Polish) --- engines/sci/detection_tables.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h index 8a6184c7e4..268914edba 100644 --- a/engines/sci/detection_tables.h +++ b/engines/sci/detection_tables.h @@ -1241,10 +1241,8 @@ static const struct ADGameDescription SciGameDescriptions[] = { // King's Quest 5 - English DOS Floppy // VERSION file reports "0.000.051" // Supplied by misterhands in bug report #3536863. - // FIXME: According to bug #3536863, there exists another English version - // with the same file checksums as the vanilla English version, patched to - // Polish. We need a better way of distinguishing the two versions. Until - // we do, this is a duplicate entry of the Polish version below. + // This is the original English version, which has been externally patched to + // Polish in the Polish release below. {"kq5", "", { {"resource.map", 0, "70010c20138541f89013bb5e1b30f16a", 7998}, {"resource.000", 0, "a591bd4b879fc832b8095c0b3befe9e2", 276398}, @@ -1374,12 +1372,10 @@ static const struct ADGameDescription SciGameDescriptions[] = { AD_LISTEND}, Common::IT_ITA, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, - // King's Quest 5 - Polish DOS Floppy (supplied by jacek909 in bug report #2725722, includes english language?!) + // King's Quest 5 - Polish DOS Floppy (supplied by jacek909 in bug report #2725722) // SCI interpreter version 1.000.060 - // FIXME: According to bug #3536863, this is actually a patched English version. - // The vanilla English version has the same MD5 checksums. - // We need a better way of detecting this. Until we do, a duplicate English - // entry has been placed above. + // VERSION file reports "0.000.051". + // This is actually an English version with external text resource patches (bug #3536863). {"kq5", "", { {"resource.map", 0, "70010c20138541f89013bb5e1b30f16a", 7998}, {"resource.000", 0, "a591bd4b879fc832b8095c0b3befe9e2", 276398}, @@ -1390,6 +1386,7 @@ static const struct ADGameDescription SciGameDescriptions[] = { {"resource.005", 0, "6556ff8e7c4d1acf6a78aea154daa76c", 1287869}, {"resource.006", 0, "da82e4beb744731d0a151f1d4922fafa", 1170456}, {"resource.007", 0, "431def14ca29cdb5e6a5e84d3f38f679", 1240176}, + {"text.000", 0, "601aa35a3ddeb558e1280e0963e955a2", 1517}, AD_LISTEND}, Common::PL_POL, Common::kPlatformPC, ADGF_ADDENGLISH, GUIO4(GUIO_NOSPEECH, GAMEOPTION_PREFER_DIGITAL_SFX, GAMEOPTION_ORIGINAL_SAVELOAD, GAMEOPTION_FB01_MIDI) }, -- cgit v1.2.3 From 13a5e5812af635477626de6a13f54ed8b8e4afa5 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 02:14:37 +0300 Subject: TEENAGENT: Unpack teenagent.dat and remove the engine's zlib dependency This addresses bug #3539822 - "TEENAGENT: Not working without zlib" --- devtools/create_teenagent/create_teenagent.cpp | 2 -- dists/engine-data/teenagent.dat | Bin 70047 -> 141090 bytes engines/teenagent/resources.cpp | 46 ++++++++++++++++--------- 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/devtools/create_teenagent/create_teenagent.cpp b/devtools/create_teenagent/create_teenagent.cpp index 9551acbaea..fc2ba4da0e 100644 --- a/devtools/create_teenagent/create_teenagent.cpp +++ b/devtools/create_teenagent/create_teenagent.cpp @@ -106,7 +106,5 @@ int main(int argc, char *argv[]) { fclose(fin); fclose(fout); - fprintf(stderr, "please run \"gzip -n %s\"\n", dat_name); - return 0; } diff --git a/dists/engine-data/teenagent.dat b/dists/engine-data/teenagent.dat index 0dd31dad14..1492326920 100644 Binary files a/dists/engine-data/teenagent.dat and b/dists/engine-data/teenagent.dat differ diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp index 597ca670c0..74ebae9c9b 100644 --- a/engines/teenagent/resources.cpp +++ b/engines/teenagent/resources.cpp @@ -22,7 +22,6 @@ #include "teenagent/resources.h" #include "teenagent/teenagent.h" #include "common/textconsole.h" -#include "common/zlib.h" namespace TeenAgent { @@ -69,24 +68,37 @@ bool Resources::loadArchives(const ADGameDescription *gd) { warning("%s", errorMessage.c_str()); return false; } - Common::SeekableReadStream *dat = Common::wrapCompressedReadStream(dat_file); - cseg.read(dat, 0xb3b0); - dseg.read(dat, 0xe790); - eseg.read(dat, 0x8be2); - - delete dat; - - { - FilePack varia; - varia.open("varia.res"); - font7.load(varia, 7); - font7.width_pack = 1; - font7.height = 11; - font8.load(varia, 8); - font8.height = 31; - varia.close(); + + // Check if teenagent.dat is compressed (older versions of the file) + uint16 header = dat_file->readUint16BE(); + bool isCompressed = (header == 0x1F8B || + ((header & 0x0F00) == 0x0800 && + header % 31 == 0)); + dat_file->seek(-2, SEEK_CUR); + + if (isCompressed) { + delete dat_file; + Common::String errorMessage = "The teenagent.dat file is compressed. Please decompress it"; + GUIErrorMessage(errorMessage); + warning("%s", errorMessage.c_str()); + return false; } + cseg.read(dat_file, 0xb3b0); + dseg.read(dat_file, 0xe790); + eseg.read(dat_file, 0x8be2); + + delete dat_file; + + FilePack varia; + varia.open("varia.res"); + font7.load(varia, 7); + font7.width_pack = 1; + font7.height = 11; + font8.load(varia, 8); + font8.height = 31; + varia.close(); + off.open("off.res"); on.open("on.res"); ons.open("ons.res"); -- cgit v1.2.3 From c54f95ee86b001676fbdc44aa5e1c74191fae459 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 02:27:51 +0300 Subject: TEENAGENT: Readd the zlib code, to maintain backwards compatibility --- engines/teenagent/resources.cpp | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp index 74ebae9c9b..49a429d5b7 100644 --- a/engines/teenagent/resources.cpp +++ b/engines/teenagent/resources.cpp @@ -22,6 +22,7 @@ #include "teenagent/resources.h" #include "teenagent/teenagent.h" #include "common/textconsole.h" +#include "common/zlib.h" namespace TeenAgent { @@ -69,26 +70,15 @@ bool Resources::loadArchives(const ADGameDescription *gd) { return false; } - // Check if teenagent.dat is compressed (older versions of the file) - uint16 header = dat_file->readUint16BE(); - bool isCompressed = (header == 0x1F8B || - ((header & 0x0F00) == 0x0800 && - header % 31 == 0)); - dat_file->seek(-2, SEEK_CUR); - - if (isCompressed) { - delete dat_file; - Common::String errorMessage = "The teenagent.dat file is compressed. Please decompress it"; - GUIErrorMessage(errorMessage); - warning("%s", errorMessage.c_str()); - return false; - } - - cseg.read(dat_file, 0xb3b0); - dseg.read(dat_file, 0xe790); - eseg.read(dat_file, 0x8be2); + // teenagent.dat used to be compressed with zlib compression. The usage of + // zlib here is no longer needed, and it's maintained only for backwards + // compatibility. + Common::SeekableReadStream *dat = Common::wrapCompressedReadStream(dat_file); + cseg.read(dat, 0xb3b0); + dseg.read(dat, 0xe790); + eseg.read(dat, 0x8be2); - delete dat_file; + delete dat; FilePack varia; varia.open("varia.res"); -- cgit v1.2.3 From f4e395b4a185ac4aabd4e0a19c7e00682365d893 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 02:47:06 +0300 Subject: TEENAGENT: Show a verbose warning when a compressed data file is used and zlib hasn't been included in the executable --- engines/teenagent/resources.cpp | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp index 49a429d5b7..0dc6ea2f3c 100644 --- a/engines/teenagent/resources.cpp +++ b/engines/teenagent/resources.cpp @@ -74,10 +74,27 @@ bool Resources::loadArchives(const ADGameDescription *gd) { // zlib here is no longer needed, and it's maintained only for backwards // compatibility. Common::SeekableReadStream *dat = Common::wrapCompressedReadStream(dat_file); + +#if !defined(USE_ZLIB) + uint16 header = dat->readUint16BE(); + bool isCompressed = (header == 0x1F8B || + ((header & 0x0F00) == 0x0800 && + header % 31 == 0)); + dat->seek(-2, SEEK_CUR); + + if (isCompressed) { + // teenagent.dat is compressed, but zlib hasn't been compiled in + delete dat; + Common::String errorMessage = "The teenagent.dat file is compressed and zlib hasn't been included in this executable. Please decompress it"; + GUIErrorMessage(errorMessage); + warning("%s", errorMessage.c_str()); + return false; + } +#endif + cseg.read(dat, 0xb3b0); dseg.read(dat, 0xe790); eseg.read(dat, 0x8be2); - delete dat; FilePack varia; -- cgit v1.2.3 From a97f4466fdf7320cf184d0d4974670b4b4e4bee4 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 03:07:01 +0300 Subject: TEENAGENT: Add translatable strings in resources.cpp --- engines/teenagent/resources.cpp | 9 +++++---- po/POTFILES | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/engines/teenagent/resources.cpp b/engines/teenagent/resources.cpp index 0dc6ea2f3c..dff58f98e2 100644 --- a/engines/teenagent/resources.cpp +++ b/engines/teenagent/resources.cpp @@ -22,6 +22,7 @@ #include "teenagent/resources.h" #include "teenagent/teenagent.h" #include "common/textconsole.h" +#include "common/translation.h" #include "common/zlib.h" namespace TeenAgent { @@ -64,9 +65,9 @@ bool Resources::loadArchives(const ADGameDescription *gd) { Common::File *dat_file = new Common::File(); if (!dat_file->open("teenagent.dat")) { delete dat_file; - Common::String errorMessage = "You're missing the 'teenagent.dat' file. Get it from the ScummVM website"; - GUIErrorMessage(errorMessage); + Common::String errorMessage = _("You're missing the 'teenagent.dat' file. Get it from the ScummVM website"); warning("%s", errorMessage.c_str()); + GUIErrorMessage(errorMessage); return false; } @@ -85,9 +86,9 @@ bool Resources::loadArchives(const ADGameDescription *gd) { if (isCompressed) { // teenagent.dat is compressed, but zlib hasn't been compiled in delete dat; - Common::String errorMessage = "The teenagent.dat file is compressed and zlib hasn't been included in this executable. Please decompress it"; - GUIErrorMessage(errorMessage); + Common::String errorMessage = _("The teenagent.dat file is compressed and zlib hasn't been included in this executable. Please decompress it"); warning("%s", errorMessage.c_str()); + GUIErrorMessage(errorMessage); return false; } #endif diff --git a/po/POTFILES b/po/POTFILES index 8b74115939..36bd2ff4c7 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -53,6 +53,7 @@ engines/sword1/logic.cpp engines/sword1/sword1.cpp engines/sword2/animation.cpp engines/sword2/sword2.cpp +engines/teenagent/resources.cpp engines/tinsel/saveload.cpp engines/parallaction/saveload.cpp -- cgit v1.2.3 From aa8dec9a722e1b85374a215cba9a7066040a5e6e Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Sat, 14 Jul 2012 23:39:28 -0500 Subject: MAEMO: Fix compile without keymapper --- backends/platform/maemo/maemo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp index e296d4787c..eb9b144ab2 100644 --- a/backends/platform/maemo/maemo.cpp +++ b/backends/platform/maemo/maemo.cpp @@ -180,6 +180,7 @@ void OSystem_SDL_Maemo::setupIcon() { // http://bugzilla.libsdl.org/show_bug.cgi?id=586 } +#ifdef ENABLE_KEYMAPPER static const Common::KeyTableEntry maemoKeys[] = { // Function keys {"MENU", Common::KEYCODE_F11, 0, "Menu", false}, @@ -191,7 +192,6 @@ static const Common::KeyTableEntry maemoKeys[] = { {0, Common::KEYCODE_INVALID, 0, 0, false} }; -#ifdef ENABLE_KEYMAPPER Common::HardwareInputSet *OSystem_SDL_Maemo::getHardwareInputSet() { return new Common::HardwareInputSet(true, maemoKeys); } -- cgit v1.2.3 From 6abb3501b50101760885efaf4a9721beadb18052 Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Sat, 14 Jul 2012 23:42:28 -0500 Subject: MAEMO: Set defaults for fullscreen and aspect ratio correction New installs now have fullscreen and aspect ratio correction on by default --- backends/platform/maemo/maemo.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp index eb9b144ab2..61fe56e816 100644 --- a/backends/platform/maemo/maemo.cpp +++ b/backends/platform/maemo/maemo.cpp @@ -84,6 +84,10 @@ static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymap #endif void OSystem_SDL_Maemo::initBackend() { + + ConfMan.registerDefault("fullscreen", true); + ConfMan.registerDefault("aspect_ratio", true); + // Create the events manager if (_eventSource == 0) _eventSource = new MaemoSdlEventSource(); -- cgit v1.2.3 From 848b6daeb980199a948fd5d067e5f199c1ee1593 Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Sun, 15 Jul 2012 00:07:24 -0500 Subject: MAEMO: Minor whitespace fix --- backends/platform/maemo/maemo.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp index 61fe56e816..4e50d04715 100644 --- a/backends/platform/maemo/maemo.cpp +++ b/backends/platform/maemo/maemo.cpp @@ -84,7 +84,6 @@ static void registerDefaultKeyBindings(Common::KeymapperDefaultBindings *_keymap #endif void OSystem_SDL_Maemo::initBackend() { - ConfMan.registerDefault("fullscreen", true); ConfMan.registerDefault("aspect_ratio", true); -- cgit v1.2.3 From 2f08f95e117dbeb3d4b0e431e73a1a49c9809f23 Mon Sep 17 00:00:00 2001 From: Tarek Soliman Date: Sun, 15 Jul 2012 00:18:49 -0500 Subject: MAEMO: Fix uninitialized member --- backends/platform/maemo/maemo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/backends/platform/maemo/maemo.cpp b/backends/platform/maemo/maemo.cpp index 4e50d04715..6bd229177b 100644 --- a/backends/platform/maemo/maemo.cpp +++ b/backends/platform/maemo/maemo.cpp @@ -43,6 +43,7 @@ namespace Maemo { OSystem_SDL_Maemo::OSystem_SDL_Maemo() : + _eventObserver(0), OSystem_POSIX() { } -- cgit v1.2.3 From 212551fe4e98ac7d16cdac317b5c87be3190ab18 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 15 Jul 2012 20:58:14 +1000 Subject: TINSEL: Added script workaround for #3543624 - DW1 PSX demo idle animation --- engines/tinsel/detection.cpp | 4 ++++ engines/tinsel/pcode.cpp | 43 ++++++++++++++++++++++++++++--------------- engines/tinsel/tinsel.h | 1 + 3 files changed, 33 insertions(+), 15 deletions(-) diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 0f662e22bd..6d20f8bee2 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -63,6 +63,10 @@ uint16 TinselEngine::getVersion() const { return _gameDescription->version; } +bool TinselEngine::getIsADGFDemo() const { + return (bool)(_gameDescription->desc.flags & ADGF_DEMO); +} + } // End of namespace Tinsel static const PlainGameDescriptor tinselGames[] = { diff --git a/engines/tinsel/pcode.cpp b/engines/tinsel/pcode.cpp index 60f04b47fd..6ea18c8268 100644 --- a/engines/tinsel/pcode.cpp +++ b/engines/tinsel/pcode.cpp @@ -122,6 +122,8 @@ static uint32 g_hMasterScript; struct WorkaroundEntry { TinselEngineVersion version; ///< Engine version this workaround applies to bool scnFlag; ///< Only applicable for Tinsel 1 (DW 1) + bool isDemo; ///< Flags whether it's for a demo + Common::Platform platform; ///< Platform filter SCNHANDLE hCode; ///< Script to apply fragment to int ip; ///< Script offset to run this fragment before int numBytes; ///< Number of bytes in the script @@ -129,6 +131,7 @@ struct WorkaroundEntry { }; #define FRAGMENT_WORD(x) (byte)(x & 0xFF), (byte)(x >> 8) +#define FRAGMENT_DWORD(x) (byte)(x & 0xFF), (byte)(x >> 8), (byte)(x >> 16), (byte)(x >> 24) static const byte fragment1[] = {OP_ZERO, OP_GSTORE | OPSIZE16, 206, 0}; static const byte fragment2[] = {OP_LIBCALL | OPSIZE8, 110}; @@ -149,6 +152,10 @@ static const byte fragment12[] = {OP_JMPTRUE | OPSIZE16, FRAGMENT_WORD(1491), OP_IMM | OPSIZE16, FRAGMENT_WORD(322), OP_LIBCALL | OPSIZE8, 46, // Give back the whistle OP_JUMP | OPSIZE16, FRAGMENT_WORD(1568)}; static const byte fragment13[] = {OP_ZERO, OP_GSTORE | OPSIZE16, FRAGMENT_WORD(306)}; +static const byte fragment14[] = {OP_LIBCALL | OPSIZE8, 58, + OP_IMM, FRAGMENT_DWORD((42 << 23)), OP_ONE, OP_ZERO, OP_LIBCALL | OPSIZE8, 44, + OP_LIBCALL | OPSIZE8, 97, OP_JUMP | OPSIZE16, FRAGMENT_WORD(2220) +}; #undef FRAGMENT_WORD @@ -157,7 +164,7 @@ const WorkaroundEntry workaroundList[] = { // book back to the present. In the GRA version, it was global 373, // and was reset when he is returned to the past, but was forgotten // in the SCN version, so this ensures the flag is properly reset. - {TINSEL_V1, true, 427942095, 1, sizeof(fragment1), fragment1}, + {TINSEL_V1, true, false, Common::kPlatformUnknown, 427942095, 1, sizeof(fragment1), fragment1}, // DW1-GRA: Rincewind exiting the Inn is blocked by the luggage. // Whilst you can then move into walkable areas, saving and @@ -165,26 +172,26 @@ const WorkaroundEntry workaroundList[] = { // fragment turns off NPC blocking for the Outside Inn rooms so that // the luggage won't block Past Outside Inn. // See bug report #2525010. - {TINSEL_V1, false, 444622076, 0, sizeof(fragment2), fragment2}, + {TINSEL_V1, false, false, Common::kPlatformUnknown, 444622076, 0, sizeof(fragment2), fragment2}, // Present Outside Inn - {TINSEL_V1, false, 352600876, 0, sizeof(fragment2), fragment2}, + {TINSEL_V1, false, false, Common::kPlatformUnknown, 352600876, 0, sizeof(fragment2), fragment2}, // DW1-GRA: Talking to palace guards in Act 2 gives !!!HIGH // STRING||| - this happens if you initiate dialog with one of the // guards, but not the other. So these fragments provide the correct // talk parameters where needed. // See bug report #2831159. - {TINSEL_V1, false, 310506872, 463, sizeof(fragment4), fragment4}, - {TINSEL_V1, false, 310506872, 485, sizeof(fragment5), fragment5}, - {TINSEL_V1, false, 310506872, 513, sizeof(fragment6), fragment6}, - {TINSEL_V1, false, 310506872, 613, sizeof(fragment7), fragment7}, - {TINSEL_V1, false, 310506872, 641, sizeof(fragment8), fragment8}, + {TINSEL_V1, false, false, Common::kPlatformUnknown, 310506872, 463, sizeof(fragment4), fragment4}, + {TINSEL_V1, false, false, Common::kPlatformUnknown, 310506872, 485, sizeof(fragment5), fragment5}, + {TINSEL_V1, false, false, Common::kPlatformUnknown, 310506872, 513, sizeof(fragment6), fragment6}, + {TINSEL_V1, false, false, Common::kPlatformUnknown, 310506872, 613, sizeof(fragment7), fragment7}, + {TINSEL_V1, false, false, Common::kPlatformUnknown, 310506872, 641, sizeof(fragment8), fragment8}, // DW1-SCN: The script for the lovable street-Starfish does a // 'StopSample' after flicking the coin to ensure it's sound is // stopped, but which also accidentally can stop any active // conversation with the Amazon. - {TINSEL_V1, true, 394640351, 121, sizeof(fragment9), fragment9}, + {TINSEL_V1, true, false, Common::kPlatformUnknown, 394640351, 121, sizeof(fragment9), fragment9}, // DW2: In the garden, global #490 is set when the bees begin their // 'out of hive' animation, and reset when done. But if the game is @@ -197,25 +204,29 @@ const WorkaroundEntry workaroundList[] = { // * Stealing the mallets from the wizards (bug #2820788). // This fix ensures that the global is reset when the Garden scene // is loaded (both entering and restoring a game). - {TINSEL_V2, true, 2888147476U, 0, sizeof(fragment3), fragment3}, + {TINSEL_V2, true, false, Common::kPlatformUnknown, 2888147476U, 0, sizeof(fragment3), fragment3}, // DW1-GRA: Corrects text being drawn partially off-screen during // the blackboard description of the Librarian. - {TINSEL_V1, false, 293831402, 133, sizeof(fragment10), fragment10}, + {TINSEL_V1, false, false, Common::kPlatformUnknown, 293831402, 133, sizeof(fragment10), fragment10}, // DW1-GRA/SCN: Corrects the dead-end of being able to give the // whistle back to the pirate before giving him the parrot. // See bug report #2934211. - {TINSEL_V1, true, 352601285, 1569, sizeof(fragment11), fragment11}, - {TINSEL_V1, false, 352602304, 1488, sizeof(fragment12), fragment12}, + {TINSEL_V1, true, false, Common::kPlatformUnknown, 352601285, 1569, sizeof(fragment11), fragment11}, + {TINSEL_V1, false, false, Common::kPlatformUnknown, 352602304, 1488, sizeof(fragment12), fragment12}, // DW2: Corrects a bug with global 306 not being cleared if you leave // the marketplace scene whilst D'Blah is talking (even if it's not // actually audible); returning to the scene and clicking on him multiple // times would cause the game to crash - {TINSEL_V2, true, 1109294728, 0, sizeof(fragment13), fragment13}, + {TINSEL_V2, true, false, Common::kPlatformUnknown, 1109294728, 0, sizeof(fragment13), fragment13}, + + // DW1 PSX DEMO: Alters a script in the PSX DW1 demo to show the Idle animation scene rather than + // quitting the game when no user input happens for a while + {TINSEL_V1, true, true, Common::kPlatformPSX, 0, 2186, sizeof(fragment14), fragment14}, - {TINSEL_V0, false, 0, 0, 0, NULL} + {TINSEL_V0, false, false, Common::kPlatformUnknown, 0, 0, 0, NULL} }; //----------------- LOCAL GLOBAL DATA -------------------- @@ -582,6 +593,8 @@ void Interpret(CORO_PARAM, INT_CONTEXT *ic) { if ((wkEntry->version == TinselVersion) && (wkEntry->hCode == ic->hCode) && (wkEntry->ip == ip) && + (wkEntry->isDemo == _vm->getIsADGFDemo()) && + ((wkEntry->platform == Common::kPlatformUnknown) || (wkEntry->platform == _vm->getPlatform())) && (!TinselV1 || (wkEntry->scnFlag == ((_vm->getFeatures() & GF_SCNFILES) != 0)))) { // Point to start of workaround fragment ip = 0; diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h index bac7ef6efb..5660366657 100644 --- a/engines/tinsel/tinsel.h +++ b/engines/tinsel/tinsel.h @@ -186,6 +186,7 @@ public: uint16 getVersion() const; uint32 getFlags() const; Common::Platform getPlatform() const; + bool getIsADGFDemo() const; const char *getSampleIndex(LANGUAGE lang); const char *getSampleFile(LANGUAGE lang); -- cgit v1.2.3 From 89aa6573fed989131da5e34648f70b0669e39501 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 14:38:26 +0300 Subject: TINSEL: Remove the GF_DEMO flag --- engines/tinsel/detection_tables.h | 4 ++-- engines/tinsel/music.cpp | 2 +- engines/tinsel/scene.h | 6 +++--- engines/tinsel/sound.cpp | 2 +- engines/tinsel/tinlib.cpp | 4 ++-- engines/tinsel/tinsel.h | 22 ++++++++++------------ 6 files changed, 19 insertions(+), 21 deletions(-) diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h index ef562a5e08..dc3b5f1382 100644 --- a/engines/tinsel/detection_tables.h +++ b/engines/tinsel/detection_tables.h @@ -47,7 +47,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_DEMO, + 0, TINSEL_V0, }, @@ -551,7 +551,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW2, 0, - GF_CD | GF_SCNFILES | GF_DEMO, + GF_CD | GF_SCNFILES, TINSEL_V2, }, diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index a226feb656..637e043e11 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -300,7 +300,7 @@ void OpenMidiFiles() { Common::File midiStream; // Demo version has no midi file - if ((_vm->getFeatures() & GF_DEMO) || (TinselVersion == TINSEL_V2)) + if (TinselV0 || TinselV2) return; if (g_midiBuffer.pDat) diff --git a/engines/tinsel/scene.h b/engines/tinsel/scene.h index baaff27a3e..06e5c096d9 100644 --- a/engines/tinsel/scene.h +++ b/engines/tinsel/scene.h @@ -75,9 +75,9 @@ enum REEL { typedef enum { TRANS_DEF, TRANS_CUT, TRANS_FADE } TRANSITS; // amount to shift scene handles by -#define SCNHANDLE_SHIFT ((TinselV2 && !IsDemo) ? 25 : 23) -#define OFFSETMASK ((TinselV2 && !IsDemo) ? 0x01ffffffL : 0x007fffffL) -#define HANDLEMASK ((TinselV2 && !IsDemo) ? 0xFE000000L : 0xFF800000L) +#define SCNHANDLE_SHIFT ((TinselV2 && !TinselV2Demo) ? 25 : 23) +#define OFFSETMASK ((TinselV2 && !TinselV2Demo) ? 0x01ffffffL : 0x007fffffL) +#define HANDLEMASK ((TinselV2 && !TinselV2Demo) ? 0xFE000000L : 0xFF800000L) void DoHailScene(SCNHANDLE scene); diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index f575b03270..f0ad62a091 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -471,7 +471,7 @@ void SoundManager::setSFXVolumes(uint8 volume) { */ void SoundManager::openSampleFiles() { // Floppy and demo versions have no sample files, except for the Discworld 2 demo - if (_vm->getFeatures() & GF_FLOPPY || (IsDemo && !TinselV2)) + if (_vm->getFeatures() & GF_FLOPPY || TinselV0) return; TinselFile f; diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index 5dda836144..7c4fec6592 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -3412,7 +3412,7 @@ static void TalkOrSay(CORO_PARAM, SPEECH_TYPE speechType, SCNHANDLE hText, int x // Kick off the sample now (perhaps with a delay) if (g_bNoPause) g_bNoPause = false; - else if (!IsDemo) + else if (!TinselV2Demo) CORO_SLEEP(SysVar(SV_SPEECHDELAY)); //SamplePlay(VOICE, hText, _ctx->sub, false, -1, -1, PRIORITY_TALK); @@ -4244,7 +4244,7 @@ int CallLibraryRoutine(CORO_PARAM, int operand, int32 *pp, const INT_CONTEXT *pi int libCode; if (TinselV0) libCode = DW1DEMO_CODES[operand]; else if (!TinselV2) libCode = DW1_CODES[operand]; - else if (_vm->getFeatures() & GF_DEMO) libCode = DW2DEMO_CODES[operand]; + else if (TinselV2Demo) libCode = DW2DEMO_CODES[operand]; else libCode = DW2_CODES[operand]; debug(7, "CallLibraryRoutine op %d (escOn %d, myEscape %d)", operand, pic->escOn, pic->myEscape); diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h index 5660366657..ef04669f5f 100644 --- a/engines/tinsel/tinsel.h +++ b/engines/tinsel/tinsel.h @@ -63,21 +63,20 @@ enum TinselGameID { }; enum TinselGameFeatures { - GF_DEMO = 1 << 0, - GF_CD = 1 << 1, - GF_FLOPPY = 1 << 2, - GF_SCNFILES = 1 << 3, - GF_ENHANCED_AUDIO_SUPPORT = 1 << 4, - GF_ALT_MIDI = 1 << 5, // Alternate sequence in midi.dat file + GF_CD = 1 << 0, + GF_FLOPPY = 1 << 1, + GF_SCNFILES = 1 << 2, + GF_ENHANCED_AUDIO_SUPPORT = 1 << 3, + GF_ALT_MIDI = 1 << 4, // Alternate sequence in midi.dat file // The GF_USE_?FLAGS values specify how many country flags are displayed // in the subtitles options dialog. // None of these defined -> 1 language, in ENGLISH.TXT - GF_USE_3FLAGS = 1 << 6, // French, German, Spanish - GF_USE_4FLAGS = 1 << 7, // French, German, Spanish, Italian - GF_USE_5FLAGS = 1 << 8, // All 5 flags + GF_USE_3FLAGS = 1 << 5, // French, German, Spanish + GF_USE_4FLAGS = 1 << 6, // French, German, Spanish, Italian + GF_USE_5FLAGS = 1 << 7, // All 5 flags - GF_BIG_ENDIAN = 1 << 9 + GF_BIG_ENDIAN = 1 << 8 }; /** @@ -134,11 +133,10 @@ typedef bool (*KEYFPTR)(const Common::KeyState &); #define TinselV0 (TinselVersion == TINSEL_V0) #define TinselV1 (TinselVersion == TINSEL_V1) #define TinselV2 (TinselVersion == TINSEL_V2) +#define TinselV2Demo (TinselVersion == TINSEL_V2 && _vm->getIsADGFDemo()) #define TinselV1PSX (TinselVersion == TINSEL_V1 && _vm->getPlatform() == Common::kPlatformPSX) #define TinselV1Mac (TinselVersion == TINSEL_V1 && _vm->getPlatform() == Common::kPlatformMacintosh) -#define IsDemo (_vm->getFeatures() & GF_DEMO) - #define READ_16(v) ((_vm->getFeatures() & GF_BIG_ENDIAN) ? READ_BE_UINT16(v) : READ_LE_UINT16(v)) #define READ_32(v) ((_vm->getFeatures() & GF_BIG_ENDIAN) ? READ_BE_UINT32(v) : READ_LE_UINT32(v)) -- cgit v1.2.3 From bd09eb06557514b4e68e6dc915cd71976af677bb Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 14:41:27 +0300 Subject: TINSEL: Reorder the detection entries to split the DW1 and DW2 entries --- engines/tinsel/detection_tables.h | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h index dc3b5f1382..23d8d2242b 100644 --- a/engines/tinsel/detection_tables.h +++ b/engines/tinsel/detection_tables.h @@ -535,26 +535,6 @@ static const TinselGameDescription gameDescriptions[] = { TINSEL_V1, }, - { // English DW2 demo - { - "dw2", - "Demo", - { - {"dw2.scn", 0, "853ab998f5136b69bc586991175d6eeb", 4231121}, - {"english.smp", 0, "b5660a0e031cb4710bcb0ef5629ea61d", 28562357}, - {NULL, 0, NULL, 0} - }, - Common::EN_ANY, - Common::kPlatformPC, - ADGF_DEMO, - GUIO1(GUIO_NOASPECT) - }, - GID_DW2, - 0, - GF_CD | GF_SCNFILES, - TINSEL_V2, - }, - { // Polish fan translaction Discworld 1 { "dw", @@ -576,6 +556,26 @@ static const TinselGameDescription gameDescriptions[] = { TINSEL_V1, }, + { // English Discworld 2 demo + { + "dw2", + "Demo", + { + {"dw2.scn", 0, "853ab998f5136b69bc586991175d6eeb", 4231121}, + {"english.smp", 0, "b5660a0e031cb4710bcb0ef5629ea61d", 28562357}, + {NULL, 0, NULL, 0} + }, + Common::EN_ANY, + Common::kPlatformPC, + ADGF_DEMO, + GUIO1(GUIO_NOASPECT) + }, + GID_DW2, + 0, + GF_CD | GF_SCNFILES, + TINSEL_V2, + }, + { // European/Australian Discworld 2 release { "dw2", -- cgit v1.2.3 From d4a354c17f811faa916bf548a11a88cb51c3b7b2 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 14:55:06 +0300 Subject: TINSEL: Remove the GF_CD and GF_FLOPPY flags --- engines/tinsel/detection.cpp | 4 ++ engines/tinsel/detection_tables.h | 92 +++++++++++++++++++-------------------- engines/tinsel/sound.cpp | 6 +-- engines/tinsel/tinsel.h | 17 ++++---- 4 files changed, 61 insertions(+), 58 deletions(-) diff --git a/engines/tinsel/detection.cpp b/engines/tinsel/detection.cpp index 6d20f8bee2..2e4be33e53 100644 --- a/engines/tinsel/detection.cpp +++ b/engines/tinsel/detection.cpp @@ -67,6 +67,10 @@ bool TinselEngine::getIsADGFDemo() const { return (bool)(_gameDescription->desc.flags & ADGF_DEMO); } +bool TinselEngine::isCD() const { + return (bool)(_gameDescription->desc.flags & ADGF_CD); +} + } // End of namespace Tinsel static const PlainGameDescriptor tinselGames[] = { diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h index 23d8d2242b..5f305f06e4 100644 --- a/engines/tinsel/detection_tables.h +++ b/engines/tinsel/detection_tables.h @@ -61,12 +61,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - ADGF_DEMO, + ADGF_DEMO | ADGF_CD, GUIO0() }, GID_DW1, 0, - GF_CD, + 0, TINSEL_V1, }, #if 0 @@ -81,12 +81,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformMacintosh, - ADGF_DEMO, + ADGF_DEMO | ADGF_CD, GUIO0() }, GID_DW1, 0, - GF_CD | GF_SCNFILES | GF_BIG_ENDIAN, + GF_SCNFILES | GF_BIG_ENDIAN, TINSEL_V1, }, #endif @@ -110,7 +110,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_FLOPPY | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, + GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -133,7 +133,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_FLOPPY | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, + GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -156,7 +156,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_FLOPPY | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, + GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -179,7 +179,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_FLOPPY | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, + GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -195,7 +195,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_FLOPPY | GF_ENHANCED_AUDIO_SUPPORT, + GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -214,7 +214,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_ENHANCED_AUDIO_SUPPORT, + GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -228,12 +228,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - ADGF_NO_FLAGS, + ADGF_CD, GUIO_NONE }, GID_DW1, 0, - GF_CD | GF_ENHANCED_AUDIO_SUPPORT, + GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -249,7 +249,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_FLOPPY | GF_ENHANCED_AUDIO_SUPPORT, + GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -271,7 +271,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, + GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -296,7 +296,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, + GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -315,12 +315,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - ADGF_DROPLANGUAGE | ADGF_CD, + ADGF_DROPLANGUAGE, GUIO0() }, GID_DW1, 0, - GF_CD | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, + GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, { @@ -343,7 +343,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, + GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, { @@ -366,7 +366,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, + GF_USE_4FLAGS | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -386,7 +386,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, + GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -406,7 +406,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, + GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -425,7 +425,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, + GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -443,12 +443,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPSX, - ADGF_DEMO, + ADGF_CD | ADGF_DEMO, GUIO0() }, GID_DW1, 0, - GF_CD | GF_SCNFILES, + GF_SCNFILES, TINSEL_V1, }, @@ -469,7 +469,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, + GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, #endif @@ -491,7 +491,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT | GF_BIG_ENDIAN, + GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT | GF_BIG_ENDIAN, TINSEL_V1, }, @@ -510,7 +510,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT | GF_ALT_MIDI, + GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT | GF_ALT_MIDI, TINSEL_V1, }, @@ -531,7 +531,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_CD | GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, + GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -547,12 +547,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::PL_POL, Common::kPlatformPC, - ADGF_NO_FLAGS, + ADGF_CD, GUIO_NONE }, GID_DW1, 0, - GF_CD | GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, + GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, @@ -567,12 +567,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_ANY, Common::kPlatformPC, - ADGF_DEMO, + ADGF_DEMO | ADGF_CD, GUIO1(GUIO_NOASPECT) }, GID_DW2, 0, - GF_CD | GF_SCNFILES, + GF_SCNFILES, TINSEL_V2, }, @@ -587,12 +587,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_GRB, Common::kPlatformPC, - ADGF_NO_FLAGS, + ADGF_CD, GUIO1(GUIO_NOASPECT) }, GID_DW2, 0, - GF_CD | GF_SCNFILES, + GF_SCNFILES, TINSEL_V2, }, @@ -607,12 +607,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::EN_USA, Common::kPlatformPC, - ADGF_NO_FLAGS, + ADGF_CD, GUIO1(GUIO_NOASPECT) }, GID_DW2, 0, - GF_CD | GF_SCNFILES, + GF_SCNFILES, TINSEL_V2, }, @@ -627,12 +627,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::FR_FRA, Common::kPlatformPC, - ADGF_NO_FLAGS, + ADGF_CD, GUIO1(GUIO_NOASPECT) }, GID_DW2, 0, - GF_CD | GF_SCNFILES, + GF_SCNFILES, TINSEL_V2, }, @@ -647,12 +647,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::DE_DEU, Common::kPlatformPC, - ADGF_NO_FLAGS, + ADGF_CD, GUIO1(GUIO_NOASPECT) }, GID_DW2, 0, - GF_CD | GF_SCNFILES, + GF_SCNFILES, TINSEL_V2, }, @@ -668,12 +668,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::IT_ITA, Common::kPlatformPC, - ADGF_NO_FLAGS, + ADGF_CD, GUIO1(GUIO_NOASPECT) }, GID_DW2, 0, - GF_CD | GF_SCNFILES, + GF_SCNFILES, TINSEL_V2, }, { @@ -688,12 +688,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::ES_ESP, Common::kPlatformPC, - ADGF_NO_FLAGS, + ADGF_CD, GUIO1(GUIO_NOASPECT) }, GID_DW2, 0, - GF_CD | GF_SCNFILES, + GF_SCNFILES, TINSEL_V2, }, @@ -709,12 +709,12 @@ static const TinselGameDescription gameDescriptions[] = { }, Common::RU_RUS, Common::kPlatformPC, - ADGF_NO_FLAGS, + ADGF_CD, GUIO1(GUIO_NOASPECT) }, GID_DW2, 0, - GF_CD | GF_SCNFILES, + GF_SCNFILES, TINSEL_V2, }, diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index f0ad62a091..e052302cfd 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -75,7 +75,7 @@ SoundManager::~SoundManager() { // playSample for DiscWorld 1 bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::SoundHandle *handle) { // Floppy version has no sample file - if (_vm->getFeatures() & GF_FLOPPY) + if (!_vm->isCD()) return false; // no sample driver? @@ -182,7 +182,7 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p Audio::Mixer::SoundType type, Audio::SoundHandle *handle) { // Floppy version has no sample file - if (_vm->getFeatures() & GF_FLOPPY) + if (!_vm->isCD()) return false; // no sample driver? @@ -471,7 +471,7 @@ void SoundManager::setSFXVolumes(uint8 volume) { */ void SoundManager::openSampleFiles() { // Floppy and demo versions have no sample files, except for the Discworld 2 demo - if (_vm->getFeatures() & GF_FLOPPY || TinselV0) + if (!_vm->isCD() || TinselV0) return; TinselFile f; diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h index ef04669f5f..38c17812b4 100644 --- a/engines/tinsel/tinsel.h +++ b/engines/tinsel/tinsel.h @@ -63,20 +63,18 @@ enum TinselGameID { }; enum TinselGameFeatures { - GF_CD = 1 << 0, - GF_FLOPPY = 1 << 1, - GF_SCNFILES = 1 << 2, - GF_ENHANCED_AUDIO_SUPPORT = 1 << 3, - GF_ALT_MIDI = 1 << 4, // Alternate sequence in midi.dat file + GF_SCNFILES = 1 << 0, + GF_ENHANCED_AUDIO_SUPPORT = 1 << 1, + GF_ALT_MIDI = 1 << 2, // Alternate sequence in midi.dat file // The GF_USE_?FLAGS values specify how many country flags are displayed // in the subtitles options dialog. // None of these defined -> 1 language, in ENGLISH.TXT - GF_USE_3FLAGS = 1 << 5, // French, German, Spanish - GF_USE_4FLAGS = 1 << 6, // French, German, Spanish, Italian - GF_USE_5FLAGS = 1 << 7, // All 5 flags + GF_USE_3FLAGS = 1 << 3, // French, German, Spanish + GF_USE_4FLAGS = 1 << 4, // French, German, Spanish, Italian + GF_USE_5FLAGS = 1 << 5, // All 5 flags - GF_BIG_ENDIAN = 1 << 8 + GF_BIG_ENDIAN = 1 << 6 }; /** @@ -185,6 +183,7 @@ public: uint32 getFlags() const; Common::Platform getPlatform() const; bool getIsADGFDemo() const; + bool isCD() const; const char *getSampleIndex(LANGUAGE lang); const char *getSampleFile(LANGUAGE lang); -- cgit v1.2.3 From a5af61005c4a2f3daacc40c81da06ff344c9bbd3 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 15:00:00 +0300 Subject: TINSEL: Remove the GF_BIG_ENDIAN flag --- engines/tinsel/detection_tables.h | 4 ++-- engines/tinsel/drives.cpp | 2 +- engines/tinsel/tinsel.h | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h index 5f305f06e4..631c2dce14 100644 --- a/engines/tinsel/detection_tables.h +++ b/engines/tinsel/detection_tables.h @@ -86,7 +86,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_SCNFILES | GF_BIG_ENDIAN, + GF_SCNFILES, TINSEL_V1, }, #endif @@ -491,7 +491,7 @@ static const TinselGameDescription gameDescriptions[] = { }, GID_DW1, 0, - GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT | GF_BIG_ENDIAN, + GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT, TINSEL_V1, }, diff --git a/engines/tinsel/drives.cpp b/engines/tinsel/drives.cpp index 5c4b939e4e..3ecef83753 100644 --- a/engines/tinsel/drives.cpp +++ b/engines/tinsel/drives.cpp @@ -149,7 +149,7 @@ bool GotoCD() { bool TinselFile::_warningShown = false; -TinselFile::TinselFile() : ReadStreamEndian((_vm->getFeatures() & GF_BIG_ENDIAN) != 0) { +TinselFile::TinselFile() : ReadStreamEndian(TinselV1Mac) { _stream = NULL; } diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h index 38c17812b4..123249125e 100644 --- a/engines/tinsel/tinsel.h +++ b/engines/tinsel/tinsel.h @@ -72,9 +72,7 @@ enum TinselGameFeatures { // None of these defined -> 1 language, in ENGLISH.TXT GF_USE_3FLAGS = 1 << 3, // French, German, Spanish GF_USE_4FLAGS = 1 << 4, // French, German, Spanish, Italian - GF_USE_5FLAGS = 1 << 5, // All 5 flags - - GF_BIG_ENDIAN = 1 << 6 + GF_USE_5FLAGS = 1 << 5 // All 5 flags }; /** @@ -135,8 +133,8 @@ typedef bool (*KEYFPTR)(const Common::KeyState &); #define TinselV1PSX (TinselVersion == TINSEL_V1 && _vm->getPlatform() == Common::kPlatformPSX) #define TinselV1Mac (TinselVersion == TINSEL_V1 && _vm->getPlatform() == Common::kPlatformMacintosh) -#define READ_16(v) ((_vm->getFeatures() & GF_BIG_ENDIAN) ? READ_BE_UINT16(v) : READ_LE_UINT16(v)) -#define READ_32(v) ((_vm->getFeatures() & GF_BIG_ENDIAN) ? READ_BE_UINT32(v) : READ_LE_UINT32(v)) +#define READ_16(v) (TinselV1Mac ? READ_BE_UINT16(v) : READ_LE_UINT16(v)) +#define READ_32(v) (TinselV1Mac ? READ_BE_UINT32(v) : READ_LE_UINT32(v)) // Global reference to the TinselEngine object extern TinselEngine *_vm; -- cgit v1.2.3 From 3ef5baed129fc739a65d846769debed67d5772db Mon Sep 17 00:00:00 2001 From: Simon Sawatzki Date: Sat, 14 Jul 2012 23:38:53 +0200 Subject: I18N: Updated German GUI translation. --- po/de_DE.po | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/po/de_DE.po b/po/de_DE.po index c40e08034a..bb53f4e2ff 100644 --- a/po/de_DE.po +++ b/po/de_DE.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: ScummVM 1.5.0git\n" "Report-Msgid-Bugs-To: scummvm-devel@lists.sf.net\n" "POT-Creation-Date: 2012-07-08 12:25+0100\n" -"PO-Revision-Date: 2012-01-29 21:11+0100\n" +"PO-Revision-Date: 2012-07-14 22:49+0100\n" "Last-Translator: Simon Sawatzki \n" "Language-Team: Simon Sawatzki (Lead), Lothar Serra Mari " -" (Contributor)\n" +"(Contributor)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" @@ -2210,7 +2210,6 @@ msgid "Choose Spell" msgstr "Zauberspruch auswhlen" #: engines/kyra/sound_midi.cpp:475 -#, fuzzy msgid "" "You appear to be using a General MIDI device,\n" "but your game only supports Roland MT32 MIDI.\n" @@ -2220,10 +2219,10 @@ msgid "" msgstr "" "Sie scheinen ein General-MIDI-Gert zu\n" "verwenden, aber das Spiel untersttzt nur\n" -"Roland MT-32 MIDI. Es wird versucht, die\n" -"Roland-MT-32-Instrumente denen von\n" -"General MIDI zuzuordnen. Es kann jedoch\n" -"vorkommen, dass ein paar Musikstcke nicht\n" +"Roland MT32 MIDI. Es wird versucht, die\n" +"Roland-MT32-Instrumente denen von\n" +"General MIDI zuzuordnen. Es ist dennoch\n" +"mglich, dass ein paar Musikstcke nicht\n" "richtig abgespielt werden." #: engines/queen/queen.cpp:59 engines/sky/detection.cpp:44 -- cgit v1.2.3 From 8865ece35904e51f8fb4e6432cb2590f27ac2362 Mon Sep 17 00:00:00 2001 From: Simon Sawatzki Date: Sat, 14 Jul 2012 23:40:32 +0200 Subject: DOCS: Updated German README (Liesmich) and NEWS (Neues). Liesmich now based on README SHA1 ID: 604c6bde91a9f1fb71d18f8fdcc172fc738ff9ef Neues now based on NEWS SHA1 ID: 3de8c4b07d6f15fe6e9ca4bcb8da92532ebf5692 --- doc/de/Liesmich | 2 +- doc/de/Neues | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/doc/de/Liesmich b/doc/de/Liesmich index e8ee4ca3f8..88b6ce6de8 100644 --- a/doc/de/Liesmich +++ b/doc/de/Liesmich @@ -2241,7 +2241,7 @@ folgende nicht standardmäßige Schlüsselwörter: erweiterten von ScummVM verwendet. native_fb01 Bool Falls „true“, wird für die MIDI-Ausgabe der Musiktreiber für eine Music-Feature-Karte - von IBM oder für ein Yahama-FB-01-FM- + von IBM oder für ein Yamaha-FB-01-FM- Synthetisierungsmodul verwendet. Baphomets Fluch II verfügt zusätzlich über folgende nicht standardmäßige diff --git a/doc/de/Neues b/doc/de/Neues index 7c6699fcb0..74203148e7 100644 --- a/doc/de/Neues +++ b/doc/de/Neues @@ -2,7 +2,7 @@ Umfangreichere Änderungsaufzeichnungen des neusten experimentellen Codes finden Sie auf Englisch unter: https://github.com/scummvm/scummvm/commits/ -1.5.0 (??.??.????) +1.5.0 (27.07.2012) Neue Spiele: - Unterstützung für Backyard Baseball 2003 hinzugefügt. - Unterstützung für Blue Force hinzugefügt. @@ -10,10 +10,7 @@ Sie auf Englisch unter: - Unterstützung für Dreamweb hinzugefügt. - Unterstützung für Geisha hinzugefügt. - Unterstützung für Gregor und der Heißluftballon hinzugefügt. - - Unterstützung für Magic Tales: Baba Yaga and the Magic Geese hinzugefügt. - - Unterstützung für Magic Tales: Imo and the King hinzugefügt. - Unterstützung für Magic Tales: Liam Finds a Story hinzugefügt. - - Unterstützung für Magic Tales: The Little Samurai hinzugefügt. - Unterstützung für Once Upon A Time: Little Red Riding Hood hinzugefügt. - Unterstützung für Sleeping Cub's Test of Courage hinzugefügt. - Unterstützung für Soltys hinzugefügt. @@ -36,12 +33,10 @@ Allgemein: - Aussehen von vorhersagendem Eingabedialog verbessert. - Verschiedene Verbesserungen der grafischen Benutzeroberfläche. - SDL-Portierungen: - - Unterstützung für OpenGL hinzugefügt. (GSoC-Aufgabe) - Baphomets Fluch 1: - Falsche Soundeffekte in der DOS-/Windows-Demo korrigiert. - Unterstützung für PlayStation-Videos hinzugefügt. + - Fehlende Untertitel zur Demo hinzugefügt. Baphomets Fluch 2: - Unterstützung für PlayStation-Videos hinzugefügt. @@ -49,6 +44,10 @@ Allgemein: Cine: - Roland-MT-32-Ausgabetreiber integriert. + Drascula: + - Spanische Untertitel zur Zwischensequenz mit Von Braun + hinzugefügt (3069981: Keine Untertitel in Szene mit „Von Braun“). + Gob: - Absturz in Lost in Time beseitigt. - AdLib-Abspieler umgeschrieben. Den nun funktionierenden MDY-Abspieler in @@ -69,6 +68,10 @@ Allgemein: - Unterstützung für Seitenverhältniskorrektur hinzugefügt. - Unterstützung für 16 Bits pro Pixel bei Spielen integriert. + Maemo-Portierung: + - Unterstützung für Nokia 770 mit dem Betriebssystem OS2008 HE hinzugefügt. + - Konfigurierbare Tastenzuweisung hinzugefügt. + Windows-Portierung: - Standard-Verzeichnis für Spielstände bei Windows NT4/2000/XP/Vista/7 geändert. -- cgit v1.2.3 From 790b0ca83cee7f4d7d11e6b310407501ed58a3ee Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 15 Jul 2012 14:07:35 +0100 Subject: I18N: Update French translation --- po/fr_FR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fr_FR.po b/po/fr_FR.po index 4631d4c91a..5faab55d83 100644 --- a/po/fr_FR.po +++ b/po/fr_FR.po @@ -1262,7 +1262,7 @@ msgstr "Jouer quand m #: engines/agi/detection.cpp:145 engines/dreamweb/detection.cpp:47 #: engines/sci/detection.cpp:390 msgid "Use original save/load screens" -msgstr "Utiliser les dialogues sauvegarde/chargement d'origine" +msgstr "Dialogues sauvegarde/chargement d'origine" #: engines/agi/detection.cpp:146 engines/dreamweb/detection.cpp:48 #: engines/sci/detection.cpp:391 -- cgit v1.2.3 From 093a48989a9cbdb88c5833299c2b574950d677a1 Mon Sep 17 00:00:00 2001 From: Thierry Crozat Date: Sun, 15 Jul 2012 14:13:33 +0100 Subject: I18N: Regenerate translations data file --- gui/themes/translations.dat | Bin 342141 -> 342397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat index 0e32008bd9..4b35fdb9a8 100644 Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ -- cgit v1.2.3 From 4c3b4835aae1fe671253a65f6a10649c5ab2014c Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 16:54:29 +0300 Subject: TINSEL: Fix bug #3459999 - "TINSEL: DW Crash in Subtitle Menu" --- engines/tinsel/dialogs.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/engines/tinsel/dialogs.cpp b/engines/tinsel/dialogs.cpp index fbe9e8d1f6..c33b412f6f 100644 --- a/engines/tinsel/dialogs.cpp +++ b/engines/tinsel/dialogs.cpp @@ -1038,18 +1038,20 @@ static bool RePosition(); static bool LanguageChange() { LANGUAGE nLang = _vm->_config->_language; - if (_vm->getFeatures() & GF_USE_3FLAGS) { - // VERY quick dodgy bodge - if (cd.selBox == 0) - nLang = TXT_FRENCH; // = 1 - else if (cd.selBox == 1) - nLang = TXT_GERMAN; // = 2 - else - nLang = TXT_SPANISH; // = 4 - } else if (_vm->getFeatures() & GF_USE_4FLAGS) { - nLang = (LANGUAGE)(cd.selBox + 1); - } else if (_vm->getFeatures() & GF_USE_5FLAGS) { - nLang = (LANGUAGE)cd.selBox; + if ((_vm->getFeatures() & GF_USE_3FLAGS) || (_vm->getFeatures() & GF_USE_4FLAGS) || (_vm->getFeatures() & GF_USE_5FLAGS)) { + // Languages: TXT_ENGLISH, TXT_FRENCH, TXT_GERMAN, TXT_ITALIAN, TXT_SPANISH + // 5 flag versions include English + int selected = (_vm->getFeatures() & GF_USE_5FLAGS) ? cd.selBox : cd.selBox + 1; + // Make sure that a language flag has been selected. If the user has + // changed the language speed slider and hasn't clicked on a flag, it + // won't be selected. + if (selected >= 0 && selected <= 4) { + nLang = (LANGUAGE)selected; + + // 3 flag versions don't include Italian + if (selected >= 3 && (_vm->getFeatures() & GF_USE_3FLAGS)) + nLang = TXT_SPANISH; + } } if (nLang != _vm->_config->_language) { -- cgit v1.2.3 From 1fffbe40ceb82bec77479c56176abeff0d2bd5e5 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Sun, 15 Jul 2012 17:37:55 +0300 Subject: TINSEL: Change SetMidiVolume() so that it doesn't start/stop music tracks Previously, SetMidiVolume() would stop the currently playing track when the MIDI volume was set to 0. Now, the music track always plays, even when the volume is set to 0. This fixes bug #3541533 - "DW: Silencing music volume stops music" and resolves two FIXME comments --- engines/tinsel/music.cpp | 44 ++++++++++---------------------------------- engines/tinsel/tinlib.cpp | 21 ++++++--------------- 2 files changed, 16 insertions(+), 49 deletions(-) diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 637e043e11..b3bfbcc5dc 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -131,13 +131,11 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { g_currentMidi = dwFileOffset; g_currentLoop = bLoop; - if (_vm->_config->_musicVolume != 0) { - bool mute = false; - if (ConfMan.hasKey("mute")) - mute = ConfMan.getBool("mute"); + bool mute = false; + if (ConfMan.hasKey("mute")) + mute = ConfMan.getBool("mute"); - SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume); - } + SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume); // the index and length of the last tune loaded uint32 dwSeqLen = 0; // length of the sequence @@ -270,27 +268,7 @@ int GetMidiVolume() { */ void SetMidiVolume(int vol) { assert(vol >= 0 && vol <= Audio::Mixer::kMaxChannelVolume); - - static int priorVolMusic = 0; // FIXME: Avoid non-const global vars - - if (vol == 0 && priorVolMusic == 0) { - // Nothing to do - } else if (vol == 0 && priorVolMusic != 0) { - // Stop current midi sequence - StopMidi(); - _vm->_midiMusic->setVolume(vol); - } else if (vol != 0 && priorVolMusic == 0) { - // Perhaps restart last midi sequence - if (g_currentLoop) - PlayMidiSequence(g_currentMidi, true); - - _vm->_midiMusic->setVolume(vol); - } else if (vol != 0 && priorVolMusic != 0) { - // Alter current volume - _vm->_midiMusic->setVolume(vol); - } - - priorVolMusic = vol; + _vm->_midiMusic->setVolume(vol); } /** @@ -933,14 +911,12 @@ void RestoreMidiFacts(SCNHANDLE Midi, bool Loop) { g_currentMidi = Midi; g_currentLoop = Loop; - if (_vm->_config->_musicVolume != 0 && Loop) { - bool mute = false; - if (ConfMan.hasKey("mute")) - mute = ConfMan.getBool("mute"); + bool mute = false; + if (ConfMan.hasKey("mute")) + mute = ConfMan.getBool("mute"); - PlayMidiSequence(g_currentMidi, true); - SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume); - } + PlayMidiSequence(g_currentMidi, true); + SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume); } #if 0 diff --git a/engines/tinsel/tinlib.cpp b/engines/tinsel/tinlib.cpp index 7c4fec6592..058f8eb6fd 100644 --- a/engines/tinsel/tinlib.cpp +++ b/engines/tinsel/tinlib.cpp @@ -1625,10 +1625,6 @@ static void Play(CORO_PARAM, SCNHANDLE hFilm, int x, int y, bool bComplete, int * Play a midi file. */ static void PlayMidi(CORO_PARAM, SCNHANDLE hMidi, int loop, bool complete) { - // FIXME: This is a workaround for the FIXME below - if (GetMidiVolume() == 0) - return; - CORO_BEGIN_CONTEXT; CORO_END_CONTEXT(_ctx); @@ -1637,18 +1633,13 @@ static void PlayMidi(CORO_PARAM, SCNHANDLE hMidi, int loop, bool complete) { PlayMidiSequence(hMidi, loop == MIDI_LOOP); - // FIXME: The following check messes up the script arguments when - // entering the secret door in the bookshelf in the library, - // leading to a crash, when the music volume is set to 0 (MidiPlaying() - // always false then). - // - // Why exactly this happens is unclear. An analysis of the involved - // script(s) might reveal more. - // - // Note: This check&sleep was added in DW v2. It was most likely added - // to ensure that the MIDI song started playing before the next opcode + // This check&sleep was added in DW v2. It was most likely added to + // ensure that the MIDI song started playing before the next opcode // is executed. - if (!MidiPlaying()) + // In DW1, it messes up the script arguments when entering the secret + // door in the bookshelf in the library, leading to a crash, when the + // music volume is set to 0. + if (!MidiPlaying() && TinselV2) CORO_SLEEP(1); if (complete) { -- cgit v1.2.3