diff options
| author | Lionel Ulmer | 2002-11-13 15:44:33 +0000 |
|---|---|---|
| committer | Lionel Ulmer | 2002-11-13 15:44:33 +0000 |
| commit | 26b284a93eb9b90506b0767743d6e82c60a36336 (patch) | |
| tree | bef2e7a49cc36eff9066c885a5a77fd968b6b302 | |
| parent | d95abae05746f6a4d1d4d786655ee294cf0de318 (diff) | |
| download | scummvm-rg350-26b284a93eb9b90506b0767743d6e82c60a36336.tar.gz scummvm-rg350-26b284a93eb9b90506b0767743d6e82c60a36336.tar.bz2 scummvm-rg350-26b284a93eb9b90506b0767743d6e82c60a36336.zip | |
Some other inits added to prepare for the 'new / delete' overloading
removal.
svn-id: r5537
| -rw-r--r-- | backends/x11/x11.cpp | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp index 3c0e7ee496..7152ad490d 100644 --- a/backends/x11/x11.cpp +++ b/backends/x11/x11.cpp @@ -322,7 +322,7 @@ OSystem_X11::OSystem_X11() current_shake_pos = 0; new_shake_pos = 0; _palette_changed = false; - num_of_dirty_square = MAX_NUMBER_OF_DIRTY_SQUARES; + num_of_dirty_square = 0; _overlay_visible = false; _mouse_state_changed = true; _mouse_visible = true; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index 9cd5fe20e8..74b466e199 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -108,7 +108,14 @@ Scumm::Scumm (GameDetector *detector, OSystem *syst) _noSubtitles = detector->_noSubtitles; _defaultTalkDelay = detector->_talkSpeed; _use_adlib = detector->_use_adlib; - + memset(&res, 0, sizeof(res)); + _allocatedSize = 0; + _roomResource = 0; + _lastLoadedRoom = 0; + _expire_counter = 0; + _dynamicRoomOffsets = 0; + _shakeEnabled = 0; + if (_gameId == GID_ZAK256) { // FmTowns is 320x240 _realWidth = 320; _realHeight = 240; |