JANITORIAL: Fix missing whitespace in pointer cast

find -name '*.h' -or -name '*.cpp' | xargs sed -r -i 's@\(([A-Za-z0-9]+)\*\)@(\1 *)@g'

This seems to have caught some params as well which is not undesirable IMO.
It also caught some strings containing this which is undesirable so I
excluded them manually. (engines/sci/engine/kernel_tables.h)

16 files changed, 104 insertions, 104 deletions

diff --git a/engines/parallaction/balloons.cpp b/engines/parallaction/balloons.cpp
index f74eef18e1..1ddd401b20 100644
--- a/engines/parallaction/balloons.cpp
+++ b/engines/parallaction/balloons.cpp
@@ -179,7 +179,7 @@ protected:
 		uint16 rx = 10;
 		uint16 ry = 4 + _lines * _font->height();	// y
 
-		byte *dst = (byte*)_surf->getBasePtr(rx, ry);
+		byte *dst = (byte *)_surf->getBasePtr(rx, ry);
 		_font->setColor(_color);
 		_font->drawString(dst, _surf->w, _line.c_str());
 	}
@@ -494,7 +494,7 @@ protected:
 		uint16 rx = _x + (_surf->w - _lineWidth) / 2;
 		uint16 ry = _y + _lines * _font->height();	// y
 
-		byte *dst = (byte*)_surf->getBasePtr(rx, ry);
+		byte *dst = (byte *)_surf->getBasePtr(rx, ry);
 		_font->setColor(_color);
 		_font->drawString(dst, _surf->w, _line.c_str());
 	}
