hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-12 08:00:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added tiberian sun mix file support, can't play game until iconset format is ironed yet.

Browse Source
This commit is contained in:
Justin Marshall
2020-06-29 15:22:06 -07:00
parent 37b4f227e6
commit 4844f4eaa7
12 changed files with 158 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/CMakeLists.txt
+2
View File
@@ -160,6 +160,8 @@ set(src_redalert
./redalert/carry.cpp
./redalert/carry.h
./redalert/cbn_.h
./redalert/crc32.cpp
./redalert/crc32.h
./redalert/ccdde.cpp
./redalert/ccdde.h
./redalert/ccfile.cpp
code/redalert/cdata.cpp
+2 -3
View File
@@ -51,13 +51,13 @@
static TemplateTypeClass const Empty(
TEMPLATE_CLEAR1,
THEATERF_TEMPERATE|THEATERF_SNOW|THEATERF_INTERIOR,
"CLEAR1",
"CLEAR01",
TXT_CLEAR
);
static TemplateTypeClass const Clear(
TEMPLATE_CLEAR1,
THEATERF_TEMPERATE|THEATERF_SNOW|THEATERF_INTERIOR,
"CLEAR1",
"CLEAR01",
TXT_CLEAR
);
static TemplateTypeClass const Road01(
@@ -3129,7 +3129,6 @@ void TemplateTypeClass::Init(TheaterType theater)
_makepath(fullname, NULL, NULL, tplate.IniName, Theaters[theater].Suffix);
ptr = MFCD::Retrieve(fullname);
((void const *&)tplate.ImageData) = ptr;
#ifdef WIN32
Register_Icon_Set((void*)ptr, TRUE); //Register icon set for video memory caching
#endif
code/redalert/crc32.cpp
+49
View File
@@ -0,0 +1,49 @@
// crc32.cpp
//
#include "crc32.h"
void Ccrc::do_block(const void* data, int size)
{
int crc_table[256] = {
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };
const unsigned char* r = reinterpret_cast<const unsigned char*>(data);
m_crc = ~m_crc;
while (size--)
m_crc = (m_crc >> 8) ^ crc_table[*r++ ^ (m_crc & 0xff)];
m_crc = ~m_crc;
}
code/redalert/crc32.h
+21
View File
@@ -0,0 +1,21 @@
// crc32.h
//
// https://xhp.xwis.net/documents/MIX_Format.html
class Ccrc
{
public:
void do_block(const void* data, int size);
void init()
{
m_crc = 0;
}
int get_crc() const
{
return m_crc;
}
private:
unsigned int m_crc;
};
code/redalert/init.cpp
+8
View File
@@ -3002,6 +3002,14 @@ static void Init_Bootstrap_Mixfiles(void)
int temp = RequiredCD;
RequiredCD = -2;
// Isometric Files
new MFCD("isosnow.mix", &FastKey, MIX_FILE_TS);
{
bool ok = MFCD::Cache("isosnow.mix");
assert(ok);
}
// jmarshall end
#ifdef WOLAPI_INTEGRATION
CCFileClass fileWolapiMix( "WOLAPI.MIX" );
if( fileWolapiMix.Is_Available() )
code/redalert/mixfile.cpp
+60 -5
View File
@@ -55,6 +55,9 @@
#include "mixfile.h"
#include "cdfile.h"
#include <string>
#include "crc32.h"
extern MFCD temp;
//template<class T> int Compare(T const *obj1, T const *obj2) {
@@ -162,13 +165,14 @@ MixFileClass<T>::~MixFileClass(void)
* 07/12/1996 JLB : Handles compressed file header. *
*=============================================================================================*/
template<class T>
MixFileClass<T>::MixFileClass(char const * filename, PKey const * key) :
MixFileClass<T>::MixFileClass(char const * filename, PKey const * key, int gameType) :
IsDigest(false),
IsEncrypted(false),
IsAllocated(false),
Filename(0),
Count(0),
DataSize(0),
mixFileGameType(gameType),
DataStart(0),
HeaderBuffer(0),
Data(0)
@@ -490,6 +494,47 @@ int compfunc(void const * ptr1, void const * ptr2)
return(0);
}
// https://xhp.xwis.net/documents/MIX_Format.html
template<class T>
int MixFileClass<T>::get_id(int game, const char *_name)
{
std::string name = _name;
if (game != MIX_FILE_TS)
{ // for TD and RA
int i = 0;
unsigned int id = 0;
int l = name.length(); // length of the filename
while (i < l)
{
unsigned int a = 0;
for (int j = 0; j < 4; j++)
{
a >>= 8;
if (i < l)
a += static_cast<unsigned int>(name[i]) << 24;
i++;
}
id = (id << 1 | id >> 31) + a;
}
return id;
}
else
{ // for TS
const int l = name.length();
int a = l >> 2;
if (l & 3)
{
name += static_cast<char>(l - (a << 2));
int i = 3 - (l & 3);
while (i--)
name += name[a << 2];
}
Ccrc crc; // use a normal CRC function
crc.init();
crc.do_block(name.c_str(), name.length());
return crc.get_crc();
}
}
/***********************************************************************************************
* MixFileClass::Offset -- Determines the offset of the requested file from the mixfile system.*
@@ -539,9 +584,12 @@ assert(filename != NULL);//BG
char filename_upper[_MAX_PATH];
strcpy(filename_upper, filename);
strupr(filename_upper);
long crc = Calculate_CRC(strupr(filename_upper), strlen(filename_upper));
SubBlock key;
key.CRC = crc;
key.CRC = get_id(MIX_FILE_RA, filename_upper);
SubBlock key2;
key2.CRC = get_id(MIX_FILE_TS, filename_upper);
/*
** Sweep through all registered mixfiles, trying to find the file in question.
@@ -554,7 +602,14 @@ assert(filename != NULL);//BG
** Binary search for the file in this mixfile. If it is found, then extract the
** appropriate information and store it in the locations provided and then return.
*/
block = (SubBlock *)bsearch(&key, ptr->HeaderBuffer, ptr->Count, sizeof(SubBlock), compfunc);
// jmarshall
if (ptr->mixFileGameType == MIX_FILE_RA)
block = (SubBlock*)bsearch(&key, ptr->HeaderBuffer, ptr->Count, sizeof(SubBlock), compfunc);
else if (ptr->mixFileGameType == MIX_FILE_TS)
block = (SubBlock*)bsearch(&key2, ptr->HeaderBuffer, ptr->Count, sizeof(SubBlock), compfunc);
else
assert(!"Offset invalid game type!");
// jmarshall end
if (block != NULL) {
if (mixfile != NULL) *mixfile = ptr;
if (size != NULL) *size = block->Size;
@@ -577,7 +632,7 @@ assert(filename != NULL);//BG
/*
** All the mixfiles have been examined but no match was found. Return with the non success flag.
*/
*/
assert(1);//BG
return(false);
}
code/redalert/mixfile.h
+9 -2
View File
@@ -37,6 +37,9 @@ typedef int bool;
#include "pk.h"
#include "buff.h"
#define MIX_FILE_RA 0
#define MIX_FILE_TS 1
template<class T>
class MixFileClass : public Node<MixFileClass<T>>
{
@@ -44,7 +47,7 @@ class MixFileClass : public Node<MixFileClass<T>>
char const * Filename; // Filename of mixfile.
MixFileClass(char const *filename, PKey const * key);
MixFileClass(char const *filename, PKey const * key, int gameType = MIX_FILE_RA);
~MixFileClass(void);
static bool Free(char const *filename);
@@ -68,7 +71,9 @@ class MixFileClass : public Node<MixFileClass<T>>
private:
static MixFileClass * Finder(char const * filename);
//long Offset(long crc, long * size = 0) const; // ST - 5/10/2019
// jmarshall
static int get_id(int game, const char* _name);
// jmarshall end
/*
** If this mixfile has an attached message digest, then this flag
** will be true. The digest is checked only when the mixfile is
@@ -109,6 +114,8 @@ class MixFileClass : public Node<MixFileClass<T>>
*/
long DataSize;
int mixFileGameType;
/*
** Start of raw data in within the mixfile.
*/
code/redalert/winstub.cpp
+7 -1
View File
@@ -196,9 +196,11 @@ static bool Image_loadHDImage(Image_t *image, const char* name, int houseid, int
}
ILuint Width, Height, Bpp;
ilConvertImage(IL_RGBA, IL_UNSIGNED_BYTE);
Width = ilGetInteger(IL_IMAGE_WIDTH);
Height = ilGetInteger(IL_IMAGE_HEIGHT);
Bpp = ilGetInteger(IL_IMAGE_BPP);
Bpp = ilGetInteger(IL_IMAGE_BPP);
ILubyte* Data = ilGetData();
if (Bpp == 4 && houseid != -1) {
@@ -216,6 +218,10 @@ static bool Image_loadHDImage(Image_t *image, const char* name, int houseid, int
byte b = Data[(i * 4) + 2];
Data[(i * 4) + 2] = Data[(i * 4) + 0];
Data[(i * 4) + 0] = b;
if (Data[(i * 4) + 2] == 0 && Data[(i * 4) + 1] == 0 && Data[(i * 4) + 0] == 117) {
Data[(i * 4) + 3] = 0;
}
}
}