diff options
| author | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-06-20 21:40:08 (GMT) |
|---|---|---|
| committer | jacksonmj <mj-pt@jacksonmj.co.uk> | 2012-06-20 21:40:08 (GMT) |
| commit | 79614a97197803c0b8bf9cc9cb5b92047c142f6c (patch) | |
| tree | fd4b855dc89e83dcc69519fd996fc641ef443aab /src/elements | |
| parent | fed8b7b2ccce037ccb5c5f098d6ffd2c58c8d523 (diff) | |
| download | powder-79614a97197803c0b8bf9cc9cb5b92047c142f6c.zip powder-79614a97197803c0b8bf9cc9cb5b92047c142f6c.tar.gz | |
Use eval_move(PT_FIGH, ...) when fighters are checking for obstacles
Also stop fighters being included in the stacking check
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/figh.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/elements/figh.c b/src/elements/figh.c index ce00af7..2234eab 100644 --- a/src/elements/figh.c +++ b/src/elements/figh.c @@ -23,7 +23,7 @@ int update_FIGH(UPDATE_FUNC_ARGS) parts[i].tmp2 = 0; //0 - stay in place, 1 - seek a stick man - //Set target cords + //Set target coords if (player.spwn && player2.spwn) { if ((pow(player.legs[2]-x, 2) + pow(player.legs[3]-y, 2))<= @@ -68,28 +68,28 @@ int update_FIGH(UPDATE_FUNC_ARGS) else if (tarx<x) { - if(!(eval_move(PT_DUST, figh->legs[4]-10, figh->legs[5]+6, NULL) - && eval_move(PT_DUST, figh->legs[4]-10, figh->legs[5]+3, NULL))) + if(!(eval_move(PT_FIGH, figh->legs[4]-10, figh->legs[5]+6, NULL) + && eval_move(PT_FIGH, figh->legs[4]-10, figh->legs[5]+3, NULL))) figh->comm = 0x01; else figh->comm = 0x02; - if (!eval_move(PT_DUST, figh->legs[4]-4, figh->legs[5]-1, NULL) - || !eval_move(PT_DUST, figh->legs[12]-4, figh->legs[13]-1, NULL) - || eval_move(PT_DUST, 2*figh->legs[4]-figh->legs[6], figh->legs[5]+5, NULL)) + if (!eval_move(PT_FIGH, figh->legs[4]-4, figh->legs[5]-1, NULL) + || !eval_move(PT_FIGH, figh->legs[12]-4, figh->legs[13]-1, NULL) + || eval_move(PT_FIGH, 2*figh->legs[4]-figh->legs[6], figh->legs[5]+5, NULL)) figh->comm = (int)figh->comm | 0x04; } else { - if (!(eval_move(PT_DUST, figh->legs[12]+10, figh->legs[13]+6, NULL) - && eval_move(PT_DUST, figh->legs[12]+10, figh->legs[13]+3, NULL))) + if (!(eval_move(PT_FIGH, figh->legs[12]+10, figh->legs[13]+6, NULL) + && eval_move(PT_FIGH, figh->legs[12]+10, figh->legs[13]+3, NULL))) figh->comm = 0x02; else figh->comm = 0x01; - if (!eval_move(PT_DUST, figh->legs[4]+4, figh->legs[5]-1, NULL) - || !eval_move(PT_DUST, figh->legs[4]+4, figh->legs[5]-1, NULL) - || eval_move(PT_DUST, 2*figh->legs[12]-figh->legs[14], figh->legs[13]+5, NULL)) + if (!eval_move(PT_FIGH, figh->legs[4]+4, figh->legs[5]-1, NULL) + || !eval_move(PT_FIGH, figh->legs[4]+4, figh->legs[5]-1, NULL) + || eval_move(PT_FIGH, 2*figh->legs[12]-figh->legs[14], figh->legs[13]+5, NULL)) figh->comm = (int)figh->comm | 0x04; } break; |