diff options
Diffstat (limited to 'game/enemy/EnemyBulletSubScene.cpp')
| -rw-r--r-- | game/enemy/EnemyBulletSubScene.cpp | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/game/enemy/EnemyBulletSubScene.cpp b/game/enemy/EnemyBulletSubScene.cpp index 488dc03..dd79678 100644 --- a/game/enemy/EnemyBulletSubScene.cpp +++ b/game/enemy/EnemyBulletSubScene.cpp @@ -10,7 +10,7 @@  #include <crepe/api/Sprite.h>  #include <crepe/api/AI.h>  #include "../Config.h" - +#include "EnemyConfig.h"  #include "EnemyBulletSubScene.h"  #include "EnemyScript.h" @@ -22,26 +22,26 @@ int EnemyBulletSubScene::create(Scene & scn){  	static int counter = 0;  	string unique_name = "enemy_bullet_" + to_string(counter++); -	GameObject bullet = scn.new_object(unique_name.c_str(),"enemy_bullet",vec2{0,-750},0,1); +	GameObject bullet = scn.new_object(unique_name.c_str(),"enemy_bullet",ENEMY_BULLET_POOL_LOCATION,0,1);  	Rigidbody& bullet_body = bullet.add_component<Rigidbody>(Rigidbody::Data {  		.gravity_scale = 0,  		.body_type = Rigidbody::BodyType::KINEMATIC, -		.linear_velocity = vec2{-300,0}, +		.linear_velocity = vec2{-250,0},  		.kinematic_collision = false,  		.collision_layers = {COLL_LAY_MISSILE},  		.collision_layer = COLL_LAY_BULLET  	});  	bullet_body.active = false; -	BoxCollider& bullet_collider = bullet.add_component<BoxCollider>(vec2(60, 40)); +	BoxCollider& bullet_collider = bullet.add_component<BoxCollider>(vec2(60, 30));  	//bullet_collider.active = false;  	Asset bullet_asset {"asset/other_effects/effect_smgbullet_x2.png"};  	Sprite & bullet_sprite = bullet.add_component<Sprite>(  		bullet_asset,  		Sprite::Data {  			.flip = {true,false}, -			.sorting_in_layer = SORT_IN_LAY_PLAYER, +			.sorting_in_layer = SORT_IN_LAY_OBSTACLES,  			.order_in_layer = 1,  			.size = vec2(60,0),  		} |