funguloids/funguloids-ogre-1.7.0.patch

   1 diff -Naur funguloids-org/include/mpakogre.h funguloids/include/mpakogre.h
   2 --- funguloids-org/include/mpakogre.h   2007-03-11 16:53:04.000000000 +0100
   3 +++ funguloids/include/mpakogre.h       2010-03-03 16:17:43.000000000 +0100
   4 @@ -49,6 +49,7 @@
   5         void unload();
   6
   7         DataStreamPtr open(const String &filename) const;
   8 +       DataStreamPtr open(const String &filename, bool) const { return open(filename); };
   9         StringVectorPtr list(bool recursive = true, bool dirs = false);
  10         FileInfoListPtr listFileInfo(bool recursive = true, bool dirs = false);
  11
  12 diff -Naur funguloids-org/include/objectsystem.h funguloids/include/objectsystem.h
  13 --- funguloids-org/include/objectsystem.h       2007-02-26 19:43:56.000000000 +0100
  14 +++ funguloids/include/objectsystem.h   2010-03-03 16:17:59.000000000 +0100
  15 @@ -34,7 +34,7 @@
  16  using namespace std;
  17  using namespace Ogre;
  18
  19 -typedef map<String, MovingObject*> ObjectMapType;
  20 +typedef std::map<String, MovingObject*> ObjectMapType;
  21
  22  // ObjectSystem
  23  class ObjectSystem : public Singleton<ObjectSystem> {
  24 diff -Naur funguloids-org/include/openalsoundsystem.h funguloids/include/openalsoundsystem.h
  25 --- funguloids-org/include/openalsoundsystem.h  2007-05-22 15:47:31.000000000 +0200
  26 +++ funguloids/include/openalsoundsystem.h      2010-03-03 16:18:13.000000000 +0100
  27 @@ -47,7 +47,7 @@
  28  using namespace std;
  29
  30
  31 -typedef map<String, ALuint> SoundMapType;
  32 +typedef std::map<String, ALuint> SoundMapType;
  33
  34  // Number of independent channels for sound fx
  35  const int NUM_SOUND_CHANNELS = 32;
  36 diff -Naur funguloids-org/src/mp3stream.cpp funguloids/src/mp3stream.cpp
  37 --- funguloids-org/src/mp3stream.cpp    2007-05-22 15:27:40.000000000 +0200
  38 +++ funguloids/src/mp3stream.cpp        2010-03-03 17:38:08.000000000 +0100
  39 @@ -1,4 +1,4 @@
  40 -//****************************************************************************
  41 +/****************************************************************************
  42  // "Those Funny Funguloids!"
  43  // http://funguloids.sourceforge.net
  44  // Copyright (c) 2006-2007, Mika Halttunen
  45 @@ -31,7 +31,9 @@
  46  #endif
  47
  48  #ifdef SOUND_STREAM_MP3
  49 -
  50 +#include <unistd.h>
  51 +#include <cstdlib>
  52 +#include <sys/types.h>
  53  #include <sys/stat.h>
  54  #include <sstream>
  55  #include "Ogre.h"
  56 @@ -232,7 +234,7 @@
  57  //----------------------------------------------------------------------------
  58  void MP3Stream::logInfo( struct mad_header *Header )
  59  {
  60 -       stringstream ss;
  61 +       std::stringstream ss;
  62
  63         /* Convert the layer number to it's printed representation. */
  64         ss << "mpeg 1 layer ";
  65 diff -Naur funguloids-org/src/oggstream.cpp funguloids/src/oggstream.cpp
  66 --- funguloids-org/src/oggstream.cpp    2007-05-22 15:27:56.000000000 +0200
  67 +++ funguloids/src/oggstream.cpp        2010-03-03 17:35:07.000000000 +0100
  68 @@ -269,7 +269,7 @@
  69  //----------------------------------------------------------------------------
  70  void OggStream::logInfo()
  71  {
  72 -       stringstream ss;
  73 +       std::stringstream ss;
  74         ss      << "version         " << mVorbisInfo->version         << "\n"
  75                 << "channels        " << mVorbisInfo->channels        << "\n"
  76                 << "rate (hz)       " << mVorbisInfo->rate            << "\n"
  77 diff -Naur funguloids-org/src/openalsoundsystem.cpp funguloids/src/openalsoundsystem.cpp
  78 --- funguloids-org/src/openalsoundsystem.cpp    2007-05-22 17:11:46.000000000 +0200
  79 +++ funguloids/src/openalsoundsystem.cpp        2010-03-03 17:37:49.000000000 +0100
  80 @@ -287,7 +287,7 @@
  81                 LogManager::getSingleton().logMessage("OpenALSoundSystem(): initialised OpenAL" );
  82         }
  83
  84 -       stringstream ss;
  85 +       std::stringstream ss;
  86         ss << "OpenAL Vendor: " << alGetString(AL_VENDOR) << std::endl;
  87         ss << "OpenAL Version: " << alGetString(AL_VERSION) << std::endl;
  88         ss << "OpenAL Renderer: " << alGetString(AL_RENDERER) << std::endl;
  89 diff -Naur funguloids-org/src/playlist.cpp funguloids/src/playlist.cpp
  90 --- funguloids-org/src/playlist.cpp     2007-05-22 15:17:41.000000000 +0200
  91 +++ funguloids/src/playlist.cpp 2010-03-03 17:41:12.000000000 +0100
  92 @@ -42,7 +42,7 @@
  93  using namespace std;
  94
  95  // Play list files
  96 -static vector<String> playList;
  97 +static std::vector<String> playList;
  98  static unsigned int currentSong = -1;
  99
 100
 101 diff -Naur funguloids-org/src/scriptsystem.cpp funguloids/src/scriptsystem.cpp
 102 --- funguloids-org/src/scriptsystem.cpp 2007-05-04 12:28:10.000000000 +0200
 103 +++ funguloids/src/scriptsystem.cpp     2010-03-03 17:43:52.000000000 +0100
 104 @@ -48,7 +48,7 @@
 105
 106
 107  // This keeps track of the lights created in script
 108 -static vector<Light*> scriptLights;
 109 +static std::vector<Light*> scriptLights;
 110
 111
 112  // File locator for script files