diff --git a/engines/parallaction/callables_br.cpp b/engines/parallaction/callables_br.cpp
index ac5ff88560..7d3e63dfba 100644
--- a/engines/parallaction/callables_br.cpp
+++ b/engines/parallaction/callables_br.cpp
@@ -26,31 +26,31 @@
 
 namespace Parallaction {
 
-void Parallaction_br::_c_null(void*) {
+void Parallaction_br::_c_null(void *) {
 	// do nothing :)
 }
 
-void Parallaction_br::_c_blufade(void*) {
+void Parallaction_br::_c_blufade(void *) {
 	warning("Parallaction_br::_c_blufade() not yet implemented");
 }
 
-void Parallaction_br::_c_resetpalette(void*) {
+void Parallaction_br::_c_resetpalette(void *) {
 	warning("Parallaction_br::_c_resetpalette() not yet implemented");
 }
 
-void Parallaction_br::_c_ferrcycle(void*) {
+void Parallaction_br::_c_ferrcycle(void *) {
 	warning("Parallaction_br::_c_ferrcycle() not yet implemented");
 }
 
-void Parallaction_br::_c_lipsinc(void*) {
+void Parallaction_br::_c_lipsinc(void *) {
 	warning("Unexpected lipsinc routine call! Please notify the team");
 }
 
-void Parallaction_br::_c_albcycle(void*) {
+void Parallaction_br::_c_albcycle(void *) {
 	warning("Parallaction_br::_c_albcycle() not yet implemented");
 }
 
-void Parallaction_br::_c_password(void*) {
+void Parallaction_br::_c_password(void *) {
 	warning("Parallaction_br::_c_password() not yet implemented");
 }
 
diff --git a/engines/parallaction/callables_ns.cpp b/engines/parallaction/callables_ns.cpp
index 77f54fcc98..64885c7ff3 100644
--- a/engines/parallaction/callables_ns.cpp
+++ b/engines/parallaction/callables_ns.cpp
@@ -260,7 +260,7 @@ void Parallaction_ns::stopMovingSarcophagus() {
 
 void Parallaction_ns::_c_moveSarc(void *parm) {
 	if (!_movingSarcophagus) {
-		startMovingSarcophagus(*(ZonePtr*)parm);
+		startMovingSarcophagus(*(ZonePtr *)parm);
 	} else {
 		stopMovingSarcophagus();
 	}
@@ -417,18 +417,18 @@ void Parallaction_ns::_c_testResult(void *parm) {
 	return;
 }
 
-void Parallaction_ns::_c_offSound(void*) {
+void Parallaction_ns::_c_offSound(void *) {
 	_soundManI->stopSfx(0);
 	_soundManI->stopSfx(1);
 	_soundManI->stopSfx(2);
 	_soundManI->stopSfx(3);
 }
 
-void Parallaction_ns::_c_startMusic(void*) {
+void Parallaction_ns::_c_startMusic(void *) {
 	_soundManI->playMusic();
 }
 
-void Parallaction_ns::_c_closeMusic(void*) {
+void Parallaction_ns::_c_closeMusic(void *) {
 	_soundManI->stopMusic();
 }
 
@@ -490,7 +490,7 @@ void Parallaction_ns::_c_moveSheet(void *parm) {
 }
 
 void zeroMask(int x, int y, int color, void *data) {
-	BackgroundInfo *info = (BackgroundInfo*)data;
+	BackgroundInfo *info = (BackgroundInfo *)data;
 
 	uint16 _ax = x + y * info->_mask->w;
 	info->_mask->data[_ax >> 2] &= ~(3 << ((_ax & 3) << 1));
@@ -575,16 +575,16 @@ int16 projectorProgram[] = {
    25, 116, 25, 115, 25, 114, 25, 113, 25, 112, 25, 111, 25, 110, 25, -1, -1
 };
 
-void Parallaction_ns::_c_projector(void*) {
+void Parallaction_ns::_c_projector(void *) {
 	_gfx->setHalfbriteMode(true);
 	_gfx->setProjectorProgram(projectorProgram);
 }
 
-void Parallaction_ns::_c_HBOff(void*) {
+void Parallaction_ns::_c_HBOff(void *) {
 	_gfx->setHalfbriteMode(false);
 }
 
-void Parallaction_ns::_c_HBOn(void*) {
+void Parallaction_ns::_c_HBOn(void *) {
 	_gfx->setHalfbriteMode(true);
 }
 
diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp
index 61172d0896..f20e05771a 100644
--- a/engines/parallaction/disk.cpp
+++ b/engines/parallaction/disk.cpp
@@ -38,7 +38,7 @@ void ILBMLoader::setupBuffer(uint32 w, uint32 h) {
 		}
 		_surf->create(w, h, Graphics::PixelFormat::createFormatCLUT8());
 		_mode  = Graphics::ILBMDecoder::ILBM_UNPACK_PLANES;
-		_intBuffer = (byte*)_surf->pixels;
+		_intBuffer = (byte *)_surf->pixels;
 		break;
 
 	case BODYMODE_MASKBUFFER:
@@ -82,7 +82,7 @@ bool ILBMLoader::callback(Common::IFFChunk &chunk) {
 	case ID_CRNG:
 		if (_crng) {
 			PaletteFxRange *ptr = &_crng[_numCRNG];
-			chunk._stream->read((byte*)ptr, chunk._size);
+			chunk._stream->read((byte *)ptr, chunk._size);
 			ptr->_timer = FROM_BE_16(ptr->_timer);
 			ptr->_step = FROM_BE_16(ptr->_step);
 			ptr->_flags = FROM_BE_16(ptr->_flags);
diff --git a/engines/parallaction/disk_br.cpp b/engines/parallaction/disk_br.cpp
index f9e368ab39..5e39c893db 100644
--- a/engines/parallaction/disk_br.cpp
+++ b/engines/parallaction/disk_br.cpp
@@ -283,7 +283,7 @@ Sprites* DosDisk_br::createSprites(Common::ReadStream *stream) {
 		spr->w = stream->readUint16LE();
 		spr->h = stream->readUint16LE();
 
-		spr->packedData = (byte*)malloc(spr->size);
+		spr->packedData = (byte *)malloc(spr->size);
 		stream->read(spr->packedData, spr->size);
 	}
 	delete stream;
@@ -450,7 +450,7 @@ void AmigaDisk_br::init() {
 
 void AmigaDisk_br::adjustForPalette(Graphics::Surface &surf, int transparentColor) {
 	uint size = surf.w * surf.h;
-	byte *data = (byte*)surf.pixels;
+	byte *data = (byte *)surf.pixels;
 	for (uint i = 0; i < size; i++, data++) {
 		if (transparentColor == -1 || transparentColor != *data)
 			*data += 16;
@@ -609,7 +609,7 @@ GfxObj* AmigaDisk_br::loadStatic(const char* name) {
 		stream->read(shadow, shadowSize);
 		for (int32 i = 0; i < surf->h; ++i) {
 			byte *src = shadow + shadowWidth * i;
-			byte *dst = (byte*)surf->pixels + surf->pitch * i;
+			byte *dst = (byte *)surf->pixels + surf->pitch * i;
 
 			for (int32 j = 0; j < surf->w; ++j, ++dst) {
 				byte bit = src[j/8] & (1 << (7 - (j & 7)));
@@ -637,7 +637,7 @@ Sprites* AmigaDisk_br::createSprites(Common::ReadStream *stream) {
 		spr->w = stream->readUint16BE();
 		spr->h = stream->readUint16BE() - 1;
 
-		spr->packedData = (byte*)malloc(spr->size);
+		spr->packedData = (byte *)malloc(spr->size);
 		stream->read(spr->packedData, spr->size);
 	}
 
@@ -725,7 +725,7 @@ GfxObj* AmigaDisk_br::loadObjects(const char *name, uint8 part) {
 		max = 72;
 
 	byte *data = new byte[max * 2601];
-	byte *srcPtr = (byte*)loader._surf->getBasePtr(0,0);
+	byte *srcPtr = (byte *)loader._surf->getBasePtr(0,0);
 	int w = loader._surf->w;
 
 	// Convert to the expected display format
diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp
index e145743f09..b2285d0da3 100644
--- a/engines/parallaction/disk_ns.cpp
+++ b/engines/parallaction/disk_ns.cpp
@@ -473,7 +473,7 @@ void DosDisk_ns::loadBackground(BackgroundInfo& info, const char *filename) {
 	// read bitmap, mask and path data and extract them into the 3 buffers
 	info.bg.create(info.width, info.height, Graphics::PixelFormat::createFormatCLUT8());
 	createMaskAndPathBuffers(info);
-	unpackBackground(stream, (byte*)info.bg.pixels, info._mask->data, info._path->data);
+	unpackBackground(stream, (byte *)info.bg.pixels, info._mask->data, info._path->data);
 
 	delete stream;
 }
@@ -661,10 +661,10 @@ public:
 
 		stream.seek(-4, SEEK_END);
 		uint32 decrlen = stream.readUint32BE() >> 8;
-		byte *dest = (byte*)malloc(decrlen);
+		byte *dest = (byte *)malloc(decrlen);
 
 		uint32 crlen = stream.size() - 4;
-		byte *src = (byte*)malloc(crlen);
+		byte *src = (byte *)malloc(crlen);
 		stream.seek(4, SEEK_SET);
 		stream.read(src, crlen);
 
@@ -757,14 +757,14 @@ void AmigaDisk_ns::unpackFrame(byte *dst, byte *src, uint16 planeSize) {
 */
 void AmigaDisk_ns::patchFrame(byte *dst, byte *dlta, uint16 bytesPerPlane, uint16 height) {
 
-	uint32 *dataIndex = (uint32*)dlta;
-	uint32 *ofslenIndex = (uint32*)dlta + 8;
+	uint32 *dataIndex = (uint32 *)dlta;
+	uint32 *ofslenIndex = (uint32 *)dlta + 8;
 
-	uint16 *base = (uint16*)dlta;
+	uint16 *base = (uint16 *)dlta;
 	uint16 wordsPerLine = bytesPerPlane >> 1;
 
 	for (uint j = 0; j < NUM_PLANES; j++) {
-		uint16 *dst16 = (uint16*)(dst + j * bytesPerPlane * height);
+		uint16 *dst16 = (uint16 *)(dst + j * bytesPerPlane * height);
 
 		uint16 *data = base + READ_BE_UINT32(dataIndex);
 		dataIndex++;
@@ -804,7 +804,7 @@ void AmigaDisk_ns::unpackBitmap(byte *dst, byte *src, uint16 numFrames, uint16 b
 			uint size = READ_BE_UINT32(src + 4);
 
 			if (tempBuffer == 0)
-				tempBuffer = (byte*)malloc(planeSize * NUM_PLANES);
+				tempBuffer = (byte *)malloc(planeSize * NUM_PLANES);
 
 			memcpy(tempBuffer, baseFrame, planeSize * NUM_PLANES);
 
diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp
index cc7f320e1c..d4c9aefd32 100644
--- a/engines/parallaction/font.cpp
+++ b/engines/parallaction/font.cpp
@@ -57,17 +57,17 @@ public:
 		_numGlyphs = stream.readByte();
 		_height = stream.readUint32BE();
 
-		_widths = (byte*)malloc(_numGlyphs);
+		_widths = (byte *)malloc(_numGlyphs);
 		stream.read(_widths, _numGlyphs);
 
-		_offsets = (uint*)malloc(_numGlyphs * sizeof(uint));
+		_offsets = (uint *)malloc(_numGlyphs * sizeof(uint));
 		_offsets[0] = 0;
 		for (uint i = 1; i < _numGlyphs; i++)
 			_offsets[i] = _offsets[i-1] + _widths[i-1] * _height;
 
 		uint size = _offsets[_numGlyphs-1] + _widths[_numGlyphs-1] * _height;
 
-		_data = (byte*)malloc(size);
+		_data = (byte *)malloc(size);
 		stream.read(_data, size);
 
 	}
@@ -503,25 +503,25 @@ AmigaFont::AmigaFont(Common::SeekableReadStream &stream) {
 	stream.seek(32);	// skips dummy header
 
 	_dataSize = stream.size() - stream.pos();
-	_data = (byte*)malloc(_dataSize);
+	_data = (byte *)malloc(_dataSize);
 	stream.read(_data, _dataSize);
 
-	_font = (AmigaDiskFont*)(_data + 78);
+	_font = (AmigaDiskFont *)(_data + 78);
 	_font->_ySize = FROM_BE_16(_font->_ySize);
 	_font->_xSize = FROM_BE_16(_font->_xSize);
 	_font->_baseline = FROM_BE_16(_font->_baseline);
 	_font->_modulo = FROM_BE_16(_font->_modulo);
 
-	_charLoc = (CharLoc*)(_data + FROM_BE_32(_font->_charLoc));
+	_charLoc = (CharLoc *)(_data + FROM_BE_32(_font->_charLoc));
 	_charData = _data + FROM_BE_32(_font->_charData);
 
 	_charSpace = 0;
 	_charKern = 0;
 
 	if (_font->_charSpace != 0)
-		_charSpace = (uint16*)(_data + FROM_BE_32(_font->_charSpace));
+		_charSpace = (uint16 *)(_data + FROM_BE_32(_font->_charSpace));
 	if (_font->_charKern != 0)
-		_charKern = (uint16*)(_data + FROM_BE_32(_font->_charKern));
+		_charKern = (uint16 *)(_data + FROM_BE_32(_font->_charKern));
 
 }
 
diff --git a/engines/parallaction/gfxbase.cpp b/engines/parallaction/gfxbase.cpp
index c351551e36..852235ce34 100644
--- a/engines/parallaction/gfxbase.cpp
+++ b/engines/parallaction/gfxbase.cpp
@@ -235,7 +235,7 @@ void Gfx::drawGfxObject(GfxObj *obj, Graphics::Surface &surf) {
 }
 
 void Gfx::drawText(Font *font, Graphics::Surface* surf, uint16 x, uint16 y, const char *text, byte color) {
-	byte *dst = (byte*)surf->getBasePtr(x, y);
+	byte *dst = (byte *)surf->getBasePtr(x, y);
 	font->setColor(color);
 	font->drawString(dst, surf->w, text);
 }
@@ -308,7 +308,7 @@ void Gfx::bltMaskScale(const Common::Rect& r, byte *data, Graphics::Surface *sur
 	dp.y = dstRect.top;
 
 	byte *s = data + srcRect.left + srcRect.top * width;
-	byte *d = (byte*)surf->getBasePtr(dp.x, dp.y);
+	byte *d = (byte *)surf->getBasePtr(dp.x, dp.y);
 
 	uint line = 0, col = 0;
 
@@ -380,7 +380,7 @@ void Gfx::bltMaskNoScale(const Common::Rect& r, byte *data, Graphics::Surface *s
 	q.translate(-r.left, -r.top);
 
 	byte *s = data + q.left + q.top * r.width();
-	byte *d = (byte*)surf->getBasePtr(dp.x, dp.y);
+	byte *d = (byte *)surf->getBasePtr(dp.x, dp.y);
 
 	uint sPitch = r.width() - q.width();
 	uint dPitch = surf->w - q.width();
@@ -422,7 +422,7 @@ void Gfx::bltNoMaskNoScale(const Common::Rect& r, byte *data, Graphics::Surface
 	q.translate(-r.left, -r.top);
 
 	byte *s = data + q.left + q.top * r.width();
-	byte *d = (byte*)surf->getBasePtr(dp.x, dp.y);
+	byte *d = (byte *)surf->getBasePtr(dp.x, dp.y);
 
 	uint sPitch = r.width() - q.width();
 	uint dPitch = surf->w - q.width();
diff --git a/engines/parallaction/graphics.cpp b/engines/parallaction/graphics.cpp
index a006edf114..6868505c52 100644
--- a/engines/parallaction/graphics.cpp
+++ b/engines/parallaction/graphics.cpp
@@ -44,7 +44,7 @@ namespace Parallaction {
 
 void halfbritePixel(int x, int y, int color, void *data) {
 	Graphics::Surface *surf = (Graphics::Surface *)data;
-	byte *pixel = (byte*)surf->getBasePtr(x, y);
+	byte *pixel = (byte *)surf->getBasePtr(x, y);
 	*pixel &= ~0x20;
 }
 
@@ -319,7 +319,7 @@ void Gfx::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int
 			y += _scrollPosY;
 		}
 
-		byte *dst = (byte*)_backBuffer.getBasePtr(x, y);
+		byte *dst = (byte *)_backBuffer.getBasePtr(x, y);
 		for (int i = 0; i < h; i++) {
 			memcpy(dst, buf, w);
 			buf += pitch;
@@ -357,7 +357,7 @@ void Gfx::unlockScreen() {
 
 void Gfx::updateScreenIntern() {
 	if (_doubleBuffering) {
-		byte *data = (byte*)_backBuffer.getBasePtr(_scrollPosX, _scrollPosY);
+		byte *data = (byte *)_backBuffer.getBasePtr(_scrollPosX, _scrollPosY);
 		_vm->_system->copyRectToScreen(data, _backBuffer.pitch, 0, 0, _vm->_screenWidth, _vm->_screenHeight);
 	}
 
@@ -425,7 +425,7 @@ void Gfx::updateScreen() {
 		// background may not cover the whole screen, so adjust bulk update size
 		uint w = _backgroundInfo->width;
 		uint h = _backgroundInfo->height;
-		byte *backgroundData = (byte*)_backgroundInfo->bg.getBasePtr(0, 0);
+		byte *backgroundData = (byte *)_backgroundInfo->bg.getBasePtr(0, 0);
 		uint16 backgroundPitch = _backgroundInfo->bg.pitch;
 		copyRectToScreen(backgroundData, backgroundPitch, _backgroundInfo->_x, _backgroundInfo->_y, w, h);
 	}
@@ -450,7 +450,7 @@ void Gfx::applyHalfbriteEffect_NS(Graphics::Surface &surf) {
 		return;
 	}
 
-	byte *buf = (byte*)surf.pixels;
+	byte *buf = (byte *)surf.pixels;
 	for (int i = 0; i < surf.w*surf.h; i++) {
 		*buf++ |= 0x20;
 	}
@@ -493,7 +493,7 @@ void Gfx::patchBackground(Graphics::Surface &surf, int16 x, int16 y, bool mask)
 	r.moveTo(x, y);
 
 	uint16 z = (mask) ? _backgroundInfo->getMaskLayer(y) : LAYER_FOREGROUND;
-	blt(r, (byte*)surf.pixels, &_backgroundInfo->bg, z, 100, 0);
+	blt(r, (byte *)surf.pixels, &_backgroundInfo->bg, z, 100, 0);
 }
 
 void Gfx::fillBackground(const Common::Rect& r, byte color) {
@@ -502,7 +502,7 @@ void Gfx::fillBackground(const Common::Rect& r, byte color) {
 
 void Gfx::invertBackground(const Common::Rect& r) {
 
-	byte *d = (byte*)_backgroundInfo->bg.getBasePtr(r.left, r.top);
+	byte *d = (byte *)_backgroundInfo->bg.getBasePtr(r.left, r.top);
 
 	for (int i = 0; i < r.height(); i++) {
 		for (int j = 0; j < r.width(); j++) {
@@ -536,12 +536,12 @@ GfxObj *Gfx::renderFloatingLabel(Font *font, char *text) {
 		setupLabelSurface(*cnv, w, h);
 
 		font->setColor((_gameType == GType_BRA) ? 0 : 7);
-		font->drawString((byte*)cnv->pixels + 1, cnv->w, text);
-		font->drawString((byte*)cnv->pixels + 1 + cnv->w * 2, cnv->w, text);
-		font->drawString((byte*)cnv->pixels + cnv->w, cnv->w, text);
-		font->drawString((byte*)cnv->pixels + 2 + cnv->w, cnv->w, text);
+		font->drawString((byte *)cnv->pixels + 1, cnv->w, text);
+		font->drawString((byte *)cnv->pixels + 1 + cnv->w * 2, cnv->w, text);
+		font->drawString((byte *)cnv->pixels + cnv->w, cnv->w, text);
+		font->drawString((byte *)cnv->pixels + 2 + cnv->w, cnv->w, text);
 		font->setColor((_gameType == GType_BRA) ? 11 : 1);
-		font->drawString((byte*)cnv->pixels + 1 + cnv->w, cnv->w, text);
+		font->drawString((byte *)cnv->pixels + 1 + cnv->w, cnv->w, text);
 	} else {
 		w = font->getStringWidth(text);
 		h = font->height();
@@ -703,8 +703,8 @@ void Gfx::unregisterLabel(GfxObj *label) {
 
 void Gfx::copyRect(const Common::Rect &r, Graphics::Surface &src, Graphics::Surface &dst) {
 
-	byte *s = (byte*)src.getBasePtr(r.left, r.top);
-	byte *d = (byte*)dst.getBasePtr(0, 0);
+	byte *s = (byte *)src.getBasePtr(r.left, r.top);
+	byte *d = (byte *)dst.getBasePtr(0, 0);
 
 	for (uint16 i = 0; i < r.height(); i++) {
 		memcpy(d, s, r.width());
@@ -1017,7 +1017,7 @@ void MaskBuffer::create(uint16 width, uint16 height) {
 	internalWidth = w >> 2;
 	h = height;
 	size = (internalWidth * h);
-	data = (byte*)calloc(size, 1);
+	data = (byte *)calloc(size, 1);
 }
 
 void MaskBuffer::free() {
@@ -1096,7 +1096,7 @@ void PathBuffer::create(uint16 width, uint16 height) {
 	internalWidth = w >> 3;
 	h = height;
 	size = (internalWidth * h);
-	data = (byte*)calloc(size, 1);
+	data = (byte *)calloc(size, 1);
 }
 
 void PathBuffer::free() {
diff --git a/engines/parallaction/graphics.h b/engines/parallaction/graphics.h
index 99bc811763..b43dd193b5 100644
--- a/engines/parallaction/graphics.h
+++ b/engines/parallaction/graphics.h
@@ -103,7 +103,7 @@ public:
 	}
 	byte*	getData(uint16 index) {
 		assert(index == 0);
-		return (byte*)_surf->getBasePtr(0,0);
+		return (byte *)_surf->getBasePtr(0,0);
 	}
 	void	getRect(uint16 index, Common::Rect &r) {
 		assert(index == 0);
diff --git a/engines/parallaction/gui_br.cpp b/engines/parallaction/gui_br.cpp
index 56148d78d8..5bc5acf630 100644
--- a/engines/parallaction/gui_br.cpp
+++ b/engines/parallaction/gui_br.cpp
@@ -488,10 +488,10 @@ public:
 		_font->setColor(0);
 		int x = (w - questionW)/2;
 		int y = 13;
-		_font->drawString((byte*)surf->getBasePtr(x, y), surf->pitch, question);
+		_font->drawString((byte *)surf->getBasePtr(x, y), surf->pitch, question);
 		x = (w - optionW)/2;
 		y = 13 + _font->height()*2;
-		_font->drawString((byte*)surf->getBasePtr(x,y), surf->pitch, option);
+		_font->drawString((byte *)surf->getBasePtr(x,y), surf->pitch, option);
 
 		_obj = new GfxObj(kGfxObjTypeMenu, new SurfaceToFrames(surf), "quitdialog");
 		assert(_obj);
diff --git a/engines/parallaction/inventory.cpp b/engines/parallaction/inventory.cpp
index 8fd9f56802..1cae63be42 100644
--- a/engines/parallaction/inventory.cpp
+++ b/engines/parallaction/inventory.cpp
@@ -183,7 +183,7 @@ ItemPosition InventoryRenderer::hitTest(const Common::Point &p) const {
 void InventoryRenderer::drawItem(ItemPosition pos, ItemName name) {
 	Common::Rect r;
 	getItemRect(pos, r);
-	byte* d = (byte*)_surf.getBasePtr(r.left, r.top);
+	byte* d = (byte *)_surf.getBasePtr(r.left, r.top);
 	drawItem(name, d, _surf.pitch);
 }
 
@@ -238,7 +238,7 @@ void InventoryRenderer::getItemRect(ItemPosition pos, Common::Rect &r) {
 }
 
 Inventory::Inventory(int maxItems, InventoryItem *verbs) : _numItems(0), _maxItems(maxItems) {
-	_items = (InventoryItem*)calloc(_maxItems, sizeof(InventoryItem));
+	_items = (InventoryItem *)calloc(_maxItems, sizeof(InventoryItem));
 
 	int i = 0;
 	for ( ; verbs[i]._id; i++) {
diff --git a/engines/parallaction/inventory.h b/engines/parallaction/inventory.h
index 91c06d1e93..a3b7bf953f 100644
--- a/engines/parallaction/inventory.h
+++ b/engines/parallaction/inventory.h
@@ -108,7 +108,7 @@ public:
 	void highlightItem(ItemPosition pos, byte color);
 	void drawItem(ItemName name, byte *buffer, uint pitch);
 
-	byte*	getData() const { return (byte*)_surf.pixels; }
+	byte*	getData() const { return (byte *)_surf.pixels; }
 
 	void	getRect(Common::Rect &r) const;
 	int16	getNumLines() const;
diff --git a/engines/parallaction/objects.cpp b/engines/parallaction/objects.cpp
index 222a0a9552..d3529c5dd9 100644
--- a/engines/parallaction/objects.cpp
+++ b/engines/parallaction/objects.cpp
@@ -386,7 +386,7 @@ ScriptVar::~ScriptVar() {
 
 
 Table::Table(uint32 size) : _size(size), _used(0), _disposeMemory(true) {
-	_data = (char**)calloc(size, sizeof(char*));
+	_data = (char**)calloc(size, sizeof(char *));
 }
 
 Table::Table(uint32 size, const char **data) : _size(size), _used(size), _disposeMemory(false) {
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 6c3ff11d15..0d56b62e2f 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -447,7 +447,7 @@ private:
 
 
 	//  callables data
-	typedef void (Parallaction_ns::*Callable)(void*);
+	typedef void (Parallaction_ns::*Callable)(void *);
 	const Callable *_callables;
 	ZonePtr _moveSarcGetZone;
 	ZonePtr _moveSarcExaZone;
@@ -468,37 +468,37 @@ private:
 	PathWalker_NS		*_walker;
 
 	// common callables
-	void _c_play_boogie(void*);
-	void _c_startIntro(void*);
-	void _c_endIntro(void*);
-	void _c_moveSheet(void*);
-	void _c_sketch(void*);
-	void _c_shade(void*);
-	void _c_score(void*);
-	void _c_fade(void*);
-	void _c_moveSarc(void*);
-	void _c_contaFoglie(void*);
-	void _c_zeroFoglie(void*);
-	void _c_trasformata(void*);
-	void _c_offMouse(void*);
-	void _c_onMouse(void*);
-	void _c_setMask(void*);
-	void _c_endComment(void*);
-	void _c_frankenstein(void*);
-	void _c_finito(void*);
-	void _c_ridux(void*);
-	void _c_testResult(void*);
+	void _c_play_boogie(void *);
+	void _c_startIntro(void *);
+	void _c_endIntro(void *);
+	void _c_moveSheet(void *);
+	void _c_sketch(void *);
+	void _c_shade(void *);
+	void _c_score(void *);
+	void _c_fade(void *);
+	void _c_moveSarc(void *);
+	void _c_contaFoglie(void *);
+	void _c_zeroFoglie(void *);
+	void _c_trasformata(void *);
+	void _c_offMouse(void *);
+	void _c_onMouse(void *);
+	void _c_setMask(void *);
+	void _c_endComment(void *);
+	void _c_frankenstein(void *);
+	void _c_finito(void *);
+	void _c_ridux(void *);
+	void _c_testResult(void *);
 
 	// dos specific callables
-	void _c_null(void*);
+	void _c_null(void *);
 
 	// amiga specific callables
-	void _c_projector(void*);
-	void _c_HBOff(void*);
-	void _c_offSound(void*);
-	void _c_startMusic(void*);
-	void _c_closeMusic(void*);
-	void _c_HBOn(void*);
+	void _c_projector(void *);
+	void _c_HBOff(void *);
+	void _c_offSound(void *);
+	void _c_startMusic(void *);
+	void _c_closeMusic(void *);
+	void _c_HBOn(void *);
 };
 
 
@@ -582,7 +582,7 @@ private:
 	void 	startIngameMenu();
 	void	freeCharacter();
 
-	typedef void (Parallaction_br::*Callable)(void*);
+	typedef void (Parallaction_br::*Callable)(void *);
 	const Callable *_callables;
 	static const Callable _dosCallables[6];
 	static const Callable _amigaCallables[6];
@@ -592,13 +592,13 @@ private:
 	PathWalker_BR		*_walker;
 
 	// dos callables
-	void _c_null(void*);
-	void _c_blufade(void*);
-	void _c_resetpalette(void*);
-	void _c_ferrcycle(void*);
-	void _c_lipsinc(void*);
-	void _c_albcycle(void*);
-	void _c_password(void*);
+	void _c_null(void *);
+	void _c_blufade(void *);
+	void _c_resetpalette(void *);
+	void _c_ferrcycle(void *);
+	void _c_lipsinc(void *);
+	void _c_albcycle(void *);
+	void _c_password(void *);
 };
 
 extern Parallaction *_vm;
diff --git a/engines/parallaction/sound_br.cpp b/engines/parallaction/sound_br.cpp
index 16ffd24a82..0925e55309 100644
--- a/engines/parallaction/sound_br.cpp
+++ b/engines/parallaction/sound_br.cpp
@@ -378,7 +378,7 @@ Audio::AudioStream *AmigaSoundMan_br::loadChannelData(const char *filename, Chan
 
 	if (_vm->getFeatures() & GF_DEMO) {
 		uint32 dataSize = stream->size();
-		int8 *data = (int8*)malloc(dataSize);
+		int8 *data = (int8 *)malloc(dataSize);
 		if (stream->read(data, dataSize) != dataSize)
 			error("DosSoundMan_br::loadChannelData: Read failed");