diff options
| author | Christopher Page | 2008-08-16 04:30:01 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-08-16 04:30:01 +0000 |
| commit | 909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9 (patch) | |
| tree | c2f2668391fa3026a6a79b38ebfad797ce1b376c /engines/parallaction/parallaction_br.cpp | |
| parent | c22f9b23588121d41fe0a12ce44926d683d7a18d (diff) | |
| parent | f2111eeb45dc8c41afb3e63bf3b86a09bf9a3532 (diff) | |
| download | scummvm-rg350-909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9.tar.gz scummvm-rg350-909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9.tar.bz2 scummvm-rg350-909b66ef54f8d6d6dfeb0fdee2aa018f2065b6c9.zip | |
Merged revisions 33777,33781-33788,33790,33792-33793,33795,33797,33805,33807-33812,33815-33817,33819,33822,33826,33829,33837,33839,33844,33847,33858-33861,33864,33871-33873,33875,33877-33879,33886,33889-33892,33894,33896,33900,33902-33903,33919 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r33924
Diffstat (limited to 'engines/parallaction/parallaction_br.cpp')
| -rw-r--r-- | engines/parallaction/parallaction_br.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/parallaction/parallaction_br.cpp b/engines/parallaction/parallaction_br.cpp index f4329edf74..e65faaeda2 100644 --- a/engines/parallaction/parallaction_br.cpp +++ b/engines/parallaction/parallaction_br.cpp @@ -193,7 +193,7 @@ void Parallaction_br::initPart() { memset(_counters, 0, ARRAYSIZE(_counters)); - _globalTable = _disk->loadTable("global"); + _globalFlagsNames = _disk->loadTable("global"); _objectsNames = _disk->loadTable("objects"); _countersNames = _disk->loadTable("counters"); @@ -208,11 +208,11 @@ void Parallaction_br::initPart() { void Parallaction_br::freePart() { - delete _globalTable; + delete _globalFlagsNames; delete _objectsNames; delete _countersNames; - _globalTable = 0; + _globalFlagsNames = 0; _objectsNames = 0; _countersNames = 0; } |