libretro/Mesen
1
0
Fork 0
mirror of https://github.com/libretro/Mesen.git synced 2025-02-23 10:01:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HD Packs: Allow all conditions to be inverted by using the ! operator

Browse Source
This commit is contained in:
Sour 2018-02-25 17:03:06 -05:00
parent 94c114e713
commit 83295b4117
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/HdData.h
View File

@ -152,6 +152,10 @@ struct HdPackCondition
{
if(_resultCache == -1) {
bool result = InternalCheckCondition(screenInfo, x, y, tile);
if(Name[0] == '!') {
result = !result;
}
if(_useCache) {
_resultCache = result ? 1 : 0;
}

25
Core/HdPackLoader.cpp
View File

@ -176,7 +176,8 @@ bool HdPackLoader::LoadPack()
ProcessBackgroundTag(tokens, conditions);
} else if(lineContent.substr(0, 11) == "<condition>") {
tokens = StringUtilities::Split(lineContent.substr(11), ',');
ProcessConditionTag(tokens);
ProcessConditionTag(tokens, false);
ProcessConditionTag(tokens, true);
} else if(lineContent.substr(0, 6) == "<tile>") {
tokens = StringUtilities::Split(lineContent.substr(6), ',');
ProcessTileTag(tokens, conditions);
@ -222,13 +223,25 @@ void HdPackLoader::InitializeGlobalConditions()
hmirror->Name = "hmirror";
_data->Conditions.push_back(unique_ptr<HdPackCondition>(hmirror));
HdPackCondition* invHmirror = new HdPackHorizontalMirroringCondition();
invHmirror->Name = "!hmirror";
_data->Conditions.push_back(unique_ptr<HdPackCondition>(invHmirror));
HdPackCondition* vmirror = new HdPackVerticalMirroringCondition();
vmirror->Name = "vmirror";
_data->Conditions.push_back(unique_ptr<HdPackCondition>(vmirror));
HdPackCondition* invVmirror = new HdPackVerticalMirroringCondition();
invVmirror->Name = "!vmirror";
_data->Conditions.push_back(unique_ptr<HdPackCondition>(invVmirror));
HdPackCondition* bgpriority = new HdPackBgPriorityCondition();
bgpriority->Name = "bgpriority";
_data->Conditions.push_back(unique_ptr<HdPackCondition>(bgpriority));
HdPackCondition* invBgpriority = new HdPackBgPriorityCondition();
invBgpriority->Name = "!bgpriority";
_data->Conditions.push_back(unique_ptr<HdPackCondition>(invBgpriority));
}
void HdPackLoader::ProcessOverscanTag(vector<string> &tokens)
@ -366,12 +379,14 @@ void HdPackLoader::ProcessOptionTag(vector<string> &tokens)
}
}
void HdPackLoader::ProcessConditionTag(vector<string> &tokens)
void HdPackLoader::ProcessConditionTag(vector<string> &tokens, bool createInvertedCondition)
{
checkConstraint(tokens.size() >= 4, "[HDPack] Condition tag should contain at least 4 parameters");
checkConstraint(tokens[0].size() > 0, "[HDPack] Condition name may not be empty");
checkConstraint(tokens[0].find_last_of('!') == string::npos, "[HDPack] Condition name may not contain '!' characters");
unique_ptr<HdPackCondition> condition;
if(tokens[1] == "tileAtPosition") {
condition.reset(new HdPackTileAtPositionCondition());
} else if(tokens[1] == "tileNearby") {
@ -394,6 +409,10 @@ void HdPackLoader::ProcessConditionTag(vector<string> &tokens)
tokens[0].erase(tokens[0].find_last_not_of(" \n\r\t") + 1);
condition->Name = tokens[0];
if(createInvertedCondition) {
condition->Name = "!" + condition->Name;
}
int index = 2;
if(dynamic_cast<HdPackBaseTileCondition*>(condition.get())) {
checkConstraint(tokens.size() >= 6, "[HDPack] Condition tag should contain at least 6 parameters");

2
Core/HdPackLoader.h
View File

@ -34,7 +34,7 @@ private:
bool ProcessImgTag(string src);
void ProcessPatchTag(vector<string> &tokens);
void ProcessOverscanTag(vector<string> &tokens);
void ProcessConditionTag(vector<string> &tokens);
void ProcessConditionTag(vector<string> &tokens, bool createInvertedCondition);
void ProcessTileTag(vector<string> &tokens, vector<HdPackCondition*> conditions);
void ProcessBackgroundTag(vector<string> &tokens, vector<HdPackCondition*> conditions);
void ProcessOptionTag(vector<string>& tokens);