Linux build fixes

This commit is contained in:
Jack Andersen 2017-11-12 21:21:51 -10:00
parent f7ec7bdc0c
commit 550078f7cb
4 changed files with 4 additions and 4 deletions

View File

@ -505,7 +505,7 @@ void CParticleDatabase::InsertParticleGen(bool oneShot, int flags, std::string_v
useMap = &x3c_rendererDrawLoop; useMap = &x3c_rendererDrawLoop;
} }
useMap->insert(std::make_pair(name, std::move(gen))); useMap->insert(std::make_pair(std::string(name), std::move(gen)));
if (flags & 0x60) if (flags & 0x60)
xb4_25_drawingEnds = true; xb4_25_drawingEnds = true;

2
amuse

@ -1 +1 @@
Subproject commit 75830dc6ddf3550eecefd59c5a1d77bfc18b6e36 Subproject commit 03d597b0ac1a09d3c1e8f4608d55401511cf6b32

2
hecl

@ -1 +1 @@
Subproject commit 6e571a0e5a09e641f8bc95b8fd1b96e716bfdfbd Subproject commit 38c511f5b53cbb161c89a1c3f2ac3ae4e9ac7c2d

2
nod

@ -1 +1 @@
Subproject commit 27a2cb5998414d937ed9f0fd2a958744851505d8 Subproject commit 69e96e3b3c069ea38fd315dac4af9c82d3b6774c