[Scummvm-cvs-logs] SF.net SVN: scummvm:[39071] scummvm/trunk/engines/sword1

hkz at users.sourceforge.net hkz at users.sourceforge.net
Mon Mar 2 12:12:41 CET 2009


Revision: 39071
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39071&view=rev
Author:   hkz
Date:     2009-03-02 11:12:41 +0000 (Mon, 02 Mar 2009)

Log Message:
-----------
Formatting changes in older PSX related functions

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/screen.cpp
    scummvm/trunk/engines/sword1/screen.h

Modified: scummvm/trunk/engines/sword1/screen.cpp
===================================================================
--- scummvm/trunk/engines/sword1/screen.cpp	2009-03-02 10:59:14 UTC (rev 39070)
+++ scummvm/trunk/engines/sword1/screen.cpp	2009-03-02 11:12:41 UTC (rev 39071)
@@ -833,7 +833,7 @@
 	}
 }
 
-uint8* Screen::psxBackgroundToIndexed(uint8* psxBackground, uint32 bakXres, uint32 bakYres) {
+uint8* Screen::psxBackgroundToIndexed(uint8 *psxBackground, uint32 bakXres, uint32 bakYres) {
 	uint32 xresInTiles = bakXres / 16;
 	uint32 yresInTiles = ((bakYres / 2) % 16) ? (bakYres / 32) + 1 : (bakYres / 32);
 	uint32 totTiles = xresInTiles * yresInTiles;
@@ -884,7 +884,7 @@
 }
 
 // needed because some psx backgrounds are half width and half height
-uint8* Screen::psxShrinkedBackgroundToIndexed(uint8* psxBackground, uint32 bakXres, uint32 bakYres) {
+uint8* Screen::psxShrinkedBackgroundToIndexed(uint8 *psxBackground, uint32 bakXres, uint32 bakYres) {
 	uint32 xresInTiles = (bakXres / 2) % 16 ? (bakXres / 32) + 1 : (bakXres / 32);
 	uint32 yresInTiles =  (bakYres / 2) % 16 ? (bakYres / 32) + 1 : (bakYres / 32);
 	uint32 totTiles = xresInTiles * yresInTiles;
@@ -943,7 +943,7 @@
 	// Last line of tiles is FULL WIDTH!
 	uint32 tileHeight = (remainingTiles == xresInTiles * 2) ? 16 : 8;
 
-	halfres_buffer = (uint8*) malloc(bakXres * 16 * 2);
+	halfres_buffer = (uint8 *)malloc(bakXres * 16 * 2);
 	memset(halfres_buffer, 0, bakXres * 16 * 2);
 
 	tileXpos = 0;

Modified: scummvm/trunk/engines/sword1/screen.h
===================================================================
--- scummvm/trunk/engines/sword1/screen.h	2009-03-02 10:59:14 UTC (rev 39070)
+++ scummvm/trunk/engines/sword1/screen.h	2009-03-02 11:12:41 UTC (rev 39071)
@@ -116,8 +116,8 @@
 	void drawSprite(uint8 *sprData, uint16 sprX, uint16 sprY, uint16 sprWidth, uint16 sprHeight, uint16 sprPitch);
 	void drawPsxHalfShrinkedSprite(uint8 *sprData, uint16 sprX, uint16 sprY, uint16 sprWidth, uint16 sprHeight, uint16 sprPitch);
 	void drawPsxFullShrinkedSprite(uint8 *sprData, uint16 sprX, uint16 sprY, uint16 sprWidth, uint16 sprHeight, uint16 sprPitch);
-	uint8* psxBackgroundToIndexed(uint8* psxBackground, uint32 bakXres, uint32 bakYres);
-	uint8* psxShrinkedBackgroundToIndexed(uint8* psxBackground, uint32 bakXres, uint32 bakYres);
+	uint8* psxBackgroundToIndexed(uint8 *psxBackground, uint32 bakXres, uint32 bakYres);
+	uint8* psxShrinkedBackgroundToIndexed(uint8 *psxBackground, uint32 bakXres, uint32 bakYres);
 	void fetchPsxParallaxSize(uint8 *psxParallax, uint16 *paraSizeX, uint16 *paraSizeY);
 	void drawPsxParallax(uint8 *psxParallax, uint16 paraScrlX, uint16 scrnScrlX, uint16 scrnWidth);
 	void decompressRLE7(uint8 *src, uint32 compSize, uint8 *dest);


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




More information about the Scummvm-git-logs mailing list