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

Removed various g++ compiler warnings.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2283 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2008-09-19 14:43:25 +00:00
parent 66b3f127f6
commit 686540bf29
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/audio/music_ogg.hpp
View File

@ -24,9 +24,13 @@
#include <iostream> #include <iostream>
#include <ogg/ogg.h> #include <ogg/ogg.h>
// Disable warning about potential loss of precision in vorbisfile.h // Disable warning about potential loss of precision in vorbisfile.h
#pragma warning(disable:4244) #if defined(WIN32) && !defined(__CYGWIN__)
# pragma warning(disable:4244)
#endif
# include <vorbis/vorbisfile.h> # include <vorbis/vorbisfile.h>
#pragma warning(default:4244) #if defined(WIN32) && !defined(__CYGWIN__)
# pragma warning(default:4244)
#endif
#ifdef __APPLE__ #ifdef __APPLE__
# include <OpenAL/al.h> # include <OpenAL/al.h>

1
src/audio/sfx_base.hpp
View File

@ -26,6 +26,7 @@ class SFXBase
{ {
public: public:
virtual ~SFXBase() {};
virtual void play() = 0; virtual void play() = 0;
virtual void loop() = 0; virtual void loop() = 0;
virtual void stop() = 0; virtual void stop() = 0;

2
src/audio/sfx_openal.hpp
View File

@ -38,7 +38,7 @@ private:
public: public:
SFXOpenAL(ALuint buffer); SFXOpenAL(ALuint buffer);
~SFXOpenAL(); virtual ~SFXOpenAL();
virtual void play(); virtual void play();
virtual void loop(); virtual void loop();
virtual void stop(); virtual void stop();

4
src/collectable.cpp
View File

@ -176,7 +176,7 @@ void Collectable::hitRedHerring(int n, const Herring &herring, int add_info)
// On client: just set the value // On client: just set the value
if(network_manager->getMode()==NetworkManager::NW_CLIENT) if(network_manager->getMode()==NetworkManager::NW_CLIENT)
{ {
int dummy = m_random.get(100); // keep random numbers in sync m_random.get(100); // keep random numbers in sync
m_type = (CollectableType)add_info; m_type = (CollectableType)add_info;
m_number = 1; m_number = 1;
return; return;
@ -234,7 +234,7 @@ void Collectable::hitRedHerring(int n, const Herring &herring, int add_info)
if(m_number > MAX_COLLECTABLES) m_number = MAX_COLLECTABLES; if(m_number > MAX_COLLECTABLES) m_number = MAX_COLLECTABLES;
} }
// Ignore new collectable if it is different from the current one // Ignore new collectable if it is different from the current one
int dummy = m_random.get(100); // keep random numbers in synch m_random.get(100); // keep random numbers in synch
return; return;
} // if network client } // if network client

4
src/highscores.cpp
View File

@ -44,7 +44,9 @@ void Highscores::Read(const lisp::Lisp* const node)
{ {
node->get("track-name", m_track ); node->get("track-name", m_track );
node->get("number-karts", m_number_of_karts ); node->get("number-karts", m_number_of_karts );
node->get("race-mode", (int&)m_highscore_type); int hst=0;
node->get("race-mode", hst );
m_highscore_type = (HighscoreType)hst;
node->get("difficulty", m_difficulty ); node->get("difficulty", m_difficulty );
node->get("number-of-laps", m_number_of_laps ); node->get("number-of-laps", m_number_of_laps );