Author: miriam
Date: 2011-11-21 16:41:53 +0000 (Mon, 21 Nov 2011)
New Revision: 12833

Added:
   packages/trunk/phlipple/debian/patches/
   packages/trunk/phlipple/debian/patches/series
   packages/trunk/phlipple/debian/patches/support_us.patch
Modified:
   packages/trunk/phlipple/debian/changelog
   packages/trunk/phlipple/debian/phlipple-data.install
Log:
Replaced Android and iOS "Support Us" buttons with a single button,  without 
explicit trademarks. Closes: #649341



Modified: packages/trunk/phlipple/debian/changelog
===================================================================
--- packages/trunk/phlipple/debian/changelog    2011-11-21 16:25:27 UTC (rev 
12832)
+++ packages/trunk/phlipple/debian/changelog    2011-11-21 16:41:53 UTC (rev 
12833)
@@ -1,6 +1,7 @@
 phlipple (0.8.2-2) UNRELEASED; urgency=low
 
-  * 
+  * Replaced Android and iOS "Support Us" buttons with a single button,
+    without explicit trademarks. Closes: #649341
 
  -- Miriam Ruiz <[email protected]>  Mon, 21 Nov 2011 17:23:45 +0100
 

Added: packages/trunk/phlipple/debian/patches/series
===================================================================
--- packages/trunk/phlipple/debian/patches/series                               
(rev 0)
+++ packages/trunk/phlipple/debian/patches/series       2011-11-21 16:41:53 UTC 
(rev 12833)
@@ -0,0 +1 @@
+support_us.patch

Added: packages/trunk/phlipple/debian/patches/support_us.patch
===================================================================
--- packages/trunk/phlipple/debian/patches/support_us.patch                     
        (rev 0)
