diff --git a/include/rstl/string.hpp b/include/rstl/string.hpp index e51e9d46..17c18512 100644 --- a/include/rstl/string.hpp +++ b/include/rstl/string.hpp @@ -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) // { diff --git a/src/MetroidPrime/ScriptObjects/CFire.cpp b/src/MetroidPrime/ScriptObjects/CFire.cpp index dd44cb47..1a0a574f 100644 --- a/src/MetroidPrime/ScriptObjects/CFire.cpp +++ b/src/MetroidPrime/ScriptObjects/CFire.cpp @@ -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))