Differences From Artifact [0b8b0d202d]:
- File
src/clientgame.m
— part of check-in
[75e920ae30]
at
2025-03-29 14:25:43
on branch trunk
— Switch from clang-format to manual formatting
clang-format does too many weird things. (user: js, size: 9909) [annotate] [blame] [check-ins using]
To Artifact [418707bf92]:
- File src/clientgame.m — part of check-in [c634a689e7] at 2025-03-29 17:13:40 on branch trunk — More style fixes (user: js, size: 9797) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
309 310 311 312 313 314 315 | // let armour absorb when possible int ad = damage * (player1.armourType + 1) * 20 / 100; if (ad > Player.player1.armour) ad = Player.player1.armour; player1.armour -= ad; damage -= ad; float droll = damage / 0.5f; | > | < < < | < < | < | 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 |
// let armour absorb when possible
int ad = damage * (player1.armourType + 1) * 20 / 100;
if (ad > Player.player1.armour)
ad = Player.player1.armour;
player1.armour -= ad;
damage -= ad;
float droll = damage / 0.5f;
// give player a kick depending on amount of damage
player1.roll += player1.roll > 0 ? droll : (player1.roll < 0 ? -droll :
(rnd(2) ? droll : -droll));
if ((player1.health -= damage) <= 0) {
if (actor == -2) {
conoutf(@"you got killed by %@!", act.name);
} else if (actor == -1) {
actor = getclientnum();
conoutf(@"you suicided!");
addmsg(1, 2, SV_FRAGS, --player1.frags);
} else {
Player *a = getclient(actor);
if (a != nil) {
if (isteam(a.team, player1.team))
conoutf(@"you got fragged by a "
@"teammate (%@)", a.name);
else
conoutf(
@"you got fragged by %@", a.name);
}
}
showscores(true);
addmsg(1, 2, SV_DIED, actor);
|
| ︙ | ︙ |