diff options
| author | Travis Howell | 2006-04-06 08:43:20 +0000 |
|---|---|---|
| committer | Travis Howell | 2006-04-06 08:43:20 +0000 |
| commit | dd9f4d9f99097f0ae96abaa958e426fb396c7d66 (patch) | |
| tree | 68967cb56cc3dfc1b977c97e56e3940d8d53c7b4 /engines/simon/simon.cpp | |
| parent | 3023f6f76ee0bcbbd8dd82849f4ed2b7afb7e4c9 (diff) | |
| download | scummvm-rg350-dd9f4d9f99097f0ae96abaa958e426fb396c7d66.tar.gz scummvm-rg350-dd9f4d9f99097f0ae96abaa958e426fb396c7d66.tar.bz2 scummvm-rg350-dd9f4d9f99097f0ae96abaa958e426fb396c7d66.zip | |
Remove duplicate code in last commit and minor fixes for FF
svn-id: r21639
Diffstat (limited to 'engines/simon/simon.cpp')
| -rw-r--r-- | engines/simon/simon.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index dde392d131..d41de44243 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -286,7 +286,7 @@ SimonEngine::SimonEngine(OSystem *syst) _iOverflow = 0; _hitAreaObjectItem = 0; _lastHitArea = 0; - _lastHitArea2Ptr = 0; + _lastNameOn = 0; _lastHitArea3 = 0; _leftButtonDown = 0; _hitAreaSubjectItem = 0; @@ -1603,9 +1603,9 @@ void SimonEngine::setup_cond_c_helper() { _lastHitArea = 0; _hitAreaObjectItem = NULL; - last = _lastHitArea2Ptr; - defocusHitarea(); - _lastHitArea2Ptr = last; + last = _lastNameOn; + clearName(); + _lastNameOn = last; for (;;) { _lastHitArea = NULL; @@ -1646,7 +1646,7 @@ void SimonEngine::setup_cond_c_helper() { out_of_here: _lastHitArea3 = 0; _lastHitArea = 0; - _lastHitArea2Ptr = NULL; + _lastNameOn = NULL; _mouseCursor = 0; _noRightClick = 0; } |