diff options
| author | oy <tom_adams@web.de> | 2011-08-03 13:50:48 -0700 |
|---|---|---|
| committer | oy <tom_adams@web.de> | 2011-08-03 13:50:48 -0700 |
| commit | 558f62f8107192c90696bf59d12c92ffcd176685 (patch) | |
| tree | eb260ba6f85e46164a46ea3f674fb09246c6ac7f | |
| parent | 50edfd37c0ed57ff793b79d06edd0bde1f6cf1bd (diff) | |
| parent | 8877cf229301f868edb425131035b5a7db2adcf6 (diff) | |
| download | zcatch-558f62f8107192c90696bf59d12c92ffcd176685.tar.gz zcatch-558f62f8107192c90696bf59d12c92ffcd176685.zip | |
Merge pull request #813 from GreYFoX/oypull
Minor and not important changes, but useful
| -rw-r--r-- | src/engine/server/server.cpp | 2 | ||||
| -rw-r--r-- | src/game/editor/editor.cpp | 2 | ||||
| -rw-r--r-- | src/game/layers.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/entities/laser.cpp | 8 |
4 files changed, 7 insertions, 7 deletions
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); 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(); } } 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<CMapItemLayerTilemap *>(pLayer); - if(pTilemap->m_Flags&1) + if(pTilemap->m_Flags&TILESLAYERFLAG_GAME) { m_pGameLayer = pTilemap; m_pGameGroup = pGroup; 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; } |