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

@@ -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<unsigned int>(buffer - 6));
+ buffer = end_buffer;
+}
+
 FileWriter::FileWriter(char * filename, uint32_t size):
  file_buffer(NULL),
  record_buffer(NULL),

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,15 +2524,15 @@ class ReqCounted : public T
 public:
  void Write(FileWriter &writer)
  {
- countType count = value.size();
+ countType count = static_cast<countType>(value.size());
  writer.record_write_subrecord(countRecord, &count, sizeof(count));
  for (uint32_t p = 0; p < value.size(); p++)
  value[p]->Write(writer);
  }
 
  void Write(uint32_t _Type, FileWriter &writer)
  {
- countType count = value.size();
+ countType count = static_cast<countType>(value.size());
  writer.record_write_subrecord(countRecord, &count, sizeof(count));
  T::Write(_Type, writer);
  }

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };

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;
  }
  };