Whitespace: "(type *)something" instead of "(type *) something", because

that's how we write it in most other places.

svn-id: r18069

7 files changed, 28 insertions, 28 deletions

diff --git a/sword2/driver/_mouse.cpp b/sword2/driver/_mouse.cpp
index 3842434942..7e04c20aba 100644
--- a/sword2/driver/_mouse.cpp
+++ b/sword2/driver/_mouse.cpp
@@ -122,7 +122,7 @@ void Mouse::drawMouse() {
 	memset(mouseData, 0, mouse_width * mouse_height);
 
 	if (_luggageAnim)
-		decompressMouse(mouseData, (byte *) _luggageAnim + READ_LE_UINT32(_luggageOffset), _luggageAnim->mousew,
+		decompressMouse(mouseData, (byte *)_luggageAnim + READ_LE_UINT32(_luggageOffset), _luggageAnim->mousew,
 				_luggageAnim->mouseh, mouse_width, deltaX, deltaY);
 
 	if (_mouseAnim)
@@ -144,7 +144,7 @@ int32 Mouse::animateMouse() {
 	if (++_mouseFrame == _mouseAnim->noAnimFrames)
 		_mouseFrame = MOUSEFLASHFRAME;
 
-	_mouseSprite = (byte *) _mouseAnim + READ_LE_UINT32(_mouseOffsets + _mouseFrame);
+	_mouseSprite = (byte *)_mouseAnim + READ_LE_UINT32(_mouseOffsets + _mouseFrame);
 
 	if (_mouseFrame != prevMouseFrame)
 		drawMouse();
@@ -172,12 +172,12 @@ int32 Mouse::setMouseAnim(byte *ma, int32 size, int32 mouseFlash) {
 		else
 			_mouseFrame = MOUSEFLASHFRAME;
 
-		_mouseAnim = (MouseAnim *) malloc(size);
+		_mouseAnim = (MouseAnim *)malloc(size);
 		if (!_mouseAnim)
 			return RDERR_OUTOFMEMORY;
 
-		memcpy((byte *) _mouseAnim, ma, size);
-		_mouseOffsets = (int32 *) ((byte *) _mouseAnim + sizeof(MouseAnim));
+		memcpy((byte *)_mouseAnim, ma, size);
+		_mouseOffsets = (int32 *)((byte *)_mouseAnim + sizeof(MouseAnim));
 
 		animateMouse();
 		drawMouse();
@@ -207,12 +207,12 @@ int32 Mouse::setLuggageAnim(byte *ma, int32 size) {
 	}
 
 	if (ma)	{
-		_luggageAnim = (MouseAnim *) malloc(size);
+		_luggageAnim = (MouseAnim *)malloc(size);
 		if (!_luggageAnim)
 			return RDERR_OUTOFMEMORY;
 
-		memcpy((byte *) _luggageAnim, ma, size);
-		_luggageOffset = (int32 *) ((byte *) _luggageAnim + sizeof(MouseAnim));
+		memcpy((byte *)_luggageAnim, ma, size);
+		_luggageOffset = (int32 *)((byte *)_luggageAnim + sizeof(MouseAnim));
 
 		animateMouse();
 		drawMouse();
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp
index 8e3e8958b6..65ac6a9583 100644
--- a/sword2/driver/animation.cpp
+++ b/sword2/driver/animation.cpp
@@ -177,7 +177,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 lea
 	if (leadInRes) {
 		byte *leadIn = _vm->_resman->openResource(leadInRes);
 		uint32 leadInLen = _vm->_resman->fetchLen(leadInRes) - sizeof(StandardHeader);
-		StandardHeader *header = (StandardHeader *) leadIn;
+		StandardHeader *header = (StandardHeader *)leadIn;
 
 		assert(header->fileType == WAV_FILE);
 
@@ -192,7 +192,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 lea
 	if (leadOutRes) {
 		leadOut = _vm->_resman->openResource(leadOutRes);
 		leadOutLen = _vm->_resman->fetchLen(leadOutRes) - sizeof(StandardHeader);
-		StandardHeader *header = (StandardHeader *) leadOut;
+		StandardHeader *header = (StandardHeader *)leadOut;
 
 		assert(header->fileType == WAV_FILE);
 
@@ -420,7 +420,7 @@ void MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte
 		data = _vm->_fontRenderer->makeTextSprite(msg, RENDERWIDE, 255, _vm->_speechFontId);
 	}
 
-	FrameHeader *frame = (FrameHeader *) data;
+	FrameHeader *frame = (FrameHeader *)data;
 	SpriteInfo msgSprite;
 	byte *msgSurface;
 
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp
index 33699972ef..d936a43941 100644
--- a/sword2/driver/d_sound.cpp
+++ b/sword2/driver/d_sound.cpp
@@ -423,9 +423,9 @@ int Sound::readBuffer(int16 *buffer, const int numSamples) {
 
 	if (!_mixBuffer || numSamples > _mixBufferLen) {
 		if (_mixBuffer)
-			_mixBuffer = (int16 *) realloc(_mixBuffer, 2 * numSamples);
+			_mixBuffer = (int16 *)realloc(_mixBuffer, 2 * numSamples);
 		else
-			_mixBuffer = (int16 *) malloc(2 * numSamples);
+			_mixBuffer = (int16 *)malloc(2 * numSamples);
 
 		_mixBufferLen = numSamples;
 	}
@@ -724,14 +724,14 @@ uint32 Sound::preFetchCompSpeech(uint32 speechId, uint16 **buf) {
 
 	uint32 bufferSize = 2 * numSamples;
 
-	*buf = (uint16 *) malloc(bufferSize);
+	*buf = (uint16 *)malloc(bufferSize);
 	if (!*buf) {
 		delete input;
 		fh->file->close();
 		return 0;
 	}
 
-	uint32 readSamples = input->readBuffer((int16 *) *buf, numSamples);
+	uint32 readSamples = input->readBuffer((int16 *)*buf, numSamples);
 
 	fh->file->close();
 	delete input;
diff --git a/sword2/driver/menu.cpp b/sword2/driver/menu.cpp
index 698090c517..065b2cf99b 100644
--- a/sword2/driver/menu.cpp
+++ b/sword2/driver/menu.cpp
@@ -278,7 +278,7 @@ int32 Mouse::setMenuIcon(uint8 menu, uint8 pocket, byte *icon) {
 	// Only put the icon in the pocket if it is not NULL
 	if (icon != NULL) {
 		_iconCount++;
-		_icons[menu][pocket] = (byte *) malloc(RDMENU_ICONWIDE * RDMENU_ICONDEEP);
+		_icons[menu][pocket] = (byte *)malloc(RDMENU_ICONWIDE * RDMENU_ICONDEEP);
 		if (_icons[menu][pocket] == NULL)
 			return RDERR_OUTOFMEMORY;
 		memcpy(_icons[menu][pocket], icon, RDMENU_ICONWIDE * RDMENU_ICONDEEP);
diff --git a/sword2/driver/palette.cpp b/sword2/driver/palette.cpp
index 60f99253ad..adea1a8dfb 100644
--- a/sword2/driver/palette.cpp
+++ b/sword2/driver/palette.cpp
@@ -88,7 +88,7 @@ void Screen::setFullPalette(int32 palRes) {
 	if (palRes) {
 		byte *pal = _vm->_resman->openResource(palRes);
 
-		StandardHeader *head = (StandardHeader *) pal;
+		StandardHeader *head = (StandardHeader *)pal;
 		assert(head->fileType == PALETTE_FILE);
 
 		pal += sizeof(StandardHeader);
diff --git a/sword2/driver/render.cpp b/sword2/driver/render.cpp
index dfee05f6b3..1b41f58f13 100644
--- a/sword2/driver/render.cpp
+++ b/sword2/driver/render.cpp
@@ -213,7 +213,7 @@ void Screen::plotPoint(int x, int y, uint8 colour) {
 }
 
 static void plot(int x, int y, int colour, void *data) {
-	Screen *screen = (Screen *) data;
+	Screen *screen = (Screen *)data;
 	screen->plotPoint(x, y, (uint8) colour);
 }
 
@@ -427,13 +427,13 @@ int32 Screen::initialiseBackgroundLayer(Parallax *p) {
 	_xBlocks[_layer] = (p->w + BLOCKWIDTH - 1) / BLOCKWIDTH;
 	_yBlocks[_layer] = (p->h + BLOCKHEIGHT - 1) / BLOCKHEIGHT;
 
-	_blockSurfaces[_layer] = (BlockSurface **) calloc(_xBlocks[_layer] * _yBlocks[_layer], sizeof(BlockSurface *));
+	_blockSurfaces[_layer] = (BlockSurface **)calloc(_xBlocks[_layer] * _yBlocks[_layer], sizeof(BlockSurface *));
 	if (!_blockSurfaces[_layer])
 		return RDERR_OUTOFMEMORY;
 
 	// Decode the parallax layer into a large chunk of memory
 
-	byte *memchunk = (byte *) calloc(_xBlocks[_layer] * _yBlocks[_layer], BLOCKWIDTH * BLOCKHEIGHT);
+	byte *memchunk = (byte *)calloc(_xBlocks[_layer] * _yBlocks[_layer], BLOCKWIDTH * BLOCKHEIGHT);
 	if (!memchunk)
 		return RDERR_OUTOFMEMORY;
 
@@ -441,7 +441,7 @@ int32 Screen::initialiseBackgroundLayer(Parallax *p) {
 		if (!p->offset[i])
 			continue;
 
-		byte *pLine = (byte *) p + FROM_LE_32(p->offset[i]);
+		byte *pLine = (byte *)p + FROM_LE_32(p->offset[i]);
 		uint16 packets = READ_LE_UINT16(pLine);
 		uint16 offset = READ_LE_UINT16(pLine + 2);
 
@@ -503,7 +503,7 @@ int32 Screen::initialiseBackgroundLayer(Parallax *p) {
 		//  Only assign a surface to the block if it contains data.
 
 		if (block_has_data) {
-			_blockSurfaces[_layer][i] = (BlockSurface *) malloc(sizeof(BlockSurface));
+			_blockSurfaces[_layer][i] = (BlockSurface *)malloc(sizeof(BlockSurface));
 
 			//  Copy the data into the surfaces.
 			dst = _blockSurfaces[_layer][i]->data;
diff --git a/sword2/driver/sprite.cpp b/sword2/driver/sprite.cpp
index f12ebb716b..a52faef3b9 100644
--- a/sword2/driver/sprite.cpp
+++ b/sword2/driver/sprite.cpp
@@ -247,7 +247,7 @@ int32 Screen::decompressRLE16(byte *dst, byte *src, int32 decompSize, byte *colT
  */
 
 int32 Screen::createSurface(SpriteInfo *s, byte **sprite) {
-	*sprite = (byte *) malloc(s->w * s->h);
+	*sprite = (byte *)malloc(s->w * s->h);
 	if (!*sprite)
 		return RDERR_OUTOFMEMORY;
 
@@ -371,7 +371,7 @@ int32 Screen::drawSprite(SpriteInfo *s) {
 	if (s->type & RDSPR_NOCOMPRESSION)
 		sprite = s->data;
 	else {
-		sprite = (byte *) malloc(s->w * s->h);
+		sprite = (byte *)malloc(s->w * s->h);
 		freeSprite = true;
 		if (!sprite)
 			return RDERR_OUTOFMEMORY;
@@ -389,7 +389,7 @@ int32 Screen::drawSprite(SpriteInfo *s) {
 	}
 
 	if (s->type & RDSPR_FLIP) {
-		newSprite = (byte *) malloc(s->w * s->h);
+		newSprite = (byte *)malloc(s->w * s->h);
 		if (newSprite == NULL) {
 			if (freeSprite)
 				free(sprite);
@@ -482,7 +482,7 @@ int32 Screen::drawSprite(SpriteInfo *s) {
 			return RDERR_NOTIMPLEMENTED;
 		}
 
-		newSprite = (byte *) malloc(s->scaledWidth * s->scaledHeight);
+		newSprite = (byte *)malloc(s->scaledWidth * s->scaledHeight);
 		if (newSprite == NULL) {
 			if (freeSprite)
 				free(sprite);
@@ -516,7 +516,7 @@ int32 Screen::drawSprite(SpriteInfo *s) {
 		// RDSPR_NOCOMPRESSION case.
 
 		if (!freeSprite) {
-			newSprite = (byte *) malloc(s->w * s->h);
+			newSprite = (byte *)malloc(s->w * s->h);
 			memcpy(newSprite, sprite, s->w * s->h);
 			sprite = newSprite;
 			freeSprite = true;
@@ -624,7 +624,7 @@ int32 Screen::openLightMask(SpriteInfo *s) {
 	if (_lightMask)
 		return RDERR_NOTCLOSED;
 
-	_lightMask = (byte *) malloc(s->w * s->h);
+	_lightMask = (byte *)malloc(s->w * s->h);
 	if (!_lightMask)
 		return RDERR_OUTOFMEMORY;