From 036036f6b6172c25823fb2046551c3e26ea53e5c Mon Sep 17 00:00:00 2001
From: dankmeme01 <42031238+dankmeme01@users.noreply.github.com>
Date: Wed, 7 Feb 2024 20:40:59 +0100
Subject: [PATCH] few fixes

---
 changelog.md                            | 7 ++++---
 mod.json                                | 2 +-
 src/hooks/player_object.cpp             | 6 ++++++
 src/ui/menu/settings/settings_layer.cpp | 7 +++++--
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/changelog.md b/changelog.md
index 447a7a8e..102c42e1 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,5 @@
-## v1.0.1
+## v1.0.2
 
-* Use github actions for releases (no more crashes on old CPUs)
-* Add a proper warning for people with unsynced system clocks
+* Use github actions for releases (hopefully no more crashes on old CPUs)
+* Add a volume slider for voice chat
+* Fixed a crash in the editor
diff --git a/mod.json b/mod.json
index 98d9b6a3..066b8977 100644
--- a/mod.json
+++ b/mod.json
@@ -1,6 +1,6 @@
 {
     "geode": "2.0.0-beta.15",
-    "version": "v1.0.1",
+    "version": "v1.0.2",
     "gd": {
         "win": "2.204",
         "android": "2.205",
diff --git a/src/hooks/player_object.cpp b/src/hooks/player_object.cpp
index e976f5d3..de52e1ef 100644
--- a/src/hooks/player_object.cpp
+++ b/src/hooks/player_object.cpp
@@ -45,6 +45,12 @@ void ComplexPlayerObject::incrementJumps() {
 
 
 void HookedPlayerObject::playSpiderDashEffect(cocos2d::CCPoint from, cocos2d::CCPoint to) {
+    // if we are in the editor, do nothing
+    if (PlayLayer::get() == nullptr) {
+        PlayerObject::playSpiderDashEffect(from, to);
+        return;
+    }
+
     auto* gpl = static_cast<GlobedPlayLayer*>(PlayLayer::get());
     if (this == gpl->m_player1) {
         gpl->m_fields->spiderTp1 = SpiderTeleportData { .from = from, .to = to };
diff --git a/src/ui/menu/settings/settings_layer.cpp b/src/ui/menu/settings/settings_layer.cpp
index 2d70f50f..9085151e 100644
--- a/src/ui/menu/settings/settings_layer.cpp
+++ b/src/ui/menu/settings/settings_layer.cpp
@@ -85,9 +85,12 @@ CCArray* GlobedSettingsLayer::createSettingsCells() {
 
     MAKE_HEADER("Communication");
 #if GLOBED_VOICE_SUPPORT
-    MAKE_SETTING(communication, voiceEnabled, "Voice chat", "Enables in-game voice chat.");
+    MAKE_SETTING(communication, voiceEnabled, "Voice chat", "Enables in-game voice chat. To talk, hold V when in a level. (keybind can be changed in game settings)");
     MAKE_SETTING(communication, voiceProximity, "Voice proximity", "In platformer mode, the loudness of other players will be determined by how close they are to you.");
-    MAKE_SETTING(communication, voiceVolume, "Voice volume", "Controls how loud other players are.");
+    MAKE_SETTING_LIM(communication, voiceVolume, "Voice volume", "Controls how loud other players are.", {
+        .floatMin = 0.f,
+        .floatMax = 1.f,
+    });
     MAKE_SETTING(communication, onlyFriends, "Only friends", "When enabled, you won't hear players that are not on your friend list in-game.");
     MAKE_SETTING(communication, lowerAudioLatency, "Lower audio latency", "Decreases the audio buffer size by 2 times, reducing the latency but potentially causing audio issues.");
     MAKE_SETTING_TYPE(communication, audioDevice, Type::AudioDevice, "Audio device", "The input device used for recording your voice.");