+++ packages/trunk/phlipple/debian/patches/support_us.patch     2011-11-21 
16:41:53 UTC (rev 12833)
@@ -0,0 +1,147 @@
+--- phlipple-0.8.2.orig/src/mainscreen.c
++++ phlipple-0.8.2/src/mainscreen.c
+@@ -76,8 +76,7 @@
+ static int showBrowser = 0;
+ static int fadeOut = 0;
+ 
+-static int highlightSupp1 = 0;
+-static int highlightSupp2 = 0;
++static int highlightSupp = 0;
+ 
+ // 0 none, 1 quit, 2 play, 3 browser
+ static int fadeAction = 0;
+@@ -204,8 +203,7 @@
+       }
+ 
+       // detect mouse over support buttonz
+-      highlightSupp1 = 0;
+-      highlightSupp2 = 0;
++      highlightSupp = 0;
+       float mx = (((float) OS_getMouseX() / (float) width) * (right - left))
+                  + left;
+       float my = (((float) OS_getMouseY() / (float) height) * (bottom - top))
+@@ -213,11 +211,8 @@
+ 
+       if (fabs(my - (bottom + buttSize / 4)) < buttSize / 4.0)
+       {
+-              if (fabs(mx - (left + buttSize / 2.0)) < buttSize / 2.0)
+-                      highlightSupp1 = 1;
+-
+               if (fabs(mx - (right - buttSize / 2.0)) < buttSize / 2.0)
+-                      highlightSupp2 = 1;
++                      highlightSupp = 1;
+       }
+ 
+       int buttPressed = 0;
+@@ -246,25 +241,14 @@
+                                     + top;
+ 
+ 
+-                      if (highlightSupp1)
+-                      {
+-#ifndef WIN32
+-                              int i = system(LINUX_BROWSER_ANDROID);
+-                              i++;
+-#endif
+-#ifdef WIN32
+-                              ShellExecute(NULL, "open", 
WIN32_BROWSER_ANDROID, NULL, NULL, SW_SHOWNORMAL);
+-#endif
+-                      }
+-
+-                      if (highlightSupp2)
++                      if (highlightSupp)
+                       {
+ #ifndef WIN32
+-                              int i = system(LINUX_BROWSER_APPLE);
++                              int i = system(LINUX_BROWSER_HOME);
+                               i++;
+ #endif
+ #ifdef WIN32
+-                              ShellExecute(NULL, "open", WIN32_BROWSER_APPLE, 
NULL, NULL, SW_SHOWNORMAL);
++                              ShellExecute(NULL, "open", WIN32_BROWSER_HOME, 
NULL, NULL, SW_SHOWNORMAL);
+ #endif
+                       }
+ 
+@@ -652,25 +636,10 @@
+ 
+       float alpha = interpolator_getVal(&buttAlpha);
+       alpha *= 0.5;
+-      if (highlightSupp1)
+-              alpha = 1.0;
+-
+-      // render support buttons
+-      texture_apply(texSupp1);
+-      glPushMatrix();
+-      glColor4f(1, 1, 1, alpha);
+-      glTranslatef(left + buttSize / 2, bottom + buttSize / 4, 0);
+-      glScalef(buttSize, buttSize / 2.0, 0);
+-      render_quad();
+-      glPopMatrix();
+-
+-
+-      alpha = interpolator_getVal(&buttAlpha);
+-      alpha *= 0.5;
+-      if (highlightSupp2)
++      if (highlightSupp)
+               alpha = 1.0;
+ 
+-      texture_apply(texSupp2);
++      texture_apply(texSupp);
+       glPushMatrix();
+       glColor4f(1, 1, 1, alpha);
+       glTranslatef(right - buttSize / 2, bottom + buttSize / 4, 0);
+--- phlipple-0.8.2.orig/src/phlipplerootscene.c
++++ phlipple-0.8.2/src/phlipplerootscene.c
+@@ -39,8 +39,7 @@
+ GLuint texTut1;
+ GLuint texTut2;
+ GLuint texTut3;
+-GLuint texSupp1;
+-GLuint texSupp2;
++GLuint texSupp;
+ 
+ TextRenderer *txtRend;
+ GradientRenderer *grdRendMain;
+@@ -104,8 +103,7 @@
+       texTut1 = texture_load("tut1.png");
+       texTut2 = texture_load("tut2.png");
+       texTut3 = texture_load("tut3.png");
+-      texSupp1 = texture_load("support_android.png");
+-      texSupp2 = texture_load("support_apple.png");
++      texSupp = texture_load("support_us.png");
+ 
+       txtRend = text_renderer_create("ubuntu_0.png", "ubuntu.fnt");
+       grdRendMain = gradient_renderer_create(mainGradCol0, mainGradCol1);
+@@ -131,8 +129,7 @@
+       texture_destroy(texTut1);
+       texture_destroy(texTut2);
+       texture_destroy(texTut3);
+-      texture_destroy(texSupp1);
+-      texture_destroy(texSupp2);
++      texture_destroy(texSupp);
+ 
+       text_renderer_destroy(txtRend);
+       gradient_renderer_destroy(grdRendMain);
+--- phlipple-0.8.2.orig/src/phlipplerootscene.h
++++ phlipple-0.8.2/src/phlipplerootscene.h
+@@ -49,8 +49,7 @@
+ extern GLuint texTut1;
+ extern GLuint texTut2;
+ extern GLuint texTut3;
+-extern GLuint texSupp1;
+-extern GLuint texSupp2;
++extern GLuint texSupp;
+ 
+ extern TextRenderer *txtRend;
+ extern GradientRenderer *grdRendMain;
+--- phlipple-0.8.2.orig/src/gfxconstants.h
++++ phlipple-0.8.2/src/gfxconstants.h
+@@ -42,6 +42,8 @@
+ #define LINUX_BROWSER_APPLE                           "xdg-open 
http://itunes.apple.com/us/app/phlipple/id465466751?mt=8&uo=4";
+ #define WIN32_BROWSER_ANDROID                 
"http://market.android.com/details?id=com.phuzzboxmedia.phlipple.android";
+ #define WIN32_BROWSER_APPLE                           
"http://itunes.apple.com/us/app/phlipple/id465466751?mt=8&uo=4";
++#define LINUX_BROWSER_HOME                            "xdg-open 
http://www.phuzzboxmedia.com/games/phlipple";
++#define WIN32_BROWSER_HOME                            
"http://www.phuzzboxmedia.com/games/phlipple";
+ 
+ 
+ //#define SHOW_SPLASH

Modified: packages/trunk/phlipple/debian/phlipple-data.install
===================================================================
--- packages/trunk/phlipple/debian/phlipple-data.install        2011-11-21 
16:25:27 UTC (rev 12832)
+++ packages/trunk/phlipple/debian/phlipple-data.install        2011-11-21 
16:41:53 UTC (rev 12833)
@@ -1 +1,2 @@
 usr/share/phlipple
+debian/support_us.png usr/share/phlipple/


_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to