r8421 - in packages/trunk/supertuxkart/debian: . patches
Christoph Egger
christoph-guest at alioth.debian.org
Sat Nov 15 11:48:50 UTC 2008
Author: christoph-guest
Date: 2008-11-15 11:48:50 +0000 (Sat, 15 Nov 2008)
New Revision: 8421
Added:
packages/trunk/supertuxkart/debian/patches/ftbfs-gcc-4.4.patch
packages/trunk/supertuxkart/debian/patches/recreation-and-restart.patch
Modified:
packages/trunk/supertuxkart/debian/changelog
packages/trunk/supertuxkart/debian/patches/bug1996464.patch
packages/trunk/supertuxkart/debian/patches/series
packages/trunk/supertuxkart/debian/rules
Log:
* switching to upstream patch for multiplayer bug
* Adding 2 other bugfixes:
* Item recreation did also happen on paused games
* Restarting follow-the-leader game restart had an
conflict in the order of function calls
* quilt.make wants $(QUILT_STAMPFN) instead of directly
using the patch target so change it
* Take the GCC-4.4 thing on my way -- won't harm and will
need fixing some time anyway
Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog 2008-11-15 04:58:55 UTC (rev 8420)
+++ packages/trunk/supertuxkart/debian/changelog 2008-11-15 11:48:50 UTC (rev 8421)
@@ -6,6 +6,15 @@
[ Peter De Wachter ]
* Added patch to check for SDL errors and to allow the game to run on
low-end hardware (closes: #501116).
+
+ [ Christoph Egger ]
+ * Use patch upstream uses for their bug #1996464
+ * Fix incorrect recreation of items
+ * Correct Issue when restarting follow-the-leader game:
+ recreation-and-restart.patch
+ * Use $(QUILT_STAMPFN) insted of direct patch target for quilt make-snippet
+ * Fix build with GCC 4.4 (Closes: #505671)
+ ftbfs-gcc-4.4.patch
-- Vincent Fourmond <fourmond at debian.org> Mon, 21 Jul 2008 01:09:06 +0200
Modified: packages/trunk/supertuxkart/debian/patches/bug1996464.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/bug1996464.patch 2008-11-15 04:58:55 UTC (rev 8420)
+++ packages/trunk/supertuxkart/debian/patches/bug1996464.patch 2008-11-15 11:48:50 UTC (rev 8421)
@@ -1,28 +1,28 @@
diff -Naur supertuxkart-0.5/src/race_manager.hpp supertuxkart-0.5-patched/src/race_manager.hpp
--- supertuxkart-0.5/src/race_manager.hpp 2008-05-31 09:07:09.000000000 +0200
-+++ supertuxkart-0.5-patched/src/race_manager.hpp 2008-06-18 20:10:50.000000000 +0200
++++ supertuxkart-0.5-patched/src/race_manager.hpp 2008-07-01 22:10:57.000000000 +0200
@@ -128,6 +128,7 @@
const std::string& getHerringStyle() const
{ return m_cup.getHerringStyle(); }
int getKartScore(int krt) const { return m_kart_status[krt].m_score;}
-+ int getKartPlayerId(int krt) const {return m_kart_status[krt].m_player_id;}
++ int getKartPlayerId(int krt) const {return m_kart_status[krt].m_player_id;}
int getPositionScore(int p) const { return m_score_for_position[p-1]; }
double getOverallTime(int kart) const { return m_kart_status[kart].m_overall_time;}
int getCoinTarget() const { return m_coin_target; }
diff -Naur supertuxkart-0.5/src/world.cpp supertuxkart-0.5-patched/src/world.cpp
--- supertuxkart-0.5/src/world.cpp 2008-05-31 09:07:09.000000000 +0200
-+++ supertuxkart-0.5-patched/src/world.cpp 2008-06-18 20:10:18.000000000 +0200
-@@ -95,7 +95,8 @@
++++ supertuxkart-0.5-patched/src/world.cpp 2008-07-03 18:57:34.000000000 +0200
+@@ -95,7 +96,8 @@
// karts can be positioned properly on (and not in) the tracks.
loadTrack() ;
- int playerIndex = 0;
-+ m_player_karts.reserve(race_manager->getNumPlayers());
++ m_player_karts.resize(race_manager->getNumPlayers());
+
for(unsigned int i=0; i<race_manager->getNumKarts(); i++)
{
int position = i+1; // position start with 1
-@@ -103,16 +104,18 @@
+@@ -103,16 +105,18 @@
m_track->getStartCoords(i, &init_pos);
Kart* newkart;
const std::string& kart_name=race_manager->getKartName(i);
@@ -43,7 +43,7 @@
}
}
else
-@@ -120,10 +123,9 @@
+@@ -120,10 +124,9 @@
if (race_manager->isPlayer(i))
{
newkart = new PlayerKart(kart_name, position,
@@ -53,7 +53,8 @@
- playerIndex++;
+ &(user_config->m_player[playerId]),
+ init_pos, playerId);
-+ m_player_karts.push_back((PlayerKart*)newkart);
++ m_player_karts[playerId] = (PlayerKart*)newkart;
}
else
{
+
Added: packages/trunk/supertuxkart/debian/patches/ftbfs-gcc-4.4.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/ftbfs-gcc-4.4.patch (rev 0)
+++ packages/trunk/supertuxkart/debian/patches/ftbfs-gcc-4.4.patch 2008-11-15 11:48:50 UTC (rev 8421)
@@ -0,0 +1,12 @@
+Index: supertuxkart-0.5.obsolete.0.162730800760077/src/lisp/lexer.cpp
+===================================================================
+--- supertuxkart-0.5.obsolete.0.162730800760077.orig/src/lisp/lexer.cpp 2008-11-15 12:19:49.000000000 +0100
++++ supertuxkart-0.5.obsolete.0.162730800760077/src/lisp/lexer.cpp 2008-11-15 12:20:27.000000000 +0100
+@@ -19,6 +19,7 @@
+ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ #include <sstream>
+ #include <stdexcept>
++#include <cstdio>
+ #include <cstring>
+
+ #include "lexer.hpp"
Added: packages/trunk/supertuxkart/debian/patches/recreation-and-restart.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/recreation-and-restart.patch (rev 0)
+++ packages/trunk/supertuxkart/debian/patches/recreation-and-restart.patch 2008-11-15 11:48:50 UTC (rev 8421)
@@ -0,0 +1,90 @@
+Index: supertuxkart-0.5/src/herring.cpp
+===================================================================
+--- supertuxkart-0.5.orig/src/herring.cpp 2008-05-31 09:07:09.000000000 +0200
++++ supertuxkart-0.5/src/herring.cpp 2008-11-15 12:11:21.000000000 +0100
+@@ -69,7 +69,7 @@
+ {
+ if(m_eaten)
+ {
+- const float T = m_time_to_return - world->getTime();
++ const float T = m_time_to_return - world->getForwardTime();
+ if ( T > 0 )
+ {
+ sgVec3 hell;
+@@ -99,6 +99,6 @@
+ void Herring::isEaten()
+ {
+ m_eaten=true;
+- m_time_to_return=world->getTime()+2.0f;
++ m_time_to_return=world->getForwardTime()+2.0f;
+ }
+
+Index: supertuxkart-0.5/src/race_manager.cpp
+===================================================================
+--- supertuxkart-0.5.orig/src/race_manager.cpp 2008-05-31 09:07:09.000000000 +0200
++++ supertuxkart-0.5/src/race_manager.cpp 2008-11-15 12:11:21.000000000 +0100
+@@ -247,8 +247,10 @@
+ {
+ m_kart_status[i].m_score -= m_kart_status[i].m_last_score;
+ m_kart_status[i].m_overall_time -= m_kart_status[i].m_last_time;
++ m_kart_status[i].m_is_eliminated = false;
+ }
+- world->restartRace();
++ //world->restartRace(); // seems that world->restartRace() gets called,
++ // not race_manager->restartRace()
+ } // restartRace
+
+ /* EOF */
+Index: supertuxkart-0.5/src/world.cpp
+===================================================================
+--- supertuxkart-0.5.orig/src/world.cpp 2008-11-15 12:11:21.000000000 +0100
++++ supertuxkart-0.5/src/world.cpp 2008-11-15 12:11:21.000000000 +0100
+@@ -66,6 +66,7 @@
+ m_previous_phase = SETUP_PHASE; // initialise it just in case
+ m_track = NULL;
+ m_clock = 0.0f;
++ m_total_clock = 0.0f;
+ m_faster_music_active = false;
+ m_fastest_lap = 9999999.9f;
+ m_fastest_kart = 0;
+@@ -453,6 +454,9 @@
+ break;
+ default : break;
+ } // switch
++
++ m_total_clock += dt;
++
+ if(race_manager->getRaceMode()==RaceManager::RM_FOLLOW_LEADER)
+ {
+ // Count 'normal' till race phase has started, then count backwards
+@@ -724,7 +728,10 @@
+ //-----------------------------------------------------------------------------
+ void World::restartRace()
+ {
++ race_manager->restartRace();
++
+ m_clock = 0.0f;
++ m_total_clock = 0.0f;
+ m_phase = SETUP_PHASE;
+ m_previous_phase = SETUP_PHASE;
+ m_faster_music_active = false;
+Index: supertuxkart-0.5/src/world.hpp
+===================================================================
+--- supertuxkart-0.5.orig/src/world.hpp 2008-05-31 09:07:10.000000000 +0200
++++ supertuxkart-0.5/src/world.hpp 2008-11-15 12:11:21.000000000 +0100
+@@ -104,6 +104,7 @@
+ void setFastestLap(Kart *k, float time) {m_fastest_kart=k;m_fastest_lap=time;}
+ const Highscores* getHighscores() const { return m_highscores; }
+ float getTime() const { return m_clock; }
++ float getForwardTime() const { return m_total_clock; }
+
+ void pause();
+ void unpause();
+@@ -118,6 +119,7 @@
+ Phase m_phase;
+ Phase m_previous_phase; // used during the race popup menu
+ float m_clock;
++ float m_total_clock;
+ float m_finish_delay_start_time;
+ int m_eliminated_karts; // number of eliminated karts
+ int m_eliminated_players; // number of eliminated players
Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series 2008-11-15 04:58:55 UTC (rev 8420)
+++ packages/trunk/supertuxkart/debian/patches/series 2008-11-15 11:48:50 UTC (rev 8421)
@@ -1,2 +1,4 @@
bug1996464.patch
modesetting.patch
+recreation-and-restart.patch
+ftbfs-gcc-4.4.patch
Modified: packages/trunk/supertuxkart/debian/rules
===================================================================
--- packages/trunk/supertuxkart/debian/rules 2008-11-15 04:58:55 UTC (rev 8420)
+++ packages/trunk/supertuxkart/debian/rules 2008-11-15 11:48:50 UTC (rev 8421)
@@ -28,7 +28,7 @@
CXXFLAGS += -O2
endif
-config.status: patch configure
+config.status: $(QUILT_STAMPFN) configure
dh_testdir
# Add here commands to configure the package.
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=/usr/games
More information about the Pkg-games-commits
mailing list