neocturne/rpgedit
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor collision handling

Browse source
This commit is contained in:
Matthias Schiffer 2016-01-08 08:27:38 +01:00
parent 6c896c3f23
commit 00970b9faa
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/control/MapContext.ts
View file

@ -59,21 +59,22 @@ export default class MapContext {
} }
private inMap(p: Position): boolean {
return p.x >= 0 && p.x < this.map.width && p.y >= 0 && p.y < this.map.height;
}
private incCollision(p: Position) { private incCollision(p: Position) {
if (this.collision[p.x] && !_.isUndefined(this.collision[p.x][p.y])) if (this.inMap(p))
this.collision[p.x][p.y]++; this.collision[p.x][p.y]++;
} }
private decCollision(p: Position) { private decCollision(p: Position) {
if (this.collision[p.x] && !_.isUndefined(this.collision[p.x][p.y])) if (this.inMap(p))
this.collision[p.x][p.y]--; this.collision[p.x][p.y]--;
} }
private collides(p: Position): boolean { private collides(p: Position): boolean {
if (this.collision[p.x] && !_.isUndefined(this.collision[p.x][p.y])) return (!this.inMap(p)) || (this.collision[p.x][p.y] > 0);
return (this.collision[p.x][p.y] > 0);
else
return true;
} }
private addEntity(entity: EntityPosition) { private addEntity(entity: EntityPosition) {