spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow Celestia to be started without stars.dat.

ver1_5_1
Chris Laurel 2004-03-03 07:55:01 +00:00
parent 7ac467fe19
commit 04bccf0438
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/celestia/celestiacore.cpp
View File

@ -3767,13 +3767,6 @@ bool CelestiaCore::initRenderer()
bool CelestiaCore::readStars(const CelestiaConfig& cfg)
{
ifstream starFile(cfg.starDatabaseFile.c_str(), ios::in | ios::binary);
if (!starFile.good())
{
cerr << "Error opening " << cfg.starDatabaseFile << '\n';
return false;
}
ifstream starNamesFile(cfg.starNamesFile.c_str(), ios::in);
if (!starNamesFile.good())
{
@ -3788,13 +3781,23 @@ bool CelestiaCore::readStars(const CelestiaConfig& cfg)
return false;
}
// StarDatabase* starDB = StarDatabase::read(starFile);
StarDatabase* starDB = new StarDatabase();
if (!starDB->loadBinary(starFile))
if (!cfg.starDatabaseFile.empty())
{
delete starDB;
cerr << "Error reading stars file\n";
return false;
ifstream starFile(cfg.starDatabaseFile.c_str(), ios::in | ios::binary);
if (!starFile.good())
{
cerr << "Error opening " << cfg.starDatabaseFile << '\n';
delete starDB;
return false;
}
if (!starDB->loadBinary(starFile))
{
delete starDB;
cerr << "Error reading stars file\n";
return false;
}
}
starDB->setNameDatabase(starNameDB);