From 29de27f9dd761801b1bc617a0ea96680c83ece71 Mon Sep 17 00:00:00 2001 From: Shereef Marzouk Date: Tue, 2 Aug 2011 12:14:00 +0200 Subject: Used the enum const TILESLAYERFLAG_GAME instead of 1 --- src/game/layers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/game/layers.cpp b/src/game/layers.cpp index 82c0a61b..6deb0829 100644 --- a/src/game/layers.cpp +++ b/src/game/layers.cpp @@ -29,7 +29,7 @@ void CLayers::Init(class IKernel *pKernel) if(pLayer->m_Type == LAYERTYPE_TILES) { CMapItemLayerTilemap *pTilemap = reinterpret_cast(pLayer); - if(pTilemap->m_Flags&1) + if(pTilemap->m_Flags&TILESLAYERFLAG_GAME) { m_pGameLayer = pTilemap; m_pGameGroup = pGroup; -- cgit 1.4.1 From c1b23535ff4669cdd21043b885e9d7ffa2bc2381 Mon Sep 17 00:00:00 2001 From: Shereef Marzouk Date: Tue, 2 Aug 2011 12:14:11 +0200 Subject: fixed typo --- src/engine/server/server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/engine/server/server.cpp b/src/engine/server/server.cpp index 193547cc..ca268cc7 100644 --- a/src/engine/server/server.cpp +++ b/src/engine/server/server.cpp @@ -1137,7 +1137,7 @@ int CServer::LoadMap(const char *pMapName) str_copy(m_aCurrentMap, pMapName, sizeof(m_aCurrentMap)); //map_set(df); - // load compelate map into memory for download + // load complete map into memory for download { IOHANDLE File = Storage()->OpenFile(aBuf, IOFLAG_READ, IStorage::TYPE_ALL); m_CurrentMapSize = (int)io_length(File); -- cgit 1.4.1 From 2b5c532589b225431ad1dc02212e274c25493a17 Mon Sep 17 00:00:00 2001 From: Shereef Marzouk Date: Tue, 2 Aug 2011 12:14:49 +0200 Subject: converted white spaces to tabs --- src/game/editor/editor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp index 500e600b..5c897953 100644 --- a/src/game/editor/editor.cpp +++ b/src/game/editor/editor.cpp @@ -957,7 +957,7 @@ void CEditor::DoToolbar(CUIRect ToolBar) if(DoButton_Editor(&s_BorderBut, "Border", pT?0:-1, &Button, 0, "Adds border tiles")) { if(pT) - DoMapBorder(); + DoMapBorder(); } } -- cgit 1.4.1 From 8877cf229301f868edb425131035b5a7db2adcf6 Mon Sep 17 00:00:00 2001 From: Shereef Marzouk Date: Tue, 2 Aug 2011 12:35:14 +0200 Subject: Refactored some pointers --- src/game/server/entities/laser.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp index af66fe0c..7278995f 100644 --- a/src/game/server/entities/laser.cpp +++ b/src/game/server/entities/laser.cpp @@ -21,15 +21,15 @@ CLaser::CLaser(CGameWorld *pGameWorld, vec2 Pos, vec2 Direction, float StartEner bool CLaser::HitCharacter(vec2 From, vec2 To) { vec2 At; - CCharacter *OwnerChar = GameServer()->GetPlayerChar(m_Owner); - CCharacter *Hit = GameServer()->m_World.IntersectCharacter(m_Pos, To, 0.f, At, OwnerChar); - if(!Hit) + CCharacter *pOwnerChar = GameServer()->GetPlayerChar(m_Owner); + CCharacter *pHit = GameServer()->m_World.IntersectCharacter(m_Pos, To, 0.f, At, pOwnerChar); + if(!pHit) return false; m_From = From; m_Pos = At; m_Energy = -1; - Hit->TakeDamage(vec2(0.f, 0.f), GameServer()->Tuning()->m_LaserDamage, m_Owner, WEAPON_RIFLE); + pHit->TakeDamage(vec2(0.f, 0.f), GameServer()->Tuning()->m_LaserDamage, m_Owner, WEAPON_RIFLE); return true; } -- cgit 1.4.1