Changed: #1440 Some additional rules

--HG--
branch : build_pipeline_v3
hg/feature/build_pipeline_v3
kaetemi 12 years ago
parent 8d91f412b4
commit 9a707b0c95

@ -75,8 +75,8 @@ const char *LinuxDatabaseDirectory = "/srv/work/database/";
bool RunningLinux = true; bool RunningLinux = true;
//const char *SrcDirectoryRecursive = "w:\\database\\interfaces\\"; //const char *SrcDirectoryRecursive = "w:\\database\\interfaces\\";
//const char *SrcDirectoryRecursive = "w:\\database\\"; const char *SrcDirectoryRecursive = "w:\\database\\";
const char *SrcDirectoryRecursive = "w:\\database\\stuff\\fyros\\city\\newpositionville\\"; //const char *SrcDirectoryRecursive = "w:\\database\\stuff\\fyros\\city\\newpositionville\\";
const char *FallbackTga = "w:\\database\\stuff\\generique\\agents\\_textures\\accessories\\lost_texture.tga"; const char *FallbackTga = "w:\\database\\stuff\\generique\\agents\\_textures\\accessories\\lost_texture.tga";
@ -785,14 +785,22 @@ void fixChunk(uint16 id, IStorageObject *chunk)
uint i = 0; uint i = 0;
while ((sint)mem.getPos() != (sint)mem.size()) while ((sint)mem.getPos() != (sint)mem.size())
{ {
nldebug("pos %i", mem.getPos()); //nldebug("pos %i", mem.getPos());
nldebug("size %i", mem.size()); //nldebug("size %i", mem.size());
char funny; char funny;
mem.serial(funny); mem.serial(funny);
nlassert(funny == '@'); nlassert(funny == '@');
uint32 size; sint32 size;
mem.serial(size); mem.serial(size);
nldebug("size %i", size); //nldebug("size %i", size);
if (size == -1)
{
nldebug("size %i", size);
nlwarning("bad size");
std::string x;
std::cin >> x;
return;
}
std::string v; std::string v;
v.resize(size); v.resize(size);
mem.serialBuffer((uint8 *)&v[0], size); mem.serialBuffer((uint8 *)&v[0], size);
@ -807,10 +815,10 @@ void fixChunk(uint16 id, IStorageObject *chunk)
return; return;
} }
v.resize(v.size() - 1); v.resize(v.size() - 1);
nldebug("%s", v.c_str()); // nldebug("%s", v.c_str());
strings.push_back(v); strings.push_back(v);
++i; ++i;
nldebug("ok"); // nldebug("ok");
} }
nlassert(strings.size() == counter); nlassert(strings.size() == counter);
asRaw->Value.resize(0); asRaw->Value.resize(0);
@ -826,13 +834,13 @@ void fixChunk(uint16 id, IStorageObject *chunk)
} }
nlassert(foundone); nlassert(foundone);
{ {
nldebug("go"); //nldebug("go");
NLMISC::CMemStream mem; NLMISC::CMemStream mem;
mem.serialBuffer(nonsense, 11); mem.serialBuffer(nonsense, 11);
mem.serial(counter); mem.serial(counter);
for (uint i = 0; i < strings.size(); ++i) for (uint i = 0; i < strings.size(); ++i)
{ {
nldebug("one"); //nldebug("one");
char funny = '@'; char funny = '@';
mem.serial(funny); mem.serial(funny);
strings[i].resize(strings[i].size() + 1); strings[i].resize(strings[i].size() + 1);
@ -892,8 +900,11 @@ void fixChunk(uint16 id, IStorageObject *chunk)
break; break;
} }
case 9730: case 9730:
// ignore if (asRaw->Value.size() > 0 && asRaw->Value[0] == 'I')
break; {
// ignore Init.max
break;
}
default: default:
if (hasImportantFilePath(asRaw)) if (hasImportantFilePath(asRaw))
{ {

Loading…
Cancel
Save