@@ -75,23 +75,28 @@ void SurfaceSet::loadPck(const std::string &pck, const std::string &tab)
 	int nframes = 0;
 
 	// Load TAB and get image offsets
-	std::ifstream offsetFile (tab.c_str(), std::ios::in | std::ios::binary);
-	if (!offsetFile)
-	{
-		nframes = 1;
-		Surface *surface = new Surface(_width, _height);
-		_frames[0] = surface;
-	}
-	else
+	if (!tab.empty())
 	{
+		std::ifstream offsetFile(tab.c_str(), std::ios::in | std::ios::binary);
+		if (!offsetFile)
+		{
+			throw Exception(tab + " not found");
+		}
 		Uint16 off;
-		while (offsetFile.read((char*)&off, sizeof(off)))
+		while (offsetFile.read((char*) &off, sizeof(off)))
 		{
 			off = SDL_SwapLE16(off);
 			Surface *surface = new Surface(_width, _height);
 			_frames[nframes] = surface;
 			nframes++;
 		}
+		offsetFile.close();
+	}
+	else
+	{
+		nframes = 1;
+		Surface *surface = new Surface(_width, _height);
+		_frames[0] = surface;
 	}
 
 	// Load PCX and put pixels in surfaces
@@ -140,7 +145,6 @@ void SurfaceSet::loadPck(const std::string &pck, const std::string &tab)
 	}
 
 	imgFile.close();
-	offsetFile.close();
 }
 
 /**
 
@@ -757,7 +757,7 @@ void XcomResourcePack::loadBattlescapeResources()
 	for (std::vector<std::string>::iterator i = usets.begin(); i != usets.end(); ++i)
 	{
 		std::string path = units + *i;
-		std::string tab = path.substr(0, path.length() - 4) + ".TAB";
+		std::string tab = CrossPlatform::getDataFile("UNITS/" + i->substr(0, i->length() - 4) + ".TAB");
 		std::transform(i->begin(), i->end(), i->begin(), toupper);
 		if (*i != "BIGOBS.PCK")
 			_sets[*i] = new SurfaceSet(32, 40);
Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ void XcomResourcePack::loadBattlescapeResources()`
`757`	`757`	`for (std::vector<std::string>::iterator i = usets.begin(); i != usets.end(); ++i)`
`758`	`758`	`{`
`759`	`759`	`std::string path = units + *i;`
`760`		`- std::string tab = path.substr(0, path.length() - 4) + ".TAB";`
	`760`	`+ std::string tab = CrossPlatform::getDataFile("UNITS/" + i->substr(0, i->length() - 4) + ".TAB");`
`761`	`761`	`std::transform(i->begin(), i->end(), i->begin(), toupper);`
`762`	`762`	`if (*i != "BIGOBS.PCK")`
`763`	`763`	`_sets[*i] = new SurfaceSet(32, 40);`