Merged New Inventory Project into main branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1871 3b4a5df2-a311-0410-b5c6-a8a6f20db521

TileEngine/World Tileset Enums.h

@@ -6,7 +6,7 @@
 
 enum
 {
-	TLS_GENERIC_1,           // 0, JA2 default
+	TLS_GENERIC_1,			// 0, JA2 default
 	TLS_CAVES_1,
 	TLS_DESERT_1,
 	TLS_LUSH_1,
@@ -17,7 +17,7 @@ enum
 	TLS_FARM_1,
 	TLS_OMERTA,
 
-	TLS_GENERIC_2,           // 10
+	TLS_GENERIC_2,			// 10
 	TLS_FARM_2,
 	TLS_PRISON,
 	TLS_HOSPITAL,
@@ -28,7 +28,7 @@ enum
 	TLS_LAWLESS_2,
 	TLS_DEAD_AIRSTRIP,
 
-	TLS_BASEMENT,            // 20
+	TLS_BASEMENT,			// 20
 	TLS_LAWLESS_3,
 	TLS_PRISON_DUNGEON,
 	TLS_ACTIVE_DRASSEN,
@@ -39,7 +39,7 @@ enum
 	TLS_MILITARY_WAREHOUSE,
 	TLS_MILITARY_TOWN,
 
-	TLS_OLD_SCHOOL,          // 30
+	TLS_OLD_SCHOOL,			// 30
 	TLS_CAMBRIA_STRIP,
 	TLS_CAMBRIA_HOMES,
 	TLS_PALACE,
@@ -50,7 +50,7 @@ enum
 	TLS_BALIME_MUSEUM,
 	TLS_DESERT_SAM,
 
-	TLS_ORTA,                // 40
+	TLS_ORTA,				// 40
 	TLS_ORTA_WEAPONS,
 	TLS_SWAMP_BARETREES,
 	TLS_ESTONI,
@@ -61,7 +61,7 @@ enum
 	TLS_QUEENS_AIRPORT,
 	TLS_DEMO_TILESET,
 
-	TLS_HEAVY_SNOW,          // 50, JA2.5 default
+	TLS_HEAVY_SNOW,			// 50, JA2.5 default
 	TLS_MIXED_SNOW,
 	TLS_GRASS_SNOW,
 	TLS_FALL_TOWN,
@@ -72,7 +72,7 @@ enum
 	TLS_UPPER_COMPLEX,
 	TLS_LOWEST_LEVEL_COMPLEX,
 
-	TILESET_60,              // 60
+	TILESET_60,				// 60
 	TILESET_61,
 	TILESET_62,
 	TILESET_63,
@@ -83,7 +83,7 @@ enum
 	TILESET_68,
 	TILESET_69,
 
-	NUM_TILESETS             // 70
+	NUM_TILESETS			 // 70
 };
 
 #endif