From 1f90085a27c6847685d6eb9589a1d7fda5c85862 Mon Sep 17 00:00:00 2001 From: Lojack Date: Sat, 29 Aug 2015 19:35:04 -0600 Subject: [PATCH] Reduce compile warnings 2: use of C++ casts in cases where data types were being implicitly converted from larger to smaller data types --- src/Common.cpp | 9 +++++++++ src/Common.h | 5 +++-- src/FalloutNewVegas/Records/ADDNRecord.cpp | 6 +----- src/FalloutNewVegas/Records/ALOCRecord.cpp | 6 +----- src/FalloutNewVegas/Records/AMEFRecord.cpp | 6 +----- src/FalloutNewVegas/Records/ARMARecord.cpp | 6 +----- src/FalloutNewVegas/Records/AVIFRecord.cpp | 6 +----- src/FalloutNewVegas/Records/BPTDRecord.cpp | 6 +----- src/FalloutNewVegas/Records/CAMSRecord.cpp | 6 +----- src/FalloutNewVegas/Records/CCRDRecord.cpp | 6 +----- src/FalloutNewVegas/Records/CDCKRecord.cpp | 6 +----- src/FalloutNewVegas/Records/CHALRecord.cpp | 6 +----- src/FalloutNewVegas/Records/CHIPRecord.cpp | 6 +----- src/FalloutNewVegas/Records/CMNYRecord.cpp | 6 +----- src/FalloutNewVegas/Records/CPTHRecord.cpp | 6 +----- src/FalloutNewVegas/Records/CSNORecord.cpp | 6 +----- src/FalloutNewVegas/Records/DEHYRecord.cpp | 6 +----- src/FalloutNewVegas/Records/DOBJRecord.cpp | 6 +----- src/FalloutNewVegas/Records/ECZNRecord.cpp | 6 +----- src/FalloutNewVegas/Records/FLSTRecord.cpp | 6 +----- src/FalloutNewVegas/Records/HUNGRecord.cpp | 6 +----- src/FalloutNewVegas/Records/IMADRecord.cpp | 6 +----- src/FalloutNewVegas/Records/IMGSRecord.cpp | 6 +----- src/FalloutNewVegas/Records/IMODRecord.cpp | 6 +----- src/FalloutNewVegas/Records/IPCTRecord.cpp | 6 +----- src/FalloutNewVegas/Records/IPDSRecord.cpp | 6 +----- src/FalloutNewVegas/Records/LGTMRecord.cpp | 6 +----- src/FalloutNewVegas/Records/LSCTRecord.cpp | 6 +----- src/FalloutNewVegas/Records/MESGRecord.cpp | 6 +----- src/FalloutNewVegas/Records/MSETRecord.cpp | 6 +----- src/FalloutNewVegas/Records/MUSCRecord.cpp | 6 +----- src/FalloutNewVegas/Records/PERKRecord.cpp | 6 +----- src/FalloutNewVegas/Records/RADSRecord.cpp | 6 +----- src/FalloutNewVegas/Records/RCCTRecord.cpp | 6 +----- src/FalloutNewVegas/Records/RCPERecord.cpp | 6 +----- src/FalloutNewVegas/Records/REPURecord.cpp | 6 +----- src/FalloutNewVegas/Records/RGDLRecord.cpp | 6 +----- src/FalloutNewVegas/Records/SLPDRecord.cpp | 6 +----- src/FalloutNewVegas/Records/VTYPRecord.cpp | 6 +----- src/Skyrim/VMAD/Alias.cpp | 2 +- src/Skyrim/VMAD/Fragment/FragmentINFO.cpp | 2 +- src/Skyrim/VMAD/Fragment/FragmentPERK.cpp | 2 +- src/Skyrim/VMAD/Fragment/FragmentQUST.cpp | 4 ++-- src/Skyrim/VMAD/Fragment/FragmentSCEN.cpp | 2 +- src/Skyrim/VMAD/Script.cpp | 2 +- src/Skyrim/VMAD/VMAD.cpp | 2 +- 46 files changed, 57 insertions(+), 195 deletions(-) diff --git a/src/Common.cpp b/src/Common.cpp index 1cca343..1da77fd 100644 --- a/src/Common.cpp +++ b/src/Common.cpp @@ -318,6 +318,15 @@ bool AlmostEqual(float A, float B, int32_t maxUlps) return false; } +void UnrecognizedSubRecord(cb_formid_t formID, uint32_t subType, uint32_t subSize, unsigned char *&buffer, unsigned char *end_buffer) +{ + //printf("FileName = %s\n", FileName); + printf(" BPTD: %08X - Unknown subType = %04x\n", formID, subType); + printf(" Size = %i\n", subSize); + printf(" CurPos = %04x\n\n", reinterpret_cast(buffer - 6)); + buffer = end_buffer; +} + FileWriter::FileWriter(char * filename, uint32_t size): file_buffer(NULL), record_buffer(NULL), diff --git a/src/Common.h b/src/Common.h index 1ea5c6b..dd24ddb 100644 --- a/src/Common.h +++ b/src/Common.h @@ -195,6 +195,7 @@ char * DeGhostModName(char * const ModName); bool FileExists(char * const FileName); char * GetTemporaryFileName(char * FileName, bool IsBackup=false); bool AlmostEqual(float A, float B, int32_t maxUlps); +void UnrecognizedSubRecord(cb_formid_t formID, uint32_t subType, uint32_t subSize, unsigned char *&buffer, unsigned char *end_buffer); class FileWriter { @@ -2523,7 +2524,7 @@ class ReqCounted : public T public: void Write(FileWriter &writer) { - countType count = value.size(); + countType count = static_cast(value.size()); writer.record_write_subrecord(countRecord, &count, sizeof(count)); for (uint32_t p = 0; p < value.size(); p++) value[p]->Write(writer); @@ -2531,7 +2532,7 @@ class ReqCounted : public T void Write(uint32_t _Type, FileWriter &writer) { - countType count = value.size(); + countType count = static_cast(value.size()); writer.record_write_subrecord(countRecord, &count, sizeof(count)); T::Write(_Type, writer); } diff --git a/src/FalloutNewVegas/Records/ADDNRecord.cpp b/src/FalloutNewVegas/Records/ADDNRecord.cpp index 052549f..6006d4f 100644 --- a/src/FalloutNewVegas/Records/ADDNRecord.cpp +++ b/src/FalloutNewVegas/Records/ADDNRecord.cpp @@ -187,11 +187,7 @@ int32_t ADDNRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DNAM.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" ADDN: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/ALOCRecord.cpp b/src/FalloutNewVegas/Records/ALOCRecord.cpp index 0cd395a..4906e5d 100644 --- a/src/FalloutNewVegas/Records/ALOCRecord.cpp +++ b/src/FalloutNewVegas/Records/ALOCRecord.cpp @@ -200,11 +200,7 @@ int32_t ALOCRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer FNAM.Read(buffer, subSize, CompressedOnDisk); break; default: - //printf("FileName = %s\n", FileName); - printf(" ALOC: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/AMEFRecord.cpp b/src/FalloutNewVegas/Records/AMEFRecord.cpp index c34b57a..19be5d3 100644 --- a/src/FalloutNewVegas/Records/AMEFRecord.cpp +++ b/src/FalloutNewVegas/Records/AMEFRecord.cpp @@ -227,11 +227,7 @@ int32_t AMEFRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" AMEF: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/ARMARecord.cpp b/src/FalloutNewVegas/Records/ARMARecord.cpp index 80c3843..e23ba36 100644 --- a/src/FalloutNewVegas/Records/ARMARecord.cpp +++ b/src/FalloutNewVegas/Records/ARMARecord.cpp @@ -736,11 +736,7 @@ int32_t ARMARecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DNAM.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" ARMA: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/AVIFRecord.cpp b/src/FalloutNewVegas/Records/AVIFRecord.cpp index fc476e8..b1329a4 100644 --- a/src/FalloutNewVegas/Records/AVIFRecord.cpp +++ b/src/FalloutNewVegas/Records/AVIFRecord.cpp @@ -135,11 +135,7 @@ int32_t AVIFRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer ANAM.Read(buffer, subSize, CompressedOnDisk); break; default: - //printf("FileName = %s\n", FileName); - printf(" AVIF: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/BPTDRecord.cpp b/src/FalloutNewVegas/Records/BPTDRecord.cpp index 5073503..e37fdb5 100644 --- a/src/FalloutNewVegas/Records/BPTDRecord.cpp +++ b/src/FalloutNewVegas/Records/BPTDRecord.cpp @@ -538,11 +538,7 @@ int32_t BPTDRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer RAGA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" BPTD: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/CAMSRecord.cpp b/src/FalloutNewVegas/Records/CAMSRecord.cpp index 7c7d9ac..aec4a3d 100644 --- a/src/FalloutNewVegas/Records/CAMSRecord.cpp +++ b/src/FalloutNewVegas/Records/CAMSRecord.cpp @@ -374,11 +374,7 @@ int32_t CAMSRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer MNAM.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" CAMS: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/CCRDRecord.cpp b/src/FalloutNewVegas/Records/CCRDRecord.cpp index 9b6d2aa..3f4c434 100644 --- a/src/FalloutNewVegas/Records/CCRDRecord.cpp +++ b/src/FalloutNewVegas/Records/CCRDRecord.cpp @@ -252,11 +252,7 @@ int32_t CCRDRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" CCRD: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/CDCKRecord.cpp b/src/FalloutNewVegas/Records/CDCKRecord.cpp index 1c98ab2..8d8569c 100644 --- a/src/FalloutNewVegas/Records/CDCKRecord.cpp +++ b/src/FalloutNewVegas/Records/CDCKRecord.cpp @@ -131,11 +131,7 @@ int32_t CDCKRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" CDCK: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/CHALRecord.cpp b/src/FalloutNewVegas/Records/CHALRecord.cpp index ad4671a..03d54b0 100644 --- a/src/FalloutNewVegas/Records/CHALRecord.cpp +++ b/src/FalloutNewVegas/Records/CHALRecord.cpp @@ -311,11 +311,7 @@ int32_t CHALRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer XNAM.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" CHAL: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/CHIPRecord.cpp b/src/FalloutNewVegas/Records/CHIPRecord.cpp index 882f5c9..ba306c2 100644 --- a/src/FalloutNewVegas/Records/CHIPRecord.cpp +++ b/src/FalloutNewVegas/Records/CHIPRecord.cpp @@ -205,11 +205,7 @@ int32_t CHIPRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer ZNAM.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" CHIP: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/CMNYRecord.cpp b/src/FalloutNewVegas/Records/CMNYRecord.cpp index 514fa84..7a32f39 100644 --- a/src/FalloutNewVegas/Records/CMNYRecord.cpp +++ b/src/FalloutNewVegas/Records/CMNYRecord.cpp @@ -176,11 +176,7 @@ int32_t CMNYRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" CMNY: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/CPTHRecord.cpp b/src/FalloutNewVegas/Records/CPTHRecord.cpp index 8cfc9b7..689c16e 100644 --- a/src/FalloutNewVegas/Records/CPTHRecord.cpp +++ b/src/FalloutNewVegas/Records/CPTHRecord.cpp @@ -171,11 +171,7 @@ int32_t CPTHRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer SNAM.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" CPTH: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/CSNORecord.cpp b/src/FalloutNewVegas/Records/CSNORecord.cpp index 4e5e714..be8f909 100644 --- a/src/FalloutNewVegas/Records/CSNORecord.cpp +++ b/src/FalloutNewVegas/Records/CSNORecord.cpp @@ -249,11 +249,7 @@ int32_t CSNORecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer break; // TODO: The rest of the ICO* subrecords default: - //printf("FileName = %s\n", FileName); - printf(" CSNO: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/DEHYRecord.cpp b/src/FalloutNewVegas/Records/DEHYRecord.cpp index 60caee4..36a4c3e 100644 --- a/src/FalloutNewVegas/Records/DEHYRecord.cpp +++ b/src/FalloutNewVegas/Records/DEHYRecord.cpp @@ -122,11 +122,7 @@ int32_t DEHYRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" DEHY: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/DOBJRecord.cpp b/src/FalloutNewVegas/Records/DOBJRecord.cpp index e7231a0..6cf832d 100644 --- a/src/FalloutNewVegas/Records/DOBJRecord.cpp +++ b/src/FalloutNewVegas/Records/DOBJRecord.cpp @@ -122,11 +122,7 @@ int32_t DOBJRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" DOBJ: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/ECZNRecord.cpp b/src/FalloutNewVegas/Records/ECZNRecord.cpp index 1658b31..ef15568 100644 --- a/src/FalloutNewVegas/Records/ECZNRecord.cpp +++ b/src/FalloutNewVegas/Records/ECZNRecord.cpp @@ -188,11 +188,7 @@ int32_t ECZNRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" ECZN: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/FLSTRecord.cpp b/src/FalloutNewVegas/Records/FLSTRecord.cpp index 54adb51..6115527 100644 --- a/src/FalloutNewVegas/Records/FLSTRecord.cpp +++ b/src/FalloutNewVegas/Records/FLSTRecord.cpp @@ -123,11 +123,7 @@ int32_t FLSTRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer LNAM.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" FLST: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/HUNGRecord.cpp b/src/FalloutNewVegas/Records/HUNGRecord.cpp index 610a0ed..97351f7 100644 --- a/src/FalloutNewVegas/Records/HUNGRecord.cpp +++ b/src/FalloutNewVegas/Records/HUNGRecord.cpp @@ -122,11 +122,7 @@ int32_t HUNGRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" HUNG: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/IMADRecord.cpp b/src/FalloutNewVegas/Records/IMADRecord.cpp index 7893708..8d7ff01 100644 --- a/src/FalloutNewVegas/Records/IMADRecord.cpp +++ b/src/FalloutNewVegas/Records/IMADRecord.cpp @@ -352,11 +352,7 @@ int32_t IMADRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer RDSI.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" IMAD: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/IMGSRecord.cpp b/src/FalloutNewVegas/Records/IMGSRecord.cpp index ad42dde..c931bd3 100644 --- a/src/FalloutNewVegas/Records/IMGSRecord.cpp +++ b/src/FalloutNewVegas/Records/IMGSRecord.cpp @@ -250,11 +250,7 @@ int32_t IMGSRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DNAM.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" IMGS: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/IMODRecord.cpp b/src/FalloutNewVegas/Records/IMODRecord.cpp index d5c2527..e59e2c1 100644 --- a/src/FalloutNewVegas/Records/IMODRecord.cpp +++ b/src/FalloutNewVegas/Records/IMODRecord.cpp @@ -219,11 +219,7 @@ int32_t IMODRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" IMOD: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/IPCTRecord.cpp b/src/FalloutNewVegas/Records/IPCTRecord.cpp index 16d0a36..e7cee56 100644 --- a/src/FalloutNewVegas/Records/IPCTRecord.cpp +++ b/src/FalloutNewVegas/Records/IPCTRecord.cpp @@ -301,11 +301,7 @@ int32_t IPCTRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer NAM1.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" IPCT: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/IPDSRecord.cpp b/src/FalloutNewVegas/Records/IPDSRecord.cpp index be7fd30..d49e20c 100644 --- a/src/FalloutNewVegas/Records/IPDSRecord.cpp +++ b/src/FalloutNewVegas/Records/IPDSRecord.cpp @@ -157,11 +157,7 @@ int32_t IPDSRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" IPDS: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/LGTMRecord.cpp b/src/FalloutNewVegas/Records/LGTMRecord.cpp index f90e571..c94f7c6 100644 --- a/src/FalloutNewVegas/Records/LGTMRecord.cpp +++ b/src/FalloutNewVegas/Records/LGTMRecord.cpp @@ -119,11 +119,7 @@ int32_t LGTMRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" LGTM: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/LSCTRecord.cpp b/src/FalloutNewVegas/Records/LSCTRecord.cpp index 8cc9b17..45d41a1 100644 --- a/src/FalloutNewVegas/Records/LSCTRecord.cpp +++ b/src/FalloutNewVegas/Records/LSCTRecord.cpp @@ -209,11 +209,7 @@ int32_t LSCTRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" LSCT: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/MESGRecord.cpp b/src/FalloutNewVegas/Records/MESGRecord.cpp index 3b84477..bd83914 100644 --- a/src/FalloutNewVegas/Records/MESGRecord.cpp +++ b/src/FalloutNewVegas/Records/MESGRecord.cpp @@ -208,11 +208,7 @@ int32_t MESGRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer Buttons[Buttons.size() - 1].CTDA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" MESG: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/MSETRecord.cpp b/src/FalloutNewVegas/Records/MSETRecord.cpp index d1521b7..14bd78c 100644 --- a/src/FalloutNewVegas/Records/MSETRecord.cpp +++ b/src/FalloutNewVegas/Records/MSETRecord.cpp @@ -358,11 +358,7 @@ int32_t MSETRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize, CompressedOnDisk); break; default: - //printf("FileName = %s\n", FileName); - printf(" MSET: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/MUSCRecord.cpp b/src/FalloutNewVegas/Records/MUSCRecord.cpp index 5ab45cc..9d0d518 100644 --- a/src/FalloutNewVegas/Records/MUSCRecord.cpp +++ b/src/FalloutNewVegas/Records/MUSCRecord.cpp @@ -123,11 +123,7 @@ int32_t MUSCRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer ANAM.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" MUSC: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/PERKRecord.cpp b/src/FalloutNewVegas/Records/PERKRecord.cpp index 2b9cd2a..405d2aa 100644 --- a/src/FalloutNewVegas/Records/PERKRecord.cpp +++ b/src/FalloutNewVegas/Records/PERKRecord.cpp @@ -468,11 +468,7 @@ int32_t PERKRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer //PRKF.Read(buffer, subSize); //FILL IN MANUALLY break; default: - //printf("FileName = %s\n", FileName); - printf(" PERK: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/RADSRecord.cpp b/src/FalloutNewVegas/Records/RADSRecord.cpp index 470cb9a..20b78a1 100644 --- a/src/FalloutNewVegas/Records/RADSRecord.cpp +++ b/src/FalloutNewVegas/Records/RADSRecord.cpp @@ -122,11 +122,7 @@ int32_t RADSRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" RADS: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/RCCTRecord.cpp b/src/FalloutNewVegas/Records/RCCTRecord.cpp index c226760..dcf4432 100644 --- a/src/FalloutNewVegas/Records/RCCTRecord.cpp +++ b/src/FalloutNewVegas/Records/RCCTRecord.cpp @@ -147,11 +147,7 @@ int32_t RCCTRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" RCCT: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/RCPERecord.cpp b/src/FalloutNewVegas/Records/RCPERecord.cpp index 219a135..f7a5595 100644 --- a/src/FalloutNewVegas/Records/RCPERecord.cpp +++ b/src/FalloutNewVegas/Records/RCPERecord.cpp @@ -148,11 +148,7 @@ int32_t RCPERecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer //RCOD.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" RCPE: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/REPURecord.cpp b/src/FalloutNewVegas/Records/REPURecord.cpp index 291543b..3fa1210 100644 --- a/src/FalloutNewVegas/Records/REPURecord.cpp +++ b/src/FalloutNewVegas/Records/REPURecord.cpp @@ -131,11 +131,7 @@ int32_t REPURecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" REPU: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/RGDLRecord.cpp b/src/FalloutNewVegas/Records/RGDLRecord.cpp index 7abbdfa..fb2fed2 100644 --- a/src/FalloutNewVegas/Records/RGDLRecord.cpp +++ b/src/FalloutNewVegas/Records/RGDLRecord.cpp @@ -401,11 +401,7 @@ int32_t RGDLRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer ANAM.Read(buffer, subSize, CompressedOnDisk); break; default: - //printf("FileName = %s\n", FileName); - printf(" RGDL: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/SLPDRecord.cpp b/src/FalloutNewVegas/Records/SLPDRecord.cpp index 2be80b2..1d4f559 100644 --- a/src/FalloutNewVegas/Records/SLPDRecord.cpp +++ b/src/FalloutNewVegas/Records/SLPDRecord.cpp @@ -122,11 +122,7 @@ int32_t SLPDRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DATA.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" SLPD: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/FalloutNewVegas/Records/VTYPRecord.cpp b/src/FalloutNewVegas/Records/VTYPRecord.cpp index 30a3d1b..684ffe4 100644 --- a/src/FalloutNewVegas/Records/VTYPRecord.cpp +++ b/src/FalloutNewVegas/Records/VTYPRecord.cpp @@ -155,11 +155,7 @@ int32_t VTYPRecord::ParseRecord(unsigned char *buffer, unsigned char *end_buffer DNAM.Read(buffer, subSize); break; default: - //printf("FileName = %s\n", FileName); - printf(" VTYP: %08X - Unknown subType = %04x\n", formID, subType); - printf(" Size = %i\n", subSize); - printf(" CurPos = %04x\n\n", buffer - 6); - buffer = end_buffer; + UnrecognizedSubRecord(formID, subType, subSize, buffer, end_buffer); break; } }; diff --git a/src/Skyrim/VMAD/Alias.cpp b/src/Skyrim/VMAD/Alias.cpp index 033a083..c3c8b63 100644 --- a/src/Skyrim/VMAD/Alias.cpp +++ b/src/Skyrim/VMAD/Alias.cpp @@ -109,7 +109,7 @@ void Alias::Write(FileWriter &writer) writer.record_write(&version, sizeof(version)); int16_t objFormat = 2; writer.record_write(&objFormat, sizeof(objFormat)); - uint16_t count = scripts.size(); + uint16_t count = static_cast(scripts.size()); writer.record_write(&count, sizeof(count)); for (uint16_t i = 0; i < count; ++i) scripts[i]->Write(writer); diff --git a/src/Skyrim/VMAD/Fragment/FragmentINFO.cpp b/src/Skyrim/VMAD/Fragment/FragmentINFO.cpp index 6fcd6b2..f30137c 100644 --- a/src/Skyrim/VMAD/Fragment/FragmentINFO.cpp +++ b/src/Skyrim/VMAD/Fragment/FragmentINFO.cpp @@ -93,7 +93,7 @@ uint32_t FragmentINFO::GetSize() const void FragmentINFO::Write(FileWriter &writer) const { writer.record_write(&unk1, sizeof(unk1)); - uint16_t count = fragments.size(); + uint16_t count = static_cast(fragments.size()); writer.record_write(&count, sizeof(count)); fileName.Write16(writer); for (uint16_t i = 0; i < count; ++i) diff --git a/src/Skyrim/VMAD/Fragment/FragmentPERK.cpp b/src/Skyrim/VMAD/Fragment/FragmentPERK.cpp index 0ec5327..1e4b002 100644 --- a/src/Skyrim/VMAD/Fragment/FragmentPERK.cpp +++ b/src/Skyrim/VMAD/Fragment/FragmentPERK.cpp @@ -125,7 +125,7 @@ void FragmentPERK::Write(FileWriter &writer) const { writer.record_write(&unk1, sizeof(unk1)); fileName.Write16(writer); - uint16_t count = fragments.size(); + uint16_t count = static_cast(fragments.size()); writer.record_write(&count, sizeof(count)); for (uint16_t i = 0; i < count; ++i) { diff --git a/src/Skyrim/VMAD/Fragment/FragmentQUST.cpp b/src/Skyrim/VMAD/Fragment/FragmentQUST.cpp index b54cb60..a9e9812 100644 --- a/src/Skyrim/VMAD/Fragment/FragmentQUST.cpp +++ b/src/Skyrim/VMAD/Fragment/FragmentQUST.cpp @@ -147,7 +147,7 @@ uint32_t FragmentQUST::GetSize() const void FragmentQUST::Write(FileWriter &writer) const { writer.record_write(&unk1, sizeof(unk1)); - uint16_t count = fragments.size(); + uint16_t count = static_cast(fragments.size()); writer.record_write(&count, sizeof(count)); fileName.Write16(writer); for (uint16_t i = 0; i < count; ++i) @@ -159,7 +159,7 @@ void FragmentQUST::Write(FileWriter &writer) const fragments[i]->scriptName.Write16(writer); fragments[i]->fragmentName.Write16(writer); } - count = aliases.size(); + count = static_cast(aliases.size()); writer.record_write(&count, sizeof(count)); for (uint16_t i = 0; i < count; ++i) aliases[i]->Write(writer); diff --git a/src/Skyrim/VMAD/Fragment/FragmentSCEN.cpp b/src/Skyrim/VMAD/Fragment/FragmentSCEN.cpp index 2843abd..51e4472 100644 --- a/src/Skyrim/VMAD/Fragment/FragmentSCEN.cpp +++ b/src/Skyrim/VMAD/Fragment/FragmentSCEN.cpp @@ -183,7 +183,7 @@ void FragmentSCEN::Write(FileWriter &writer) const beginFragment->scriptName.Write16(writer); beginFragment->fragmentName.Write16(writer); } - uint16_t count = phases.size(); + uint16_t count = static_cast(phases.size()); writer.record_write(&count, sizeof(count)); for (uint16_t i = 0; i < count; ++i) { diff --git a/src/Skyrim/VMAD/Script.cpp b/src/Skyrim/VMAD/Script.cpp index 684225c..706efa7 100644 --- a/src/Skyrim/VMAD/Script.cpp +++ b/src/Skyrim/VMAD/Script.cpp @@ -153,7 +153,7 @@ void Script::Write(FileWriter &writer) { name.Write16(writer); writer.record_write(&status, sizeof(status)); - uint16_t count = properties.size(); + uint16_t count = static_cast(properties.size()); writer.record_write(&count, sizeof(count)); for (uint16_t i = 0; i < count; ++i) properties[i]->Write(writer); diff --git a/src/Skyrim/VMAD/VMAD.cpp b/src/Skyrim/VMAD/VMAD.cpp index 92e2ad9..8e40b87 100644 --- a/src/Skyrim/VMAD/VMAD.cpp +++ b/src/Skyrim/VMAD/VMAD.cpp @@ -176,7 +176,7 @@ void VMADRecord::ReqWrite(uint32_t _Type, FileWriter &writer) writer.record_write(&objFormat, 2); // scriptCount - uint16_t count = scripts.size(); + uint16_t count = static_cast(scripts.size()); writer.record_write(&count, 2); // scripts