mirror of https://github.com/PrimeDecomp/prime.git
Allow implicit conversion to rstl::string
This commit is contained in:
parent
9ae9e52ed7
commit
fdbb3376ff
|
@ -64,7 +64,7 @@ public:
|
|||
// ++x4_cow->x4_refCount;
|
||||
// }
|
||||
|
||||
basic_string(const _CharTp* data, int size, const Alloc& = rmemory_allocator());
|
||||
basic_string(const _CharTp* data, int size = -1, const Alloc& = rmemory_allocator());
|
||||
// {
|
||||
// if (size <= 0 && !data)
|
||||
// {
|
||||
|
|
|
@ -9,7 +9,7 @@ CFire::CFire(TToken< CGenDescription > effect, TUniqueId uid, TAreaId area, bool
|
|||
TUniqueId owner, const CTransform4f& xf, const CDamageInfo& dInfo, const CAABox& aabox,
|
||||
const CVector3f& vec, bool b1, CAssetId visorEffect, bool b2, bool b3, bool b4,
|
||||
float f1, float f2, float f3, float f4)
|
||||
: CActor(uid, active, rstl::string("Fire", -1), CEntityInfo(area, NullConnectionList), xf,
|
||||
: CActor(uid, active, "Fire", CEntityInfo(area, NullConnectionList), xf,
|
||||
CModelData::CModelDataNull(), MakeMaterialList(), CActorParameters::None(),
|
||||
kInvalidUniqueId)
|
||||
, xe8_(new CElementGen(effect))
|
||||
|
|
Loading…
Reference in New Issue