|
|
|
@ -378,6 +378,7 @@ void Crawler::UpdateEffects(float fElapsedTime){ |
|
|
|
|
std::erase_if(EMITTER_LIST,[](std::unique_ptr<Emitter>&e){return e->dead;}); |
|
|
|
|
std::erase_if(backgroundEffects,[](std::unique_ptr<Effect>&e){return e->dead;}); |
|
|
|
|
std::erase_if(foregroundEffects,[](std::unique_ptr<Effect>&e){return e->dead;}); |
|
|
|
|
std::erase_if(DAMAGENUMBER_LIST,[](std::shared_ptr<DamageNumber>&n){return n->lifeTime>1;}); |
|
|
|
|
|
|
|
|
|
for(auto it=foregroundEffectsToBeInserted.begin();it!=foregroundEffectsToBeInserted.end();++it){ |
|
|
|
|
foregroundEffects.push_back(std::move(*it)); |
|
|
|
@ -674,6 +675,10 @@ void Crawler::RenderWorld(float fElapsedTime){ |
|
|
|
|
#pragma endregion |
|
|
|
|
//DrawDecal({0,0},MAP_TILESETS["assets/maps/"+MAP_DATA[LEVEL1].TilesetData[1].data["source"]]->Decal());
|
|
|
|
|
|
|
|
|
|
for(Monster&m:MONSTER_LIST){ |
|
|
|
|
m.strategyDraw(this); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(player->GetZ()>0){ |
|
|
|
|
vf2d shadowScale=vf2d{8*player->GetSizeMult()/3.f,1}/std::max(1.f,player->GetZ()/24); |
|
|
|
|
view.DrawDecal(player->GetPos()-vf2d{3,3}*shadowScale/2+vf2d{0,6*player->GetSizeMult()},GFX["circle.png"].Decal(),shadowScale,BLACK); |
|
|
|
@ -803,16 +808,10 @@ void Crawler::RenderWorld(float fElapsedTime){ |
|
|
|
|
dn->pauseTime-=fElapsedTime; |
|
|
|
|
} else{ |
|
|
|
|
dn->lifeTime+=fElapsedTime; |
|
|
|
|
if(dn->lifeTime>1){ |
|
|
|
|
it=DAMAGENUMBER_LIST.erase(it); |
|
|
|
|
if(it==DAMAGENUMBER_LIST.end()){ |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
if(dn->lifeTime<=1){ |
|
|
|
|
if(dn->lifeTime<DamageNumber::MOVE_UP_TIME){ |
|
|
|
|
dn->pos.y-=20*fElapsedTime; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
std::string text=std::to_string(dn->damage); |
|
|
|
|