diff --git a/includes/powder.h b/includes/powder.h index c9e96531e..eb89ef332 100644 --- a/includes/powder.h +++ b/includes/powder.h @@ -948,6 +948,8 @@ static wall_type wtypes[] = particle portalp[CHANNELS][8][80]; const particle emptyparticle; int wireless[CHANNELS][2]; +extern int portal_rx[8]; +extern int portal_ry[8]; extern int wire_placed; diff --git a/src/elements/prti.c b/src/elements/prti.c index f7599bfee..703841276 100644 --- a/src/elements/prti.c +++ b/src/elements/prti.c @@ -1,26 +1,27 @@ #include -/*these are the count vaules of where the particle gets stored, depending on where it came from - 1 4 6 - 2 . 7 - 3 5 8 - PRTO counts backwards, so that it will come out at the opposite place of where it came in - 8 5 3 - 7 . 2 - 6 4 1 +/*these are the count values of where the particle gets stored, depending on where it came from + 0 1 2 + 7 . 3 + 6 5 4 + PRTO does (count+4)%8, so that it will come out at the opposite place to where it came in PRTO does +/-1 to the count, so it doesn't jam as easily */ +int portal_rx[8] = {-1, 0, 1, 1, 1, 0,-1,-1}; +int portal_ry[8] = {-1,-1,-1, 0, 1, 1, 1, 0}; + int update_PRTI(UPDATE_FUNC_ARGS) { int r, nnx, rx, ry, fe = 0; int count =0; parts[i].tmp = (int)((parts[i].temp-73.15f)/100+1); if (parts[i].tmp>=CHANNELS) parts[i].tmp = CHANNELS-1; else if (parts[i].tmp<0) parts[i].tmp = 0; - for (rx=-1; rx<2; rx++) - for (ry=-1; ry<2; ry++) + for (count=0; count<8; count++) + { + rx = portal_rx[count]; + ry = portal_ry[count]; if (x+rx>=0 && y+ry>0 && x+rx>8)>=NPART) @@ -38,9 +39,9 @@ int update_PRTI(UPDATE_FUNC_ARGS) { detach(r>>8); for ( nnx=0; nnx<80; nnx++) - if (!portalp[parts[i].tmp][count-1][nnx].type) + if (!portalp[parts[i].tmp][count][nnx].type) { - portalp[parts[i].tmp][count-1][nnx] = parts[r>>8]; + portalp[parts[i].tmp][count][nnx] = parts[r>>8]; if ((r&0xFF)==PT_SPRK) part_change_type(r>>8,x+rx,y+ry,parts[r>>8].ctype); else @@ -49,6 +50,7 @@ int update_PRTI(UPDATE_FUNC_ARGS) { break; } } + } if (fe) { diff --git a/src/elements/prto.c b/src/elements/prto.c index 38718a5a5..880de2021 100644 --- a/src/elements/prto.c +++ b/src/elements/prto.c @@ -1,12 +1,9 @@ #include -/*these are the count vaules of where the particle gets stored, depending on where it came from - 1 4 6 - 2 . 7 - 3 5 8 - PRTO counts backwards, so that it will come out at the opposite place of where it came in - 8 5 3 - 7 . 2 - 6 4 1 +/*these are the count values of where the particle gets stored, depending on where it came from + 0 1 2 + 7 . 3 + 6 5 4 + PRTO does (count+4)%8, so that it will come out at the opposite place to where it came in PRTO does +/-1 to the count, so it doesn't jam as easily */ int update_PRTO(UPDATE_FUNC_ARGS) { @@ -15,12 +12,13 @@ int update_PRTO(UPDATE_FUNC_ARGS) { parts[i].tmp = (int)((parts[i].temp-73.15f)/100+1); if (parts[i].tmp>=CHANNELS) parts[i].tmp = CHANNELS-1; else if (parts[i].tmp<0) parts[i].tmp = 0; - for (rx=1; rx>-2; rx--) - for (ry=1; ry>-2; ry--) + for (count=0; count<8; count++) + { + rx = portal_rx[count]; + ry = portal_ry[count]; if (x+rx>=0 && y+ry>0 && x+rx>8)>=NPART || r) @@ -29,12 +27,8 @@ int update_PRTO(UPDATE_FUNC_ARGS) { { for ( nnx =0 ; nnx<80; nnx++) { - int randomness = count + rand()%3-1;//add -1,0,or 1 to count - if (randomness<1) - randomness=1; - if (randomness>8) - randomness=8; - if (portalp[parts[i].tmp][randomness-1][nnx].type==PT_SPRK)// TODO: make it look better, spark creation + int randomness = (count + rand()%3-1 + 4)%8;//add -1,0,or 1 to count + if (portalp[parts[i].tmp][randomness][nnx].type==PT_SPRK)// TODO: make it look better, spark creation { create_part(-1,x+1,y,PT_SPRK); create_part(-1,x+1,y+1,PT_SPRK); @@ -44,26 +38,27 @@ int update_PRTO(UPDATE_FUNC_ARGS) { create_part(-1,x-1,y+1,PT_SPRK); create_part(-1,x-1,y,PT_SPRK); create_part(-1,x-1,y-1,PT_SPRK); - portalp[parts[i].tmp][randomness-1][nnx] = emptyparticle; + portalp[parts[i].tmp][randomness][nnx] = emptyparticle; break; } - else if (portalp[parts[i].tmp][randomness-1][nnx].type) + else if (portalp[parts[i].tmp][randomness][nnx].type) { - if (portalp[parts[i].tmp][randomness-1][nnx].type==PT_STKM) + if (portalp[parts[i].tmp][randomness][nnx].type==PT_STKM) player[27] = 0; - if (portalp[parts[i].tmp][randomness-1][nnx].type==PT_STKM2) + if (portalp[parts[i].tmp][randomness][nnx].type==PT_STKM2) player2[27] = 0; - np = create_part(-1,x+rx,y+ry,portalp[parts[i].tmp][randomness-1][nnx].type); + np = create_part(-1,x+rx,y+ry,portalp[parts[i].tmp][randomness][nnx].type); if (np<0) continue; - parts[np] = portalp[parts[i].tmp][randomness-1][nnx]; + parts[np] = portalp[parts[i].tmp][randomness][nnx]; parts[np].x = x+rx; parts[np].y = y+ry; - portalp[parts[i].tmp][randomness-1][nnx] = emptyparticle; + portalp[parts[i].tmp][randomness][nnx] = emptyparticle; break; } } } } + } if (fe) { int orbd[4] = {0, 0, 0, 0}; //Orbital distances int orbl[4] = {0, 0, 0, 0}; //Orbital locations diff --git a/src/elements/stkm.c b/src/elements/stkm.c index c574fb58f..6873ef510 100644 --- a/src/elements/stkm.c +++ b/src/elements/stkm.c @@ -389,21 +389,23 @@ void STKM_interact(float* playerp, int i, int x, int y) if ((r&0xFF)==PT_PLUT) //If on plut parts[i].life -= 1; + + if (ptypes[r&0xFF].properties&PROP_DEADLY) + parts[i].life -= 1; if ((r&0xFF)==PT_PRTI && parts[i].type) { - int nnx, count; + int nnx, count=1;//gives rx=0, ry=1 in update_PRTO parts[r>>8].tmp = (int)((parts[r>>8].temp-73.15f)/100+1); if (parts[r>>8].tmp>=CHANNELS) parts[r>>8].tmp = CHANNELS-1; else if (parts[r>>8].tmp<0) parts[r>>8].tmp = 0; - for (count=1; count<=8; count++) - for (nnx=0; nnx<80; nnx++) - if (!portalp[parts[r>>8].tmp][count-1][nnx].type) - { - portalp[parts[r>>8].tmp][count-1][nnx] = parts[i]; - kill_part(i); - playerp[27] = 1;//stop SPWN creating a new STKM while he is in portal - } + for (nnx=0; nnx<80; nnx++) + if (!portalp[parts[r>>8].tmp][count][nnx].type) + { + portalp[parts[r>>8].tmp][count][nnx] = parts[i]; + kill_part(i); + playerp[27] = 1;//stop SPWN creating a new STKM while he is in portal + } } } } @@ -415,23 +417,23 @@ void STKM_init_legs(float* playerp, int i) x = (int)(parts[i].x+0.5f); y = (int)(parts[i].y+0.5f); - player[3] = x-1; - player[4] = y+6; - player[5] = x-1; - player[6] = y+6; + playerp[3] = x-1; + playerp[4] = y+6; + playerp[5] = x-1; + playerp[6] = y+6; - player[7] = x-3; - player[8] = y+12; - player[9] = x-3; - player[10] = y+12; + playerp[7] = x-3; + playerp[8] = y+12; + playerp[9] = x-3; + playerp[10] = y+12; - player[11] = x+1; - player[12] = y+6; - player[13] = x+1; - player[14] = y+6; + playerp[11] = x+1; + playerp[12] = y+6; + playerp[13] = x+1; + playerp[14] = y+6; - player[15] = x+3; - player[16] = y+12; - player[17] = x+3; - player[18] = y+12; + playerp[15] = x+3; + playerp[16] = y+12; + playerp[17] = x+3; + playerp[18] = y+12; } diff --git a/src/graphics.c b/src/graphics.c index fb354d745..3ea811fdc 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -4453,22 +4453,22 @@ pixel *prerender_save(void *save, int size, int *width, int *height) if (j==PT_STKM) lc = PIXRGB(255, 255, 255); else lc = PIXRGB(100, 100, 255); //only need to check upper bound of y coord - lower bounds and x>8].temp = parts[i].temp; - if ((r & 0xFF) < PT_NUM && ptypes[r&0xFF].hconduct) + if ((r & 0xFF) < PT_NUM && ptypes[r&0xFF].hconduct && ((r&0xFF)!=PT_HSWC||parts[r>>8].life==10) && (r&0xFF)!=PT_FILT) parts[i].temp = parts[r>>8].temp = restrict_flt((parts[r>>8].temp+parts[i].temp)/2, MIN_TEMP, MAX_TEMP); } if (parts[i].type==PT_NEUT && ((r&0xFF)==PT_CLNE || (r&0xFF)==PT_PCLN || (r&0xFF)==PT_BCLN || (r&0xFF)==PT_PBCN)) { @@ -223,30 +223,19 @@ int try_move(int i, int x, int y, int nx, int ny) if ((r&0xFF)==PT_PRTI && (parts[i].type==PT_PHOT || parts[i].type==PT_NEUT)) { int nnx, count; - if (nx-x<0) + for (count=0; count<8; count++) { - if (ny-y<0) count = 1; - else if (ny-y==0) count = 2; - else count = 3; - } - else if (nx-x==0) - { - if (ny-y<0) count = 4; - else count = 5; - } - else - { - if (ny-y<0) count = 6; - else if (ny-y==0) count = 7; - else count = 8; + if (isign(x-nx)==isign(portal_rx[count]) && isign(y-ny)==isign(portal_ry[count])) + break; } + count = count%8; parts[r>>8].tmp = (int)((parts[r>>8].temp-73.15f)/100+1); if (parts[r>>8].tmp>=CHANNELS) parts[r>>8].tmp = CHANNELS-1; else if (parts[r>>8].tmp<0) parts[r>>8].tmp = 0; for ( nnx=0; nnx<80; nnx++) - if (!portalp[parts[r>>8].tmp][count-1][nnx].type) + if (!portalp[parts[r>>8].tmp][count][nnx].type) { - portalp[parts[r>>8].tmp][count-1][nnx] = parts[i]; + portalp[parts[r>>8].tmp][count][nnx] = parts[i]; parts[i].type=PT_NONE; break; }