Merge pull request #26 from TeeMidnight/pr-fix-mis-tile-name

Renaming the tiles to prevent misunderstanding

Author: Bamcane

src/game/collision.cpp

@@ -39,11 +39,11 @@ void CCollision::Init(class CLayers *pLayers)
 		case TILE_DEATH:
 			m_pTiles[i].m_Index = COLFLAG_DEATH;
 			break;
-		case TILE_SOLID:
+		case TILE_HOOKABLE:
 			m_pTiles[i].m_Index = COLFLAG_SOLID;
 			break;
-		case TILE_NOHOOK:
-			m_pTiles[i].m_Index = COLFLAG_SOLID|COLFLAG_NOHOOK;
+		case TILE_UNHOOKABLE:
+			m_pTiles[i].m_Index = COLFLAG_SOLID|COLFLAG_UNHOOKABLE;
 			break;
 		default:
 			m_pTiles[i].m_Index = 0;

src/game/collision.h

@@ -20,7 +20,7 @@ class CCollision
 	{
 		COLFLAG_SOLID=1,
 		COLFLAG_DEATH=2,
-		COLFLAG_NOHOOK=4,
+		COLFLAG_UNHOOKABLE=4,
 	};
 
 	CCollision();

src/game/editor/popups.cpp

@@ -50,7 +50,7 @@ bool CEditor::PopupGroup(void *pContext, CUIRect View)
 			for(int y = 0; y < gl->m_Height; ++y)
 				for(int x = 0; x < gl->m_Width; ++x)
 				{
-					if(gl->m_pTiles[y*gl->m_Width+x].m_Index > static_cast<unsigned char>(TILE_NOHOOK))
+					if(gl->m_pTiles[y*gl->m_Width+x].m_Index > static_cast<unsigned char>(TILE_UNHOOKABLE))
 						continue;
 
 					bool Found = false;

src/game/gamecore.cpp

@@ -198,7 +198,7 @@ void CCharacterCore::Tick(bool UseInput)
 		int Hit = m_pCollision->IntersectLine(m_HookPos, NewPos, &NewPos, 0);
 		if(Hit)
 		{
-			if(Hit&CCollision::COLFLAG_NOHOOK)
+			if(Hit&CCollision::COLFLAG_UNHOOKABLE)
 				GoingToRetract = true;
 			else
 				GoingToHitGround = true;

src/game/mapitems.h

@@ -44,9 +44,9 @@ enum
 	NUM_ENTITIES,
 
 	TILE_AIR=0,
-	TILE_SOLID,
+	TILE_HOOKABLE,
 	TILE_DEATH,
-	TILE_NOHOOK,
+	TILE_UNHOOKABLE,
 
 	TILEFLAG_VFLIP=1,
 	TILEFLAG_HFLIP=2,