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

CGE: Rearrange engine setup so sprite arrays are setup before they're needed

Browse source
This commit is contained in:
Paul Gilbert 2011-07-05 21:39:14 +10:00
parent 24fa551a71
commit c676f88da0
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
engines/cge/cge.cpp
View file

@ -69,21 +69,7 @@ void CGEEngine::setup() {
Bitmap::init(); Bitmap::init();
Talk::init(); Talk::init();
// Initialise engine objects // Initialise sprite arrays used by game objects
_text = new Text(this, progName(), 128);
_vga = new Vga(M13H);
_heart = new Heart;
_sys = new System(this);
_pocLight = new Sprite(this, LI);
for (int i = 0; i < POCKET_NX; i++)
_pocket[i] = new Sprite(this, NULL);
_sprite = new Sprite(this, NULL);
_miniCave = new Sprite(this, NULL);
_shadow = new Sprite(this, NULL);
_horzLine = new Sprite(this, HL);
_infoLine = new InfoLine(this, INFO_W);
_cavLight = new Sprite(this, PR);
_debugLine = new InfoLine(this, SCR_WID);
MB[0] = new Bitmap("BRICK", true); MB[0] = new Bitmap("BRICK", true);
MB[1] = NULL; MB[1] = NULL;
HL[0] = new Bitmap("HLINE", true); HL[0] = new Bitmap("HLINE", true);
@ -101,6 +87,22 @@ void CGEEngine::setup() {
LI[2] = new Bitmap("LITE2", true); LI[2] = new Bitmap("LITE2", true);
LI[3] = new Bitmap("LITE3", true); LI[3] = new Bitmap("LITE3", true);
LI[4] = NULL; LI[4] = NULL;
// Initialise engine objects
_text = new Text(this, progName(), 128);
_vga = new Vga(M13H);
_heart = new Heart;
_sys = new System(this);
_pocLight = new Sprite(this, LI);
for (int i = 0; i < POCKET_NX; i++)
_pocket[i] = new Sprite(this, NULL);
_sprite = new Sprite(this, NULL);
_miniCave = new Sprite(this, NULL);
_shadow = new Sprite(this, NULL);
_horzLine = new Sprite(this, HL);
_infoLine = new InfoLine(this, INFO_W);
_cavLight = new Sprite(this, PR);
_debugLine = new InfoLine(this, SCR_WID);
_snail = new Snail(this, false); _snail = new Snail(this, false);
_snail_ = new Snail(this, true); _snail_ = new Snail(this, true);