aboutsummaryrefslogtreecommitdiff
path: root/engines/avalanche/avalanche.cpp
diff options
context:
space:
mode:
authorStrangerke2013-09-08 11:30:23 +0200
committerStrangerke2013-09-08 11:30:23 +0200
commitf42f29d8f8e1cc39b02cf1827318ff8fb59d3dd7 (patch)
tree39c9b8f67caae0b413f81a7320c1ee773c6d962f /engines/avalanche/avalanche.cpp
parent1b25defe3417d8ff526a37b5448fe96b415626a5 (diff)
downloadscummvm-rg350-f42f29d8f8e1cc39b02cf1827318ff8fb59d3dd7.tar.gz
scummvm-rg350-f42f29d8f8e1cc39b02cf1827318ff8fb59d3dd7.tar.bz2
scummvm-rg350-f42f29d8f8e1cc39b02cf1827318ff8fb59d3dd7.zip
AVALANCHE: Rename Timeout into Timer
Diffstat (limited to 'engines/avalanche/avalanche.cpp')
-rw-r--r--engines/avalanche/avalanche.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 2e7b7f3115..b28fe7fb5f 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -69,7 +69,7 @@ AvalancheEngine::~AvalancheEngine() {
delete _enid;
delete _celer;
delete _sequence;
- delete _timeout;
+ delete _timer;
delete _animation;
delete _acci;
delete _dropdown;
@@ -90,7 +90,7 @@ Common::ErrorCode AvalancheEngine::initialize() {
_enid = new Enid(this);
_celer = new Celer(this);
_sequence = new Sequence(this);
- _timeout = new Timeout(this);
+ _timer = new Timer(this);
_animation = new Animation(this);
_acci = new Acci(this);
_dropdown = new Dropdown(this);
@@ -335,9 +335,9 @@ void AvalancheEngine::synchronize(Common::Serializer &sz) {
//blockwrite(f, times, sizeof(times)); // Timeout.times: Timers.
for (byte i = 0; i < 7; i++) {
- sz.syncAsSint32LE(_timeout->_times[i]._timeLeft);
- sz.syncAsByte(_timeout->_times[i]._action);
- sz.syncAsByte(_timeout->_times[i]._reason);
+ sz.syncAsSint32LE(_timer->_times[i]._timeLeft);
+ sz.syncAsByte(_timer->_times[i]._action);
+ sz.syncAsByte(_timer->_times[i]._reason);
}
//blockwrite(f, seq, sizeof(seq)); // Sequencer information.