7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-03-22 02:45:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

im done for today, good work IMO

Browse source
This commit is contained in:
altalk23 2023-12-21 22:43:23 +03:00
parent 1036e780f9
commit 9888a7aa1e
6 changed files with 12 additions and 18 deletions
loader
src
loader
LoaderImpl.cpp
platform
android
gdstdlib.cpp
mac
gdstdlib.cpp
ui/internal/list
ModListLayer.cppSearchFilterPopup.cpp
test/members
Android.cpp

6
loader/src/loader/LoaderImpl.cpp
View file

@ -60,9 +60,9 @@ Result<> Loader::Impl::setup() {
log::debug("Setting up crash handler");
log::pushNest();
// if (!crashlog::setupPlatformHandler()) {
// log::debug("Failed to set up crash handler");
// }
if (!crashlog::setupPlatformHandler()) {
log::debug("Failed to set up crash handler");
}
log::popNest();
log::debug("Loading hooks");

7
loader/src/platform/android/gdstdlib.cpp
View file

@ -8,7 +8,6 @@
namespace geode::base {
uintptr_t get() {
static uintptr_t base = (reinterpret_cast<uintptr_t>(&MenuLayer::scene) - (0x309068 - 0x10000)) & (~0x1);
log::debug("base: {}", (void*)base);
// static uintptr_t base = reinterpret_cast<uintptr_t>(dlopen("libcocos2dcpp.so", RTLD_NOW));
return base;
}
@ -61,12 +60,6 @@ namespace gd {
bool string::operator==(string const& other) const {
return std::string(*this) == std::string(other);
}
// TODO: these need to stay for old mods linking against geode <1.2.0, remove in 2.0.0
template class map<int, int>;
template class map<gd::string, gd::string>;
template class map<gd::string, bool>;
template class map<short, bool>;
}
#endif

6
loader/src/platform/mac/gdstdlib.cpp
View file

@ -56,12 +56,6 @@ namespace gd {
bool string::operator==(string const& other) const {
return std::string(*this) == std::string(other);
}
// TODO: these need to stay for old mods linking against geode <1.2.0, remove in 2.0.0
template class map<int, int>;
template class map<gd::string, gd::string>;
template class map<gd::string, bool>;
template class map<short, bool>;
}
#endif

2
loader/src/ui/internal/list/ModListLayer.cpp
View file

@ -523,7 +523,7 @@ void ModListLayer::reloadList(bool keepScroll, std::optional<ModListQuery> const
// set list
// TODO: 6th param dont know
m_list = GJListLayer::create(list, nullptr, { 0, 0, 0, 180 }, 358.f, 220.f, 0);
m_list = GJListLayer::create(list, nullptr, { 0, 0, 0, 180 }, 358.f, 220.f, items->count());
m_list->setZOrder(2);
m_list->setPosition(winSize / 2 - m_list->getScaledContentSize() / 2);
this->addChild(m_list);

2
loader/src/ui/internal/list/SearchFilterPopup.cpp
View file

@ -147,7 +147,7 @@ CCMenuItemToggler* SearchFilterPopup::addToggle(
) {
auto toggle = GameToolbox::createToggleButton(
title, selector, toggled, m_buttonMenu, pos, this, m_buttonMenu, .5f, .5f, 100.f,
{ 10.f, .0f }, nullptr, false, tag, nullptr
{ 10.f, .0f }, "bigFont.fnt", false, tag, nullptr
);
toggle->setTag(tag);
pos.y -= 22.5f;

7
loader/test/members/Android.cpp
View file

@ -33,6 +33,13 @@ GEODE_SIZE_CHECK(Slider, 0x158);
GEODE_SIZE_CHECK(SliderTouchLogic, 0x174);
GEODE_SIZE_CHECK(CCScrollLayerExt, 0x184);
GEODE_SIZE_CHECK(TableView, 0x1dc);
GEODE_SIZE_CHECK(CCTextInputNode, 0x1a0);
GEODE_MEMBER_CHECK(CCTextInputNode, m_maxLabelWidth, 0x164);
GEODE_MEMBER_CHECK(CCTextInputNode, m_textField, 0x17c);
GEODE_MEMBER_CHECK(FLAlertLayer, m_buttonMenu, 0x1b8);
GEODE_MEMBER_CHECK(FLAlertLayer, m_mainLayer, 0x1c8);
// GEODE_MEMBER_CHECK(CCNode, m_pUserObject, 0xcc);