[Scummvm-cvs-logs] SF.net SVN: scummvm:[53016] scummvm/trunk/engines/scumm/gfx_towns.cpp

[athrxx at users.sourceforge.net]

Revision: 53016
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53016&view=rev
Author:   athrxx
Date:     2010-10-04 17:03:38 +0000 (Mon, 04 Oct 2010)

Log Message:
-----------
SCUMM/FM-TOWNS: cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/gfx_towns.cpp

Modified: scummvm/trunk/engines/scumm/gfx_towns.cpp
===================================================================
--- scummvm/trunk/engines/scumm/gfx_towns.cpp	2010-10-04 11:58:51 UTC (rev 53015)
+++ scummvm/trunk/engines/scumm/gfx_towns.cpp	2010-10-04 17:03:38 UTC (rev 53016)
@@ -53,7 +53,7 @@
 		for (int h = 0; h < height; ++h) {
 			if (_bytesPerPixelOutput == 2) {
 				for (int w = 0; w < width; ++w) {
-					WRITE_UINT16(dst1, _16BitPalette[*src1++]);
+					*(uint16*)dst1 = _16BitPalette[*src1++];
 					dst1 += _bytesPerPixelOutput;
 				}
 
@@ -304,7 +304,7 @@
 	for (int i = 0; i < h; ++i) {
 		if (l->bpp == 2) {
 			for (int ii = 0; ii < w; ++ii) {			
-				WRITE_UINT16(pos, col);
+				*(uint16*)pos = col;
 				pos += 2;
 			}
 			pos += (l->pitch - w * 2);
@@ -471,10 +471,10 @@
 							if (col || l->onBottom) {
 								if (l->numCol == 16)
 									col = (col >> 4) & (col & 0x0f);
-								WRITE_LE_UINT16(dst, l->bltTmpPal[col]);
+								*(uint16*)dst = l->bltTmpPal[col];
 							}
 						} else {
-							WRITE_LE_UINT16(dst, READ_LE_UINT16(src));
+							*(uint16*)dst = *(uint16*)src;
 						}
 						dst += 2;
 					}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.