diff --git a/Makefile.common b/Makefile.common index d240c8f1a31..a112975f697 100644 --- a/Makefile.common +++ b/Makefile.common @@ -465,7 +465,7 @@ ifdef ENABLE_WINTERMUTE DIST_FILES_ENGINEDATA+=wintermute.zip endif ifdef ENABLE_XEEN -DIST_FILES_ENGINEDATA+=xeen.ccs +DIST_FILES_ENGINEDATA+=mm.dat endif ifdef ENABLE_FREESCAPE DIST_FILES_ENGINEDATA+=freescape.dat diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp index 358903acf4a..f6c52fb8f25 100644 --- a/devtools/create_project/xcode.cpp +++ b/devtools/create_project/xcode.cpp @@ -850,6 +850,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu files.push_back("dists/engine-data/monkey4-patch.m4b"); files.push_back("dists/engine-data/grim-patch.lab"); files.push_back("dists/engine-data/macventure.dat"); + files.push_back("dists/engine-data/mm.dat"); files.push_back("dists/engine-data/mort.dat"); files.push_back("dists/engine-data/neverhood.dat"); files.push_back("dists/engine-data/queen.tbl"); @@ -861,7 +862,6 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu files.push_back("dists/engine-data/toon.dat"); files.push_back("dists/engine-data/ultima.dat"); files.push_back("dists/engine-data/wintermute.zip"); - files.push_back("dists/engine-data/xeen.ccs"); files.push_back("dists/ios7/LaunchScreen_ios.storyboard"); files.push_back("dists/pred.dic"); files.push_back("dists/networking/wwwroot.zip"); diff --git a/dists/engine-data/README b/dists/engine-data/README index 9d02f2d0644..d5c02a1bf7b 100644 --- a/dists/engine-data/README +++ b/dists/engine-data/README @@ -88,5 +88,5 @@ This file contains scripts and game data used by Ultima engine. wintermute.zip: This file contains additional graphics resources used by Wintermute engine. -xeen.ccs: -This file contains all the various strings and figures needed for the games. +mm.dat: +This file contains all the various strings and data needed for the Might & Magic games. diff --git a/dists/engine-data/xeen.ccs b/dists/engine-data/xeen.ccs deleted file mode 100644 index 7486b952110..00000000000 Binary files a/dists/engine-data/xeen.ccs and /dev/null differ diff --git a/dists/irix/scummvm.idb b/dists/irix/scummvm.idb index 86800452485..9a40a63807f 100644 --- a/dists/irix/scummvm.idb +++ b/dists/irix/scummvm.idb @@ -39,7 +39,7 @@ f 0644 root sys usr/ScummVM/share/scummvm/toon.dat toon.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/ultima.dat ultima.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/freescape.dat freescape.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/wintermute.zip wintermute.zip scummvm.sw.eoe -f 0644 root sys usr/ScummVM/share/scummvm/xeen.ccs xeen.ccs scummvm.sw.eoe +f 0644 root sys usr/ScummVM/share/scummvm/mm.dat mm.dat scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/pred.dic pred.dic scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/scummmodern.zip scummmodern.zip scummvm.sw.eoe f 0644 root sys usr/ScummVM/share/scummvm/scummremastered.zip scummremastered.zip scummvm.sw.eoe diff --git a/dists/scummvm.rc b/dists/scummvm.rc index 9f3f801d0fe..c95ce636ab9 100644 --- a/dists/scummvm.rc +++ b/dists/scummvm.rc @@ -113,7 +113,7 @@ ultima.dat FILE "dists/engine-data/ultima.dat" wintermute.zip FILE "dists/engine-data/wintermute.zip" #endif #if PLUGIN_ENABLED_STATIC(XEEN) -xeen.ccs FILE "dists/engine-data/xeen.ccs" +mm.dat FILE "dists/engine-data/mm.dat" #endif #if PLUGIN_ENABLED_STATIC(AGI) pred.dic FILE "dists/pred.dic"