[Scummvm-cvs-logs] SF.net SVN: scummvm:[45082] scummvm/trunk
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Oct 14 16:17:16 CEST 2009
Revision: 45082
http://scummvm.svn.sourceforge.net/scummvm/?rev=45082&view=rev
Author: lordhoto
Date: 2009-10-14 14:17:15 +0000 (Wed, 14 Oct 2009)
Log Message:
-----------
Add LoL PC98 credits entries to kyra.dat.
Modified Paths:
--------------
scummvm/trunk/dists/engine-data/kyra.dat
scummvm/trunk/engines/kyra/resource.h
scummvm/trunk/engines/kyra/sequences_lol.cpp
scummvm/trunk/engines/kyra/staticres.cpp
scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
scummvm/trunk/tools/create_kyradat/create_kyradat.h
scummvm/trunk/tools/create_kyradat/games.cpp
scummvm/trunk/tools/create_kyradat/tables.cpp
Modified: scummvm/trunk/dists/engine-data/kyra.dat
===================================================================
(Binary files differ)
Modified: scummvm/trunk/engines/kyra/resource.h
===================================================================
--- scummvm/trunk/engines/kyra/resource.h 2009-10-14 14:15:40 UTC (rev 45081)
+++ scummvm/trunk/engines/kyra/resource.h 2009-10-14 14:17:15 UTC (rev 45082)
@@ -298,6 +298,8 @@
kLolLightningDefs,
kLolFireballCoords,
+ kLolCredits,
+
kLolHistory,
#endif // ENABLE_LOL
Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp 2009-10-14 14:15:40 UTC (rev 45081)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp 2009-10-14 14:17:15 UTC (rev 45082)
@@ -1182,7 +1182,22 @@
_screen->_charOffset = 0;
- char *credits = (char *)_res->fileData("CREDITS.TXT", 0);
+ char *credits = 0;
+
+ if (_flags.platform == Common::kPlatformPC98) {
+ int size = 0;
+ const uint8 *internCredits = _staticres->loadRawData(kLolCredits, size);
+ assert(size > 0);
+
+ credits = new char[size];
+ assert(credits);
+
+ memcpy(credits, internCredits, size);
+ _staticres->unloadId(kLolCredits);
+ } else {
+ credits = (char *)_res->fileData("CREDITS.TXT", 0);
+ }
+
processCredits(credits, 21, 4, 5);
delete[] credits;
Modified: scummvm/trunk/engines/kyra/staticres.cpp
===================================================================
--- scummvm/trunk/engines/kyra/staticres.cpp 2009-10-14 14:15:40 UTC (rev 45081)
+++ scummvm/trunk/engines/kyra/staticres.cpp 2009-10-14 14:17:15 UTC (rev 45082)
@@ -45,7 +45,7 @@
namespace Kyra {
-#define RESFILE_VERSION 58
+#define RESFILE_VERSION 59
namespace {
bool checkKyraDat(Common::SeekableReadStream *file) {
@@ -469,6 +469,8 @@
{ kLolLightningDefs, kRawData, "MLGHTNG.DEF" },
{ kLolFireballCoords, kLolRawDataBe16, "MFIREBLL.DEF" },
+ { kLolCredits, kRawData, "LOLCREDITS" },
+
{ kLolHistory, kRawData, "HISTORY.FLS" },
{ 0, 0, 0 }
@@ -501,10 +503,10 @@
}
const char * const *StaticResource::loadStrings(int id, int &strings) {
- const char * const*temp = (const char* const *)getData(id, kStringList, strings);
+ const char * const *temp = (const char * const *)getData(id, kStringList, strings);
if (temp)
return temp;
- return (const char* const *)getData(id, kLanguageList, strings);
+ return (const char * const *)getData(id, kLanguageList, strings);
}
const uint8 *StaticResource::loadRawData(int id, int &size) {
Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.cpp 2009-10-14 14:15:40 UTC (rev 45081)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.cpp 2009-10-14 14:17:15 UTC (rev 45082)
@@ -37,7 +37,7 @@
#include "md5.h"
enum {
- kKyraDatVersion = 58,
+ kKyraDatVersion = 59,
kIndexSize = 12
};
@@ -148,6 +148,8 @@
{ kPaletteList31, kTypeRawData, "PALTABLE31.PAL" },
{ kPaletteList32, kTypeRawData, "PALTABLE32.PAL" },
{ kPaletteList33, kTypeRawData, "PALTABLE33.PAL" },
+
+ // CREDITS (used in FM-TOWNS and AMIGA)
{ kCreditsStrings, kTypeRawData, "CREDITS" },
// FM-TOWNS specific
@@ -286,6 +288,8 @@
{ kLolLightningDefs, kTypeRawData, "MLGHTNG.DEF" },
{ kLolFireballCoords, kLolTypeRaw16, "MFIREBLL.DEF" },
+ { kLolCredits, kTypeRawData, "LOLCREDITS" },
+
{ kLolHistory, kTypeRawData, "HISTORY.FLS" },
{ -1, 0, 0 }
Modified: scummvm/trunk/tools/create_kyradat/create_kyradat.h
===================================================================
--- scummvm/trunk/tools/create_kyradat/create_kyradat.h 2009-10-14 14:15:40 UTC (rev 45081)
+++ scummvm/trunk/tools/create_kyradat/create_kyradat.h 2009-10-14 14:17:15 UTC (rev 45082)
@@ -270,6 +270,8 @@
kLolLightningDefs,
kLolFireballCoords,
+ kLolCredits,
+
kLolHistory,
kMaxResIDs
Modified: scummvm/trunk/tools/create_kyradat/games.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/games.cpp 2009-10-14 14:15:40 UTC (rev 45081)
+++ scummvm/trunk/tools/create_kyradat/games.cpp 2009-10-14 14:17:15 UTC (rev 45082)
@@ -105,7 +105,8 @@
{ kLol, DE_DEU, kPlatformPC, -1, "6b843869772c1b779e1386be868c15dd" },
// PC98 (no language specifc strings)
- { kLol, JA_JPN, kPlatformPC98, -1, "6d5bd4a2f5ce433365734ca6b7a8d984" },
+ { kLol, JA_JPN, kPlatformPC98, kFile1, "6d5bd4a2f5ce433365734ca6b7a8d984" },
+ { kLol, JA_JPN, kPlatformPC98, kFile2, "1b0a457c48ae6908da301b656fe0aab4" },
// DOS CD (multi language version, with no language specific strings)
{ kLol, UNK_LANG, kPlatformPC, kTalkieFile1, "9d1778314de80598c0b0d032e2a1a1cf" },
@@ -660,7 +661,7 @@
-1
};
-const int lolPC98Need[] = {
+const int lolPC98File1Need[] = {
kLolIngamePakFiles,
kLolCharacterDefs,
@@ -739,6 +740,12 @@
-1
};
+const int lolPC98File2Need[] = {
+ kLolCredits,
+
+ -1
+};
+
const int lolCDFile1Need[] = {
kLolHistory,
-1
@@ -875,7 +882,8 @@
{ kKyra3, kPlatformPC, -1, kyra3Need },
{ kLol, kPlatformPC, -1, lolFloppyNeed },
- { kLol, kPlatformPC98, -1, lolPC98Need },
+ { kLol, kPlatformPC98, kFile1, lolPC98File1Need },
+ { kLol, kPlatformPC98, kFile2, lolPC98File2Need },
{ kLol, kPlatformPC, kTalkieFile1, lolCDFile1Need },
{ kLol, kPlatformPC, kTalkieFile2, lolCDFile2Need },
Modified: scummvm/trunk/tools/create_kyradat/tables.cpp
===================================================================
--- scummvm/trunk/tools/create_kyradat/tables.cpp 2009-10-14 14:15:40 UTC (rev 45081)
+++ scummvm/trunk/tools/create_kyradat/tables.cpp 2009-10-14 14:17:15 UTC (rev 45082)
@@ -1656,6 +1656,12 @@
EXTRACT_END_ENTRY
};
+const ExtractEntrySearchData kLolCreditsProvider[] = {
+ { JA_JPN , kPlatformPC98, { 0x000005E7, 0x0001A1B0, { { 0x2A, 0xD0, 0x38, 0x84, 0x0C, 0x38, 0xCB, 0x52, 0x5D, 0x82, 0xBE, 0x03, 0x76, 0xFA, 0x0A, 0x4A } } } },
+
+ EXTRACT_END_ENTRY
+};
+
const ExtractEntrySearchData kLolHistoryProvider[] = {
{ UNK_LANG, kPlatformPC, { 0x000001D1, 0x00007F9B, { { 0x25, 0x10, 0x86, 0x40, 0xAC, 0x53, 0xFE, 0x11, 0x4D, 0xE2, 0xD9, 0x35, 0xD6, 0x89, 0xBB, 0x09 } } } },
@@ -1866,6 +1872,7 @@
{ kLolHealShapeFrames, kLolHealShapeFramesProvider },
{ kLolLightningDefs, kLolLightningDefsProvider },
{ kLolFireballCoords, kLolFireballCoordsProvider },
+ { kLolCredits, kLolCreditsProvider },
{ kLolHistory, kLolHistoryProvider },
{ -1, NULL }
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list