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

Bugfix: missing function in kart.hpp, missing include path in VS project file.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2248 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2008-09-07 15:24:14 +00:00
parent 864a3a72aa
commit 0c46cfb51c
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ide/vc9/supertuxkart.vcproj
View File

@@ -516,7 +516,7 @@
Name="VCCLCompilerTool"
Optimization="0"
WholeProgramOptimization="false"
AdditionalIncludeDirectories="../../../src;../../../src/bullet/src;"$(STK_INCLUDE)""
AdditionalIncludeDirectories="../../../src;../../../src/bullet/src;"$(STK_INCLUDE)";../../../src/enet/include"
PreprocessorDefinitions="BT_NO_PROFILE;HAVE_OPENAL;HAVE_OGGVORBIS;_DEBUG;_CONSOLE;WIN32;NOMINMAX;VERSION=\"SVN\";_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;DEBUG;PACKAGE=\"supertuxkart\";HAS_GETTEXT;HAVE_ENET"
GeneratePreprocessedFile="0"
MinimalRebuild="true"
@@ -539,8 +539,8 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="opengl32.lib user32.lib gdi32.lib winmm.lib advapi32.lib SDL.lib SDLmain.lib OpenAL32.lib libogg.lib libvorbis.lib libvorbisfile.lib sg.lib ssg.lib ul.lib ssgAux.lib fnt.lib intl.lib enet.lib ws2_32.lib"
OutputFile="./../../../$(ProjectName)_bullet_d.exe"
AdditionalDependencies="opengl32.lib user32.lib gdi32.lib winmm.lib advapi32.lib SDL.lib SDLmain.lib OpenAL32.lib libogg.lib libvorbis.lib libvorbisfile.lib sg.lib ssg.lib ul.lib ssgAux.lib fnt.lib intl.lib ws2_32.lib"
OutputFile="./../../../$(ProjectName)_d.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="&quot;$(STK_LIB)&quot;"
IgnoreAllDefaultLibraries="false"
@@ -1086,6 +1086,10 @@
<Filter
Name="network"
>
<File
RelativePath="..\..\network\connect_message.cpp"
>
</File>
<File
RelativePath="..\..\network\kart_control_message.cpp"
>

12
src/kart.hpp
View File

@@ -43,7 +43,7 @@ private:
Vec3 m_curr_track_coords;
Vec3 m_last_track_coords;
unsigned int m_world_kart_id; // index of kart in world
protected:
bool m_on_road; // true if the kart is on top of the
// road path drawn by the drivelines
@@ -146,12 +146,7 @@ public:
void getClosestKart (float *cdist, int *closest);
void updatePhysics (float dt);
/**
returns a bullet transform object located at the kart's position
and oriented in the direction the kart is going. Can be useful
e.g. to calculate the starting point and direction of projectiles
*/
btTransform getKartHeading (const float customPitch=-1);
btTransform getKartHeading();
// Functions to access the current kart properties (which might get changed,
// e.g. mass increase or air_friction increase depending on attachment etc.)
@@ -197,6 +192,9 @@ public:
bool isInRest () const;
//have to use this instead of moveable getVelocity to get velocity for bullet rigid body
float getSpeed () const {return m_speed; }
/** This is used on the client side only to set the speed of the kart
* from the server information. */
void setSpeed (float s) {m_speed = s; }
float handleWheelie (float dt);
float getActualWheelForce();
bool isOnGround () const;