Skip to content

Commit

Permalink
remove broken search options
Browse files Browse the repository at this point in the history
  • Loading branch information
Cvolton committed Jul 30, 2023
1 parent 0c99463 commit ca70268
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/layers/CvoltonSearchOptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ void CvoltonSearchOptions::drawToggles(){
auto CM = CvoltonManager::sharedState();
auto winSize = CCDirector::sharedDirector()->getWinSize();

createToggle("search_contains", "Name Contains", -170, 75); //40 -60, 170 -60, 300 -60, 40 -110
createToggle("search_no_id", "No ID Search", -40, 75);
createToggle("search_surround_percent", "No Forced Star", 90, 75);
createToggle("search_trim", "Trim Spaces", -170, 25);
//createToggle("search_contains", "Name Contains", -170, 75); //40 -60, 170 -60, 300 -60, 40 -110
//createToggle("search_no_id", "No ID Search", -40, 75);
//createToggle("search_surround_percent", "No Forced Star", 90, 75);
createToggle("search_trim", "Trim Spaces", -170, 75); //25

createTextLabel("Completed Mode:", {0, -95}, 0.5f, m_pButtonMenu, "goldFont.fnt");
createButton("edit_leftBtn_001.png", {-120, -120}, menu_selector(CvoltonSearchOptions::onCompletedPrev), 1.2f);
Expand Down
8 changes: 4 additions & 4 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1177,12 +1177,12 @@ GJSearchObject* __fastcall LevelSearchLayer_getSearchObject(LevelSearchLayer* se
str.erase(str.find_last_not_of(' ') + 1);
}

if(CM->getOption("search_no_id") && isID && type == SearchType::kSearchTypeSearch) str = str + "%25";
if(CM->getOption("search_no_id") && isID && type == SearchType::kSearchTypeFindUsers) str = str + "%20";
//if(CM->getOption("search_no_id") && isID && type == SearchType::kSearchTypeSearch) str = str + "%25";
//if(CM->getOption("search_no_id") && isID && type == SearchType::kSearchTypeFindUsers) str = str + "%20";

if(CM->getOption("search_surround_percent") && (!isID || CM->getOption("search_no_id")) && type == SearchType::kSearchTypeSearch) str = str + "%25%25";
//if(CM->getOption("search_surround_percent") && (!isID || CM->getOption("search_no_id")) && type == SearchType::kSearchTypeSearch) str = str + "%25%25";

if(CM->getOption("search_contains") && type == SearchType::kSearchTypeSearch && (!isID || CM->getOption("search_no_id"))) str = "%25" + str;
//if(CM->getOption("search_contains") && type == SearchType::kSearchTypeSearch && (!isID || CM->getOption("search_no_id"))) str = "%25" + str;

return MHook::getOriginal(LevelSearchLayer_getSearchObject)(self, a, type, str);
}
Expand Down

0 comments on commit ca70268

Please sign in to comment.