PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow implicit conversion to rstl::string 

Former-commit-id: fdbb3376ff
This commit is contained in:
Phillip Stephens 2022-10-08 01:46:42 -07:00
parent 28bfac18ed
commit b4aff47c3c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rstl/string.hpp
View File

@ -64,7 +64,7 @@ public:
// ++x4_cow->x4_refCount; // ++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) // if (size <= 0 && !data)
// { // {

2
src/MetroidPrime/ScriptObjects/CFire.cpp
View File

@ -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, TUniqueId owner, const CTransform4f& xf, const CDamageInfo& dInfo, const CAABox& aabox,
const CVector3f& vec, bool b1, CAssetId visorEffect, bool b2, bool b3, bool b4, const CVector3f& vec, bool b1, CAssetId visorEffect, bool b2, bool b3, bool b4,
float f1, float f2, float f3, float f4) 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(), CModelData::CModelDataNull(), MakeMaterialList(), CActorParameters::None(),
kInvalidUniqueId) kInvalidUniqueId)
, xe8_(new CElementGen(effect)) , xe8_(new CElementGen(effect))