]>
Commit | Line | Data |
---|---|---|
cf2098bc | 1 | diff -urN aa/atanks/src/player.cc atanks/src/player.cc |
2 | --- aa/atanks/src/player.cc 2004-02-05 00:05:14.000000000 +0100 | |
3 | +++ atanks/src/player.cc 2004-06-28 23:39:27.517259680 +0200 | |
4 | @@ -1009,12 +1009,12 @@ | |
5 | if (weapNum >= RIOT_CHARGE && weapNum <= RIOT_BLAST) { | |
6 | // add points only within range and above ctank | |
7 | if ( (cy > ctank->y - (radius / 2)) || | |
8 | - (abs (ctank->x - cx) > radius)) | |
9 | + (abs ((int)ctank->x - cx) > radius)) | |
10 | continue; | |
11 | } else if (weapNum >= SML_ROLLER && weapNum <= DTH_ROLLER) { | |
12 | // Only aim rollers above other tanks | |
13 | if (cy > tankY + TANKHEIGHT && | |
14 | - abs (ctank->x - cx) > radius) | |
15 | + abs ((int)ctank->x - cx) > radius) | |
16 | continue; | |
17 | } else if (weapNum >= SML_LAZER && weapNum <= LRG_LAZER) { | |
18 | // Lazer can only be aimed above horizontal | |
19 | @@ -1085,7 +1085,7 @@ | |
20 | if (itemNum >= ITEM_VENGEANCE && itemNum <= ITEM_FATAL_FURY) { | |
21 | // add sqrt distances for each tank * potential damage | |
22 | long int totalEffectiveDamage = calcTotalEffectiveDamage (itemNum); | |
23 | - _targetMatrix[(int)ctank->x] += sqrt (abs (ctank->x - ltank->x)) * totalEffectiveDamage; | |
24 | + _targetMatrix[(int)ctank->x] += sqrt (abs ((int)(ctank->x - ltank->x))) * totalEffectiveDamage; | |
25 | ||
26 | } | |
27 | } |