Skip to content

Commit 886d4c2

Browse files
SollyBunnySollyBunny
committed
IndexN -> Tile in outlines.cpp
1 parent f80d357 commit 886d4c2

File tree

1 file changed

+65
-69
lines changed

1 file changed

+65
-69
lines changed

‎src/game/client/components/tclient/outlines.cpp‎

Lines changed: 65 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -121,86 +121,82 @@ void COutlines::OnRender()
121121

122122
IGraphics::CQuadItem Array[8];
123123
bool Neighbors[8];
124+
int Tile;
124125
if(IsFreeze && TileType == TILE_FREEZE)
125126
{
126-
int IndexN;
127-
128-
IndexN = pTiles[ClampedIndex(mx - 1, my - 1, w, h)].m_Index;
129-
Neighbors[0] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
130-
IndexN = pTiles[ClampedIndex(mx - 0, my - 1, w, h)].m_Index;
131-
Neighbors[1] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
132-
IndexN = pTiles[ClampedIndex(mx + 1, my - 1, w, h)].m_Index;
133-
Neighbors[2] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
134-
IndexN = pTiles[ClampedIndex(mx - 1, my + 0, w, h)].m_Index;
135-
Neighbors[3] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
136-
IndexN = pTiles[ClampedIndex(mx + 1, my + 0, w, h)].m_Index;
137-
Neighbors[4] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
138-
IndexN = pTiles[ClampedIndex(mx - 1, my + 1, w, h)].m_Index;
139-
Neighbors[5] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
140-
IndexN = pTiles[ClampedIndex(mx + 0, my + 1, w, h)].m_Index;
141-
Neighbors[6] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
142-
IndexN = pTiles[ClampedIndex(mx + 1, my + 1, w, h)].m_Index;
143-
Neighbors[7] = IndexN == TILE_AIR || IndexN == TILE_UNFREEZE || IndexN == TILE_DUNFREEZE;
127+
Tile = pTiles[ClampedIndex(mx - 1, my - 1, w, h)].m_Index;
128+
Neighbors[0] = Tile == TILE_AIR || Tile == TILE_UNFREEZE || Tile == TILE_DUNFREEZE;
129+
Tile = pTiles[ClampedIndex(mx - 0, my - 1, w, h)].m_Index;
130+
Neighbors[1] = Tile == TILE_AIR || Tile == TILE_UNFREEZE || Tile == TILE_DUNFREEZE;
131+
Tile = pTiles[ClampedIndex(mx + 1, my - 1, w, h)].m_Index;
132+
Neighbors[2] = Tile == TILE_AIR || Tile == TILE_UNFREEZE || Tile == TILE_DUNFREEZE;
133+
Tile = pTiles[ClampedIndex(mx - 1, my + 0, w, h)].m_Index;
134+
Neighbors[3] = Tile == TILE_AIR || Tile == TILE_UNFREEZE || Tile == TILE_DUNFREEZE;
135+
Tile = pTiles[ClampedIndex(mx + 1, my + 0, w, h)].m_Index;
136+
Neighbors[4] = Tile == TILE_AIR || Tile == TILE_UNFREEZE || Tile == TILE_DUNFREEZE;
137+
Tile = pTiles[ClampedIndex(mx - 1, my + 1, w, h)].m_Index;
138+
Neighbors[5] = Tile == TILE_AIR || Tile == TILE_UNFREEZE || Tile == TILE_DUNFREEZE;
139+
Tile = pTiles[ClampedIndex(mx + 0, my + 1, w, h)].m_Index;
140+
Neighbors[6] = Tile == TILE_AIR || Tile == TILE_UNFREEZE || Tile == TILE_DUNFREEZE;
141+
Tile = pTiles[ClampedIndex(mx + 1, my + 1, w, h)].m_Index;
142+
Neighbors[7] = Tile == TILE_AIR || Tile == TILE_UNFREEZE || Tile == TILE_DUNFREEZE;
144143
}
145144
else if(IsSolid && TileType == TILE_SOLID)
146145
{
147-
int IndexN;
148-
IndexN = pTiles[ClampedIndex(mx - 1, my - 1, w, h)].m_Index;
149-
Neighbors[0] = IndexN != TILE_NOHOOK && IndexN != Index;
150-
IndexN = pTiles[ClampedIndex(mx - 0, my - 1, w, h)].m_Index;
151-
Neighbors[1] = IndexN != TILE_NOHOOK && IndexN != Index;
152-
IndexN = pTiles[ClampedIndex(mx + 1, my - 1, w, h)].m_Index;
153-
Neighbors[2] = IndexN != TILE_NOHOOK && IndexN != Index;
154-
IndexN = pTiles[ClampedIndex(mx - 1, my + 0, w, h)].m_Index;
155-
Neighbors[3] = IndexN != TILE_NOHOOK && IndexN != Index;
156-
IndexN = pTiles[ClampedIndex(mx + 1, my + 0, w, h)].m_Index;
157-
Neighbors[4] = IndexN != TILE_NOHOOK && IndexN != Index;
158-
IndexN = pTiles[ClampedIndex(mx - 1, my + 1, w, h)].m_Index;
159-
Neighbors[5] = IndexN != TILE_NOHOOK && IndexN != Index;
160-
IndexN = pTiles[ClampedIndex(mx + 0, my + 1, w, h)].m_Index;
161-
Neighbors[6] = IndexN != TILE_NOHOOK && IndexN != Index;
162-
IndexN = pTiles[ClampedIndex(mx + 1, my + 1, w, h)].m_Index;
163-
Neighbors[7] = IndexN != TILE_NOHOOK && IndexN != Index;
146+
Tile = pTiles[ClampedIndex(mx - 1, my - 1, w, h)].m_Index;
147+
Neighbors[0] = Tile != TILE_NOHOOK && Tile != Index;
148+
Tile = pTiles[ClampedIndex(mx - 0, my - 1, w, h)].m_Index;
149+
Neighbors[1] = Tile != TILE_NOHOOK && Tile != Index;
150+
Tile = pTiles[ClampedIndex(mx + 1, my - 1, w, h)].m_Index;
151+
Neighbors[2] = Tile != TILE_NOHOOK && Tile != Index;
152+
Tile = pTiles[ClampedIndex(mx - 1, my + 0, w, h)].m_Index;
153+
Neighbors[3] = Tile != TILE_NOHOOK && Tile != Index;
154+
Tile = pTiles[ClampedIndex(mx + 1, my + 0, w, h)].m_Index;
155+
Neighbors[4] = Tile != TILE_NOHOOK && Tile != Index;
156+
Tile = pTiles[ClampedIndex(mx - 1, my + 1, w, h)].m_Index;
157+
Neighbors[5] = Tile != TILE_NOHOOK && Tile != Index;
158+
Tile = pTiles[ClampedIndex(mx + 0, my + 1, w, h)].m_Index;
159+
Neighbors[6] = Tile != TILE_NOHOOK && Tile != Index;
160+
Tile = pTiles[ClampedIndex(mx + 1, my + 1, w, h)].m_Index;
161+
Neighbors[7] = Tile != TILE_NOHOOK && Tile != Index;
164162
}
165163
else if(IsKill && TileType == TILE_DEATH)
166164
{
167-
int IndexN;
168-
IndexN = pTiles[ClampedIndex(mx - 1, my - 1, w, h)].m_Index;
169-
Neighbors[0] = IndexN != TILE_DEATH && IndexN != Index;
170-
IndexN = pTiles[ClampedIndex(mx - 0, my - 1, w, h)].m_Index;
171-
Neighbors[1] = IndexN != TILE_DEATH && IndexN != Index;
172-
IndexN = pTiles[ClampedIndex(mx + 1, my - 1, w, h)].m_Index;
173-
Neighbors[2] = IndexN != TILE_DEATH && IndexN != Index;
174-
IndexN = pTiles[ClampedIndex(mx - 1, my + 0, w, h)].m_Index;
175-
Neighbors[3] = IndexN != TILE_DEATH && IndexN != Index;
176-
IndexN = pTiles[ClampedIndex(mx + 1, my + 0, w, h)].m_Index;
177-
Neighbors[4] = IndexN != TILE_DEATH && IndexN != Index;
178-
IndexN = pTiles[ClampedIndex(mx - 1, my + 1, w, h)].m_Index;
179-
Neighbors[5] = IndexN != TILE_DEATH && IndexN != Index;
180-
IndexN = pTiles[ClampedIndex(mx + 0, my + 1, w, h)].m_Index;
181-
Neighbors[6] = IndexN != TILE_DEATH && IndexN != Index;
182-
IndexN = pTiles[ClampedIndex(mx + 1, my + 1, w, h)].m_Index;
183-
Neighbors[7] = IndexN != TILE_DEATH && IndexN != Index;
165+
Tile = pTiles[ClampedIndex(mx - 1, my - 1, w, h)].m_Index;
166+
Neighbors[0] = Tile != TILE_DEATH && Tile != Index;
167+
Tile = pTiles[ClampedIndex(mx - 0, my - 1, w, h)].m_Index;
168+
Neighbors[1] = Tile != TILE_DEATH && Tile != Index;
169+
Tile = pTiles[ClampedIndex(mx + 1, my - 1, w, h)].m_Index;
170+
Neighbors[2] = Tile != TILE_DEATH && Tile != Index;
171+
Tile = pTiles[ClampedIndex(mx - 1, my + 0, w, h)].m_Index;
172+
Neighbors[3] = Tile != TILE_DEATH && Tile != Index;
173+
Tile = pTiles[ClampedIndex(mx + 1, my + 0, w, h)].m_Index;
174+
Neighbors[4] = Tile != TILE_DEATH && Tile != Index;
175+
Tile = pTiles[ClampedIndex(mx - 1, my + 1, w, h)].m_Index;
176+
Neighbors[5] = Tile != TILE_DEATH && Tile != Index;
177+
Tile = pTiles[ClampedIndex(mx + 0, my + 1, w, h)].m_Index;
178+
Neighbors[6] = Tile != TILE_DEATH && Tile != Index;
179+
Tile = pTiles[ClampedIndex(mx + 1, my + 1, w, h)].m_Index;
180+
Neighbors[7] = Tile != TILE_DEATH && Tile != Index;
184181
}
185182
else
186183
{
187-
int IndexN;
188-
IndexN = pTiles[ClampedIndex(mx - 1, my - 1, w, h)].m_Index;
189-
Neighbors[0] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
190-
IndexN = pTiles[ClampedIndex(mx - 0, my - 1, w, h)].m_Index;
191-
Neighbors[1] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
192-
IndexN = pTiles[ClampedIndex(mx + 1, my - 1, w, h)].m_Index;
193-
Neighbors[2] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
194-
IndexN = pTiles[ClampedIndex(mx - 1, my + 0, w, h)].m_Index;
195-
Neighbors[3] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
196-
IndexN = pTiles[ClampedIndex(mx + 1, my + 0, w, h)].m_Index;
197-
Neighbors[4] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
198-
IndexN = pTiles[ClampedIndex(mx - 1, my + 1, w, h)].m_Index;
199-
Neighbors[5] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
200-
IndexN = pTiles[ClampedIndex(mx + 0, my + 1, w, h)].m_Index;
201-
Neighbors[6] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
202-
IndexN = pTiles[ClampedIndex(mx + 1, my + 1, w, h)].m_Index;
203-
Neighbors[7] = IndexN != TILE_UNFREEZE && IndexN != TILE_DUNFREEZE;
184+
Tile = pTiles[ClampedIndex(mx - 1, my - 1, w, h)].m_Index;
185+
Neighbors[0] = Tile != TILE_UNFREEZE && Tile != TILE_DUNFREEZE;
186+
Tile = pTiles[ClampedIndex(mx - 0, my - 1, w, h)].m_Index;
187+
Neighbors[1] = Tile != TILE_UNFREEZE && Tile != TILE_DUNFREEZE;
188+
Tile = pTiles[ClampedIndex(mx + 1, my - 1, w, h)].m_Index;
189+
Neighbors[2] = Tile != TILE_UNFREEZE && Tile != TILE_DUNFREEZE;
190+
Tile = pTiles[ClampedIndex(mx - 1, my + 0, w, h)].m_Index;
191+
Neighbors[3] = Tile != TILE_UNFREEZE && Tile != TILE_DUNFREEZE;
192+
Tile = pTiles[ClampedIndex(mx + 1, my + 0, w, h)].m_Index;
193+
Neighbors[4] = Tile != TILE_UNFREEZE && Tile != TILE_DUNFREEZE;
194+
Tile = pTiles[ClampedIndex(mx - 1, my + 1, w, h)].m_Index;
195+
Neighbors[5] = Tile != TILE_UNFREEZE && Tile != TILE_DUNFREEZE;
196+
Tile = pTiles[ClampedIndex(mx + 0, my + 1, w, h)].m_Index;
197+
Neighbors[6] = Tile != TILE_UNFREEZE && Tile != TILE_DUNFREEZE;
198+
Tile = pTiles[ClampedIndex(mx + 1, my + 1, w, h)].m_Index;
199+
Neighbors[7] = Tile != TILE_UNFREEZE && Tile != TILE_DUNFREEZE;
204200
}
205201

206202
int NumQuads = 0;

0 commit comments

Comments
 (0)