From 2c42d993ca294205de2dee195775e127c8108fe8 Mon Sep 17 00:00:00 2001 From: shmyga Date: Tue, 11 Jun 2019 15:56:00 +0300 Subject: [PATCH] [common] fix bullet and tank collision with bricks under bonus --- WORK.md | 3 +-- src/common/haxe/ru/m/tankz/engine/Engine.hx | 2 +- src/common/haxe/ru/m/tankz/game/GameRunner.hx | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/WORK.md b/WORK.md index 3382372..7801bd7 100644 --- a/WORK.md +++ b/WORK.md @@ -1,7 +1,6 @@ -* [bug] (server) **grenade** bonus * [bug] **clock** bonus for spawned tanks * [feature] **shovel** bonus with armor bricks * [feature] tanks and bullets speed balancing * [bug] record system broken * [feature] custom map size -* [bug] bullet and tank collision with bricks under bonus +* [feature] result frame update (next game select, only human player info) diff --git a/src/common/haxe/ru/m/tankz/engine/Engine.hx b/src/common/haxe/ru/m/tankz/engine/Engine.hx index ddf73a6..1cb27a4 100755 --- a/src/common/haxe/ru/m/tankz/engine/Engine.hx +++ b/src/common/haxe/ru/m/tankz/engine/Engine.hx @@ -112,6 +112,7 @@ import ru.m.tankz.map.LevelMap; break; } } + if (withCollision != null) break; for (other in entities.iterator()) { if (other != ent && other != null) { @@ -120,7 +121,6 @@ import ru.m.tankz.map.LevelMap; } } } - if (withCollision != null) break; } diff --git a/src/common/haxe/ru/m/tankz/game/GameRunner.hx b/src/common/haxe/ru/m/tankz/game/GameRunner.hx index 7152046..78efae3 100644 --- a/src/common/haxe/ru/m/tankz/game/GameRunner.hx +++ b/src/common/haxe/ru/m/tankz/game/GameRunner.hx @@ -68,7 +68,7 @@ class GameRunner extends Game implements EngineListener { } gameEventSignal.emit(EventUtil.buildBricksSpawn(engine.map)); gameEventSignal.emit(START(state)); - //for (i in 0...10) spawnBonus("grenade"); + //for (i in 0...10) spawnBonus(); } private function spawn(task:SpawnTask):Void {