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

修复c4问题-room

Browse Source
This commit is contained in:
aozhiwei 2021-07-07 06:17:40 +00:00
parent 186aa4acfb
commit 71466b4f9b
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/gameserver/room.cc
View File

@ -568,16 +568,17 @@ int Room::CreateLootEx(int equip_id, a8::Vec2 born_pos, a8::Vec2 pos, int count,
}
}
void Room::CreateBullet(Creature* sender,
Creature* passenger,
MetaData::Equip* weapon_meta,
MetaData::EquipUpgrade* weapon_upgrade_meta,
MetaData::Equip* bullet_meta,
a8::Vec2 pos,
a8::Vec2 dir,
float fly_distance,
bool is_tank_skin)
int Room::CreateBullet(Creature* sender,
Creature* passenger,
MetaData::Equip* weapon_meta,
MetaData::EquipUpgrade* weapon_upgrade_meta,
MetaData::Equip* bullet_meta,
a8::Vec2 pos,
a8::Vec2 dir,
float fly_distance,
bool is_tank_skin)
{
int bullet_uniid = 0;
if (grid_service->CanAdd(pos.x, pos.y)) {
Bullet* bullet = EntityFactory::Instance()->MakeBullet(AllocUniid());
bullet->sender.Attach(sender);
@ -597,7 +598,9 @@ void Room::CreateBullet(Creature* sender,
bullet->Initialize();
AddObjectLater(bullet);
grid_service->AddBullet(bullet);
bullet_uniid = bullet->GetUniId();
}
return bullet_uniid;
}
Car* Room::CreateCar(Human* driver,

18
server/gameserver/room.h
View File

@ -112,15 +112,15 @@ public:
int CreateLoot(int equip_id, a8::Vec2 pos, int count, int equip_lv);
int CreateLootEx(int equip_id, a8::Vec2 born_pos, a8::Vec2 pos, int count, int equip_lv, bool show_anim);
void CreateBullet(Creature* sender,
Creature* passenger,
MetaData::Equip* weapon_meta,
MetaData::EquipUpgrade* weapon_upgrade_meta,
MetaData::Equip* bullet_meta,
a8::Vec2 pos,
a8::Vec2 dir,
float fly_distance,
bool is_tank_skin = false);
int CreateBullet(Creature* sender,
Creature* passenger,
MetaData::Equip* weapon_meta,
MetaData::EquipUpgrade* weapon_upgrade_meta,
MetaData::Equip* bullet_meta,
a8::Vec2 pos,
a8::Vec2 dir,
float fly_distance,
bool is_tank_skin = false);
Car* CreateCar(Human* driver,
int car_uniid,
MetaData::Equip* meta,