diff --git a/machines/machinefactory.cpp b/machines/machinefactory.cpp index e26ae9b..da97518 100644 --- a/machines/machinefactory.cpp +++ b/machines/machinefactory.cpp @@ -33,6 +33,7 @@ along with this program. If not, see . #include #include #include +#include #include #include #include @@ -67,11 +68,11 @@ static const map> rom_identity = { static const PropMap GossamerSettings = { {"rambank1_size", - new IntProperty(256, vector({8, 16, 64, 128, 256}))}, + new IntProperty(256, vector({8, 16, 32, 64, 128, 256}))}, {"rambank2_size", - new IntProperty( 0, vector({0, 8, 16, 64, 128, 256}))}, + new IntProperty( 0, vector({0, 8, 16, 32, 64, 128, 256}))}, {"rambank3_size", - new IntProperty( 0, vector({0, 8, 16, 64, 128, 256}))}, + new IntProperty( 0, vector({0, 8, 16, 32, 64, 128, 256}))}, {"gfxmem_size", new IntProperty( 2, vector({2, 4, 6}))}, }; @@ -84,7 +85,7 @@ static const map PropHelp = { }; static const map, string>> machines = { - {"pmg3", {GossamerSettings, create_gossamer, "PowerMacintosh G3 (Beige)"}}, + {"pmg3", {GossamerSettings, create_gossamer, "Power Macintosh G3 (Beige)"}}, }; string machine_name_from_rom(string& rom_filepath) { @@ -180,7 +181,7 @@ void list_machines() { cout << endl << "Supported machines:" << endl << endl; for (auto& mach : machines) { - cout << mach.first << "\t\t" << get<2>(mach.second) << endl; + cout << setw(13) << mach.first << "\t\t" << get<2>(mach.second) << endl; } cout << endl; @@ -190,10 +191,10 @@ void list_properties() { cout << endl; for (auto& mach : machines) { - cout << get<2>(mach.second) << " properties:" << endl << endl; + cout << get<2>(mach.second) << " supported properties:" << endl << endl; for (auto& p : get<0>(mach.second)) { - cout << p.first << "\t\t" << PropHelp.at(p.first) << endl << endl; + cout << setw(13) << p.first << "\t\t" << PropHelp.at(p.first) << endl << endl; } } diff --git a/main.cpp b/main.cpp index f40c1a8..7c88af1 100644 --- a/main.cpp +++ b/main.cpp @@ -47,17 +47,6 @@ static string appDescription = string( "\n" ); -void display_recognized_machines() { - std::cout << " " << endl; - std::cout << "The following machines are supported by DingusPPC: " << endl; - std::cout << "___________________________________________________" << endl; - std::cout << "| COMMAND | MACHINE RECOGNIZED |" << endl; - std::cout << "___________________________________________________" << endl; - std::cout << " pmg3 | Power Mac G3 Beige " << endl; - std::cout << " pm6100 | Power Mac 6100 " << endl; - std::cout << " " << endl; -} - int main(int argc, char** argv) { /* Execution Type: