From 5ec883b86a29ff25ef94483050b4190bf1f70bb0 Mon Sep 17 00:00:00 2001 From: hiker Date: Tue, 23 Sep 2014 15:12:26 +1000 Subject: [PATCH 1/4] Minor code simplification. --- src/graphics/lod_node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/graphics/lod_node.cpp b/src/graphics/lod_node.cpp index a044906db..59298280e 100644 --- a/src/graphics/lod_node.cpp +++ b/src/graphics/lod_node.cpp @@ -83,7 +83,7 @@ int LODNode::getLevel() const Vec3 &pos = kart->getFrontXYZ(); const int dist = - (int)((m_nodes[0]->getAbsolutePosition()).getDistanceFromSQ( core::vector3df(pos.getX(), pos.getY(), pos.getZ()))); + (int)((m_nodes[0]->getAbsolutePosition()).getDistanceFromSQ(pos.toIrrVector() )); for (unsigned int n=0; n Date: Tue, 23 Sep 2014 15:51:06 +1000 Subject: [PATCH 2/4] Added new supertuxkart.appdata file from hughsie (#1545). --- data/supertuxkart.appdata | 59 ++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/data/supertuxkart.appdata b/data/supertuxkart.appdata index e58edf135..5e1fabfb4 100644 --- a/data/supertuxkart.appdata +++ b/data/supertuxkart.appdata @@ -1,29 +1,36 @@ - + + - supertuxkart.desktop - CC0 - SuperTuxKart - 3D Kart Racing Game - -

-SuperTuxKart is a Free 3d kart racing game. - -The focus of the game is more to be fun than it is to be realistic. -You can play with up to 4 friends on one PC, racing against each other or just try to beat the computer. - -See the great lighthouse or drive through the sand and visit the pyramids. Race underground or in space, -watching the stars passing by. Have some rest under the palms on the beach (watching the other karts -overtaking you :) ). But don't eat the bananas! Watch for bowling balls, plungers, bubble gum and cakes thrown by opponents. - -You can do a single race against other karts, compete in one of several Grand Prix, try to beat the high score in time trials -on your own, play battle mode against your friends, and more! -

- - - http://supertuxkart.sourceforge.net/persistent/images/7/7a/Supertuxkart-0.8.1-screenshot-1.png - - http://supertuxkart.sourceforge.net - supertuxkart-devel@lists.sourceforge.net - SuperTuxKart + supertuxkart.desktop + CC0-1.0 + SuperTuxKart + A racing game + +

+ SuperTuxKart is a fun 3D kart racing game. + You can play with up to 4 friends on one PC, racing against each other or + just try to beat the computer. +

+

+ See the great lighthouse or drive through the sand and visit the pyramids. + Race underground or in space, watching the stars passing by. + Have some rest under the palms on the beach (watching the other karts + overtaking you :) ). + But don't eat the bananas! Watch for bowling balls, plungers, bubble gum + and cakes thrown by opponents. +

+

+ You can do a single race against other karts, compete in one of several + Grand Prix, try to beat the high score in time trials on your own, play + battle mode against your friends, and more! +

+ + http://supertuxkart.sourceforge.net/ + + http://supertuxkart.sourceforge.net/persistent/images/4/4d/SuperTuxKart_0.8_screenshot.jpg + http://supertuxkart.sourceforge.net/persistent/images/1/1f/SuperTuxKart_0.8_screenshot4.jpg + + supertuxkart-devel@lists.sourceforge.net + --> From d007703d6b590ff05bcd9990eb62cf915b1b9a32 Mon Sep 17 00:00:00 2001 From: deve Date: Tue, 23 Sep 2014 08:28:39 +0200 Subject: [PATCH 3/4] Fixed warning when SOCKET_ERROR is already defined. --- src/utils/types.hpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/utils/types.hpp b/src/utils/types.hpp index 671019a9d..0fa73c7cb 100644 --- a/src/utils/types.hpp +++ b/src/utils/types.hpp @@ -20,17 +20,17 @@ #define HEADER_TYPES_HPP #if defined(_MSC_VER) && _MSC_VER < 1700 - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - typedef __int32 int32_t; - typedef unsigned __int32 uint32_t; - typedef __int64 int64_t; - typedef unsigned __int64 uint64_t; - #elif defined(_MSC_VER) && _MSC_VER >= 1700 - # include + typedef unsigned char uint8_t; + typedef unsigned short uint16_t; + typedef __int32 int32_t; + typedef unsigned __int32 uint32_t; + typedef __int64 int64_t; + typedef unsigned __int64 uint64_t; #else - # include - # define SOCKET_ERROR -1 + #include + #ifndef SOCKET_ERROR + #define SOCKET_ERROR -1 + #endif #endif #endif From 667245f5aab03cba248682b8761b01bd96488e1e Mon Sep 17 00:00:00 2001 From: deve Date: Tue, 23 Sep 2014 08:38:30 +0200 Subject: [PATCH 4/4] Avoid redeclaration for mingw compiler --- src/io/file_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/io/file_manager.cpp b/src/io/file_manager.cpp index f429c44c9..e2369bbed 100644 --- a/src/io/file_manager.cpp +++ b/src/io/file_manager.cpp @@ -48,7 +48,7 @@ # include # include # include -# ifndef __CYGWIN__ +# if !defined(__CYGWIN__ ) && !defined(__MINGW32__) /*Needed by the remove directory function */ # define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR) # define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)