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-04-21 17:49:44 +08:00
parent 0c6a2b6f6d
commit cf6ac96828
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/gameserver/bullet.cc
View File

@ -986,9 +986,6 @@ float Bullet::GetHitRadius()
hit_radius = GetExplosionRange(); hit_radius = GetExplosionRange();
} }
} }
if (room->IsNewBieRoom()) {
hit_radius += 3;
}
return hit_radius; return hit_radius;
} }

9
server/gameserver/collision.cc
View File

@ -8,6 +8,7 @@
#include "creature.h" #include "creature.h"
#include "obstacle.h" #include "obstacle.h"
#include "roomobstacle.h" #include "roomobstacle.h"
#include "room.h"
#include "mt/Map.h" #include "mt/Map.h"
#include "mt/MapThing.h" #include "mt/MapThing.h"
@ -15,16 +16,20 @@
bool Collision::CheckBullet(IBullet* bullet, Creature* c) bool Collision::CheckBullet(IBullet* bullet, Creature* c)
{ {
glm::vec3 bullet_real_pos = bullet->GetPos().ToGlmVec3() - bullet->GetDir() * bullet->GetHitRadius(); glm::vec3 bullet_real_pos = bullet->GetPos().ToGlmVec3() - bullet->GetDir() * bullet->GetHitRadius();
float bullet_hit_radius = bullet->GetHitRadius();
if (c->room->IsNewBieRoom()) {
bullet_hit_radius += 3;
}
bool ret = a8::IntersectCylinderCylinder bool ret = a8::IntersectCylinderCylinder
( (
bullet_real_pos, bullet->GetHitRadius() * 1.0, 10, bullet_real_pos, bullet_hit_radius * 1.0, 10,
c->GetPos().ToGlmVec3(), c->GetHitRadius(), 10 c->GetPos().ToGlmVec3(), c->GetHitRadius(), 10
); );
if (!ret) { if (!ret) {
bullet_real_pos = bullet->GetPos().ToGlmVec3() - bullet->GetDir() * (bullet->GetHitRadius() - 2); bullet_real_pos = bullet->GetPos().ToGlmVec3() - bullet->GetDir() * (bullet->GetHitRadius() - 2);
ret = a8::IntersectCylinderCylinder ret = a8::IntersectCylinderCylinder
( (
bullet_real_pos, bullet->GetHitRadius() * 1.0, 10, bullet_real_pos, bullet_hit_radius * 1.0, 10,
c->GetPos().ToGlmVec3(), c->GetHitRadius(), 10 c->GetPos().ToGlmVec3(), c->GetHitRadius(), 10
); );
} }

2
server/gameserver/roommgr.cc
View File

@ -866,7 +866,7 @@ void RoomMgr::SetMatchMode(int mode)
void RoomMgr::AdjustCMJoin(cs::CMJoin* msg) void RoomMgr::AdjustCMJoin(cs::CMJoin* msg)
{ {
#if 0 #if 1
#ifdef DEBUG #ifdef DEBUG
#ifdef NEWBIE_ROOM #ifdef NEWBIE_ROOM
msg->set_force_enter_newbie_room(true); msg->set_force_enter_newbie_room(true);