diff options
| author | Alyssa Milburn | 2011-08-19 20:14:40 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-19 20:14:40 +0200 |
| commit | bda1afdbfb3e080441db5557667264e57c29e98e (patch) | |
| tree | 729ffe73da9fcd7671da5f6f06c8c5abe94cbb12 /engines/cge/walk.cpp | |
| parent | 4e156b24635c3cb44d46dde7a01f97fb2fe4a552 (diff) | |
| parent | 8ff904c6b576eda37930b020e39855c1fd261b2f (diff) | |
| download | scummvm-rg350-bda1afdbfb3e080441db5557667264e57c29e98e.tar.gz scummvm-rg350-bda1afdbfb3e080441db5557667264e57c29e98e.tar.bz2 scummvm-rg350-bda1afdbfb3e080441db5557667264e57c29e98e.zip | |
Merge branch 'soltys_wip2' of https://github.com/Strangerke/scummvm into soltys_wip2
Conflicts:
engines/cge/bitmap.cpp
Diffstat (limited to 'engines/cge/walk.cpp')
| -rw-r--r-- | engines/cge/walk.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/cge/walk.cpp b/engines/cge/walk.cpp index 89d7f6308b..914f6db669 100644 --- a/engines/cge/walk.cpp +++ b/engines/cge/walk.cpp @@ -71,7 +71,7 @@ Cluster XZ(Couple xy) { } Walk::Walk(CGEEngine *vm, BitmapPtr *shpl) - : Sprite(vm, shpl), _dir(kDirNone), _tracePtr(-1), _level(0), _target(-1, -1), _vm(vm) { + : Sprite(vm, shpl), _dir(kDirNone), _tracePtr(-1), _level(0), _target(-1, -1), _findLevel(-1), _vm(vm) { } |