Merge pull request #445 from blackberry-gaming/next-cculy

Next cculy

gameplay/src/Joystick.cpp

@@ -158,9 +158,9 @@ bool Joystick::touchEvent(Touch::TouchEvent touchEvent, int x, int y, unsigned i
     return Control::touchEvent(touchEvent, x, y, contactIndex);
 }
 
-void Joystick::update(const Rectangle& clip, const Vector2& offset)
+void Joystick::update(const Control* container, const Vector2& offset)
 {
-    Control::update(clip, offset);
+    Control::update(container, offset);
 }
 
 void Joystick::drawImages(SpriteBatch* spriteBatch, const Rectangle& clip)
@@ -216,4 +216,4 @@ void Joystick::drawImages(SpriteBatch* spriteBatch, const Rectangle& clip)
     spriteBatch->end();
 }
 
-}
+}

gameplay/src/Joystick.h

@@ -108,12 +108,13 @@ protected:
     bool touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex);
 
     /**
-     * Called when a joystick's properties change. Updates this joystick's internal rendering properties.
+     * Called when a control's properties change.  Updates this control's internal rendering
+     * properties, such as its text viewport.
      *
-     * @param clip The clipping rectangle of this joystick's parent container.
-     * @param offset The scroll offset of this joystick's parent container.
+     * @param container This control's parent container.
+     * @param offset Positioning offset to add to the control's position.
      */
-    void update(const Rectangle& clip, const Vector2& offset);
+    void update(const Control* container, const Vector2& offset);
 
     /**
      * Draw the images associated with this control.

gameplay/src/SceneLoader.cpp

@@ -848,7 +848,7 @@ void SceneLoader::loadReferencedFiles()
                 properties = Properties::create(fileString.c_str());
                 if (properties == NULL)
                 {
-                    GP_ERROR("Failed to load referenced properties file '%s'.", fileString);
+                    GP_ERROR("Failed to load referenced properties file '%s'.", fileString.c_str());
                     continue;
                 }