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

HUGO: Fix 2 uninitialized variables

Browse source 
svn-id: r55788
This commit is contained in:
Arnaud Boutonné 2011-02-05 14:07:30 +00:00
parent 69a88e315c
commit bc77c8534c
2 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
engines/hugo/display.cpp
View file

@ -45,6 +45,9 @@ namespace Hugo {
Screen::Screen(HugoEngine *vm) : _vm(vm) { Screen::Screen(HugoEngine *vm) : _vm(vm) {
_mainPalette = 0; _mainPalette = 0;
_curPalette = 0; _curPalette = 0;
_dlAddIndex = 0;
_dlRestoreIndex = 0;
for (int i = 0; i < kNumFonts; i++) { for (int i = 0; i < kNumFonts; i++) {
_arrayFont[i] = 0; _arrayFont[i] = 0;
fontLoadedFl[i] = false; fontLoadedFl[i] = false;
@ -55,17 +58,15 @@ Screen::Screen(HugoEngine *vm) : _vm(vm) {
_dlBlistList[i].dx = 0; _dlBlistList[i].dx = 0;
_dlBlistList[i].dy = 0; _dlBlistList[i].dy = 0;
} }
for (int i = 0; i < kRectListSize; i++) {
_dlRestoreList[i].x = 0;
_dlRestoreList[i].y = 0;
_dlRestoreList[i].dx = 0;
_dlRestoreList[i].dy = 0;
}
for (int i = 0; i < kRectListSize; i++) { for (int i = 0; i < kRectListSize; i++) {
_dlAddList[i].x = 0; _dlAddList[i].x = 0;
_dlAddList[i].y = 0; _dlAddList[i].y = 0;
_dlAddList[i].dx = 0; _dlAddList[i].dx = 0;
_dlAddList[i].dy = 0; _dlAddList[i].dy = 0;
_dlRestoreList[i].x = 0;
_dlRestoreList[i].y = 0;
_dlRestoreList[i].dx = 0;
_dlRestoreList[i].dy = 0;
} }
} }

6
engines/hugo/intro.cpp
View file

@ -64,6 +64,7 @@ void intro_v1d::introInit() {
surf.pixels = _vm->_screen->getFrontBuffer(); surf.pixels = _vm->_screen->getFrontBuffer();
surf.pitch = 320; surf.pitch = 320;
surf.bytesPerPixel = 1; surf.bytesPerPixel = 1;
_vm->_screen->displayList(kDisplayInit);
} }
bool intro_v1d::introPlay() { bool intro_v1d::introPlay() {
@ -206,6 +207,7 @@ void intro_v2d::preNewGame() {
} }
void intro_v2d::introInit() { void intro_v2d::introInit() {
_vm->_screen->displayList(kDisplayInit);
_vm->_file->readBackground(_vm->_numScreens - 1); // display splash screen _vm->_file->readBackground(_vm->_numScreens - 1); // display splash screen
surf.w = 320; surf.w = 320;
surf.h = 200; surf.h = 200;
@ -251,6 +253,7 @@ void intro_v3d::preNewGame() {
} }
void intro_v3d::introInit() { void intro_v3d::introInit() {
_vm->_screen->displayList(kDisplayInit);
_vm->_file->readBackground(_vm->_numScreens - 1); // display splash screen _vm->_file->readBackground(_vm->_numScreens - 1); // display splash screen
surf.w = 320; surf.w = 320;
surf.h = 200; surf.h = 200;
@ -365,9 +368,8 @@ void intro_v3w::preNewGame() {
* Hugo 3 - show map and set up for introPlay() * Hugo 3 - show map and set up for introPlay()
*/ */
void intro_v3w::introInit() { void intro_v3w::introInit() {
_vm->_screen->displayList(kDisplayInit);
_vm->_file->readBackground(_vm->_numScreens - 1); // display splash screen _vm->_file->readBackground(_vm->_numScreens - 1); // display splash screen
_vm->_screen->displayBackground(); _vm->_screen->displayBackground();
g_system->updateScreen(); g_system->updateScreen();
g_system->delayMillis(3000); g_system->delayMillis(3000);