[Scummvm-cvs-logs] scummvm master -> 35b27e6986725d20d83da4d9ff773196a9115ee8

criezy criezy at scummvm.org
Tue Sep 8 00:51:34 CEST 2015


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d21054f0b7 DEVTOOLS: Include french menu in mort.dat
35b27e6986 MORTEVIELLE: Use engine data file for french version without menufr.mor


Commit: d21054f0b774d0b20ddb11dd46365dd1c9db2951
    https://github.com/scummvm/scummvm/commit/d21054f0b774d0b20ddb11dd46365dd1c9db2951
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2015-09-07T23:49:58+01:00

Commit Message:
DEVTOOLS: Include french menu in mort.dat

Changed paths:
    devtools/create_mortdat/create_mortdat.cpp
    devtools/create_mortdat/menudata.h
    dists/engine-data/mort.dat



diff --git a/devtools/create_mortdat/create_mortdat.cpp b/devtools/create_mortdat/create_mortdat.cpp
index f6b2884..2d7c9ad 100644
--- a/devtools/create_mortdat/create_mortdat.cpp
+++ b/devtools/create_mortdat/create_mortdat.cpp
@@ -227,6 +227,7 @@ void writeMenuData(const char *menuData, int languageId) {
 
 void writeMenuBlock() {
 	writeMenuData(menuDataEn, 1);
+	writeMenuData(menuDataFr, 0);
 	writeMenuData(menuDataDe, 2);
 }
 
diff --git a/devtools/create_mortdat/menudata.h b/devtools/create_mortdat/menudata.h
index 2290666..0d46f93 100644
--- a/devtools/create_mortdat/menudata.h
+++ b/devtools/create_mortdat/menudata.h
@@ -76,6 +76,56 @@ const char *menuDataEn =
 	"@@@     @@@  @@@  @@@   "
 	"                        ";
 
+const char *menuDataFr =
+	"   @@@                  "
+	"    @                   "
+	"   @  @ @@   @@@ @@@    "
+	"   @   @  @   @   @     "
+	"  @   @  @    @  @      "
+	"  @   @  @    @ @       "
+	"@@@ @@@ @@    @@        "
+	"                        "
+	"  @@@@@     @@          "
+	"   @   @   @            "
+	"  @    @  @@@  @ @@@    "
+	"  @    @ @   @  @   @   "
+	" @    @  @@@@  @   @    "
+	" @   @  @      @@@@     "
+	"@@@@@   @@@   @         "
+	"             @@@        "
+	"      @           @     "
+	"     @@           @     "
+	"    @ @    @@@@ @@@@    "
+	"   @  @   @   @  @      "
+	"  @@@@@  @      @       "
+	" @    @  @   @  @       "
+	"@@@ @@@   @@@   @@      "
+	"                        "
+	"    @@@@@       @@@  @@@"
+	"   @    @        @  @  @"
+	"  @       @@@   @   @   "
+	"   @@@@  @   @  @  @@@  "
+	"      @ @@@@@  @   @    "
+	" @    @ @      @  @     "
+	"@@@@@@  @@@  @@@ @@@    "
+	"                        "
+	"  @@@@@    @            "
+	"   @   @                "
+	"  @    @ @@   @@@@      "
+	"  @    @  @  @          "
+	" @    @  @   @@@        "
+	" @   @   @      @       "
+	"@@@@@  @@@ @@@@@        "
+	"                        "
+	"   @@@@@@@  @           "
+	"    @    @              "
+	"   @  @   @@   @@@@     "
+	"   @@@@    @  @   @     "
+	"  @  @    @  @          "
+	"  @       @  @   @      "
+	"@@@     @@@   @@@       "
+	"                        ";
+
 const char *menuDataDe =
 	"   @@@       @@         "
 	"    @         @         "
diff --git a/dists/engine-data/mort.dat b/dists/engine-data/mort.dat
index 0d6a442..49d80b3 100644
Binary files a/dists/engine-data/mort.dat and b/dists/engine-data/mort.dat differ


Commit: 35b27e6986725d20d83da4d9ff773196a9115ee8
    https://github.com/scummvm/scummvm/commit/35b27e6986725d20d83da4d9ff773196a9115ee8
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2015-09-07T23:50:36+01:00

Commit Message:
MORTEVIELLE: Use engine data file for french version without menufr.mor

Changed paths:
    engines/mortevielle/detection_tables.h



diff --git a/engines/mortevielle/detection_tables.h b/engines/mortevielle/detection_tables.h
index 26611d4..fb85e74 100644
--- a/engines/mortevielle/detection_tables.h
+++ b/engines/mortevielle/detection_tables.h
@@ -124,7 +124,7 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
 			Common::kPlatformDOS,
 			ADGF_NO_FLAGS,
 			GUIO0()
-		}, Common::FR_FRA, kUseOriginalData
+		}, Common::FR_FRA, kUseEngineDataFile
 	},
 
 	{ AD_TABLE_END_MARKER , Common::EN_ANY, kUseEngineDataFile}






More information about the Scummvm-git-logs mailing list