Overview
Comment: | Handle departures/arrivals while the object is not linked into the playfield, so that it doesn't trigger itself |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
cfacb2c35a80535f4c9c8bac0b06b65b |
User & Date: | user on 2020-12-14 22:31:56 |
Other Links: | manifest | tags |
Context
2020-12-15
| ||
02:21 | Implement Level, MoveNumber, rot, and -rot instructions check-in: 10053de140 user: user tags: trunk | |
2020-12-14
| ||
22:31 | Handle departures/arrivals while the object is not linked into the playfield, so that it doesn't trigger itself check-in: cfacb2c35a user: user tags: trunk | |
22:30 | Implement FlushClass, FlushObj, and IgnoreKey. check-in: ccfd090a7a user: user tags: trunk | |
Changes
Modified exec.c from [c7401d76bd] to [54b48a316e].
︙ | ︙ | |||
492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 | if(v_bool(send_message(n,m,MSG_PLAYERMOVING,NVALUE(x),NVALUE(y),OVALUE(from)))) return 0; m=objects[m]->prev; } } if(!(o->oflags&OF_BIZARRO) && (i=classes[o->class]->collisionLayers) && (xx=collisions_at(x,y)&i)) { if((i=collide_with(xx,VOIDLINK,x,y,o->class))&0x01) return i&0x04?1:0; } if(!(o->oflags&((classes[o->class]->cflags&CF_COMPATIBLE?OF_VISUALONLY:0)|OF_STEALTHY))) { for(i=25;i>=0;i--) { xx=o->x+Xbit(i); yy=o->y+Ybit(i); if(xx<1 || xx>pfwidth || yy<1 || yy>pfheight) continue; m=playfield[xx+yy*64-65]; while(m!=VOIDLINK) { p=objects[m]; if(p->departures&(1<<i)) p->departed|=1<<i; m=p->up; } } } | > < < > | 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 | if(v_bool(send_message(n,m,MSG_PLAYERMOVING,NVALUE(x),NVALUE(y),OVALUE(from)))) return 0; m=objects[m]->prev; } } if(!(o->oflags&OF_BIZARRO) && (i=classes[o->class]->collisionLayers) && (xx=collisions_at(x,y)&i)) { if((i=collide_with(xx,VOIDLINK,x,y,o->class))&0x01) return i&0x04?1:0; } pfunlink(n); if(!(o->oflags&((classes[o->class]->cflags&CF_COMPATIBLE?OF_VISUALONLY:0)|OF_STEALTHY))) { for(i=25;i>=0;i--) { xx=o->x+Xbit(i); yy=o->y+Ybit(i); if(xx<1 || xx>pfwidth || yy<1 || yy>pfheight) continue; m=playfield[xx+yy*64-65]; while(m!=VOIDLINK) { p=objects[m]; if(p->departures&(1<<i)) p->departed|=1<<i; m=p->up; } } } o->distance+=abs(x-o->x)+abs(y-o->y); o->x=x; o->y=y; if(!(o->oflags&((classes[o->class]->cflags&CF_COMPATIBLE?OF_VISUALONLY:0)|OF_STEALTHY))) { for(i=25;i>=0;i--) { xx=x+Xbit(i); yy=y+Ybit(i); if(xx<1 || xx>pfwidth || yy<1 || yy>pfheight) continue; m=playfield[xx+yy*64-65]; while(m!=VOIDLINK) { p=objects[m]; if(p->arrivals&(1<<i)) p->arrived|=1<<i; m=p->up; } } } pflink(n); if(!(o->oflags&OF_VISUALONLY)) { m=objects[n]->up; if(m!=VOIDLINK) { v=send_message(VOIDLINK,n,MSG_SUNK,NVALUE(0),NVALUE(0),NVALUE(0)); while(m!=VOIDLINK) { send_message(n,m,MSG_FLOATED,NVALUE(0),NVALUE(0),v); m=objects[m]->up; |
︙ | ︙ |