Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/elsongabriel/canary into fe…
Browse files Browse the repository at this point in the history
…ature/title-system

# Conflicts:
#	src/creatures/CMakeLists.txt
#	src/creatures/players/player.cpp
#	src/creatures/players/player.hpp
#	src/game/game.cpp
#	src/game/game.hpp
#	src/game/game_definitions.hpp
#	src/io/functions/iologindata_load_player.cpp
#	src/lua/functions/core/game/game_functions.cpp
#	src/lua/functions/creatures/player/player_functions.cpp
#	src/lua/functions/creatures/player/player_functions.hpp
#	src/server/network/protocol/protocolgame.cpp
#	src/server/network/protocol/protocolgame.hpp
#	vcproj/canary.vcxproj
  • Loading branch information
elsongabriel committed May 4, 2024
2 parents 9a8c6dc + 9efbe4c commit fd5107b
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/game/game.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8262,7 +8262,6 @@ void Game::playerCyclopediaCharacterInfo(std::shared_ptr<Player> player, uint32_
return;
}

g_logger().debug("Selected characterInfoType: {}", characterInfoType);
switch (characterInfoType) {
case CYCLOPEDIA_CHARACTERINFO_BASEINFORMATION:
player->sendCyclopediaCharacterBaseInformation();
Expand Down

0 comments on commit fd5107b

Please sign in to comment.