Merge branch '0.9-rc1' of github.com:supertuxkart/stk-code into 0.9-rc1

supertuxkart · Apr 15, 2015 · 943eeb9 · 943eeb9
2 parents a1fa9d2 + aedb96c
commit 943eeb9
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 4 deletions.
diff --git a/data/gfx/gfx_sparkBlue_a.xml b/data/gfx/gfx_sparkBlue_a.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<!-- For sky particles, the size of the box is ignored -->
+<particles emitter="sphere" radius="0.2">
+
+    <spreading angle="10"           />
+
+    <velocity  x="-0.000"
+               y="0.003"
+               z="-0.000"             />
+
+    <material  file="gfx_sparkBlue_a.png" clampu="Y" clampv="Y" />
+
+    <!-- Amount of particles emitted per second -->
+    <rate      min="20"
+               max="50"           />
+
+    <!-- Minimal and maximal lifetime of a particle, in milliseconds. -->
+    <lifetime  min="1000"
+               max="1500"          />    
+
+    <!-- Size of the particles -->
+    <size min="0.08"
+         max="0.15"
+         x-increase-factor="1.2"
+         y-increase-factor="1.3" /> 
+
+    <color     min="40 40 255"
+               max="255 255 255"   />
+
+    <!-- How much time in milliseconds before the particle is fully faded out  -->
+    <fadeout   time="100"          />
+
+    <wind      speed="0.16"
+               flips="Y"           />
+
+</particles>
diff --git a/src/achievements/achievement.cpp b/src/achievements/achievement.cpp
@@ -19,7 +19,7 @@
 
 
 #include "achievements/achievement.hpp"
-
+#include "achievements/achievements_manager.hpp"
 #include "achievements/achievement_info.hpp"
 #include "guiengine/message_queue.hpp"
 #include "io/utf_writer.hpp"
@@ -199,8 +199,13 @@ void Achievement::check()
     if(m_achievement_info->checkCompletion(this))
     {
         //show achievement
-        core::stringw s = _("Completed achievement \"%s\".", 
-                            m_achievement_info->getName());
+        // Note: the "name" variable is required, see issue #2068
+        // calling _("...", info->getName()) is invalid because getName also calls
+        // _() and thus the string it returns is mapped to a temporary buffer
+        // in theory, it should return a copy of the string, but clang tries to
+        // optimise away the copy
+        core::stringw name = m_achievement_info->getName();
+        core::stringw s = _("Completed achievement \"%s\".", name);
         MessageQueue::add(MessageQueue::MT_ACHIEVEMENT, s);
 
         // Sends a confirmation to the server that an achievement has been

diff --git a/src/graphics/render.cpp b/src/graphics/render.cpp
@@ -390,7 +390,8 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, unsigned po
         // Bind() modifies the viewport. In order not to affect anything else,
         // the viewport is just reset here and not removed in Bind().
         const core::recti &vp = Camera::getActiveCamera()->getViewport();
-        glViewport(vp.UpperLeftCorner.X, vp.UpperLeftCorner.Y,
+        glViewport(vp.UpperLeftCorner.X,
+                   irr_driver->getActualScreenSize().Height - vp.LowerRightCorner.Y,
                    vp.LowerRightCorner.X - vp.UpperLeftCorner.X,
                    vp.LowerRightCorner.Y - vp.UpperLeftCorner.Y);
         glClear(GL_DEPTH_BUFFER_BIT);