matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Stop STKM being able to jump on the bottom of the screen

Browse Source
This commit is contained in:
jacksonmj 2012-06-29 00:50:52 +01:00
parent 9144733aeb
commit 509b84b4f1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/elements/stkm.c
View File

@ -156,7 +156,7 @@ int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
{ {
if (dl>dr) if (dl>dr)
{ {
if (!eval_move(t, playerp->legs[4], playerp->legs[5], NULL)) if (INBOND(playerp->legs[4], playerp->legs[5]) && !eval_move(t, playerp->legs[4], playerp->legs[5], NULL))
{ {
playerp->accs[2] = -3*gvy-3*gvx; playerp->accs[2] = -3*gvy-3*gvx;
playerp->accs[3] = 3*gvx-3*gvy; playerp->accs[3] = 3*gvx-3*gvy;
@ -166,7 +166,7 @@ int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
} }
else else
{ {
if (!eval_move(t, playerp->legs[12], playerp->legs[13], NULL)) if (INBOND(playerp->legs[12], playerp->legs[13]) && !eval_move(t, playerp->legs[12], playerp->legs[13], NULL))
{ {
playerp->accs[6] = -3*gvy-3*gvx; playerp->accs[6] = -3*gvy-3*gvx;
playerp->accs[7] = 3*gvx-3*gvy; playerp->accs[7] = 3*gvx-3*gvy;
@ -181,7 +181,7 @@ int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
{ {
if (dl<dr) if (dl<dr)
{ {
if (!eval_move(t, playerp->legs[4], playerp->legs[5], NULL)) if (INBOND(playerp->legs[4], playerp->legs[5]) && !eval_move(t, playerp->legs[4], playerp->legs[5], NULL))
{ {
playerp->accs[2] = 3*gvy-3*gvx; playerp->accs[2] = 3*gvy-3*gvx;
playerp->accs[3] = -3*gvx-3*gvy; playerp->accs[3] = -3*gvx-3*gvy;
@ -191,7 +191,7 @@ int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
} }
else else
{ {
if (!eval_move(t, playerp->legs[12], playerp->legs[13], NULL)) if (INBOND(playerp->legs[12], playerp->legs[13]) && !eval_move(t, playerp->legs[12], playerp->legs[13], NULL))
{ {
playerp->accs[6] = 3*gvy-3*gvx; playerp->accs[6] = 3*gvy-3*gvx;
playerp->accs[7] = -3*gvx-3*gvy; playerp->accs[7] = -3*gvx-3*gvy;
@ -203,7 +203,8 @@ int run_stickman(playerst* playerp, UPDATE_FUNC_ARGS) {
//Jump //Jump
if (((int)(playerp->comm)&0x04) == 0x04 && if (((int)(playerp->comm)&0x04) == 0x04 &&
(!eval_move(t, playerp->legs[4], playerp->legs[5], NULL) || !eval_move(t, playerp->legs[12], playerp->legs[13], NULL))) ((INBOND(playerp->legs[4], playerp->legs[5]) && !eval_move(t, playerp->legs[4], playerp->legs[5], NULL))
|| (INBOND(playerp->legs[12], playerp->legs[13]) && !eval_move(t, playerp->legs[12], playerp->legs[13], NULL))))
{ {
parts[i].vy -= 4*gvy; parts[i].vy -= 4*gvy;
playerp->accs[3] -= gvy; playerp->accs[3] -= gvy;