From 34a813cab0b8f9c69bbb6467b0a1a4244c152a66 Mon Sep 17 00:00:00 2001 From: OV2 Date: Wed, 28 Mar 2012 21:10:40 +0200 Subject: [PATCH] Remove ZeroMemory references from memstream merge --- memmap.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/memmap.cpp b/memmap.cpp index c2bbfed4..54f83587 100644 --- a/memmap.cpp +++ b/memmap.cpp @@ -1771,8 +1771,8 @@ bool8 CMemory::LoadMultiCartMem (const uint8 *sourceA, uint32 sourceASize, const uint8 *bios, uint32 biosSize) { uint32 offset = 0; - ZeroMemory(ROM, MAX_ROM_SIZE); - ZeroMemory(&Multi, sizeof(Multi)); + memset(ROM, 0, MAX_ROM_SIZE); + memset(&Multi, 0, sizeof(Multi)); if(bios) { 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) { - ZeroMemory(ROM, MAX_ROM_SIZE); - ZeroMemory(&Multi, sizeof(Multi)); + memset(ROM, 0, MAX_ROM_SIZE); + memset(&Multi, 0, sizeof(Multi)); Settings.DisplayColor = BUILD_PIXEL(31, 31, 31); SET_UI_COLOR(255, 255, 255); @@ -1922,7 +1922,7 @@ bool8 CMemory::LoadMultiCartInt () if (Multi.cartSizeB) strcpy(ROMFilename, Multi.fileNameB); - ZeroMemory(&SNESGameFixes, sizeof(SNESGameFixes)); + memset(&SNESGameFixes, 0, sizeof(SNESGameFixes)); SNESGameFixes.SRAMInitialValue = 0x60; S9xLoadCheatFile(S9xGetFilename(".cht", CHEAT_DIR));