empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove redundant casts of argument to (prototyped) double parameter.

Browse source
This commit is contained in:
Markus Armbruster 2006-05-01 12:34:16 +00:00
parent 7c3899bf89
commit 7ed308526c
19 changed files with 82 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

34
include/land.h
View file

@ -142,27 +142,27 @@ struct lchrstr {
#define L_TRAIN bit(11) /* train unit - neato */
#define L_HEAVY bit(12) /* heavy unit - can't go on trains */
#define LND_ATTDEF(b, t) (((b) * (1.0 + ((sqrt((double)(t)) / 100.0) * 4.0))) \
> 127 ? 127 : \
((b) * (1.0 + ((sqrt((double)(t)) / 100.0) * 4.0))))
#define LND_SPD(b, t) ((b * (1.0 + ((sqrt((double)t) / 100.0) * 2.1))) > 127\
? 127 : (b * (1.0 + ((sqrt((double)t) / 100.0) * 2.1))))
#define LND_VUL(b, t) ((b * (1.0 - ((sqrt((double)t) / 100.0) * 1.1))) < 0\
? 0 : (b * (1.0 - ((sqrt((double)t) / 100.0) * 1.1))))
#define LND_ATTDEF(b, t) (((b) * (1.0 + ((sqrt((t)) / 100.0) * 4.0))) \
> 127 ? 127 : \
((b) * (1.0 + ((sqrt((t)) / 100.0) * 4.0))))
#define LND_SPD(b, t) ((b * (1.0 + ((sqrt(t) / 100.0) * 2.1))) > 127 \
? 127 : (b * (1.0 + ((sqrt(t) / 100.0) * 2.1))))
#define LND_VUL(b, t) ((b * (1.0 - ((sqrt(t) / 100.0) * 1.1))) < 0 \
? 0 : (b * (1.0 - ((sqrt(t) / 100.0) * 1.1))))
#define LND_VIS(b, t) (b)
#define LND_SPY(b, t) (b)
#define LND_RAD(b, t) (b)
#define LND_FRG(b, t) ((t) ? \
((b) * (logx((double)(t), (double)35.0) < 1.0 ? 1.0 : \
logx((double)(t), (double)35.0))) : (b))
#define LND_DAM(b, t) ((t) ? \
((b) * (logx((double)(t), (double)60.0) < 1.0 ? 1.0 : \
logx((double)(t), (double)60.0))) : (b))
#define LND_ACC(b, t) ((b * (1.0 - ((sqrt((double)t) / 100.0) * 1.1))) < 0\
? 0 : (b * (1.0 - ((sqrt((double)t) / 100.0) * 1.1))))
#define LND_FRG(b, t) ((t) ? \
((b) * (logx((t), 35.0) < 1.0 ? 1.0 : \
logx((t), 35.0))) : (b))
#define LND_DAM(b, t) ((t) ? \
((b) * (logx((t), 60.0) < 1.0 ? 1.0 : \
logx((t), 60.0))) : (b))
#define LND_ACC(b, t) ((b * (1.0 - ((sqrt(t) / 100.0) * 1.1))) < 0 \
? 0 : (b * (1.0 - ((sqrt(t) / 100.0) * 1.1))))
#define LND_AMM(b, d, t) ((b) ? ((LND_DAM((d), (t)) / 2) + 1) : 0)
#define LND_AAF(b, t) ((b * (1.0 + ((sqrt((double)t) / 100.0) * 3.0))) > 127\
? 127 : (b * (1.0 + ((sqrt((double)t) / 100.0) * 3.0))))
#define LND_AAF(b, t) ((b * (1.0 + ((sqrt(t) / 100.0) * 3.0))) > 127 \
? 127 : (b * (1.0 + ((sqrt(t) / 100.0) * 3.0))))
#define LND_FC(b, t) (b)
#define LND_FU(b, t) (b)
#define LND_XPL(b, t) (b)

8
include/plane.h
View file

@ -149,10 +149,10 @@ struct shiplist {
};
#define PLN_ATTDEF(b, t) (b + ((b?1:0) * ((t/20)>10?10:(t/20))))
#define PLN_ACC(b, t) (b * (1.0 - (sqrt((double)t) / 50.)))
#define PLN_RAN(b, t) (t ? (b + (logx((double)t, (double)2.0))) : b)
#define PLN_LOAD(b, t) (t ? (b * (logx((double)t, (double)50.0) < 1.0 ? 1.0 : \
logx((double)t, (double)50.0))) : b)
#define PLN_ACC(b, t) (b * (1.0 - (sqrt(t) / 50.)))
#define PLN_RAN(b, t) (t ? (b + (logx(t, 2.0))) : b)
#define PLN_LOAD(b, t) (t ? (b * (logx(t, 50.0) < 1.0 ? 1.0 : \
logx(t, 50.0))) : b)
/* Work required for building 100% */
#define PLN_BLD_WORK(lcm, hcm) (20 + (lcm) + 2 * (hcm))

18
include/ship.h
View file

@ -191,15 +191,15 @@ struct mlist {
double mobil; /* how much mobility the ship has left */
};
#define SHP_DEF(b, t) (t ? (b * (logx((double)t, (double)40.0) < 1.0 ? 1.0 : \
logx((double)t, (double)40.0))) : b)
#define SHP_SPD(b, t) (t ? (b * (logx((double)t, (double)35.0) < 1.0 ? 1.0 : \
logx((double)t, (double)35.0))) : b)
#define SHP_VIS(b, t) (b * (1 - (sqrt((double)t) / 50)))
#define SHP_RNG(b, t) (t ? (b * (logx((double)t, (double)35.0) < 1.0 ? 1.0 : \
logx((double)t, (double)35.0))) : b)
#define SHP_FIR(b, t) (t ? (b * (logx((double)t, (double)60.0) < 1.0 ? 1.0 : \
logx((double)t, (double)60.0))) : b)
#define SHP_DEF(b, t) (t ? (b * (logx(t, 40.0) < 1.0 ? 1.0 : \
logx(t, 40.0))) : b)
#define SHP_SPD(b, t) (t ? (b * (logx(t, 35.0) < 1.0 ? 1.0 : \
logx(t, 35.0))) : b)
#define SHP_VIS(b, t) (b * (1 - (sqrt(t) / 50)))
#define SHP_RNG(b, t) (t ? (b * (logx(t, 35.0) < 1.0 ? 1.0 : \
logx(t, 35.0))) : b)
#define SHP_FIR(b, t) (t ? (b * (logx(t, 60.0) < 1.0 ? 1.0 : \
logx(t, 60.0))) : b)
/* Work required for building 100% */
#define SHP_BLD_WORK(lcm, hcm) (20 + (lcm) + 2 * (hcm))