(svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too

This commit is contained in:
truebrain
2011-12-01 12:03:34 +00:00
parent fa07d61b84
commit bf803e40cc
23 changed files with 33 additions and 198 deletions

View File

@@ -1044,9 +1044,7 @@ static bool DifficultyNoiseChange(int32 i)
static bool MaxNoAIsChange(int32 i)
{
if (GetGameSettings().difficulty.max_no_competitors != 0 &&
#ifdef ENABLE_AI
AI::GetInfoList()->size() == 0 &&
#endif /* ENABLE_AI */
(!_networking || _network_server)) {
ShowErrorMessage(STR_WARNING_NO_SUITABLE_AI, INVALID_STRING_ID, WL_CRITICAL);
}
@@ -1314,7 +1312,6 @@ static void NewsDisplayLoadConfig(IniFile *ini, const char *grpname)
static void AILoadConfig(IniFile *ini, const char *grpname)
{
#ifdef ENABLE_AI
IniGroup *group = ini->GetGroup(grpname);
IniItem *item;
@@ -1339,7 +1336,6 @@ static void AILoadConfig(IniFile *ini, const char *grpname)
}
if (item->value != NULL) config->StringToSettings(item->value);
}
#endif /* ENABLE_AI */
}
/**
@@ -1436,7 +1432,6 @@ static void NewsDisplaySaveConfig(IniFile *ini, const char *grpname)
static void AISaveConfig(IniFile *ini, const char *grpname)
{
#ifdef ENABLE_AI
IniGroup *group = ini->GetGroup(grpname);
if (group == NULL) return;
@@ -1457,7 +1452,6 @@ static void AISaveConfig(IniFile *ini, const char *grpname)
IniItem *item = new IniItem(group, name, strlen(name));
item->SetValue(value);
}
#endif /* ENABLE_AI */
}
/**