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-05-29 21:14:03 +08:00
parent ac7e77a7e4
commit 3338c226b9
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/CMakeLists.txt
View File

@ -9,7 +9,7 @@ else()
endif() 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") 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_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")

3
server/gameserver/bullet.cc
View File

@ -105,6 +105,9 @@ void Bullet::OnHit(std::set<Entity*>& objects)
switch (target->entity_type) { switch (target->entity_type) {
case ET_Player: case ET_Player:
{ {
if (App::Instance()->HasFlag(8)) {
return;
}
Human* hum = (Human*)target; Human* hum = (Human*)target;
#if 1 #if 1
if (!hum->dead) { if (!hum->dead) {

4
server/gameserver/human.cc
View File

@ -740,7 +740,7 @@ bool Human::HasNoDownedTeammate()
void Human::Land() void Human::Land()
{ {
a8::UnSetBitFlag(status, HS_Jump); 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)); MetaData::Equip* weapon_meta = MetaMgr::Instance()->GetEquip(a8::RandEx(12103, 12122));
if (weapon_meta) { if (weapon_meta) {
weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1; weapons[GUN_SLOT1].weapon_idx = GUN_SLOT1;
@ -958,7 +958,9 @@ void Human::FindLocation()
std::vector<Entity*> objects; std::vector<Entity*> objects;
room->BuildingBoxBoundCollisionDetection(this, objects); room->BuildingBoxBoundCollisionDetection(this, objects);
if (objects.size() > 1) { if (objects.size() > 1) {
#if 0
abort(); abort();
#endif
} }
if (!objects.empty()) { if (!objects.empty()) {
Building* building = (Building*)objects[0]; Building* building = (Building*)objects[0];

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit 07650796618d3d5f86bc3749e817bdc4848458b9 Subproject commit c0baee99800e68e3e82c5902aae5ad4ce151493e

2
third_party/framework vendored

@ -1 +1 @@
Subproject commit 0d1fd33446c6dda16e8ecb5a0ad9b0e42c44deee Subproject commit 7af5d3b84aeaa84a2979c24db9db5ed5a43cea2d