diff options
| author | Max Horn | 2005-03-27 00:42:53 +0000 |
|---|---|---|
| committer | Max Horn | 2005-03-27 00:42:53 +0000 |
| commit | 5bd26a52df502391714b539df30eb76e50c72cf7 (patch) | |
| tree | 68c28db4f1cca6b0c21902424915e17388ed9351 /scumm/base-costume.cpp | |
| parent | 446be21239727bcea559e201b77a48860fd5a34f (diff) | |
| download | scummvm-rg350-5bd26a52df502391714b539df30eb76e50c72cf7.tar.gz scummvm-rg350-5bd26a52df502391714b539df30eb76e50c72cf7.tar.bz2 scummvm-rg350-5bd26a52df502391714b539df30eb76e50c72cf7.zip | |
More costume code restructuring
svn-id: r17258
Diffstat (limited to 'scumm/base-costume.cpp')
| -rw-r--r-- | scumm/base-costume.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/scumm/base-costume.cpp b/scumm/base-costume.cpp index b8609aaf49..c1402f922e 100644 --- a/scumm/base-costume.cpp +++ b/scumm/base-costume.cpp @@ -22,6 +22,7 @@ #include "stdafx.h" #include "scumm/base-costume.h" +#include "scumm/costume.h" namespace Scumm { @@ -88,12 +89,17 @@ bool ScummEngine::isCostumeInUse(int cost) const { } void ScummEngine::costumeDecodeData(Actor *a, int frame, uint usemask) { + // TODO: This should eventually become a method of the appropriate + // BaseCostumeLoader subclasses. if (_features & GF_NEW_COSTUMES) akos_decodeData(a, frame, usemask); - else if (_features & GF_NES) - NES_cost_decodeData(a, frame, usemask); - else - cost_decodeData(a, frame, usemask); + else if (_features & GF_NES) { + NESCostumeLoader lc(this); + lc.costumeDecodeData(a, frame, usemask); + } else { + ClassicCostumeLoader lc(this); + lc.costumeDecodeData(a, frame, usemask); + } } } // End of namespace Scumm |