[Scummvm-cvs-logs] SF.net SVN: scummvm: [32432] scummvm/trunk/backends/platform/ds/arm9/source

[fingolfin at users.sourceforge.net]

Revision: 32432
          http://scummvm.svn.sourceforge.net/scummvm/?rev=32432&view=rev
Author:   fingolfin
Date:     2008-05-31 12:24:26 -0700 (Sat, 31 May 2008)

Log Message:
-----------
DS: The SpriteEntry::atributes array has only 3 elements; also removed some apparently not needed #includes

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
    scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
    scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2008-05-31 19:08:52 UTC (rev 32431)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2008-05-31 19:24:26 UTC (rev 32432)
@@ -71,7 +71,6 @@
 #include <stdlib.h>
 #include "dsmain.h"
 #include "string.h"
-#include "system.h"
 #include "osystem_ds.h"
 #include "icons_raw.h"
 #include "fat/gba_nds_fat.h"
@@ -359,14 +358,14 @@
 	   sprites[i].attribute[0] = ATTR0_DISABLED;
 	   sprites[i].attribute[1] = 0;
 	   sprites[i].attribute[2] = 0;
-	   sprites[i].attribute[3] = 0;
+	   sprites[i].filler = 0;
     }
 	
 	for (int i = 0; i < 128; i++) {
 	   spritesMain[i].attribute[0] = ATTR0_DISABLED;
 	   spritesMain[i].attribute[1] = 0;
 	   spritesMain[i].attribute[2] = 0;
-	   spritesMain[i].attribute[3] = 0;
+	   spritesMain[i].filler = 0;
     }
 	
 	updateOAM();
@@ -1611,7 +1610,7 @@
 //		spritesMain[0].attribute[0] = ATTR0_DISABLED;
 //		spritesMain[0].attribute[1] = 0;
 //		spritesMain[0].attribute[2] = 0;
-//		spritesMain[0].attribute[3] = 0;
+//		spritesMain[0].filler = 0;
 		setIconMain(0, 0, 0, 0, 0, false);
 	}
 

Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp	2008-05-31 19:08:52 UTC (rev 32431)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp	2008-05-31 19:24:26 UTC (rev 32432)
@@ -22,7 +22,6 @@
 
 #include "common/scummsys.h"
 #include "common/system.h"
-#include "system.h"
 
 #include "common/util.h"
 #include "common/rect.h"

Modified: scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp	2008-05-31 19:08:52 UTC (rev 32431)
+++ scummvm/trunk/backends/platform/ds/arm9/source/ramsave.cpp	2008-05-31 19:24:26 UTC (rev 32432)
@@ -20,7 +20,6 @@
  * 
  */
  // Save in order 1,2,3,4,larger 2,5
-#include "system.h"
 #include "ramsave.h"
 #include "nds.h"
 #include "compressor/lz.h"


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