ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed creation and merging of stella.pro to DefProps.hxx.

This commit is contained in:
Stephen Anthony 2022-05-20 19:07:04 -02:30
parent 264e573cf8
commit 5b788cac1e
6 changed files with 1545 additions and 1544 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes.txt
View File

@ -12,7 +12,7 @@
Release History
===========================================================================
6.6 to 6.7 (May 31, 2002)
6.6 to 6.7 (May 31, 2022)
* Completely reworked the file launcher:
- Redesigned user interface

5
src/common/repository/KeyValueRepositoryPropertyFile.cxx
View File

@ -70,7 +70,8 @@ namespace {
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
KeyValueRepositoryPropertyFile::KeyValueRepositoryPropertyFile(const FilesystemNode& node)
KeyValueRepositoryPropertyFile::KeyValueRepositoryPropertyFile(
const FilesystemNode& node)
: KeyValueRepositoryFile<KeyValueRepositoryPropertyFile>(node)
{
}
@ -116,6 +117,8 @@ bool KeyValueRepositoryPropertyFile::save(ostream& out, const std::map<string, V
writeQuotedString(out, value.toString());
out.put('\n');
}
out.put('"'); out.put('"');
out.put('\n'); out.put('\n');
return true;
}

2920
src/emucore/DefProps.hxx
View File

File diff suppressed because it is too large Load Diff

24
src/emucore/Props.cxx
View File

@ -162,6 +162,8 @@ void Properties::print() const
<< get(PropType::Cart_Sound) << "|"
<< get(PropType::Cart_StartBank) << "|"
<< get(PropType::Cart_Type) << "|"
<< get(PropType::Cart_Highscore) << "|"
<< get(PropType::Cart_Url) << "|"
<< get(PropType::Console_LeftDiff) << "|"
<< get(PropType::Console_RightDiff) << "|"
<< get(PropType::Console_TVType) << "|"
@ -179,9 +181,7 @@ void Properties::print() const
<< get(PropType::Display_Format) << "|"
<< get(PropType::Display_VCenter) << "|"
<< get(PropType::Display_Phosphor) << "|"
<< get(PropType::Display_PPBlend) << "|"
<< get(PropType::Cart_Highscore) << "|"
<< get(PropType::Cart_Url)
<< get(PropType::Display_PPBlend)
<< endl;
}
@ -223,6 +223,8 @@ void Properties::printHeader()
<< "Cart_Sound|"
<< "Cart_StartBank|"
<< "Cart_Type|"
<< "Cart_Highscore|"
<< "Cart_Url|"
<< "Console_LeftDiff|"
<< "Console_RightDiff|"
<< "Console_TVType|"
@ -240,9 +242,7 @@ void Properties::printHeader()
<< "Display_Format|"
<< "Display_VCenter|"
<< "Display_Phosphor|"
<< "Display_PPBlend|"
<< "Cart_Highscore|"
<< "Cart_Url"
<< "Display_PPBlend"
<< endl;
}
@ -258,6 +258,8 @@ std::array<string, Properties::NUM_PROPS> Properties::ourDefaultProperties =
"MONO", // Cart.Sound
"AUTO", // Cart.StartBank
"AUTO", // Cart.Type
"", // Cart.Highscore
"", // Cart.Url
"B", // Console.LeftDiff
"B", // Console.RightDiff
"COLOR", // Console.TVType
@ -275,9 +277,7 @@ std::array<string, Properties::NUM_PROPS> Properties::ourDefaultProperties =
"AUTO", // Display.Format
"0", // Display.VCenter
"NO", // Display.Phosphor
"0", // Display.PPBlend
"", // Cart.Highscore
"" // Cart.Url
"0" // Display.PPBlend
};
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -292,6 +292,8 @@ std::array<string, Properties::NUM_PROPS> Properties::ourPropertyNames =
"Cart.Sound",
"Cart.StartBank",
"Cart.Type",
"Cart.Highscore",
"Cart.Url",
"Console.LeftDiff",
"Console.RightDiff",
"Console.TVType",
@ -309,7 +311,5 @@ std::array<string, Properties::NUM_PROPS> Properties::ourPropertyNames =
"Display.Format",
"Display.VCenter",
"Display.Phosphor",
"Display.PPBlend",
"Cart.Highscore",
"Cart.Url"
"Display.PPBlend"
};

4
src/emucore/Props.hxx
View File

