Fixed potential conflict with standard memset

svn-id: r20552

4 files changed, 5 insertions, 5 deletions

diff --git a/lure/decode.cpp b/lure/decode.cpp
index c2691d461e..c04e4dca5b 100644
--- a/lure/decode.cpp
+++ b/lure/decode.cpp
@@ -41,7 +41,7 @@ void PictureDecoder::writeByte(MemoryBlock *dest, byte v) {
 void PictureDecoder::writeBytes(MemoryBlock *dest, byte v, uint16 numBytes) {
 	if (outputOffset + numBytes > dest->size()) 
 		error("Decoded data exceeded allocated output buffer size");
-	dest->memset(v, outputOffset, numBytes);
+	dest->memorySet(v, outputOffset, numBytes);
 	outputOffset += numBytes;
 }
 
diff --git a/lure/hotspots.cpp b/lure/hotspots.cpp
index 6c158b929f..e7df938d47 100644
--- a/lure/hotspots.cpp
+++ b/lure/hotspots.cpp
@@ -104,7 +104,7 @@ void Hotspot::setAnimation(HotspotAnimData *newRecord) {
 		_numFrames = 1;
 		_frameNumber = 0;
 		_frames = new Surface(1, 1);
-		_frames->data().memset(_data->colourOffset, 0, 1);
+		_frames->data().memorySet(_data->colourOffset, 0, 1);
 		return;
 	}
 
@@ -124,7 +124,7 @@ void Hotspot::setAnimation(HotspotAnimData *newRecord) {
 	
 	_frames = new Surface(_data->width * _numFrames, _data->height);
 
-	_frames->data().memset(_data->colourOffset, 0, _frames->data().size());
+	_frames->data().memorySet(_data->colourOffset, 0, _frames->data().size());
 
 	byte *pSrc = dest->data() + 0x40;
 	byte *pDest;
diff --git a/lure/memory.cpp b/lure/memory.cpp
index a83858dce0..2a24101dd3 100644
--- a/lure/memory.cpp
+++ b/lure/memory.cpp
@@ -66,7 +66,7 @@ void MemoryBlock::empty() {
 	::memset(_data, 0, _size);
 }
 
-void MemoryBlock::memset(int c, size_t startIndex, size_t num) {
+void MemoryBlock::memorySet(int c, size_t startIndex, size_t num) {
 	byte *p = _data + startIndex;
 	::memset(p, c, num);
 }
diff --git a/lure/memory.h b/lure/memory.h
index e34f28893c..c2f735ca2b 100644
--- a/lure/memory.h
+++ b/lure/memory.h
@@ -42,7 +42,7 @@ public:
 	uint32 size() { return _size; }
 
 	void empty();
-	void memset(int c, size_t startIndex, size_t num);
+	void memorySet(int c, size_t startIndex, size_t num);
 	void copyFrom(MemoryBlock *src);
 	void copyFrom(MemoryBlock *src, uint32 srcPos, uint32 destPos, uint32 srcLen);
 	void copyFrom(const byte *src, uint32 srcPos, uint32 destPos, uint32 srcLen);