edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 06:28:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7411 from infclass/for-ddnet

Browse source 
Fix displayed version (drop patch version if == 0), do some random little cleanup
This commit is contained in:
Dennis Felsing 2023-11-03 21:46:32 +00:00 committed by GitHub
parent dbfe8887a9 b886b93cf2
commit 1d9369593e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -22,7 +22,11 @@ else()
message(FATAL_ERROR "Couldn't parse version from src/game/version.h") message(FATAL_ERROR "Couldn't parse version from src/game/version.h")
endif() endif()
if(VERSION_PATCH STREQUAL "0")
project(DDNet VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
else()
project(DDNet VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) project(DDNet VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
endif()
set(ORIGINAL_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}) set(ORIGINAL_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
set(ORIGINAL_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES}) set(ORIGINAL_CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES})

4
src/game/client/components/menu_background.cpp
View file

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

2
src/game/server/entities/character.cpp
View file

@ -1162,7 +1162,7 @@ bool CCharacter::IsSnappingCharacterInView(int SnappingClientID)
{ {
for(const auto &AttachedPlayerID : m_Core.m_AttachedPlayers) 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(pOtherPlayer && pOtherPlayer->m_Core.HookedPlayer() == ID)
{ {
if(!NetworkClippedLine(SnappingClientID, m_Pos, pOtherPlayer->m_Pos)) if(!NetworkClippedLine(SnappingClientID, m_Pos, pOtherPlayer->m_Pos))

1
src/game/server/player.h
View file

@ -112,7 +112,6 @@ public:
bool m_ForceBalanced; bool m_ForceBalanced;
int m_LastActionTick; int m_LastActionTick;
int m_TeamChangeTick; int m_TeamChangeTick;
bool m_SentSemicolonTip;
// network latency calculations // network latency calculations
struct struct