diff --git a/Src/Model3/DriveBoard/DriveBoard.cpp b/Src/Model3/DriveBoard/DriveBoard.cpp index 30d73dc..e896dfd 100644 --- a/Src/Model3/DriveBoard/DriveBoard.cpp +++ b/Src/Model3/DriveBoard/DriveBoard.cpp @@ -61,7 +61,7 @@ #define ROM_SIZE 0x9000 #define RAM_SIZE 0x2000 // Z80 RAM -static_assert(sizeof(bool) == 1); // Save state code relies on this -- we must fix this so that bools are copied to uint8_t explicitly +static_assert(sizeof(bool) == 1, "bools must be copied to uint8_t"); // Save state code relies on this -- we must fix this so that bools are copied to uint8_t explicitly void CDriveBoard::SaveState(CBlockFile* SaveState) { @@ -145,7 +145,7 @@ void CDriveBoard::LoadState(CBlockFile* SaveState) void CDriveBoard::LoadLegacyState(const LegacyDriveBoardState &state, CBlockFile *SaveState) { - static_assert(RAM_SIZE == sizeof(state.ram)); + static_assert(RAM_SIZE == sizeof(state.ram),"Ram sizes must match"); memcpy(m_ram, state.ram, RAM_SIZE); m_initialized = state.initialized; m_allowInterrupts = state.allowInterrupts; diff --git a/VS2008/Supermodel.vcxproj b/VS2008/Supermodel.vcxproj index 08428e9..e5ab21a 100644 --- a/VS2008/Supermodel.vcxproj +++ b/VS2008/Supermodel.vcxproj @@ -327,7 +327,11 @@ xcopy /D /Y "$(ProjectDir)..\Config\*" "$(TargetDir)Config" - + + + + + @@ -498,7 +502,11 @@ xcopy /D /Y "$(ProjectDir)..\Config\*" "$(TargetDir)Config" - + + + + + diff --git a/VS2008/Supermodel.vcxproj.filters b/VS2008/Supermodel.vcxproj.filters index cdd5f5d..98ce804 100644 --- a/VS2008/Supermodel.vcxproj.filters +++ b/VS2008/Supermodel.vcxproj.filters @@ -138,6 +138,12 @@ {284c6ebd-9a90-4283-9ee6-ea097974c8f4} + + {2802dddb-302d-494a-9f0a-e37a870a7cc4} + + + {5adb385b-66b5-4aec-9f7c-37a82388f0d2} + @@ -194,9 +200,6 @@ Source Files\Model3 - - Source Files\Model3 - Source Files\Model3 @@ -437,6 +440,21 @@ Source Files\Network + + Source Files\Model3\DriveBoard + + + Source Files\Model3\DriveBoard + + + Source Files\Model3\DriveBoard + + + Source Files\Model3\DriveBoard + + + Source Files\Model3\DriveBoard + @@ -523,9 +541,6 @@ Header Files\Model3 - - Header Files\Model3 - Header Files\Model3 @@ -799,6 +814,21 @@ Source Files\Network + + Header Files\Model3\DriveBoard + + + Header Files\Model3\DriveBoard + + + Header Files\Model3\DriveBoard + + + Header Files\Model3\DriveBoard + + + Header Files\Model3\DriveBoard +