Skip to content
This repository has been archived by the owner on Dec 16, 2019. It is now read-only.

Commit

Permalink
Basic support (reads, writes, is exposed, not set tested)
Browse files Browse the repository at this point in the history
  FNV::ANIORecord, FNV::WATRRecord, FNV::EFSHRecord, FNV::EXPLRecord, FNV::DEBRRecord
  • Loading branch information
waruddar committed May 19, 2011
1 parent 0598c4b commit 11fea48
Show file tree
Hide file tree
Showing 51 changed files with 3,869 additions and 2,185 deletions.
Binary file modified CBash.suo
Binary file not shown.
10 changes: 5 additions & 5 deletions CBash/CBash.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ ModFile *ValidateModName(Collection *curCollection, STRING const ModName)
STRING const &CompName = NonGhostName ? NonGhostName : ModName;
//ModFiles will never contain null pointers
for(UINT32 x = 0; x < curCollection->ModFiles.size();++x)
if(_stricmp(CompName, curCollection->ModFiles[x]->reader.getModName()) == 0)
if(icmps(CompName, curCollection->ModFiles[x]->reader.getModName()) == 0)
{
delete []NonGhostName;
return curCollection->ModFiles[x];
Expand All @@ -122,7 +122,7 @@ ModFile *ValidateLoadOrderIndex(Collection *curCollection, STRING const ModName)
STRING const &CompName = NonGhostName ? NonGhostName : ModName;
//ModFiles will never contain null pointers
for(UINT32 x = 0; x < curCollection->LoadOrder255.size();++x)
if(_stricmp(CompName, curCollection->LoadOrder255[x]->reader.getModName()) == 0)
if(icmps(CompName, curCollection->LoadOrder255[x]->reader.getModName()) == 0)
{
delete []NonGhostName;
return curCollection->LoadOrder255[x];
Expand Down Expand Up @@ -314,7 +314,7 @@ Collection * CreateCollection(STRING const ModsPath, const UINT32 CollectionType

try
{
//ValidatePointer(ModsPath);
ValidatePointer(ModsPath);
for(UINT32 p = 0; p < Collections.size(); ++p)
{
if(Collections[p] == NULL)
Expand Down Expand Up @@ -513,7 +513,7 @@ SINT32 AddMod(Collection *CollectionID, STRING const ModName, const UINT32 ModFl
try
{
//ValidatePointer(CollectionID);
//ValidatePointer(ModName);
ValidatePointer(ModName);
return CollectionID->AddMod(ModName, flags);
}
catch(std::exception &ex)
Expand Down Expand Up @@ -967,7 +967,7 @@ STRING GetLongIDName(Collection *CollectionID, ModFile *ModID, const UINT8 ModIn
// {
// ModFile *curModFile = ValidateModID(ValidateCollectionID(CollectionID), ModID);
// for(UINT16 x = 0; x < curModFile->TES4.MAST.size(); ++x)
// if(_stricmp(curModFile->TES4.MAST[x].value, ModName) == 0)
// if(icmps(curModFile->TES4.MAST[x].value, ModName) == 0)
// return curModFile->FormIDHandler.ExpandTable[(UINT8)x] << 24;
// printf("GetShortIDIndex: Error\n %s not found in %s's master list!\n", ModName, curModFile->reader.getModName());
// return -1;
Expand Down
202 changes: 202 additions & 0 deletions CBash/CBash.vcproj
Original file line number Diff line number Diff line change
Expand Up @@ -1261,6 +1261,37 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\ANIORecord.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="FullDebug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\ARMORecord.cpp"
>
Expand Down Expand Up @@ -1486,6 +1517,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\DEBRRecord.cpp"
>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\DOORRecord.cpp"
>
Expand Down Expand Up @@ -1517,6 +1552,37 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\EFSHRecord.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="FullDebug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\ENCHRecord.cpp"
>
Expand Down Expand Up @@ -1548,6 +1614,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\EXPLRecord.cpp"
>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\EYESRecord.cpp"
>
Expand Down Expand Up @@ -2437,6 +2507,37 @@
RelativePath=".\FalloutNewVegas\Records\TXSTRecord.cpp"
>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\WATRRecord.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="FullDebug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\WEAPRecord.cpp"
>
Expand Down Expand Up @@ -2658,6 +2759,37 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\API\ANIORecordAPI.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="FullDebug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\API\ARMORecordAPI.cpp"
>
Expand Down Expand Up @@ -2914,6 +3046,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\API\DEBRRecordAPI.cpp"
>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\API\DIALRecordAPI.cpp"
>
Expand Down Expand Up @@ -2976,6 +3112,37 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\API\EFSHRecordAPI.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="FullDebug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\API\ENCHRecordAPI.cpp"
>
Expand Down Expand Up @@ -3007,6 +3174,10 @@
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\API\EXPLRecordAPI.cpp"
>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\API\EYESRecordAPI.cpp"
>
Expand Down Expand Up @@ -4005,6 +4176,37 @@
RelativePath=".\FalloutNewVegas\Records\API\TXSTRecordAPI.cpp"
>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\API\WATRRecordAPI.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
<FileConfiguration
Name="FullDebug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\$(InputName)1.obj"
XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\FalloutNewVegas\Records\API\WEAPRecordAPI.cpp"
>
Expand Down
4 changes: 2 additions & 2 deletions CBash/Collection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ SINT32 Collection::AddMod(STRING const &_FileName, ModFlags &flags, bool IsPrelo
bool Collection::IsModAdded(STRING const &ModName)
{
for(UINT32 p = 0;p < ModFiles.size();p++)
if(_stricmp(ModName, ModFiles[p]->reader.getModName()) == 0)
if(icmps(ModName, ModFiles[p]->reader.getModName()) == 0)
return true;
return false;
}
Expand Down Expand Up @@ -932,7 +932,7 @@ SINT32 Collection::SetRecordIDs(ModFile *&curModFile, Record *&RecordID, FORMID
{
if(EditorID == NULL)
bChangingEditorID = true;
else if(strcmp(RecordEditorID, EditorID) != 0)
else if(cmps(RecordEditorID, EditorID) != 0)
bChangingEditorID = true;
}

Expand Down
Loading

0 comments on commit 11fea48

Please sign in to comment.