[SCM] Standalone 3D Game Maker and 3D Game Design program branch, master, updated. debian/2.7.1+dfsg-1-1-g6247604

[Scott Howard]

The following commit has been merged in the master branch:
commit 62476042d2063b9a93b35c6984e7ecd0426c2b4e
Author: Scott Howard <showard at debian.org>
Date:   Sat Jun 9 22:47:30 2012 -0400

    fixed FTBFS from gcc 4.7 transition (Closes: #673545)

diff --git a/debian/changelog b/debian/changelog
index 4899621..9474d05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sandboxgamemaker (2.7.1+dfsg-2) unstable; urgency=low
+
+  * debian/patches/gcc4.7.patch
+    - fixed FTBFS from gcc 4.7 transition (Closes: #673545)
+
+ -- Scott Howard <showard at debian.org>  Sat, 09 Jun 2012 22:46:30 -0400
+
 sandboxgamemaker (2.7.1+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/gcc4.7.patch b/debian/patches/gcc4.7.patch
new file mode 100644
index 0000000..3d6ac69
--- /dev/null
+++ b/debian/patches/gcc4.7.patch
@@ -0,0 +1,46 @@
+Index: sandboxgamemaker/src/engine/skelmodel.h
+===================================================================
+--- sandboxgamemaker.orig/src/engine/skelmodel.h	2011-10-03 20:55:39.504776564 -0400
++++ sandboxgamemaker/src/engine/skelmodel.h	2012-06-09 22:35:08.486609323 -0400
+@@ -2179,16 +2179,16 @@
+ 
+     skelcommands()
+     {
+-        if(MDL::multiparted()) modelcommand(loadpart, "load", "ssf");
+-        modelcommand(settag, "tag", "ssffffff");
+-        modelcommand(setpitch, "pitch", "sffff");
+-        modelcommand(setpitchtarget, "pitchtarget", "ssiff");
+-        modelcommand(setpitchcorrect, "pitchcorrect", "ssfff");
++        if(MDL::multiparted()) this->modelcommand(loadpart, "load", "ssf");
++        this->modelcommand(settag, "tag", "ssffffff");
++        this->modelcommand(setpitch, "pitch", "sffff");
++        this->modelcommand(setpitchtarget, "pitchtarget", "ssiff");
++        this->modelcommand(setpitchcorrect, "pitchcorrect", "ssfff");
+         if(MDL::animated())
+         {
+-            modelcommand(setanim, "anim", "ssfiii");
+-            modelcommand(setanimpart, "animpart", "s");
+-            modelcommand(setadjust, "adjust", "sffffff");
++            this->modelcommand(setanim, "anim", "ssfiii");
++            this->modelcommand(setanimpart, "animpart", "s");
++            this->modelcommand(setadjust, "adjust", "sffffff");
+         }
+     }
+ };
+Index: sandboxgamemaker/src/engine/vertmodel.h
+===================================================================
+--- sandboxgamemaker.orig/src/engine/vertmodel.h	2012-06-09 22:21:42.000000000 -0400
++++ sandboxgamemaker/src/engine/vertmodel.h	2012-06-09 22:34:00.522607708 -0400
+@@ -648,9 +648,9 @@
+ 
+     vertcommands()
+     {
+-        if(MDL::multiparted()) modelcommand(loadpart, "load", "sf");
+-        modelcommand(setpitch, "pitch", "ffff");
+-        if(MDL::animated()) modelcommand(setanim, "anim", "siiff");
++        if(MDL::multiparted()) this->modelcommand(loadpart, "load", "sf");
++        this->modelcommand(setpitch, "pitch", "ffff");
++        if(MDL::animated()) this->modelcommand(setanim, "anim", "siiff");
+     }
+ };
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 3c88b07..f08c996 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+gcc4.7.patch
 wx_launcher_paths.patch
 debianizing_makefiles.patch
 linux_launcher.patch

-- 
Standalone 3D Game Maker and 3D Game Design program