From cbac8db8a53b6c5efd606ef03f49343af2558a50 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Fri, 29 Dec 2006 03:48:00 +0000 Subject: [PATCH] Fixed things I broke for Visual C++ while fixing the source for GCC 4.2. SVN r431 (trunk) --- src/nodebuild_utility.cpp | 8 ++++---- src/sound/music_midi_stream.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/nodebuild_utility.cpp b/src/nodebuild_utility.cpp index 297feb60a..a7e136c79 100644 --- a/src/nodebuild_utility.cpp +++ b/src/nodebuild_utility.cpp @@ -148,10 +148,10 @@ int FNodeBuilder::CreateSeg (int linenum, int sidenum) seg.next = DWORD_MAX; seg.loopnum = 0; - seg.partner = DWORD_MAX; - seg.hashnext = NULL; - seg.planefront = DWORD_MAX; - seg.planenum = DWORD_MAX; + seg.partner = DWORD_MAX; + seg.hashnext = NULL; + seg.planefront = false; + seg.planenum = DWORD_MAX; seg.storedseg = DWORD_MAX; if (sidenum == 0) diff --git a/src/sound/music_midi_stream.cpp b/src/sound/music_midi_stream.cpp index cfb8b5149..fd8fe6418 100644 --- a/src/sound/music_midi_stream.cpp +++ b/src/sound/music_midi_stream.cpp @@ -121,9 +121,11 @@ void I_BuildMIDIMenuList (struct value_s **outValues, float *numValues) if (res == MMSYSERR_NOERROR) { size_t len = strlen (caps.szPname) + 1; - values[p].name = new char[len]; + char *name = new char[len]; + + memcpy (name, caps.szPname, len); + values[p].name = name; values[p].value = (float)id; - memcpy (values[p].name, caps.szPname, len); ++p; } }