|
2604
|
1 |
--- supertuxkart-0.6.2a/configure.ac Sun May 9 14:47:32 2010
|
|
|
2 |
+++ supertuxkart-0.6.2a-patch/configure.ac Sun May 9 14:47:42 2010
|
|
|
3 |
@@ -13,14 +13,6 @@
|
|
|
4 |
AM_INIT_AUTOMAKE([foreign tar-ustar])
|
|
|
5 |
|
|
|
6 |
|
|
|
7 |
-dnl =====================================================
|
|
|
8 |
-dnl Set the default CFLAGS/CXXFLAGS
|
|
|
9 |
-dnl If these were not set, the AC_PROG_CC and AC_PROG_CXX
|
|
|
10 |
-dnl scripts set them to "-g -O2".
|
|
|
11 |
-dnl =====================================================
|
|
|
12 |
-CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -Wmissing-prototypes"
|
|
|
13 |
-CXXFLAGS="$CXXFLAGS -Wall"
|
|
|
14 |
-
|
|
|
15 |
dnl ===================
|
|
|
16 |
dnl Check for compilers
|
|
|
17 |
dnl ===================
|
|
|
18 |
--- supertuxkart-0.6.2a/src/bullet/src/LinearMath/btAlignedAllocator.h Fri Oct 16 02:43:56 2009
|
|
|
19 |
+++ supertuxkart-0.6.2a-patch/src/bullet/src/LinearMath/btAlignedAllocator.h Sun May 9 14:55:23 2010
|
|
|
20 |
@@ -16,6 +16,8 @@
|
|
|
21 |
#ifndef BT_ALIGNED_ALLOCATOR
|
|
|
22 |
#define BT_ALIGNED_ALLOCATOR
|
|
|
23 |
|
|
|
24 |
+#include <stdio.h>
|
|
|
25 |
+
|
|
|
26 |
///we probably replace this with our own aligned memory allocator
|
|
|
27 |
///so we replace _aligned_malloc and _aligned_free with our own
|
|
|
28 |
///that is better portable and more predictable
|
|
|
29 |
--- supertuxkart-0.6.2a/src/bullet/src/LinearMath/btAlignedAllocator.cpp Fri Oct 16 02:43:56 2009
|
|
|
30 |
+++ supertuxkart-0.6.2a-patch/src/bullet/src/LinearMath/btAlignedAllocator.cpp Sun May 9 14:56:10 2010
|
|
|
31 |
@@ -13,6 +13,8 @@
|
|
|
32 |
3. This notice may not be removed or altered from any source distribution.
|
|
|
33 |
*/
|
|
|
34 |
|
|
|
35 |
+#include <stdlib.h>
|
|
|
36 |
+
|
|
|
37 |
#include "btAlignedAllocator.h"
|
|
|
38 |
|
|
|
39 |
int gNumAlignedAllocs = 0;
|
|
|
40 |
--- supertuxkart-0.6.2a/src/utils/translation.cpp Fri Oct 16 02:43:56 2009
|
|
|
41 |
+++ supertuxkart-0.6.2a-patch/src/utils/translation.cpp Sun May 9 15:00:42 2010
|
|
|
42 |
@@ -21,6 +21,8 @@
|
|
|
43 |
#include "translation.hpp"
|
|
|
44 |
#include "file_manager.hpp"
|
|
|
45 |
|
|
|
46 |
+#include <locale.h>
|
|
|
47 |
+
|
|
|
48 |
Translations* translations=NULL;
|
|
|
49 |
|
|
|
50 |
Translations::Translations() {
|
|
|
51 |
--- supertuxkart-0.6.2a/src/gui/widget_manager.hpp Fri Oct 16 02:43:52 2009
|
|
|
52 |
+++ supertuxkart-0.6.2a-patch/src/gui/widget_manager.hpp Sun May 9 15:27:46 2010
|
|
|
53 |
@@ -367,8 +367,8 @@
|
|
|
54 |
int handleDown();
|
|
|
55 |
|
|
|
56 |
/* Scrolling modification. */
|
|
|
57 |
- void increaseScrollSpeed(bool = false);
|
|
|
58 |
- void decreaseScrollSpeed(bool = false);
|
|
|
59 |
+ void increaseScrollSpeed(const bool = false);
|
|
|
60 |
+ void decreaseScrollSpeed(const bool = false);
|
|
|
61 |
void setPosition(const int token,
|
|
|
62 |
WidgetDirection hori, float percentage_x,
|
|
|
63 |
WidgetDirection verti, float percentage_y);
|
|
|
64 |
--- supertuxkart-0.6.2a/src/gui/widget.cpp Fri Oct 16 02:43:52 2009
|
|
|
65 |
+++ supertuxkart-0.6.2a-patch/src/gui/widget.cpp Sun May 9 15:37:02 2010
|
|
|
66 |
@@ -325,7 +325,7 @@
|
|
|
67 |
}
|
|
|
68 |
|
|
|
69 |
//-----------------------------------------------------------------------------
|
|
|
70 |
-void Widget::setTexture( const std::string& FILENAME, bool is_full_path )
|
|
|
71 |
+void Widget::setTexture( const std::string& FILENAME, const bool is_full_path )
|
|
|
72 |
{
|
|
|
73 |
Material *m = material_manager->getMaterial( FILENAME, is_full_path );
|
|
|
74 |
m_texture = m->getState()->getTextureHandle();
|
|
|
75 |
--- supertuxkart-0.6.2a/src/highscores.cpp Fri Oct 16 02:44:09 2009
|
|
|
76 |
+++ supertuxkart-0.6.2a-patch/src/highscores.cpp Sun May 9 15:40:40 2010
|
|
|
77 |
@@ -107,7 +107,7 @@
|
|
|
78 |
|
|
|
79 |
// -----------------------------------------------------------------------------
|
|
|
80 |
int HighscoreEntry::matches(HighscoreType highscore_type,
|
|
|
81 |
- int num_karts, RaceManager::Difficulty difficulty,
|
|
|
82 |
+ int num_karts, const RaceManager::Difficulty difficulty,
|
|
|
83 |
const std::string track, const int number_of_laps)
|
|
|
84 |
{
|
|
|
85 |
return (m_highscore_type == highscore_type &&
|