small fixes

GlobedGD · Feb 27, 2024 · 8d0d934 · 8d0d934
1 parent 30a98f8
commit 8d0d934
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/server/game/src/data/types/gd.rs b/server/game/src/data/types/gd.rs
@@ -84,7 +84,7 @@ impl PlayerAccountData {
  color2: self.icons.color2,
  glow_color: self.icons.glow_color,
  level_id,
- name_color: self.special_user_data.as_ref().map(|x| x.name_color),
+ // name_color: self.special_user_data.as_ref().map(|x| x.name_color),
  }
  }
 
@@ -124,7 +124,7 @@ pub struct PlayerRoomPreviewAccountData {
  pub color2: i16,
  pub glow_color: i16,
  pub level_id: LevelId,
- pub name_color: Option<Color3B>,
+ // pub name_color: Option<Color3B>,
 }
 
 /* AssociatedPlayerData */

diff --git a/src/data/types/gd.hpp b/src/data/types/gd.hpp
@@ -123,12 +123,12 @@ class PlayerRoomPreviewAccountData {
  buf.writeI16(color2);
  buf.writeI16(glowColor);
  buf.writePrimitive(levelId);
- if (nameColor.has_value()) {
- buf.writeBool(true);
- buf.writeColor3(nameColor.value());
- } else {
- buf.writeBool(false);
- }
+ // if (nameColor.has_value()) {
+ //  buf.writeBool(true);
+ //  buf.writeColor3(nameColor.value());
+ // } else {
+ //  buf.writeBool(false);
+ // }
  }
 
  GLOBED_DECODE {
@@ -140,9 +140,9 @@ class PlayerRoomPreviewAccountData {
  color2 = buf.readI16();
  glowColor = buf.readI16();
  levelId = buf.readPrimitive<LevelId>();
- if (buf.readBool()) {
- nameColor = buf.readColor3();
- }
+ // if (buf.readBool()) {
+ //  nameColor = buf.readColor3();
+ // }
  }
 
  int32_t accountId, userId;

diff --git a/src/hooks/appdelegate.cpp b/src/hooks/appdelegate.cpp
@@ -1,6 +1,5 @@
 #include "appdelegate.hpp"
 
-#include <hooks/loading_layer.hpp>
 #include <net/network_manager.hpp>
 #include <util/lowlevel.hpp>
 

diff --git a/src/hooks/loading_layer.cpp b/src/hooks/loading_layer.cpp
@@ -20,7 +20,6 @@ using namespace geode::prelude;
 }
 
 void HookedLoadingLayer::loadingFinished() {
- log::debug("loading finished got called!!");
  if (m_fields->preloadingStage == 0) {
  m_fields->loadingStartedTime = util::time::systemNow();
  log::debug("preloading assets");