Merge remote-tracking branch 'origin/master' into prince

devtools/create_mortdat/create_mortdat.cpp

@@ -210,7 +210,7 @@ void writeMenuData(const char *menuData, int languageId) {
 	outputFile.writeByte(languageId);
 	// Write each 8-characters block as a byte (one bit per character)
 	// ' ' -> 0, anything else -> 1
-	byte value;
+	byte value = 0;
 	int valueCpt = 0;
 	const char* str = menuData;
 	while (*str != 0) {

devtools/credits.pl

@@ -48,7 +48,7 @@
 $Text::Wrap::unexpand = 0;
 if ($mode eq "TEXT") {
 	$Text::Wrap::columns = 78;
-	$max_name_width = 23; # The maximal width of a name.
+	$max_name_width = 28; # The maximal width of a name.
 } elsif ($mode eq "CPP") {
 	$Text::Wrap::columns = 48;	# Approx.
 }
@@ -60,6 +60,7 @@ sub html_entities_to_ascii {
 	# For now we hardcode these mappings
 	# á  -> a
 	# é  -> e
+	# í  -> i
 	# ì  -> i
 	# ó  -> o
 	# ø  -> o
@@ -72,15 +73,18 @@ sub html_entities_to_ascii {
 	# ł    -> l
 	# ś    -> s
 	# Š  -> S
+	# ñ  -> n
 	$text =~ s/á/a/g;
 	$text =~ s/é/e/g;
+	$text =~ s/í/i/g;
 	$text =~ s/ì/i/g;
 	$text =~ s/ó/o/g;
 	$text =~ s/ø/o/g;
 	$text =~ s/ł/l/g;
 	$text =~ s/ś/s/g;
 	$text =~ s/Š/S/g;
 	$text =~ s/å/aa/g;
+	$text =~ s/ñ/n/g;
 
 	$text =~ s/ä/a/g;
 	$text =~ s/ë/e/g;
@@ -101,13 +105,15 @@ sub html_entities_to_cpp {
 	# The numerical values are octal!
 	$text =~ s/á/\\341/g;
 	$text =~ s/é/\\351/g;
+	$text =~ s/í/\\355/g;
 	$text =~ s/ì/\\354/g;
 	$text =~ s/ó/\\363/g;
 	$text =~ s/ø/\\370/g;
 	$text =~ s/ł/l/g;
 	$text =~ s/ś/s/g;
 	$text =~ s/Š/S/g;
 	$text =~ s/å/\\345/g;
+	$text =~ s/ñ/\\361/g;
 
 	$text =~ s/ä/\\344/g;
 	$text =~ s/ë/\\353/g;
@@ -126,6 +132,7 @@ sub html_entities_to_rtf {
 
 	$text =~ s/á/\\'87/g;
 	$text =~ s/é/\\'8e/g;
+	$text =~ s/í/\\'92/g;
 	$text =~ s/ì/\\'93/g;
 	$text =~ s/ó/\\'97/g;
 	$text =~ s/ø/\\'bf/g;
@@ -135,6 +142,8 @@ sub html_entities_to_rtf {
 	$text =~ s/Š/\\uc0\\u540 /g;
 
 	# Back to hex numbers
+	$text =~ s/ñ/\\'96/g;
+
 	$text =~ s/ä/\\'8a/g;
 	$text =~ s/ë/\\'eb/g;
 	$text =~ s/ö/\\'9a/g;
@@ -151,12 +160,14 @@ sub html_entities_to_tex {
 
 	$text =~ s/á/\\'a/g;
 	$text =~ s/é/\\'e/g;
+	$text =~ s/í/\\'i/g;
 	$text =~ s/ì/\\`\\i/g;
 	$text =~ s/ó/\\'o/g;
 	$text =~ s/ø/{\\o}/g;
 	$text =~ s/å/\\aa /g;
 	$text =~ s/ł/{\\l}/g;
 	$text =~ s/Š/{\\v S}/g;
+	$text =~ s/ñ/\\˜n/g;
 
 	$text =~ s/ä/\\"a/g;
 	$text =~ s/ö/\\"o/g;
@@ -984,7 +995,7 @@ sub add_paragraph {
 			end_section();
 		end_section();
 
-		begin_section("Translations");
+		begin_section("GUI Translations");
 				begin_persons();
 					add_person("Thierry Crozat", "criezy", "Translation Lead");
 				end_persons();
@@ -1049,6 +1060,20 @@ sub add_paragraph {
 					add_person("Lubomyr Lisen", "", "");
 				end_section();
 		end_section();
+		begin_section("Game Translations");
+				begin_section("CGE");
+					add_person("Dan Serban", "nutron", "Soltys English translation");
+					add_person("Víctor González", "IlDucci", "Soltys Spanish translation");
+					add_person("Alejandro Gómez de la Muñoza", "TheFireRed", "Soltys Spanish translation");
+				end_section();
+				begin_section("Drascula");
+					add_person("Thierry Crozat", "criezy", "Improve French translation");
+				end_section();
+				begin_section("Mortevielle");
+					add_person("Hugo Labrande", "", "Improve English translation");
+					add_person("Thierry Crozat", "criezy", "Improve English translation");
+				end_section();
+		end_section();
 
 		begin_section("Websites (design)");
 			begin_persons();

devtools/extract_mort/extract_mort.cpp

@@ -104,9 +104,9 @@ class File {
 		return ftell(f);
 	}
 	uint32 size() {
-		int position = ftell(f);
+		uint32 position = ftell(f);
 		fseek (f, 0, SEEK_END);
-		int end = ftell (f);
+		uint32 end = ftell(f);
 		fseek (f, position, SEEK_SET);
 
 		return end;

engines/avalanche/animation.cpp

@@ -49,6 +49,7 @@ const int32 Animation::kCatacombMap[8][8] = {
 AnimationType::AnimationType(Animation *anim) {
 	_anim = anim;
 
+	_xLength = 0;
 	_yLength = 0;
 	for (int i = 0; i < 24; i++) {
 		_mani[i] = nullptr;
@@ -77,6 +78,7 @@ AnimationType::AnimationType(Animation *anim) {
 	_eachStepProc = Animation::kProcNone;
 	_fgBubbleCol = kColorWhite;
 	_bgBubbleCol = kColorBlack;
+	_id = 177;
 }
 
 /**

engines/avalanche/avalanche.cpp

@@ -75,7 +75,8 @@ AvalancheEngine::~AvalancheEngine() {
 }
 
 void AvalancheEngine::initVariables() {
-	// Needed because of Lucerna::load_also()
+	resetVariables();
+
 	for (int i = 0; i < 31; i++) {
 		_also[i][0] = nullptr;
 		_also[i][1] = nullptr;
@@ -117,11 +118,18 @@ void AvalancheEngine::initVariables() {
 	_doingSpriteRun = false;
 	_isLoaded = false;
 	_soundFx = true;
-	_spludwickAtHome = false;
-	_passedCwytalotInHerts = false;
 	_holdTheDawn = false;
-	_lastRoom = 0;
-	_lastRoomNotMap = 0;
+
+	_lineNum = 0;
+	for (int i = 0; i < 50; i++)
+		_lines[i]._color = kColorWhite;
+	_dropsOk = false;
+	_cheat = false;
+	_letMeOut = false;
+	_thinks = 2;
+	_thinkThing = true;
+	_seeScroll = false;
+	_currentMouse = 177;
 }
 
 Common::ErrorCode AvalancheEngine::initialize() {

engines/cge/detection.cpp

@@ -115,6 +115,18 @@ static const CgeGameDescription gameDescriptions[] = {
 		},
 		kGameTypeSoltys
 	},
+	{
+		{
+			"soltys", "Soltys Freeware v1.0",
+			{
+				{"vol.cat", 0, "fcae86b20eaa5cedec17b24fa5e85eb4", 50176},
+				{"vol.dat", 0, "ff10d54acc2c95696c57e05819b6906f", 8450151},
+				AD_LISTEND
+			},
+			Common::ES_ESP, Common::kPlatformDOS, ADGF_NO_FLAGS , GUIO0()
+		},
+		kGameTypeSoltys
+	},
 	{
 		{
 			// Polish version, provided by Strangerke

engines/drascula/drascula.cpp

@@ -141,6 +141,32 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
 	drasculaX = 0;
 	drasculaY = 0;
 	trackDrascula = 0;
+	_roomNumber = 0;
+	numRoomObjs = 0;
+	takeObject = 0;
+	pickedObject = 0;
+	_subtitlesDisabled = 0;
+	_menuBar = 0;
+	_menuScreen = 0;
+	_hasName = 0;
+	curExcuseLook = 0;
+	curExcuseAction = 0;
+	frame_y = 0;
+	curX = 0;
+	curY = 0;
+	characterMoved = 0;
+	curDirection = 0;
+	trackProtagonist = 0;
+	_characterFrame = 0;
+	hare_se_ve = 0;
+	roomX = 0;
+	roomY = 0;
+	checkFlags = 0;
+	doBreak = 0;
+	stepX = 0;
+	stepY = 0;
+	curHeight = 0;
+	curWidth = 0;
 
 	_color = 0;
 	blinking = 0;

engines/dreamweb/dreamweb.cpp

@@ -232,6 +232,15 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam
 	_hasSpeech = 0;
 	_roomsSample = 0;
 	_copyProtection = 0;
+
+	for (uint i = 0; i < 128; i++)
+		memset(&_setDat[i], 0, sizeof(SetObject));
+
+	for (uint i = 0; i < 80; i++)
+		memset(&_freeDat[i], 0, sizeof(DynObject));
+
+	for (uint i = 0; i < kNumExObjects; i++)
+		memset(&_exData[i], 0, sizeof(DynObject));
 }
 
 DreamWebEngine::~DreamWebEngine() {

engines/fullpipe/constants.h

@@ -89,6 +89,7 @@ namespace Fullpipe {
 #define PIC_CSR_ITN_RED 5329
 #define PIC_CSR_LIFT 5176
 #define PIC_CSR_MAP 5339
+#define PIC_IN1_GAMETITLE 5169
 #define PIC_IN1_PIPETITLE 5167
 #define PIC_INV_MENU 991
 #define PIC_MAP_A13 5275
@@ -101,6 +102,7 @@ namespace Fullpipe {
 #define QU_IN2_DO 5144
 #define QU_INTR_FINISH 5138
 #define QU_INTR_GETUPMAN 5136
+#define QU_INTR_STARTINTRO 5133
 #define SC_1 301
 #define SC_10 653
 #define SC_11 654
@@ -155,6 +157,7 @@ namespace Fullpipe {
 #define SC_TITLES 5166
 #define SND_CMN_031 3516
 #define SND_CMN_070 5199
+#define SND_INTR_019 5220
 #define ST_IN1MAN_SLEEP 5112
 #define ST_LBN_0N 2832
 #define ST_LBN_0P 2833

engines/fullpipe/fullpipe.cpp

@@ -80,7 +80,7 @@ FullpipeEngine::FullpipeEngine(OSystem *syst, const ADGameDescription *gameDesc)
 
 	_gameContinue = true;
 	_needRestart = false;
-	_flgPlayIntro = false;
+	_flgPlayIntro = true;
 	_gamePaused = false;
 	_inputArFlag = false;
 	_recordEvents = false;

engines/fullpipe/gameloader.cpp

@@ -481,7 +481,7 @@ bool PreloadItems::load(MfcArchive &file) {
 
 	int count = file.readCount();
 
-	resize(count);
+	clear();
 
 	for (int i = 0; i < count; i++) {
 		PreloadItem *t = new PreloadItem();