struct Unit change. make_shared fix.
This commit is contained in:
parent
1493faa8e5
commit
54435247e3
@ -2,7 +2,7 @@
|
||||
#include "olcPixelGameEngine.h"
|
||||
#include "MemoryType.h"
|
||||
|
||||
class Unit;
|
||||
struct Unit;
|
||||
|
||||
class CollectionPoint{
|
||||
public:
|
||||
|
@ -5,7 +5,7 @@
|
||||
#define AUDIO_SOURCE_IMPLEMENTATION
|
||||
#define OLC_PGEX_QUICKGUI
|
||||
|
||||
//#define SPLASH_ENABLED
|
||||
#define SPLASH_ENABLED
|
||||
#ifdef SPLASH_ENABLED
|
||||
#define OLC_PGEX_SPLASHSCREEN
|
||||
#endif
|
||||
@ -196,7 +196,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){
|
||||
@ -218,7 +218,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)};
|
||||
|
Loading…
x
Reference in New Issue
Block a user