diff options
| author | Max Horn | 2008-05-31 19:24:26 +0000 |
|---|---|---|
| committer | Max Horn | 2008-05-31 19:24:26 +0000 |
| commit | fb5ea14e4e5f4f078d51a7ffb901070f091d5eaf (patch) | |
| tree | e178023d6186679a61f5563db849c55fc6bf4fd1 | |
| parent | c27f261b0bf262c58276c36c658817a2805af18b (diff) | |
| download | scummvm-rg350-fb5ea14e4e5f4f078d51a7ffb901070f091d5eaf.tar.gz scummvm-rg350-fb5ea14e4e5f4f078d51a7ffb901070f091d5eaf.tar.bz2 scummvm-rg350-fb5ea14e4e5f4f078d51a7ffb901070f091d5eaf.zip | |
DS: The SpriteEntry::atributes array has only 3 elements; also removed some apparently not needed #includes
svn-id: r32432
| -rw-r--r-- | backends/platform/ds/arm9/source/dsmain.cpp | 7 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.cpp | 1 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/ramsave.cpp | 1 |
3 files changed, 3 insertions, 6 deletions
diff --git a/backends/platform/ds/arm9/source/dsmain.cpp b/backends/platform/ds/arm9/source/dsmain.cpp index ab68df8f7a..a130509e36 100644 --- a/backends/platform/ds/arm9/source/dsmain.cpp +++ b/backends/platform/ds/arm9/source/dsmain.cpp @@ -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 @@ void initSprites() { 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 @@ void updateStatus() { // 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); } diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index 330d09403d..6e6b457115 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -22,7 +22,6 @@ #include "common/scummsys.h" #include "common/system.h" -#include "system.h" #include "common/util.h" #include "common/rect.h" diff --git a/backends/platform/ds/arm9/source/ramsave.cpp b/backends/platform/ds/arm9/source/ramsave.cpp index f8e005647e..be355ce76f 100644 --- a/backends/platform/ds/arm9/source/ramsave.cpp +++ b/backends/platform/ds/arm9/source/ramsave.cpp @@ -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" |