ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove ZeroMemory references from memstream merge

This commit is contained in:
OV2 2012-03-28 21:10:40 +02:00
parent 486cde4391
commit 34a813cab0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
memmap.cpp
View File

@ -1771,8 +1771,8 @@ bool8 CMemory::LoadMultiCartMem (const uint8 *sourceA, uint32 sourceASize,
const uint8 *bios, uint32 biosSize) const uint8 *bios, uint32 biosSize)
{ {
uint32 offset = 0; uint32 offset = 0;
ZeroMemory(ROM, MAX_ROM_SIZE); memset(ROM, 0, MAX_ROM_SIZE);
ZeroMemory(&Multi, sizeof(Multi)); memset(&Multi, 0, sizeof(Multi));
if(bios) { if(bios) {
if(!is_SufamiTurbo_BIOS(bios,biosSize)) if(!is_SufamiTurbo_BIOS(bios,biosSize))
@ -1803,8 +1803,8 @@ bool8 CMemory::LoadMultiCartMem (const uint8 *sourceA, uint32 sourceASize,
bool8 CMemory::LoadMultiCart (const char *cartA, const char *cartB) bool8 CMemory::LoadMultiCart (const char *cartA, const char *cartB)
{ {
ZeroMemory(ROM, MAX_ROM_SIZE); memset(ROM, 0, MAX_ROM_SIZE);
ZeroMemory(&Multi, sizeof(Multi)); memset(&Multi, 0, sizeof(Multi));
Settings.DisplayColor = BUILD_PIXEL(31, 31, 31); Settings.DisplayColor = BUILD_PIXEL(31, 31, 31);
SET_UI_COLOR(255, 255, 255); SET_UI_COLOR(255, 255, 255);
@ -1922,7 +1922,7 @@ bool8 CMemory::LoadMultiCartInt ()
if (Multi.cartSizeB) if (Multi.cartSizeB)
strcpy(ROMFilename, Multi.fileNameB); strcpy(ROMFilename, Multi.fileNameB);
ZeroMemory(&SNESGameFixes, sizeof(SNESGameFixes)); memset(&SNESGameFixes, 0, sizeof(SNESGameFixes));
SNESGameFixes.SRAMInitialValue = 0x60; SNESGameFixes.SRAMInitialValue = 0x60;
S9xLoadCheatFile(S9xGetFilename(".cht", CHEAT_DIR)); S9xLoadCheatFile(S9xGetFilename(".cht", CHEAT_DIR));