diff --git a/src/objects/dlzrocket.c b/src/objects/dlzrocket.c index fb110bd773b1f29d6f0ee94f9bb3f613dc159a45..efc60610feb35f961e8084aabd56640e2366eff5 100644 --- a/src/objects/dlzrocket.c +++ b/src/objects/dlzrocket.c @@ -137,11 +137,13 @@ void Obj_playerDLZRocket(player_t *p) p->dlzrocketangle += turndir*DLZROCKETTURNSPEED; - if ( (p->cmd.throwdir > 0 && (!(p->temporaryextrapflagsforthismr & PF_INVERTEDFLIGHT))) - || (p->cmd.throwdir < 0 && (p->temporaryextrapflagsforthismr & PF_INVERTEDFLIGHT))) + SINT8 vertdir = p->cmd.throwdir; + if (p->temporaryextrapflagsforthismr & PF_INVERTEDFLIGHT) + vertdir *= -1; + + if (vertdir > 0) p->dlzrocketanglev = min(DLZROCKETMAXVERT, p->dlzrocketanglev + DLZROCKETVERTSPEED); - else if ( (p->cmd.throwdir < 0 && (!(p->temporaryextrapflagsforthismr & PF_INVERTEDFLIGHT))) - || (p->cmd.throwdir > 0 && (p->temporaryextrapflagsforthismr & PF_INVERTEDFLIGHT))) + else if (vertdir < 0) p->dlzrocketanglev = max(-DLZROCKETMAXVERT, p->dlzrocketanglev - DLZROCKETVERTSPEED); } diff --git a/src/objects/rideroid.c b/src/objects/rideroid.c index 2d433d17a1d631c2ae0f0636994aab5f570b7209..30a8f525654396a80fee8f2a05d359aa31de4af5 100644 --- a/src/objects/rideroid.c +++ b/src/objects/rideroid.c @@ -433,8 +433,11 @@ void Obj_RideroidThink(mobj_t *mo) // and now, going up/down - if ( (p->cmd.throwdir > 0 && (!(p->temporaryextrapflagsforthismr & PF_INVERTEDFLIGHT))) - || (p->cmd.throwdir < 0 && (p->temporaryextrapflagsforthismr & PF_INVERTEDFLIGHT))) + SINT8 vertdir = p->cmd.throwdir; + if (p->temporaryextrapflagsforthismr & PF_INVERTEDFLIGHT) + vertdir *= -1; + + if (vertdir > 0) { // if we were going the opposite direction, this helps us change our height very easily. if (p->rdaddmomz < 0) @@ -448,8 +451,7 @@ void Obj_RideroidThink(mobj_t *mo) p->rideroidspeed -= 1; } - else if ( (p->cmd.throwdir < 0 && (!(p->temporaryextrapflagsforthismr & PF_INVERTEDFLIGHT))) - || (p->cmd.throwdir > 0 && (p->temporaryextrapflagsforthismr & PF_INVERTEDFLIGHT))) + else if (vertdir < 0) { // if we were going the opposite direction, this helps us change our height very easily. if (p->rdaddmomz > 0)