memartel/SQCSimulator2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Correction pour pr20

Browse Source
This commit is contained in:
MarcEricMartel
2023-10-30 15:42:02 -04:00
parent 9b0c4dc594
commit 2a4a5e13cc
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SQCSim-common/bullet.cpp
View File

@@ -13,23 +13,13 @@ bool Bullet::Update(World* world, float elapsedtime, int perframe, std::map<uint
for (int x = 0; x < max; ++x) {
m_currentpos += m_velocity * elapsedtime;
std::map<uint64_t, Player*>::iterator it = mapPlayer.begin();
while (it != mapPlayer.end())
{
Player* player = it->second;
Vector3f playerPos = player->GetPosition();
if (playerPos == m_currentpos)
{
for (auto& [key, player] : mapPlayer) {
if ((m_currentpos - player->GetPosition()).Length() < .4f) {
player->InflictDamage(damage);
return true;
}
it++;
}
if (!world->ChunkAt(m_currentpos))
return true;
else if (world->BlockAt(m_currentpos) != BTYPE_AIR) {