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

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Sun Jul 23 04:20:54 CEST 2006


Revision: 23572
Author:   lordhoto
Date:     2006-07-22 19:20:49 -0700 (Sat, 22 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23572&view=rev

Log Message:
-----------
No need for packing SaveInfoSection and ThumbnailHeader anymore.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/saveload.cpp
    scummvm/trunk/engines/scumm/thumbnail.cpp
Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2006-07-22 21:23:49 UTC (rev 23571)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2006-07-23 02:20:49 UTC (rev 23572)
@@ -53,8 +53,6 @@
 	char name[32];
 };
 
-#include <common/pack-start.h>	// START STRUCT PACKING
-
 struct SaveInfoSection {
 	uint32 type;
 	uint32 version;
@@ -69,8 +67,6 @@
 
 #define SaveInfoSectionSize (4+4+4 + 4+4 + 4+2)
 
-#include <common/pack-end.h>	// END STRUCT PACKING
-
 #define INFOSECTION_VERSION 2
 
 void ScummEngine::requestSave(int slot, const char *name, bool temporary) {

Modified: scummvm/trunk/engines/scumm/thumbnail.cpp
===================================================================
--- scummvm/trunk/engines/scumm/thumbnail.cpp	2006-07-22 21:23:49 UTC (rev 23571)
+++ scummvm/trunk/engines/scumm/thumbnail.cpp	2006-07-23 02:20:49 UTC (rev 23572)
@@ -31,8 +31,6 @@
 
 #define THMB_VERSION 1
 
-#include <common/pack-start.h>	// START STRUCT PACKING
-
 struct ThumbnailHeader {
 	uint32 type;
 	uint32 size;
@@ -43,9 +41,6 @@
 
 #define ThumbnailHeaderSize (4+4+1+2+2+1)
 
-#include <common/pack-end.h>	// END STRUCT PACKING
-
-
 inline void colorToRGB(uint16 color, uint8 &r, uint8 &g, uint8 &b) {
 	r = (((color >> 11) & 0x1F) << 3);
 	g = (((color >> 5) & 0x3F) << 2);


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