@ -31,6 +31,8 @@ enum class PropType : uInt8 {
Cart_Sound,
Cart_StartBank,
Cart_Type,
Cart_Highscore,
Cart_Url,
Console_LeftDiff,
Console_RightDiff,
Console_TVType,
@ -49,8 +51,6 @@ enum class PropType : uInt8 {
Display_VCenter,
Display_Phosphor,
Display_PPBlend,
Cart_Highscore,
Cart_Url,
NumTypes
};

134
src/tools/PropSet.pm
View File

@ -12,40 +12,43 @@ my %prop_type = (
"Cart.Sound" => 6,
"Cart.StartBank" => 7,
"Cart.Type" => 8,
"Console.LeftDiff" => 9,
"Console.RightDiff" => 10,
"Console.TVType" => 11,
"Console.SwapPorts" => 12,
"Controller.Left" => 13,
"Controller.Left1" => 14,
"Controller.Left2" => 15,
"Controller.Right" => 16,
"Controller.Right1" => 17,
"Controller.Right2" => 18,
"Controller.SwapPaddles" => 19,
"Controller.PaddlesXCenter" => 20,
"Controller.PaddlesYCenter" => 21,
"Controller.MouseAxis" => 22,
"Display.Format" => 23,
"Display.VCenter" => 24,
"Display.Phosphor" => 25,
"Display.PPBlend" => 26,
"Cart.Highscore" => 27,
"Cart.Url" => 28
"Cart.Highscore" => 9,
"Cart.Url" => 10,
"Console.LeftDiff" => 11,
"Console.RightDiff" => 12,
"Console.TVType" => 13,
"Console.SwapPorts" => 14,
"Controller.Left" => 15,
"Controller.Left1" => 16,
"Controller.Left2" => 17,
"Controller.Right" => 18,
"Controller.Right1" => 19,
"Controller.Right2" => 20,
"Controller.SwapPaddles" => 21,
"Controller.PaddlesXCenter" => 22,
"Controller.PaddlesYCenter" => 23,
"Controller.MouseAxis" => 24,
"Display.Format" => 25,
"Display.VCenter" => 26,
"Display.Phosphor" => 27,
"Display.PPBlend" => 28
);
my @prop_type_as_string = (
"Cart.MD5",
"Cart.Manufacturer",
"Cart.ModelNo",
"Cart.Name",
"Cart.Note",
"Cart.Rarity",
"Cart.Sound",
"Cart.StartBank",
"Cart.Type",
"Console.LeftDiff",
"Console.RightDiff",
"Console.TVType",
"Cart.MD5",
"Cart.Manufacturer",
"Cart.ModelNo",
"Cart.Name",
"Cart.Note",
"Cart.Rarity",
"Cart.Sound",
"Cart.StartBank",
"Cart.Type",
"Cart.Highscore",
"Cart.Url",
"Console.LeftDiff",
"Console.RightDiff",
"Console.TVType",
"Console.SwapPorts",
"Controller.Left",
"Controller.Left1",
"Controller.Left2",
@ -59,44 +62,39 @@ my @prop_type_as_string = (
"Display.Format",
"Display.VCenter",
"Display.Phosphor",
"Display.PPBlend",
"Cart_Highscore",
"Cart_Url"
);
"Display.PPBlend"
);
my @prop_defaults = (
"", # Cart.MD5
"", # Cart.Manufacturer
"", # Cart.ModelNo
"", # Cart.Name
"", # Cart.Note
"", # Cart.Rarity
"MONO", # Cart.Sound
"AUTO", # Cart.StartBank
"AUTO", # Cart.Type
"B", # Console.LeftDiff
"B", # Console.RightDiff
"COLOR", # Console.TVType
"NO", # Console.SwapPorts
"", # Controller.Left
"", # Controller.Left1
"", # Controller.Left2
"", # Controller.Right
"", # Controller.Right1
"", # Controller.Right2
"NO", # Controller.SwapPaddles
"0", # Controller.PaddlesXCenter
"0", # Controller.PaddlesYCenter
"AUTO", # Controller.MouseAxis
"AUTO", # Display.Format
"0", # Display.VCenter
"NO", # Display.Phosphor
"0", # Display.PPBlend
"1", # Cart.Variations
"", # Cart.Formats
"", # Cart.Addresses
"", # Cart.Highscore
"" # Cart.Url
"", # Cart.MD5
"", # Cart.Manufacturer
"", # Cart.ModelNo
"", # Cart.Name
"", # Cart.Note
"", # Cart.Rarity
"MONO", # Cart.Sound
"AUTO", # Cart.StartBank
"AUTO", # Cart.Type
"", # Cart.Highscore
"", # Cart.Url
"B", # Console.LeftDiff
"B", # Console.RightDiff
"COLOR", # Console.TVType
"NO", # Console.SwapPorts
"", # Controller.Left
"", # Controller.Left1
"", # Controller.Left2
"", # Controller.Right
"", # Controller.Right1
"", # Controller.Right2
"NO", # Controller.SwapPaddles
"0", # Controller.PaddlesXCenter
"0", # Controller.PaddlesYCenter
"AUTO", # Controller.MouseAxis
"AUTO", # Display.Format
"0", # Display.VCenter
"NO", # Display.Phosphor
"0" # Display.PPBlend
);
# Load and parse a properties file into an hash table of property