diff --git a/server/gameserver/CMakeLists.txt b/server/gameserver/CMakeLists.txt index d5ba883..9e57f2d 100644 --- a/server/gameserver/CMakeLists.txt +++ b/server/gameserver/CMakeLists.txt @@ -9,7 +9,7 @@ else() endif() 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") #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") diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index f3daef5..cf6434c 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -105,6 +105,9 @@ void Bullet::OnHit(std::set& objects) switch (target->entity_type) { case ET_Player: { + if (App::Instance()->HasFlag(8)) { + return; + } Human* hum = (Human*)target; #if 1 if (!hum->dead) { diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc index 5e7c699..bad5a31 100644 --- a/server/gameserver/human.cc +++ b/server/gameserver/human.cc @@ -740,7 +740,7 @@ bool Human::HasNoDownedTeammate() void Human::Land() { a8::UnSetBitFlag(status, HS_Jump); - if (entity_subtype == EST_Android) { + if (entity_subtype == EST_Android || App::Instance()->HasFlag(8)) { MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(a8::RandEx(12103, 12122)); if (weapon_meta) { weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1; @@ -958,7 +958,9 @@ void Human::FindLocation() std::vector objects; room->BuildingBoxBoundCollisionDetection(this, objects); if (objects.size() > 1) { + #if 0 abort(); + #endif } if (!objects.empty()) { Building* building = (Building*)objects[0]; diff --git a/third_party/a8engine b/third_party/a8engine index 0765079..c0baee9 160000 --- a/third_party/a8engine +++ b/third_party/a8engine @@ -1 +1 @@ -Subproject commit 07650796618d3d5f86bc3749e817bdc4848458b9 +Subproject commit c0baee99800e68e3e82c5902aae5ad4ce151493e diff --git a/third_party/framework b/third_party/framework index 0d1fd33..7af5d3b 160000 --- a/third_party/framework +++ b/third_party/framework @@ -1 +1 @@ -Subproject commit 0d1fd33446c6dda16e8ecb5a0ad9b0e42c44deee +Subproject commit 7af5d3b84aeaa84a2979c24db9db5ed5a43cea2d