[Scummvm-cvs-logs] scummvm master -> 419211733e949d376b443df8678c392d6abab5d8
sev-
sev at scummvm.org
Mon May 23 22:42:04 CEST 2016
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6e55be3213 SCUMM HE: Cleanup
419211733e COMMON: Fix warning
Commit: 6e55be321349a752f3f7245bde603024c9008a5c
https://github.com/scummvm/scummvm/commit/6e55be321349a752f3f7245bde603024c9008a5c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-23T22:41:21+02:00
Commit Message:
SCUMM HE: Cleanup
Changed paths:
engines/scumm/he/moonbase/ai_main.cpp
engines/scumm/he/moonbase/ai_main.h
diff --git a/engines/scumm/he/moonbase/ai_main.cpp b/engines/scumm/he/moonbase/ai_main.cpp
index 1357dda..1e523e1 100644
--- a/engines/scumm/he/moonbase/ai_main.cpp
+++ b/engines/scumm/he/moonbase/ai_main.cpp
@@ -158,6 +158,7 @@ AIEntity *AItype[5];
int AIstate = STATE_CHOOSE_BEHAVIOR;
int behavior = 2;
+static int energyHogType = 0;
patternList *moveList[5];
@@ -326,7 +327,7 @@ int masterControlProgram(const int paramCount, const int32 *params) {
behavior = chooseBehavior();
warning("Behavior mode: %d", behavior);
- if (_vm->_rnd.getRandomNumber(99) < AItype[getCurrentPlayer()]->getBehaviorVariation() * AI_VAR_BASE_BEHAVIOR + 1) {
+ if ((int)_vm->_rnd.getRandomNumber(99) < AItype[getCurrentPlayer()]->getBehaviorVariation() * AI_VAR_BASE_BEHAVIOR + 1) {
if (_vm->_rnd.getRandomNumber(1)) {
behavior--;
@@ -1028,10 +1029,6 @@ int masterControlProgram(const int paramCount, const int32 *params) {
int chooseBehavior() {
static int dominantMode = 0;
- int modeValue[3];
-
- const int DEFAULT_SCALE = 5;
-
if (getBuildingStackPtr() < 5)
return OFFENSE_MODE;
@@ -1041,86 +1038,50 @@ int chooseBehavior() {
switch (AIpersonality) {
case BRUTAKAS:
- modeValue[ENERGY_MODE] = DEFAULT_SCALE;
- modeValue[OFFENSE_MODE] = 2 * DEFAULT_SCALE;
- modeValue[DEFENSE_MODE] = 0;
dominantMode = OFFENSE_MODE;
break;
case AGI:
- modeValue[ENERGY_MODE] = DEFAULT_SCALE;
- modeValue[OFFENSE_MODE] = 0;
- modeValue[DEFENSE_MODE] = 2 * DEFAULT_SCALE;
dominantMode = DEFENSE_MODE;
break;
case EL_GATO:
- modeValue[ENERGY_MODE] = 2 * DEFAULT_SCALE;
- modeValue[OFFENSE_MODE] = DEFAULT_SCALE;
- modeValue[DEFENSE_MODE] = 0;
dominantMode = ENERGY_MODE;
break;
case PIXELAHT:
- modeValue[ENERGY_MODE] = DEFAULT_SCALE;
- modeValue[OFFENSE_MODE] = 0;
- modeValue[DEFENSE_MODE] = DEFAULT_SCALE;
dominantMode = DEFENSE_MODE;
break;
case CYBALL:
- modeValue[ENERGY_MODE] = 0;
- modeValue[OFFENSE_MODE] = 0;
- modeValue[DEFENSE_MODE] = 0;
dominantMode = ENERGY_MODE;
break;
case NEEP:
- modeValue[ENERGY_MODE] = 0;
- modeValue[OFFENSE_MODE] = DEFAULT_SCALE;
- modeValue[DEFENSE_MODE] = DEFAULT_SCALE;
dominantMode = DEFENSE_MODE;
break;
case WARCUPINE:
- modeValue[ENERGY_MODE] = 5 * DEFAULT_SCALE;
- modeValue[OFFENSE_MODE] = DEFAULT_SCALE;
- modeValue[DEFENSE_MODE] = 0;
dominantMode = ENERGY_MODE;
break;
case AONE:
- modeValue[ENERGY_MODE] = 0;
- modeValue[OFFENSE_MODE] = DEFAULT_SCALE;
- modeValue[DEFENSE_MODE] = 2 * DEFAULT_SCALE;
dominantMode = DEFENSE_MODE;
break;
case SPANDO:
- modeValue[ENERGY_MODE] = DEFAULT_SCALE;
- modeValue[OFFENSE_MODE] = DEFAULT_SCALE;
- modeValue[DEFENSE_MODE] = DEFAULT_SCALE;
dominantMode = ENERGY_MODE;
break;
case ORBNU_LUNATEK:
- modeValue[ENERGY_MODE] = 0;
- modeValue[OFFENSE_MODE] = 0;
- modeValue[DEFENSE_MODE] = 0;
dominantMode = ENERGY_MODE;
break;
case CRAWLER_CHUCKER:
- modeValue[ENERGY_MODE] = 0;
- modeValue[OFFENSE_MODE] = 2 * DEFAULT_SCALE;
- modeValue[DEFENSE_MODE] = 0;
dominantMode = OFFENSE_MODE;
break;
case ENERGY_HOG:
- modeValue[ENERGY_MODE] = 2 * DEFAULT_SCALE;
- modeValue[OFFENSE_MODE] = 0;
- modeValue[DEFENSE_MODE] = 0;
dominantMode = ENERGY_MODE;
{
int breakFlag = 0;
@@ -1135,9 +1096,6 @@ int chooseBehavior() {
break;
case RANGER:
- modeValue[ENERGY_MODE] = 2 * DEFAULT_SCALE;
- modeValue[OFFENSE_MODE] = 0;
- modeValue[DEFENSE_MODE] = 0;
dominantMode = OFFENSE_MODE;
//random chance of defense if really early in game, otherwise offense
@@ -1148,9 +1106,6 @@ int chooseBehavior() {
break;
default: //BRUTAKAS
- modeValue[ENERGY_MODE] = DEFAULT_SCALE;
- modeValue[OFFENSE_MODE] = 2 * DEFAULT_SCALE;
- modeValue[DEFENSE_MODE] = 0;
dominantMode = OFFENSE_MODE;
break;
}
@@ -2880,9 +2835,6 @@ int simulateBuildingLaunch(int x, int y, int power, int angle, int numSteps, int
sWhichUnit = getClosestUnit(x + 10, y, 30, getCurrentPlayer(), 1, BUILDING_MAIN_BASE, 0, 0);
}
- int savedUnscaledXLoc = 0;
- int savedUnscaledYLoc = 0;
-
for (int i = 1; i <= numSteps; i++) {
unscaledXLoc = sXLoc / SCALE_X;
unscaledYLoc = sYLoc / SCALE_Y;
@@ -2925,9 +2877,6 @@ int simulateBuildingLaunch(int x, int y, int power, int angle, int numSteps, int
if (!isEnergy)
cfes = checkForEnergySquare(unscaledXLoc, unscaledYLoc);
- savedUnscaledXLoc = unscaledXLoc;
- savedUnscaledYLoc = unscaledYLoc;
-
if (cfco || cfuo || cfes || cfao) {
sXSpeed = 0;
sYSpeed = 0;
diff --git a/engines/scumm/he/moonbase/ai_main.h b/engines/scumm/he/moonbase/ai_main.h
index 8952cb5..8c58a70 100644
--- a/engines/scumm/he/moonbase/ai_main.h
+++ b/engines/scumm/he/moonbase/ai_main.h
@@ -84,8 +84,6 @@ enum {
MIN_DIST = 108
};
-static int energyHogType = 0;
-
void resetAI(ScummEngine_v90he *vm);
void cleanUpAI();
void setAIType(const int paramCount, const int32 *params);
Commit: 419211733e949d376b443df8678c392d6abab5d8
https://github.com/scummvm/scummvm/commit/419211733e949d376b443df8678c392d6abab5d8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-05-23T22:41:21+02:00
Commit Message:
COMMON: Fix warning
Changed paths:
common/array.h
diff --git a/common/array.h b/common/array.h
index 29a1ff8..16ca769 100644
--- a/common/array.h
+++ b/common/array.h
@@ -417,22 +417,22 @@ private:
// Licensed under GPLv2+
void *bsearchMin(const void *key, const void *base, uint num, uint size,
int (*cmp)(const void *key, const void *elt)) {
- uint start = 0, end = num;
+ uint start_ = 0, end_ = num;
int result;
- while (start < end) {
- uint mid = start + (end - start) / 2;
+ while (start_ < end_) {
+ uint mid = start_ + (end_ - start_) / 2;
result = cmp(key, (byte *)base + mid * size);
if (result < 0)
- end = mid;
+ end_ = mid;
else if (result > 0)
- start = mid + 1;
+ start_ = mid + 1;
else
return (void *)((byte *)base + mid * size);
}
- return (void *)((byte *)base + start * size);
+ return (void *)((byte *)base + start_ * size);
}
private:
More information about the Scummvm-git-logs
mailing list