Skip to content

Commit 9295202

Browse files
committed
nitpicks
1 parent 439f785 commit 9295202

7 files changed

Lines changed: 6 additions & 17 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ add_library(${PROJECT_NAME} SHARED ${SOURCES})
1515

1616
target_include_directories(${PROJECT_NAME} PRIVATE include src)
1717

18-
if(PROJECT_IS_TOP_LEVEL)
19-
target_compile_definitions(${PROJECT_NAME} PRIVATE BRKD_HORRIBLE_API_EXPORTING)
20-
endif()
21-
2218
if(NOT DEFINED ENV{GEODE_SDK})
2319
message(FATAL_ERROR "Unable to find Geode SDK! Please define GEODE_SDK environment variable to point to Geode")
2420
else()

include/horrible/DLL.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#pragma once
22

33
#ifdef GEODE_IS_WINDOWS
4-
#ifdef BRKD_HORRIBLE_API_EXPORTING
4+
#ifdef HorribleMenu_EXPORTS
55
#define BRKD_HORRIBLE_API_DLL __declspec(dllexport)
66
#else
77
#define BRKD_HORRIBLE_API_DLL __declspec(dllimport)
88
#endif
99
#else
10-
#ifdef BRKD_HORRIBLE_API_EXPORTING
10+
#ifdef HorribleMenu_EXPORTS
1111
#define BRKD_HORRIBLE_API_DLL __attribute__((visibility("default")))
1212
#else
1313
#define BRKD_HORRIBLE_API_DLL

src/hooks/Gambler.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ class $modify(GamblerPlayLayer, PlayLayer) {
2626
bool init(GJGameLevel* level, bool useReplay, bool dontCreateObjects) {
2727
if (!PlayLayer::init(level, useReplay, dontCreateObjects)) return false;
2828

29-
auto f = m_fields.self();
30-
3129
// check every frame so we can detect each percentage change
32-
if (!f->triggered) schedule(schedule_selector(GamblerPlayLayer::gamblerCheck), 0.f);
30+
if (!m_fields->triggered) schedule(schedule_selector(GamblerPlayLayer::gamblerCheck), 0.f);
3331

3432
return true;
3533
};

src/hooks/Mock.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,11 @@ class $modify(MockMenuLayer, MenuLayer) {
2929
bool init() {
3030
if (!MenuLayer::init()) return false;
3131

32-
auto f = m_fields.self();
33-
3432
// show a lazysprite for the first png found in the save dir
3533
auto rnd = rng::fast();
3634
log::trace("mock chance {}", rnd);
3735

38-
if (rnd <= f->chance) {
36+
if (rnd <= m_fields->chance) {
3937
auto const mockConfigPath = fmt::format("{}\\mock.json", mod->getSaveDir());
4038
auto const mockConfig = file::readJson(fs::path(mockConfigPath));
4139

src/hooks/OnIce.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ class $modify(OnIcePlayerObject, PlayerObject) {
2020
HORRIBLE_DELEGATE_HOOKS(THIS_ID);
2121

2222
void update(float p0) {
23-
// make the player always on ice. yea this is it xD
24-
m_isOnIce = true;
2523
PlayerObject::update(p0);
24+
m_isOnIce = true; // make the player always on ice. yea this is it xD
2625
};
2726
};

src/hooks/Parry.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <Utils.h>
22

3-
#include <Geode/Geode.hpp>
3+
// #include <Geode/Geode.hpp>
44

55
// #include <Geode/modify/PlayLayer.hpp>
66
// #include <Geode/modify/PlayerObject.hpp>

src/hooks/Sticky.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,11 @@ class $modify(StickyPlayerObject, PlayerObject) {
6161

6262
void stickyCol1() {
6363
auto f = m_fields.self();
64-
6564
if (f->m_clickLabel) f->m_clickLabel->setColor(colors::yellow);
6665
};
6766

6867
void stickyCol2() {
6968
auto f = m_fields.self();
70-
7169
if (f->m_clickLabel) f->m_clickLabel->setColor(colors::white);
7270
};
7371

0 commit comments

Comments
 (0)