From cb3c2e25022bb4eac3b3ae3757c14c48672d7358 Mon Sep 17 00:00:00 2001
From: albertzeyer <albertzeyer@4df4b0f3-56ce-47cb-b001-ed939b7d65a6>
Date: Wed, 22 Jul 2009 00:45:55 +0000
Subject: [PATCH] small fixes

git-svn-id: https://clonekeenplus.svn.sourceforge.net/svnroot/clonekeenplus/cgenius/trunk@86 4df4b0f3-56ce-47cb-b001-ed939b7d65a6
---
 src/fileio/CExeFile.cpp       | 2 +-
 src/hqp/CMusic.cpp            | 3 +--
 src/vorticon/CEGAGraphics.cpp | 6 ++----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/fileio/CExeFile.cpp b/src/fileio/CExeFile.cpp
index 8b4d56428..3a8542c0f 100644
--- a/src/fileio/CExeFile.cpp
+++ b/src/fileio/CExeFile.cpp
@@ -48,7 +48,7 @@ bool CExeFile::readData()
 	{
 		m_datasize = decdata->size();
 		m_data = new unsigned char[m_datasize];
-		memcpy(m_data, decdata->data(), m_datasize);
+		memcpy(m_data, &decdata[0], m_datasize);
 	}
 	else
 	{
diff --git a/src/hqp/CMusic.cpp b/src/hqp/CMusic.cpp
index 675a98f86..3ad9b513c 100644
--- a/src/hqp/CMusic.cpp
+++ b/src/hqp/CMusic.cpp
@@ -20,8 +20,6 @@ CMusic::~CMusic() {
 
 int CMusic::load(SDL_AudioSpec AudioSpec, char *musicfile)
 {
-	FILE *fp;
-
 	if(AudioSpec.format != 0)
 	{
 
@@ -35,6 +33,7 @@ int CMusic::load(SDL_AudioSpec AudioSpec, char *musicfile)
 	pOggAudio.sound_len=0;
 	pOggAudio.sound_pos=0;
 
+	FILE *fp;
 	if((fp = fopen(musicfile,"rb")) == NULL)
 	{
 		g_pLogFile->textOut(PURPLE,"Music Driver(): \"%s\". File does not exist!<br>", musicfile);
diff --git a/src/vorticon/CEGAGraphics.cpp b/src/vorticon/CEGAGraphics.cpp
index ac3a86fa7..69e66be3f 100644
--- a/src/vorticon/CEGAGraphics.cpp
+++ b/src/vorticon/CEGAGraphics.cpp
@@ -72,10 +72,8 @@ bool CEGAGraphics::loadData()
 	}
 	HeadFile.close();
 
-	char *data;
-	data = new char[databuf.size()];
-
-	memcpy(data, databuf.data(), databuf.size());
+	char *data = new char[databuf.size()];
+	memcpy(data, &databuf[0], databuf.size());
 
 	// Now copy the data to the EGAHEAD Structure
     memcpy(&LatchPlaneSize,data,4);