Skip to content

Commit e2d0085

Browse files
committed
Add the new 2.208 functions (Does not compile)
1 parent 3dbabf4 commit e2d0085

File tree

9 files changed

+119
-60
lines changed

9 files changed

+119
-60
lines changed

bindings/2.2081/GeometryDash.bro

Lines changed: 98 additions & 27 deletions
Large diffs are not rendered by default.

bindings/2.2081/inline/EditorUI.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -691,14 +691,6 @@ void EditorUI::toggleLockUI(bool lockUI) {
691691
m_isPaused = lockUI;
692692
}
693693

694-
void EditorUI::toggleStickyControls(bool enable) {
695-
m_stickyControlsEnabled = enable;
696-
m_linkBtn->setEnabled(enable);
697-
m_linkBtn->setVisible(enable);
698-
m_unlinkBtn->setEnabled(enable);
699-
m_unlinkBtn->setVisible(enable);
700-
}
701-
702694
void EditorUI::transformObjectsReset() {
703695
auto selectedObjects = m_selectedObjects;
704696
if (!selectedObjects || selectedObjects->count() == 0) {

bindings/2.2081/inline/GJBaseGameLayer.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,8 +1278,8 @@ void GJBaseGameLayer::testInstantCountTrigger(int itemID, int compareCount, int
12781278
this->toggleGroupTriggered(groupID, activateGroup, remapKeys, uniqueID, controlID);
12791279
}
12801280

1281-
void GJBaseGameLayer::togglePlayerStreakBlend(bool blend) {
1282-
if (blend != m_gameState.m_playerStreakBlend) {
1281+
void GJBaseGameLayer::togglePlayerStreakBlend(bool blend, bool force) {
1282+
if (blend != m_gameState.m_playerStreakBlend || force) {
12831283
m_gameState.m_playerStreakBlend = blend;
12841284
m_player1->updateStreakBlend(blend);
12851285
m_player2->updateStreakBlend(blend);
@@ -1635,7 +1635,7 @@ void GJBaseGameLayer::updateTimeMod(float speed, bool players, bool noEffects) {
16351635
}
16361636
}
16371637

1638-
void GJBaseGameLayer::updateTimeWarp(GameObject* object, float timeWarp) {
1638+
void GJBaseGameLayer::queueTimeWarp(float timeWarp) {
16391639
m_gameState.m_unk18c = timeWarp;
16401640
}
16411641
#endif

bindings/2.2081/inline/GJUserScore.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ GJUserScore::GJUserScore() {
6767
m_unkInt2 = 0;
6868
m_levelMode = 0;
6969
m_leaderboardMode = LevelLeaderboardMode::Time;
70-
m_leaderboardType = 0;
70+
m_leaderboardStat = LeaderboardStat::Stars;
7171
}
7272
#endif
7373

bindings/2.2081/inline/GameLevelManager.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ const char* GameLevelManager::getLenKey(int len) {
3030
return cocos2d::CCString::createWithFormat("Len%i", len)->getCString();
3131
}
3232

33-
const char* GameLevelManager::getLevelDownloadKey(int levelID, bool isGauntlet) {
34-
return cocos2d::CCString::createWithFormat("%i_%i", levelID, isGauntlet)->getCString();
33+
const char* GameLevelManager::getLevelDownloadKey(int levelID, bool isGauntlet, int dailyID) {
34+
return cocos2d::CCString::createWithFormat("%i_%i_%i", levelID, isGauntlet, dailyID)->getCString();
3535
}
3636

3737
const char* GameLevelManager::getLevelKey(int levelID) {

bindings/2.2081/inline/GauntletNode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bool GauntletNode::init(GJMapPack* gauntlet) {
2828
m_gauntlet->retain();
2929
}
3030
m_locked = false;
31-
this->setupNode();
31+
this->generateNode();
3232
return true;
3333
}
3434
#endif

bindings/2.2081/inline/LeaderboardsLayer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
LeaderboardsLayer::LeaderboardsLayer() {
44
m_list = nullptr;
55
m_userScores = nullptr;
6-
m_state = LeaderboardState::Default;
7-
m_mode = 0;
6+
m_type = LeaderboardType::Default;
7+
m_stat = LeaderboardStat::Stars;
88
m_topBtn = nullptr;
99
m_globalBtn = nullptr;
1010
m_creatorsBtn = nullptr;
@@ -23,20 +23,20 @@ LeaderboardsLayer::~LeaderboardsLayer() {
2323
if (glm->m_leaderboardManagerDelegate == this) glm->m_leaderboardManagerDelegate = nullptr;
2424
}
2525

26-
LeaderboardsLayer* LeaderboardsLayer::create(LeaderboardState state, int mode) {
26+
LeaderboardsLayer* LeaderboardsLayer::create(LeaderboardType type, LeaderboardStat stat) {
2727
auto ret = new LeaderboardsLayer();
28-
if (ret->init(state, mode)) {
28+
if (ret->init(type, stat)) {
2929
ret->autorelease();
3030
return ret;
3131
}
3232
delete ret;
3333
return nullptr;
3434
}
3535

36-
cocos2d::CCScene* LeaderboardsLayer::scene(LeaderboardState state, int mode) {
36+
cocos2d::CCScene* LeaderboardsLayer::scene(LeaderboardType type, LeaderboardStat stat) {
3737
auto scene = cocos2d::CCScene::create();
3838
AppDelegate::get()->m_runningScene = scene;
39-
auto layer = LeaderboardsLayer::create(state, mode);
39+
auto layer = LeaderboardsLayer::create(type, stat);
4040
scene->addChild(layer);
4141
return scene;
4242
}

bindings/2.2081/inline/PlayLayer.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ void PlayLayer::updateScreenRotation(int rotation, bool add, bool convert, float
9191
if (angle != m_gameState.m_targetCameraAngle) m_calculateTargetHeightOffset = true;
9292
GJBaseGameLayer::updateScreenRotation(angle, add, convert, duration, easingType, easingRate, uniqueID, controlID);
9393
}
94-
95-
void PlayLayer::updateTimeWarp(EffectGameObject* object, float timeWarp) {
96-
this->updateTimeWarp(timeWarp);
97-
}
9894
#endif
9995

10096
#if defined(GEODE_IS_WINDOWS)
@@ -242,12 +238,6 @@ void PlayLayer::toggleBGEffectVisibility(bool enabled) {
242238
else if (m_glitterEnabled) m_glitterParticles->resumeSystem();
243239
}
244240

245-
void PlayLayer::toggleDebugDraw(bool enabled) {
246-
m_isDebugDrawEnabled = enabled;
247-
m_debugDrawNode->clear();
248-
m_debugDrawNode->setVisible(m_isDebugDrawEnabled && m_isPracticeMode);
249-
}
250-
251241
void PlayLayer::toggleGhostEffect(int type) {
252242
m_player1->toggleGhostEffect((GhostType)type);
253243
if (m_gameState.m_isDualMode) m_player2->toggleGhostEffect((GhostType)type);

bindings/include/Geode/Enums.hpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,15 +1068,21 @@ enum class MoveTargetType {
10681068
YOnly = 2,
10691069
};
10701070

1071-
// Geode Addition
1072-
enum class LeaderboardState {
1071+
enum class LeaderboardType {
10731072
Default = 0,
10741073
Top100 = 1,
10751074
Global = 2,
10761075
Creator = 3,
10771076
Friends = 4,
10781077
};
10791078

1079+
enum class LeaderboardStat {
1080+
Stars = 0,
1081+
Moons = 1,
1082+
Demons = 2,
1083+
UserCoins = 3
1084+
};
1085+
10801086
// Wylie Addition (https://github.com/Wyliemaster/GD-Decompiled/blob/main/GD/code/headers/Layers/LevelSettingsLayer.h)
10811087
enum class Speed {
10821088
Normal = 0,

0 commit comments

Comments
 (0)