ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:supertuxkart/stk-code

Browse Source
This commit is contained in:
hiker 2014-09-23 16:45:08 +10:00
commit 4f95aee051
4 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
data/supertuxkart.appdata
View File

@ -1,29 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2013 Dominique Leuenberger <dimstar@opensuse.org> -->
<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
<application>
<id type="desktop">supertuxkart.desktop</id>
<licence>CC0</licence>
<name>SuperTuxKart</name>
<summary>3D Kart Racing Game</summary>
<description>
<p>
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!
</p>
</description>
<screenshots>
<screenshot type="default" width="1280" height="768">http://supertuxkart.sourceforge.net/persistent/images/7/7a/Supertuxkart-0.8.1-screenshot-1.png</screenshot>
</screenshots>
<url type="homepage">http://supertuxkart.sourceforge.net</url>
<updatecontact> supertuxkart-devel@lists.sourceforge.net</updatecontact>
<project_group>SuperTuxKart</project_group>
<id type="desktop">supertuxkart.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<name>SuperTuxKart</name>
<summary>A racing game</summary>
<description>
<p>
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.
</p>
<p>
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.
</p>
<p>
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!
</p>
</description>
<url type="homepage">http://supertuxkart.sourceforge.net/</url>
<screenshots>
<screenshot type="default">http://supertuxkart.sourceforge.net/persistent/images/4/4d/SuperTuxKart_0.8_screenshot.jpg</screenshot>
<screenshot>http://supertuxkart.sourceforge.net/persistent/images/1/1f/SuperTuxKart_0.8_screenshot4.jpg</screenshot>
</screenshots>
<updatecontact>supertuxkart-devel@lists.sourceforge.net</updatecontact>
-->
</application>

2
src/graphics/lod_node.cpp
View File

@ -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<m_detail.size(); n++)
{

2
src/io/file_manager.cpp
View File

@ -48,7 +48,7 @@
# include <direct.h>
# include <Windows.h>
# include <stdio.h>
# 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)

20
src/utils/types.hpp
View File

@ -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 <stdint.h>
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 <stdint.h>
# define SOCKET_ERROR -1
#include <stdint.h>
#ifndef SOCKET_ERROR
#define SOCKET_ERROR -1
#endif
#endif
#endif