diff options
| author | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-06-24 18:55:14 +0000 |
|---|---|---|
| committer | FWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544> | 2012-06-24 18:55:14 +0000 |
| commit | 88a7e24d44695f49e1250a9314f03bf4c6e1cff8 (patch) | |
| tree | b02bac4b5735ede954eb48e0a2cfbead900f1fa5 /Stars45/ShipDesign.cpp | |
| parent | 05f1b225a03adeab4cda01a6c96595359464ac0e (diff) | |
| download | starshatter-88a7e24d44695f49e1250a9314f03bf4c6e1cff8.zip starshatter-88a7e24d44695f49e1250a9314f03bf4c6e1cff8.tar.gz starshatter-88a7e24d44695f49e1250a9314f03bf4c6e1cff8.tar.bz2 | |
A few PVS studio things5.1.87
Diffstat (limited to 'Stars45/ShipDesign.cpp')
| -rw-r--r-- | Stars45/ShipDesign.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Stars45/ShipDesign.cpp b/Stars45/ShipDesign.cpp index 9965d3d..92a5c30 100644 --- a/Stars45/ShipDesign.cpp +++ b/Stars45/ShipDesign.cpp @@ -3590,6 +3590,8 @@ void ShipDesign::ParseSkinMtl(TermStruct* val, Skin* skin)
{
Material* mtl = new(__FILE__,__LINE__) Material;
+ if (mtl == nullptr)
+ return;
for (int i = 0; i < val->elements()->size(); i++) {
TermDef* def = val->elements()->at(i)->isDef();
@@ -3675,6 +3677,7 @@ ShipDesign::ParseSkinMtl(TermStruct* val, Skin* skin) Print("WARNING: invalid or missing tex_emissive in '%s'\n", filename);
DataLoader* loader = DataLoader::GetLoader();
+
loader->LoadTexture(tex_name, mtl->tex_emissive);
}
}
|