|
|
|
@ -201,7 +201,7 @@ void VirusAttack::LoadLevel(LevelName level){ |
|
|
|
|
for(auto&u:selectedLevel.unitPlacement){ |
|
|
|
|
#define TranslateUnit(type) \ |
|
|
|
|
case UnitType::type:{ \
|
|
|
|
|
units.push_back(std::make_unique<type>(this,u.pos,IMAGES,u.friendly)); \
|
|
|
|
|
units.push_back(std::make_shared<type>(this,u.pos,IMAGES,u.friendly)); \
|
|
|
|
|
}break; |
|
|
|
|
|
|
|
|
|
switch(u.type){ |
|
|
|
@ -223,7 +223,7 @@ void VirusAttack::LoadLevel(LevelName level){ |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
for(auto&cp:selectedLevel.cpPlacement){ |
|
|
|
|
collectionPoints.push_back(std::make_unique<CollectionPoint>(this,cp.pos,cp.rot,*IMAGES[MEMORY_COLLECTION_POINT],cp.type));
|
|
|
|
|
collectionPoints.push_back(std::make_shared<CollectionPoint>(this,cp.pos,cp.rot,*IMAGES[MEMORY_COLLECTION_POINT],cp.type));
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
randomBackgroundOffset={util::random(128),util::random(128)}; |
|
|
|
|