Răsfoiți Sursa

Merge pull request #202 from blackberry-gaming/next-setaylor

Next setaylor
Sean Paul Taylor 13 ani în urmă
părinte
comite
fd9365b1c8

+ 2 - 0
gameplay-template/template.bar-descriptor.xml

@@ -39,6 +39,8 @@
 
 
     <!--  Unique author ID assigned by signing authority. Required if using debug tokens. -->
     <!--  Unique author ID assigned by signing authority. Required if using debug tokens. -->
     <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
     <!-- <authorId>gYAAgPkLP1tZlyYP1wiMaRFFNMw</authorId> -->
+    
+    <platformVersion>2.0.0.7971</platformVersion>
 
 
     <initialWindow>
     <initialWindow>
         <aspectRatio>landscape</aspectRatio>
         <aspectRatio>landscape</aspectRatio>

+ 3 - 4
gameplay/src/ParticleEmitter.cpp

@@ -50,12 +50,11 @@ ParticleEmitter* ParticleEmitter::create(const char* textureFile, TextureBlendin
     Texture* texture = NULL;
     Texture* texture = NULL;
     texture = Texture::create(textureFile, true);    
     texture = Texture::create(textureFile, true);    
 
 
-    if (!texture)
+	if (!texture)
     {
     {
-        // Use default texture.
-        texture = Texture::create("res/particle-default.png", true);
+        LOG_ERROR_VARG("Error creating ParticleEmitter: Could not read texture file: %s", textureFile);
+        return NULL;
     }
     }
-    assert(texture);
 
 
     // Use default SpriteBatch material.
     // Use default SpriteBatch material.
     SpriteBatch* batch =  SpriteBatch::create(texture, NULL, particleCountMax);
     SpriteBatch* batch =  SpriteBatch::create(texture, NULL, particleCountMax);