AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

extract fixes

This commit is contained in:
Jack Andersen 2015-07-11 18:26:49 -10:00
parent e1a37b53eb
commit 0a5d1a45fd
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hecl/driver/ToolExtract.hpp
View File

@ -28,10 +28,13 @@ public:
for (const HECL::Database::DataSpecEntry* entry : HECL::Database::DATA_SPEC_REGISTRY) for (const HECL::Database::DataSpecEntry* entry : HECL::Database::DATA_SPEC_REGISTRY)
{ {
HECL::Database::IDataSpec* ds = entry->m_factory(HECL::Database::TOOL_EXTRACT); HECL::Database::IDataSpec* ds = entry->m_factory(HECL::Database::TOOL_EXTRACT);
if (ds->canExtract(m_einfo, m_reps)) if (ds)
m_dataSpecs.emplace_back(ds); {
else if (ds->canExtract(m_einfo, m_reps))
delete ds; m_dataSpecs.emplace_back(ds);
else
delete ds;
}
} }
} }
@ -69,12 +72,12 @@ public:
for (int l=0 ; l<level ; ++l) for (int l=0 ; l<level ; ++l)
HECL::Printf(_S(" ")); HECL::Printf(_S(" "));
if (XTERM_COLOR) if (XTERM_COLOR)
HECL::Printf(_S("" CYAN BOLD "%s" NORMAL "\n"), rep.name.c_str()); HECL::Printf(_S("" BOLD "%s" NORMAL ""), rep.name.c_str());
else else
HECL::Printf(_S("%s\n"), rep.name.c_str()); HECL::Printf(_S("%s"), rep.name.c_str());
for (int l=0 ; l<level ; ++l) if (rep.desc.size())
HECL::Printf(_S(" ")); HECL::Printf(_S(" [%s]"), rep.desc.c_str());
HECL::Printf(_S(" %s\n"), rep.desc.c_str()); HECL::Printf(_S("\n"));
for (HECL::Database::IDataSpec::ExtractReport& child : rep.childOpts) for (HECL::Database::IDataSpec::ExtractReport& child : rep.childOpts)
_recursivePrint(level + 1, child); _recursivePrint(level + 1, child);
} }
@ -99,9 +102,9 @@ public:
_recursivePrint(0, rep); _recursivePrint(0, rep);
if (XTERM_COLOR) if (XTERM_COLOR)
HECL::Printf(_S("" BLUE BOLD "Continue?" NORMAL "(Y/N)")); HECL::Printf(_S("\n" BLUE BOLD "Continue?" NORMAL " (Y/N) "));
else else
HECL::Printf(_S("Continue? (Y/N)")); HECL::Printf(_S("\nContinue? (Y/N) "));
int ch; int ch;
while ((ch = getchar())) while ((ch = getchar()))

2
hecl/extern/RetroCommon vendored

@ -1 +1 @@
Subproject commit c1f4f31e6ff55889c8e32da17dd2ab500ba503cb Subproject commit 975429f3c690dacfc8d112b033e512b52730fb54