Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: Warzone2100/warzone2100
base: f20d737
...
head fork: Warzone2100/warzone2100
compare: 29cd427
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
Commits on Mar 23, 2012
@perim perim scavfact.js: Remove useless conversions to world coordinates. Closes …
…ticket:3356
d408c6a
@perim perim Fix production of barbarian foot soldiers. They were classified as
heavy bodies, when factory only could produce light bodies. And a
sanity check needlessly triggered since the body list was read
in reverse order. Closes ticket:3358
29cd427
View
2  data/base/stats/body.ini
@@ -501,7 +501,7 @@ designable = false
[B1BaBaPerson01]
name = "*BaBa Body*"
-size = HEAVY
+size = LIGHT
buildPower = 1
buildPoints = 20
weight = 100
View
4 data/mp/multiplay/script/scavfact.js
@@ -85,7 +85,7 @@ function eventGameInit()
makeComponentAvailable("BabaFlame", me);
makeComponentAvailable("BaBaMG", me);
attackGroup = newGroup(); // allocate a new group
- groupAddArea(attackGroup, 0, 0, (mapWidth * 128), (mapHeight * 128));
+ groupAddArea(attackGroup, 0, 0, mapWidth, mapHeight);
}
function eventStartLevel()
@@ -125,7 +125,7 @@ function eventAttacked(victim, attacker)
for (var i = 0; i < droidlist.length; i++)
{
var droid = droidlist[i];
- if (distBetweenTwoPoints(victim.x, victim.y, attacker.x, attacker.y) < (24 * 128))
+ if (distBetweenTwoPoints(victim.x, victim.y, attacker.x, attacker.y) < 24)
{
orderDroidLoc(droid, DORDER_MOVE, attacker.x, attacker.y);
}
View
2  data/mp/stats/body.ini
@@ -711,7 +711,7 @@ designable = false
[B1BaBaPerson01]
name = "*BaBa Body*"
-size = HEAVY
+size = LIGHT
buildPower = 1
buildPoints = 20
weight = 100
View
2  src/stats.cpp
@@ -1107,7 +1107,7 @@ bool loadBodyStats(const char *pFileName)
}
ini.endGroup();
- statsSetBody(psStats, i); //save the stats
+ statsSetBody(psStats, list.size() - 1 - i); // save the stats (and reorder list, so that ZNULLBODY is zero)
//set the max stat values for the design screen
if (psStats->designable)

No commit comments for this range

Something went wrong with that request. Please try again.