From ca7e8de0e51982b9ed80946637e2f86d7323c628 Mon Sep 17 00:00:00 2001 From: GreYFoXGTi Date: Sat, 28 Aug 2010 02:07:01 +0200 Subject: [PATCH] Shame on me ( takes 1 else to fuck me up ) Signed-off-by: GreYFoXGTi --- src/game/editor/ed_io.cpp | 2 +- src/game/editor/ed_layer_tiles.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/editor/ed_io.cpp b/src/game/editor/ed_io.cpp index 1aef8e909..9d93c33f6 100644 --- a/src/game/editor/ed_io.cpp +++ b/src/game/editor/ed_io.cpp @@ -288,7 +288,7 @@ int CEditorMap::Save(class IStorage *pStorage, const char *pFileName) Item.m_Flags = 4; else if(pLayer->m_Front) Item.m_Flags = 8; - if(pLayer->m_Switch) + else if(pLayer->m_Switch) Item.m_Flags = 16; else Item.m_Flags = pLayer->m_Game; diff --git a/src/game/editor/ed_layer_tiles.cpp b/src/game/editor/ed_layer_tiles.cpp index b25a278b9..4f129188f 100644 --- a/src/game/editor/ed_layer_tiles.cpp +++ b/src/game/editor/ed_layer_tiles.cpp @@ -769,7 +769,7 @@ void CLayerSwitch::BrushDraw(CLayer *pBrush, float wx, float wy) if(fx<0 || fx >= m_Width || fy < 0 || fy >= m_Height) continue; - if(l->m_pTiles[y*l->m_Width+x].m_Index == (ENTITY_DOOR + ENTITY_OFFSET)|| l->m_pTiles[y*l->m_Width+x].m_Index == (ENTITY_TRIGGER + ENTITY_OFFSET) || l->m_pTiles[y*l->m_Width+x].m_Index == (ENTITY_LASER_LONG + ENTITY_OFFSET) || l->m_pTiles[y*l->m_Width+x].m_Index == (ENTITY_LASER_MIDDLE + ENTITY_OFFSET) || l->m_pTiles[y*l->m_Width+x].m_Index == (ENTITY_LASER_SHORT + ENTITY_OFFSET)) + if(l->m_pTiles[y*l->m_Width+x].m_Index == (ENTITY_DOOR + ENTITY_OFFSET) || l->m_pTiles[y*l->m_Width+x].m_Index == (ENTITY_TRIGGER + ENTITY_OFFSET) || l->m_pTiles[y*l->m_Width+x].m_Index == (ENTITY_LASER_LONG + ENTITY_OFFSET) || l->m_pTiles[y*l->m_Width+x].m_Index == (ENTITY_LASER_MIDDLE + ENTITY_OFFSET) || l->m_pTiles[y*l->m_Width+x].m_Index == (ENTITY_LASER_SHORT + ENTITY_OFFSET)) { if(l->m_pSwitchTile[y*l->m_Width+x].m_Number) m_pSwitchTile[fy*m_Width+fx].m_Number = l->m_pSwitchTile[y*l->m_Width+x].m_Number;