[Scummvm-cvs-logs] SF.net SVN: scummvm: [20552] scummvm/trunk/lure

[chrilith at users.sourceforge.net]

Revision: 20552
Author:   chrilith
Date:     2006-02-11 09:16:26 -0800 (Sat, 11 Feb 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm?rev=20552&view=rev

Log Message:
-----------
Fixed potential conflict with standard memset

Modified Paths:
--------------
    scummvm/trunk/lure/decode.cpp
    scummvm/trunk/lure/hotspots.cpp
    scummvm/trunk/lure/memory.cpp
    scummvm/trunk/lure/memory.h
Modified: scummvm/trunk/lure/decode.cpp
===================================================================
--- scummvm/trunk/lure/decode.cpp	2006-02-11 17:14:06 UTC (rev 20551)
+++ scummvm/trunk/lure/decode.cpp	2006-02-11 17:16:26 UTC (rev 20552)
@@ -41,7 +41,7 @@
 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;
 }
 

Modified: scummvm/trunk/lure/hotspots.cpp
===================================================================
--- scummvm/trunk/lure/hotspots.cpp	2006-02-11 17:14:06 UTC (rev 20551)
+++ scummvm/trunk/lure/hotspots.cpp	2006-02-11 17:16:26 UTC (rev 20552)
@@ -104,7 +104,7 @@
 		_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 @@
 	
 	_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;

Modified: scummvm/trunk/lure/memory.cpp
===================================================================
--- scummvm/trunk/lure/memory.cpp	2006-02-11 17:14:06 UTC (rev 20551)
+++ scummvm/trunk/lure/memory.cpp	2006-02-11 17:16:26 UTC (rev 20552)
@@ -66,7 +66,7 @@
 	::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);
 }

Modified: scummvm/trunk/lure/memory.h
===================================================================
--- scummvm/trunk/lure/memory.h	2006-02-11 17:14:06 UTC (rev 20551)
+++ scummvm/trunk/lure/memory.h	2006-02-11 17:16:26 UTC (rev 20552)
@@ -42,7 +42,7 @@
 	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);