server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-03-02 18:37:43 +08:00
parent cbeed93374
commit 603b4ae691
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/CMakeLists.txt
View File

@ -14,8 +14,8 @@ endif()
set(LIB_DIR "ubuntu20.04_g++-9")
message(LIB_DIR: ${LIB_DIR} )
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DMAP3D -DDT_VIRTUAL_QUERYFILTER")
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -DCXY -DSXY -DMAP3D -DDT_VIRTUAL_QUERYFILTER")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1")
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -DCXY -DSXY -DMAP3D -DDT_VIRTUAL_QUERYFILTER -DNEW_WEAPON_SYS=1")
include_directories(
AFTER

4
server/gameserver/player.cc
View File

@ -384,7 +384,11 @@ void Player::UpdateShot()
void Player::UpdateSelectWeapon()
{
if (!FreezeOperate()) {
#if 1
if (selected_weapon_idx >= GUN_SLOT0 && selected_weapon_idx < GUN_SLOT2) {
#else
if (selected_weapon_idx >= 0 && selected_weapon_idx < weapons.size()) {
#endif
Weapon* old_weapon = GetCurrWeapon();
Weapon* weapon = &weapons[selected_weapon_idx];
if (weapon->weapon_id != 0) {