Skip to content

fix "unused var" #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abma wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix "unused var" #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d01b757
fix "unused var"
abma Feb 17, 2014
53375ed
link to CUtils (don't compile them)
abma Aug 12, 2014
33596c7
E323AI: fix unused var warning
abma Aug 16, 2014
edc03b9
unused var
abma Aug 18, 2014
06b6bc3
remove unused backwards compat code
abma May 7, 2015
3f435de
remove __DATE__ macro (reproducible builds)
abma May 7, 2015
d0e4236
Revert "remove unused backwards compat code"
abma May 7, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions CEconomy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,23 +1065,20 @@ void CEconomy::tryBuildingDefense(CGroup* group) {
if (mstall || estall)
return;

//bool allow;
int size;
float k;
unitCategory incCats, excCats;
buildType bt;
CCoverageCell::NType layer;
// CCoverageCell::NType layer;

if (ai->intel->getEnemyCount(AIR) > 0 && rng.RandFloat() > 0.66f) {
bt = BUILD_AA_DEFENSE;
layer = CCoverageCell::DEFENSE_ANTIAIR;
// layer = CCoverageCell::DEFENSE_ANTIAIR;
// TODO: replace STATIC with DEFENSE after all config files updated
incCats = STATIC|ANTIAIR;
excCats = TORPEDO;
}
else if (ai->gamemap->IsWaterMap() && rng.RandFloat() > 0.5f) {
bt = BUILD_UW_DEFENSE;
layer = CCoverageCell::DEFENSE_UNDERWATER;
// layer = CCoverageCell::DEFENSE_UNDERWATER;
// TODO: replace STATIC with DEFENSE after all config files updated
incCats = STATIC|TORPEDO;
// NOTE: we do not support coastal torpedo launchers
Expand All @@ -1090,15 +1087,17 @@ void CEconomy::tryBuildingDefense(CGroup* group) {
else
{
bt = BUILD_AG_DEFENSE;
layer = CCoverageCell::DEFENSE_GROUND;
// layer = CCoverageCell::DEFENSE_GROUND;
incCats = ATTACKER|DEFENSE;
excCats = ANTIAIR|TORPEDO;
}

size = ai->coverage->getLayerSize(layer);
k = size / (ai->unittable->staticUnits.size() - size + 1.0f);
/*
int size = ai->coverage->getLayerSize(layer);
const float k = size / (ai->unittable->staticUnits.size() - size + 1.0f);
bool allow;

/* switch (ai->difficulty) {
switch (ai->difficulty) {
case DIFFICULTY_EASY:
allow = k < 0.11f;
break;
Expand All @@ -1108,7 +1107,8 @@ void CEconomy::tryBuildingDefense(CGroup* group) {
case DIFFICULTY_HARD:
allow = k < 0.51f;
break;
}*/
}
*/

buildOrAssist(*group, bt, incCats, excCats);
}
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### Generic native Skirmish AI config
#
set(mySourceDirRel "") # Common values are "" or "src"
set(additionalSources ${CUtils_SRC})
set(additionalSources "")
set(additionalCompileFlags "")
set(additionalLibraries ${LegacyCpp_AIWRAPPER_TARGET} ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY})
set(additionalLibraries ${LegacyCpp_AIWRAPPER_TARGET} CUtils ${Boost_THREAD_LIBRARY} ${Boost_SYSTEM_LIBRARY})

ConfigureNativeSkirmishAI(mySourceDirRel additionalSources additionalCompileFlags additionalLibraries)
2 changes: 1 addition & 1 deletion headers/Defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/* AI meta data */
#define AI_VERSION_NR aiexport_getVersion()
#define AI_NAME std::string("E323AI")
#define AI_VERSION AI_NAME + " " + AI_VERSION_NR + " - High Templar (" + __DATE__ + ")"
#define AI_VERSION AI_NAME + " " + AI_VERSION_NR + " - High Templar"
#define AI_CREDITS "Error323 & Simon Logic"
#define AI_NOTES "This A.I. mainly focusses on the XTA and BA mods"

Expand Down