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

1

Browse Source
This commit is contained in:
aozhiwei 2019-06-12 14:48:19 +08:00
parent 24d95c8578
commit 566ceb0570
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/gameserver/CMakeLists.txt
View File

@ -10,10 +10,8 @@ endif()
set(CMAKE_BUILD_TYPE "Debug") set(CMAKE_BUILD_TYPE "Debug")
set(CMAKE_BUILD_TYPE "Release") set(CMAKE_BUILD_TYPE "Release")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1 -DRAY_DETECTION=1") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1")
#set(CMAKE_CXX_FLAGS_RELEASE "-O2 -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1 -fsanitize=address -fno-omit-frame-pointer") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1")
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1 -DRAY_DETECTION=1")
#set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++11 -DGAME_ID=${GAME_ID} -DA8_TCP_SESSION2=1 -fsanitize=address -fno-omit-frame-pointer")
include_directories( include_directories(
AFTER AFTER

6
server/gameserver/player.cc
View File

@ -108,18 +108,14 @@ void Player::UpdateMove()
moving = false; moving = false;
moved_frames = 0; moved_frames = 0;
last_collision_door = nullptr; last_collision_door = nullptr;
#ifdef RAY_DETECTION
movement->Clear(); movement->Clear();
#endif
return; return;
} }
++moved_frames; ++moved_frames;
if (moved_frames > 4) { if (moved_frames > 4) {
moving = false; moving = false;
moved_frames = 0; moved_frames = 0;
#ifdef RAY_DETECTION
movement->Clear(); movement->Clear();
#endif
return; return;
} }
if (in_walk_zone) { if (in_walk_zone) {
@ -696,13 +692,11 @@ void Player::_CMMove(f8::MsgHdr& hdr, const cs::CMMove& msg)
move_dir.FromPB(&msg.move_dir()); move_dir.FromPB(&msg.move_dir());
move_dir.Normalize(); move_dir.Normalize();
moving = true; moving = true;
#ifdef RAY_DETECTION
if (std::abs(move_dir.x - old_move_dir.x) > 0.000001f || if (std::abs(move_dir.x - old_move_dir.x) > 0.000001f ||
std::abs(move_dir.y - old_move_dir.y) > 0.000001f) { std::abs(move_dir.y - old_move_dir.y) > 0.000001f) {
ClearWalkZone(); ClearWalkZone();
movement->RayDetection(); movement->RayDetection();
} }
#endif
} }
} }
assert(!isnan(move_dir.x) && !isnan(move_dir.y)); assert(!isnan(move_dir.x) && !isnan(move_dir.y));

2
server/gameserver/room.cc
View File

@ -606,9 +606,7 @@ void Room::CreateBullet(Human* hum, Weapon* weapon,
bullet->Initialize(); bullet->Initialize();
AddObjectLater(bullet); AddObjectLater(bullet);
grid_service.AddBullet(bullet); grid_service.AddBullet(bullet);
#ifdef RAY_DETECTION
bullet->movement->RayDetection(); bullet->movement->RayDetection();
#endif
} }
void Room::RemoveObjectLater(Entity* entity) void Room::RemoveObjectLater(Entity* entity)