diff options
| author | Simon Howard | 2014-05-11 00:24:01 -0400 |
|---|---|---|
| committer | Simon Howard | 2014-05-11 00:24:01 -0400 |
| commit | d1b6350ec5f26cb3c53e37805e9865b26a716171 (patch) | |
| tree | 700779538774cf1e14ac83416b7a2c07969a7140 /src | |
| parent | b19ba33766b80c7b216692f03839fcc23ef36ac0 (diff) | |
| parent | f388d888518486676931e0fc3bd915fbb8b338e3 (diff) | |
| download | chocolate-doom-d1b6350ec5f26cb3c53e37805e9865b26a716171.tar.gz chocolate-doom-d1b6350ec5f26cb3c53e37805e9865b26a716171.tar.bz2 chocolate-doom-d1b6350ec5f26cb3c53e37805e9865b26a716171.zip | |
Merge pull request #403 from alexey-lysiuk/hexen_demo1_desync
hexen: Fix desync of demo1 on some platforms/compilers
Diffstat (limited to 'src')
| -rw-r--r-- | src/hexen/a_action.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/hexen/a_action.c b/src/hexen/a_action.c index 3100a074..e25b4f84 100644 --- a/src/hexen/a_action.c +++ b/src/hexen/a_action.c @@ -295,10 +295,15 @@ void A_LeafSpawn(mobj_t * actor) for (i = (P_Random() & 3) + 1; i; i--) { - mo = P_SpawnMobj(actor->x + ((P_Random() - P_Random()) << 14), - actor->y + ((P_Random() - P_Random()) << 14), - actor->z + (P_Random() << 14), - MT_LEAF1 + (P_Random() & 1)); + // Official release of Hexen's source code relies on unspecified behavior + // the in order of function's argument evaluation, + // see ISO-IEC 9899-1999, [6.5.2.2.10] + mobjtype_t type = MT_LEAF1 + (P_Random() & 1); + fixed_t z = actor->z + (P_Random() << 14); + fixed_t y = actor->y + ((P_Random() - P_Random()) << 14); + fixed_t x = actor->x + ((P_Random() - P_Random()) << 14); + + mo = P_SpawnMobj(x, y, z, type); if (mo) { P_ThrustMobj(mo, actor->angle, (P_Random() << 9) + 3 * FRACUNIT); |