edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-09 09:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor CRaceHelper::IsStart function

Browse source 
Avoid duplicate calculation by extraction result of `GetPureMapIndex` in variable.

Rename variable `Indices` to `Index`.

Include `vector` instead of `list`, as the former is used but the latter is not.
This commit is contained in:
Robert Müller 2024-08-04 14:03:54 +02:00
parent 00d941a309
commit 6dba8851a5
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game/client/race.cpp
View file

@ -1,5 +1,5 @@
#include <cctype> #include <cctype>
#include <list> #include <vector>
#include <game/client/gameclient.h> #include <game/client/gameclient.h>
#include <game/mapitems.h> #include <game/mapitems.h>
@ -78,18 +78,21 @@ bool CRaceHelper::IsStart(CGameClient *pClient, vec2 Prev, vec2 Pos)
{ {
std::vector<int> vIndices = pCollision->GetMapIndices(Prev, Pos); std::vector<int> vIndices = pCollision->GetMapIndices(Prev, Pos);
if(!vIndices.empty()) if(!vIndices.empty())
for(int &Indice : vIndices) {
for(const int Index : vIndices)
{ {
if(pCollision->GetTileIndex(Indice) == TILE_START) if(pCollision->GetTileIndex(Index) == TILE_START)
return true; return true;
if(pCollision->GetFTileIndex(Indice) == TILE_START) if(pCollision->GetFTileIndex(Index) == TILE_START)
return true; return true;
} }
}
else else
{ {
if(pCollision->GetTileIndex(pCollision->GetPureMapIndex(Pos)) == TILE_START) const int Index = pCollision->GetPureMapIndex(Pos);
if(pCollision->GetTileIndex(Index) == TILE_START)
return true; return true;
if(pCollision->GetFTileIndex(pCollision->GetPureMapIndex(Pos)) == TILE_START) if(pCollision->GetFTileIndex(Index) == TILE_START)
return true; return true;
} }
} }