thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Store palettes in a Common::Array instead of a fixed size array.

Browse source 
svn-id: r41891
This commit is contained in:
Johannes Schickel 2009-06-25 23:04:21 +00:00
parent fc0d0e2323
commit 7bbad2738a
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/kyra/screen.cpp
View file

@ -57,10 +57,8 @@ Screen::~Screen() {
delete[] _decodeShapeBuffer;
delete[] _animBlockPtr;
if (_vm->gameFlags().platform != Common::kPlatformAmiga) {
for (int i = 0; i < ARRAYSIZE(_palettes); ++i)
delete _palettes[i];
}
for (uint i = 0; i < _palettes.size(); ++i)
delete _palettes[i];
CursorMan.popAllCursors();
}
@ -123,14 +121,13 @@ bool Screen::init() {
memset(_shapePages, 0, sizeof(_shapePages));
memset(_palettes, 0, sizeof(_palettes));
const int paletteCount = (_vm->gameFlags().platform == Common::kPlatformAmiga) ? 12 : 4;
const int numColors = (_vm->gameFlags().platform == Common::kPlatformAmiga) ? 32 : 256;
_screenPalette = new Palette(numColors);
assert(_screenPalette);
_palettes.resize(paletteCount);
for (int i = 0; i < paletteCount; ++i) {
_palettes[i] = new Palette(numColors);
assert(_palettes[i]);
@ -2640,7 +2637,7 @@ void Screen::setMouseCursor(int x, int y, const byte *shape) {
}
Palette &Screen::getPalette(int num) {
assert(num >= 0 && num < (_vm->gameFlags().platform == Common::kPlatformAmiga ? 12 : 4));
assert(num >= 0 && (uint)num < _palettes.size());
return *_palettes[num];
}

3
engines/kyra/screen.h
View file

@ -29,6 +29,7 @@
#include "common/util.h"
#include "common/func.h"
#include "common/list.h"
#include "common/array.h"
#include "common/rect.h"
#include "common/stream.h"
@ -374,7 +375,7 @@ protected:
uint8 _sjisInvisibleColor;
Palette *_screenPalette;
Palette *_palettes[12];
Common::Array<Palette *> _palettes;
Palette *_internFadePalette;
Font _fonts[FID_NUM];