[Opde-commits] SF.net SVN: opde:[1150] trunk/src/services/draw/DrawService.cpp

[<vo...@us...>]

Revision: 1150
          http://opde.svn.sourceforge.net/opde/?rev=1150&view=rev
Author:   volca
Date:     2009-02-25 06:30:43 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
Converting to use primitives from integers.h

Modified Paths:
--------------
    trunk/src/services/draw/DrawService.cpp

Modified: trunk/src/services/draw/DrawService.cpp
===================================================================
--- trunk/src/services/draw/DrawService.cpp	2009-02-25 05:36:59 UTC (rev 1149)
+++ trunk/src/services/draw/DrawService.cpp	2009-02-25 06:30:43 UTC (rev 1150)
@@ -354,11 +354,11 @@
 			return;
 		}
 
-		BYTE bpp;
+		uint8_t bpp;
 		paletteFile->readElem(&bpp, 1);
 
 		paletteFile->seek(3 * 256 + 1, File::FSEEK_END);
-		BYTE padding;
+		uint8_t padding;
 		paletteFile->readElem(&padding, 1);
 
 		if((bpp == 8) && (padding == 0x0C)) { //Make sure it is an 8bpp and a valid PCX
@@ -382,7 +382,7 @@
 	void DrawService::loadPaletteExternal(const Ogre::String& fname, const Ogre::String& group) {
 		// Code written by patryn, reused here for the new font rendering pipeline support
 		ExternalPaletteHeader paletteHeader;
-		WORD count;
+		uint16_t count;
 		unsigned int i;
 
 		freeCurrentPal();
@@ -403,11 +403,11 @@
 		mCurrentPalette = new RGBAQuad[256];
 
 		// We're sure that we have external palette here:
-		paletteFile->readElem(&paletteHeader.RiffSig, sizeof(DWORD));
-		paletteFile->readElem(&paletteHeader.RiffLength, sizeof(DWORD));
-		paletteFile->readElem(&paletteHeader.PSig1, sizeof(DWORD));
-		paletteFile->readElem(&paletteHeader.PSig2, sizeof(DWORD));
-		paletteFile->readElem(&paletteHeader.Length, sizeof(DWORD));
+		paletteFile->readElem(&paletteHeader.RiffSig, sizeof(uint32_t));
+		paletteFile->readElem(&paletteHeader.RiffLength, sizeof(uint32_t));
+		paletteFile->readElem(&paletteHeader.PSig1, sizeof(uint32_t));
+		paletteFile->readElem(&paletteHeader.PSig2, sizeof(uint32_t));
+		paletteFile->readElem(&paletteHeader.Length, sizeof(uint32_t));
 
 		if (paletteHeader.RiffSig == 0x46464952) {
 			if (paletteHeader.PSig1 != 0x204C4150) {


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