From 6fe9daf1b6d5fc39f8916229319a863c77d93e9c Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Wed, 22 Sep 2010 18:07:45 +0300 Subject: [PATCH] Refactored Some Function Names Signed-off-by: GreYFoXGTi --- src/game/collision.cpp | 16 ++++++++++---- src/game/collision.h | 5 +++-- src/game/server/entities/character.cpp | 30 +++++++++++++------------- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/src/game/collision.cpp b/src/game/collision.cpp index f05adbb0c..097300532 100644 --- a/src/game/collision.cpp +++ b/src/game/collision.cpp @@ -97,6 +97,14 @@ void CCollision::Init(class CLayers *pLayers) } } + +int CCollision::GetPureMapIndex(vec2 Pos) +{ + int nx = clamp((int)Pos.x/32, 0, m_Width-1); + int ny = clamp((int)Pos.y/32, 0, m_Height-1); + return ny*m_Width+nx; +} + int CCollision::GetMapIndex(vec2 PrevPos, vec2 Pos) { float d = distance(PrevPos, Pos); @@ -156,16 +164,16 @@ vec2 CCollision::GetPos(int Index) return vec2(16+x*32, 16+y*32); } -int CCollision::GetCollisionDDRace(int Index) +int CCollision::GetTileIndex(int Index) { - /*dbg_msg("GetCollisionDDRace","m_pTiles[%d].m_Index = %d",Index,m_pTiles[Index].m_Index);//Remove*/ + /*dbg_msg("GetTileIndex","m_pTiles[%d].m_Index = %d",Index,m_pTiles[Index].m_Index);//Remove*/ if(Index < 0) return 0; return m_pTiles[Index].m_Index; } -int CCollision::GetFCollisionDDRace(int Index) +int CCollision::GetFTileIndex(int Index) { - /*dbg_msg("GetFCollisionDDRace","m_pFront[%d].m_Index = %d",Index,m_pFront[Index].m_Index);//Remove*/ + /*dbg_msg("GetFTileIndex","m_pFront[%d].m_Index = %d",Index,m_pFront[Index].m_Index);//Remove*/ if(Index < 0 || !m_pFront) return 0; diff --git a/src/game/collision.h b/src/game/collision.h index 4b2f74425..f4a000664 100644 --- a/src/game/collision.h +++ b/src/game/collision.h @@ -43,10 +43,11 @@ public: int GetFTile(int x, int y); int Entity(int x, int y, bool Front); //DDRace + int GetPureMapIndex(vec2 Pos); int GetMapIndex(vec2 PrevPos, vec2 Pos); vec2 GetPos(int Index); - int GetCollisionDDRace(int Index); - int GetFCollisionDDRace(int Index); + int GetTileIndex(int Index); + int GetFTileIndex(int Index); int IsTeleport(int Index); int IsEvilTeleport(int Index); //int IsCheckpoint(int Index); diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index 01f5387fc..17f46aa6e 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -672,21 +672,21 @@ void CCharacter::Tick() { CGameControllerDDRace* Controller = (CGameControllerDDRace*)GameServer()->m_pController; int MapIndex = GameServer()->Collision()->GetMapIndex(m_PrevPos, m_Pos); - int MapIndexL = GameServer()->Collision()->GetMapIndex(vec2(m_Pos.x + (m_ProximityRadius/2)+4,m_Pos.y), vec2(m_Pos.x + (m_ProximityRadius/2)+4,m_Pos.y)); - int MapIndexR = GameServer()->Collision()->GetMapIndex(vec2(m_Pos.x - (m_ProximityRadius/2)-4,m_Pos.y), vec2(m_Pos.x - (m_ProximityRadius/2)-4,m_Pos.y)); - int MapIndexT = GameServer()->Collision()->GetMapIndex(vec2(m_Pos.x,m_Pos.y + (m_ProximityRadius/2)+4), vec2(m_Pos.x,m_Pos.y + (m_ProximityRadius/2)+4)); - int MapIndexB = GameServer()->Collision()->GetMapIndex(vec2(m_Pos.x,m_Pos.y - (m_ProximityRadius/2)-4), vec2(m_Pos.x,m_Pos.y - (m_ProximityRadius/2)-4)); + int MapIndexL = GameServer()->Collision()->GetPureMapIndex(vec2(m_Pos.x + (m_ProximityRadius/2)+4,m_Pos.y)); + int MapIndexR = GameServer()->Collision()->GetPureMapIndex(vec2(m_Pos.x - (m_ProximityRadius/2)-4,m_Pos.y)); + int MapIndexT = GameServer()->Collision()->GetPureMapIndex(vec2(m_Pos.x,m_Pos.y + (m_ProximityRadius/2)+4)); + int MapIndexB = GameServer()->Collision()->GetPureMapIndex(vec2(m_Pos.x,m_Pos.y - (m_ProximityRadius/2)-4)); //dbg_msg("","N%d L%d R%d B%d T%d",MapIndex,MapIndexL,MapIndexR,MapIndexB,MapIndexT); - m_TileIndex = GameServer()->Collision()->GetCollisionDDRace(MapIndex); - m_TileFIndex = GameServer()->Collision()->GetFCollisionDDRace(MapIndex); - m_TileIndexL = GameServer()->Collision()->GetCollisionDDRace(MapIndexL); - m_TileFIndexL = GameServer()->Collision()->GetFCollisionDDRace(MapIndexL); - m_TileIndexR = GameServer()->Collision()->GetCollisionDDRace(MapIndexR); - m_TileFIndexR = GameServer()->Collision()->GetFCollisionDDRace(MapIndexR); - m_TileIndexT = GameServer()->Collision()->GetCollisionDDRace(MapIndexT); - m_TileFIndexT = GameServer()->Collision()->GetFCollisionDDRace(MapIndexT); - m_TileIndexB = GameServer()->Collision()->GetCollisionDDRace(MapIndexB); - m_TileFIndexB = GameServer()->Collision()->GetFCollisionDDRace(MapIndexB); + m_TileIndex = GameServer()->Collision()->GetTileIndex(MapIndex); + m_TileFIndex = GameServer()->Collision()->GetFTileIndex(MapIndex); + m_TileIndexL = GameServer()->Collision()->GetTileIndex(MapIndexL); + m_TileFIndexL = GameServer()->Collision()->GetFTileIndex(MapIndexL); + m_TileIndexR = GameServer()->Collision()->GetTileIndex(MapIndexR); + m_TileFIndexR = GameServer()->Collision()->GetFTileIndex(MapIndexR); + m_TileIndexT = GameServer()->Collision()->GetTileIndex(MapIndexT); + m_TileFIndexT = GameServer()->Collision()->GetFTileIndex(MapIndexT); + m_TileIndexB = GameServer()->Collision()->GetTileIndex(MapIndexB); + m_TileFIndexB = GameServer()->Collision()->GetFTileIndex(MapIndexB); //dbg_msg("","N%d L%d R%d B%d T%d",m_TileIndex,m_TileIndexL,m_TileIndexR,m_TileIndexB,m_TileIndexT); //dbg_msg("","N%d L%d R%d B%d T%d",m_TileFIndex,m_TileFIndexL,m_TileFIndexR,m_TileFIndexB,m_TileFIndexT); /*m_CurrentTile = m_TileIndex; @@ -837,7 +837,7 @@ void CCharacter::Tick() } m_Core.m_Vel.x = 0; } - if((m_TileIndexR == TILE_STOPA || m_TileFIndexR == TILE_STOPA || m_TileIndex == TILE_STOPR || m_TileIndexR == TILE_STOPR || m_TileFIndex == TILE_STOPR || m_TileFIndexR == TILE_STOPR || m_TileIndexR == TILE_STOPH || m_TileFIndexR == TILE_STOPH) && m_Core.m_Vel.x < 0) + if((m_TileIndexR == TILE_STOPA || m_TileFIndexR == TILE_STOPA || /*m_TileIndex == TILE_STOPR ||*/ m_TileIndexR == TILE_STOPR || /*m_TileFIndex == TILE_STOPR ||*/ m_TileFIndexR == TILE_STOPR || m_TileIndexR == TILE_STOPH || m_TileFIndexR == TILE_STOPH) && m_Core.m_Vel.x < 0) { if((int)GameServer()->Collision()->GetPos(MapIndex).x) if((int)GameServer()->Collision()->GetPos(MapIndex).x > (int)m_Core.m_Pos.x)