Merge pull request ddnet#7411 from infclass/for-ddnet

Fix displayed version (drop patch version if == 0), do some random little cleanup
chillerbot · Nov 3, 2023 · 1d93695 · 1d93695
2 parents dbfe888 + b886b93
commit 1d93695
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,11 @@ else()
  message(FATAL_ERROR "Couldn't parse version from src/game/version.h")
 endif()
 
-project(DDNet VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+if(VERSION_PATCH STREQUAL "0")
+ project(DDNet VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
+else()
+ project(DDNet VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+endif()
 
 set(ORIGINAL_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
 set(ORIGINAL_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})

diff --git a/src/game/client/components/menu_background.cpp b/src/game/client/components/menu_background.cpp
@@ -412,8 +412,8 @@ std::vector<CTheme> &CMenuBackground::GetThemes()
  m_vThemes.emplace_back("rand", true, true); // random theme
 
  m_ThemeScanStartTime = time_get_nanoseconds();
- Storage()->ListDirectory(IStorage::TYPE_ALL, "themes", ThemeScan, (CMenuBackground *)this);
- Storage()->ListDirectory(IStorage::TYPE_ALL, "themes", ThemeIconScan, (CMenuBackground *)this);
+ Storage()->ListDirectory(IStorage::TYPE_ALL, "themes", ThemeScan, this);
+ Storage()->ListDirectory(IStorage::TYPE_ALL, "themes", ThemeIconScan, this);
 
  std::sort(m_vThemes.begin() + PREDEFINED_THEMES_COUNT, m_vThemes.end());
  }

diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
@@ -1162,7 +1162,7 @@ bool CCharacter::IsSnappingCharacterInView(int SnappingClientID)
  {
  for(const auto &AttachedPlayerID : m_Core.m_AttachedPlayers)
  {
- CCharacter *pOtherPlayer = GameServer()->GetPlayerChar(AttachedPlayerID);
+ const CCharacter *pOtherPlayer = GameServer()->GetPlayerChar(AttachedPlayerID);
  if(pOtherPlayer && pOtherPlayer->m_Core.HookedPlayer() == ID)
  {
  if(!NetworkClippedLine(SnappingClientID, m_Pos, pOtherPlayer->m_Pos))

diff --git a/src/game/server/player.h b/src/game/server/player.h
@@ -112,7 +112,6 @@ class CPlayer
  bool m_ForceBalanced;
  int m_LastActionTick;
  int m_TeamChangeTick;
- bool m_SentSemicolonTip;
 
  // network latency calculations
  struct