mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-10-31 20:26:43 +00:00 
			
		
		
		
	Merge branch 'nonull' into 'master'
Don't pass a nullptr to a std::string constructor See merge request OpenMW/openmw!1178
This commit is contained in:
		
						commit
						18f51e1026
					
				
					 1 changed files with 1 additions and 1 deletions
				
			
		|  | @ -428,7 +428,7 @@ namespace MWWorld | |||
|         const ESM::WeaponType *search(const int id) const; | ||||
|         const ESM::WeaponType *find(const int id) const; | ||||
| 
 | ||||
|         RecordId load(ESM::ESMReader &esm) override { return RecordId(nullptr, false); } | ||||
|         RecordId load(ESM::ESMReader &esm) override { return RecordId({}, false); } | ||||
| 
 | ||||
|         ESM::WeaponType* insert(const ESM::WeaponType &weaponType); | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue