Tools/Extractors: Fixed possible name issues (underscore instead of space) when attempting to extract M2 models from MPQ

This commit is contained in:
Shauren committed 2013-06-27 19:31:38 +02:00
1 parent 36c866f9ff
commit 50e7b93bbd
8 files changed
+90 -101

No files matched your search

+43 -32
View File
@@ -44,26 +44,29 @@ char* GetPlainName(char* FileName)
return FileName;
}
void fixnamen(char* name, size_t len)
void FixNameCase(char* name, size_t len)
{
for (size_t i = 0; i < len-3; i++)
{
if (i > 0 && name[i] >= 'A' && name[i] <= 'Z' && isalpha(name[i-1]))
name[i] |= 0x20;
else if ((i == 0 || !isalpha(name[i-1])) && name[i]>='a' && name[i]<='z')
name[i] &= ~0x20;
}
char* ptr = name + len - 1;
//extension in lowercase
for (size_t i = len - 3; i < len; i++)
name[i] |= 0x20;
for (; *ptr != '.'; --ptr)
*ptr |= 0x20;
for (; ptr >= name; --ptr)
{
if (ptr > name && *ptr >= 'A' && *ptr <= 'Z' && isalpha(*(ptr - 1)))
*ptr |= 0x20;
else if ((ptr == name || !isalpha(*(ptr - 1))) && *ptr >= 'a' && *ptr <= 'z')
*ptr &= ~0x20;
}
}
void fixname2(char* name, size_t len)
void FixNameSpaces(char* name, size_t len)
{
for (size_t i=0; i<len-3; i++)
{
if(name[i] == ' ')
name[i] = '_';
name[i] = '_';
}
}
@@ -132,23 +135,24 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
{
if (size)
{
char *buf = new char[size];
char* buf = new char[size];
ADT.read(buf, size);
char *p=buf;
int t=0;
ModelInstansName = new string[size];
while (p<buf+size)
char* p = buf;
int t = 0;
ModelInstanceNames = new std::string[size];
while (p < buf + size)
{
fixnamen(p,strlen(p));
std::string path(p);
char* s = GetPlainName(p);
fixname2(s,strlen(s));
FixNameCase(s, strlen(s));
FixNameSpaces(s, strlen(s));
ModelInstansName[t++] = s;
ModelInstanceNames[t++] = s;
string path(p);
ExtractSingleModel(path);
p = p+strlen(p)+1;
p += strlen(p) + 1;
}
delete[] buf;
}
@@ -159,16 +163,18 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
{
char* buf = new char[size];
ADT.read(buf, size);
char* p=buf;
char* p = buf;
int q = 0;
WmoInstansName = new string[size];
while (p<buf+size)
WmoInstanceNames = new std::string[size];
while (p < buf + size)
{
char* s = GetPlainName(p);
fixnamen(s, strlen(s));
fixname2(s, strlen(s));
FixNameCase(s, strlen(s));
FixNameSpaces(s, strlen(s));
WmoInstanceNames[q++] = s;
p += strlen(p) + 1;
WmoInstansName[q++] = s;
}
delete[] buf;
}
@@ -183,9 +189,10 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
{
uint32 id;
ADT.read(&id, 4);
ModelInstance inst(ADT,ModelInstansName[id].c_str(), map_num, tileX, tileY, dirfile);
ModelInstance inst(ADT, ModelInstanceNames[id].c_str(), map_num, tileX, tileY, dirfile);
}
delete[] ModelInstansName;
delete[] ModelInstanceNames;
ModelInstanceNames = NULL;
}
}
else if (!strcmp(fourcc,"MODF"))
@@ -197,14 +204,18 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY)
{
uint32 id;
ADT.read(&id, 4);
WMOInstance inst(ADT,WmoInstansName[id].c_str(), map_num, tileX, tileY, dirfile);
WMOInstance inst(ADT, WmoInstanceNames[id].c_str(), map_num, tileX, tileY, dirfile);
}
delete[] WmoInstansName;
delete[] WmoInstanceNames;
WmoInstanceNames = NULL;
}
}
//======================
ADT.seek(nextpos);
}
ADT.close();
fclose(dirfile);
return true;