Audio.hpp   Audio.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 AudioResource.hpp   AudioResource.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Clock.hpp   Clock.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Color.hpp   Color.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Config.hpp   Config.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 52 skipping to change at line 52
#elif defined(linux) || defined(__linux) #elif defined(linux) || defined(__linux)
// Linux // Linux
#define SFML_SYSTEM_LINUX #define SFML_SYSTEM_LINUX
#elif defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || define d(Macintosh) #elif defined(__APPLE__) || defined(MACOSX) || defined(macintosh) || define d(Macintosh)
// MacOS // MacOS
#define SFML_SYSTEM_MACOS #define SFML_SYSTEM_MACOS
#elif defined(__FreeBSD__)
// FreeBSD
#define SFML_SYSTEM_FREEBSD
#else #else
// Unsupported system // Unsupported system
#error This operating system is not supported by SFML library #error This operating system is not supported by SFML library
#endif #endif
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Define a portable debug macro // Define a portable debug macro
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
 End of changes. 2 change blocks. 
1 lines changed or deleted 6 lines changed or added


 Context.hpp   Context.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Drawable.hpp   Drawable.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Event.hpp   Event.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Font.hpp   Font.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Ftp.hpp   Ftp.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Glyph.hpp   Glyph.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Graphics.hpp   Graphics.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Http.hpp   Http.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 317 skipping to change at line 317
void SetHost(const std::string& Host, unsigned short Port = 0); void SetHost(const std::string& Host, unsigned short Port = 0);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Send a HTTP request and return the server's response. /// Send a HTTP request and return the server's response.
/// You must be connected to a host before sending requests. /// You must be connected to a host before sending requests.
/// Any missing mandatory header field will be added with an appropriat e value. /// Any missing mandatory header field will be added with an appropriat e value.
/// Warning : this function waits for the server's response and may /// Warning : this function waits for the server's response and may
/// not return instantly; use a thread if you don't want to block your /// not return instantly; use a thread if you don't want to block your
/// application. /// application.
/// ///
/// \param Req : Request to send /// \param Req : Request to send
/// \param Timeout : Maximum time to wait, in seconds (0 by default, me
ans no timeout)
/// ///
/// \return Server's response /// \return Server's response
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Response SendRequest(const Request& Req); Response SendRequest(const Request& Req, float Timeout = 0.f);
private : private :
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Member data // Member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
SocketTCP myConnection; ///< Connection to the host SocketTCP myConnection; ///< Connection to the host
IPAddress myHost; ///< Web host address IPAddress myHost; ///< Web host address
std::string myHostName; ///< Web host name std::string myHostName; ///< Web host name
unsigned short myPort; ///< Port used for connection with host unsigned short myPort; ///< Port used for connection with host
 End of changes. 3 change blocks. 
3 lines changed or deleted 5 lines changed or added


 IPAddress.hpp   IPAddress.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 125 skipping to change at line 125
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
static IPAddress GetLocalAddress(); static IPAddress GetLocalAddress();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the computer's public IP address (from the web point of view). /// Get the computer's public IP address (from the web point of view).
/// The only way to get a public address is to ask it to a /// The only way to get a public address is to ask it to a
/// distant website ; as a consequence, this function may be /// distant website ; as a consequence, this function may be
/// very slow -- use it as few as possible ! /// very slow -- use it as few as possible !
/// ///
/// \param Timeout : Maximum time to wait, in seconds (0 by default : n
o timeout)
///
/// \return Public IP address /// \return Public IP address
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
static IPAddress GetPublicAddress(); static IPAddress GetPublicAddress(float Timeout = 0.f);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Comparison operator == /// Comparison operator ==
/// ///
/// \param Other : Address to compare /// \param Other : Address to compare
/// ///
/// \return True if *this == Other /// \return True if *this == Other
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool operator ==(const IPAddress& Other) const; bool operator ==(const IPAddress& Other) const;
 End of changes. 3 change blocks. 
2 lines changed or deleted 5 lines changed or added


 Image.hpp   Image.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 163 skipping to change at line 163
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Copy pixels from another image onto this one. /// Copy pixels from another image onto this one.
/// This function does a slow pixel copy and should only /// This function does a slow pixel copy and should only
/// be used at initialization time /// be used at initialization time
/// ///
/// \param Source : Source image to copy /// \param Source : Source image to copy
/// \param DestX : X coordinate of the destination position /// \param DestX : X coordinate of the destination position
/// \param DestY : Y coordinate of the destination position /// \param DestY : Y coordinate of the destination position
/// \param SourceRect : Sub-rectangle of the source image to copy (empt y by default - entire image) /// \param SourceRect : Sub-rectangle of the source image to copy (empt y by default - entire image)
/// \param ApplyAlpha : Should the copy take in account the source tran sparency? (false by default)
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Copy(const Image& Source, unsigned int DestX, unsigned int DestY, const IntRect& SourceRect = IntRect(0, 0, 0, 0)); void Copy(const Image& Source, unsigned int DestX, unsigned int DestY, const IntRect& SourceRect = IntRect(0, 0, 0, 0), bool ApplyAlpha = false);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Create the image from the current contents of the /// Create the image from the current contents of the
/// given window /// given window
/// ///
/// \param Window : Window to capture /// \param Window : Window to capture
/// \param SourceRect : Sub-rectangle of the screen to copy (empty by d efault - entire image) /// \param SourceRect : Sub-rectangle of the screen to copy (empty by d efault - entire image)
/// ///
/// \return True if copy was successful /// \return True if copy was successful
/// ///
 End of changes. 3 change blocks. 
2 lines changed or deleted 3 lines changed or added


 Input.hpp   Input.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Listener.hpp   Listener.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Lock.hpp   Lock.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Matrix3.hpp   Matrix3.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Matrix3.inl   Matrix3.inl 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFGE - Simple and Fast Game Engine // SFGE - Simple and Fast Game Engine
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Music.hpp   Music.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Mutex.hpp   Mutex.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Network.hpp   Network.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 NonCopyable.hpp   NonCopyable.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 OpenGL.hpp   OpenGL.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 29 skipping to change at line 29
// and must not be misrepresented as being the original software. // and must not be misrepresented as being the original software.
// //
// 3. This notice may not be removed or altered from any source distributio n. // 3. This notice may not be removed or altered from any source distributio n.
// //
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#ifndef SFML_OPENGL_HPP #ifndef SFML_OPENGL_HPP
#define SFML_OPENGL_HPP #define SFML_OPENGL_HPP
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Headers
////////////////////////////////////////////////////////////
#include <SFML/Config.hpp>
////////////////////////////////////////////////////////////
/// This file just includes the OpenGL (GL and GLU) headers, /// This file just includes the OpenGL (GL and GLU) headers,
/// which have actually different paths on each system /// which have actually different paths on each system
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#if defined(SFML_SYSTEM_WINDOWS) || defined(SFML_SYSTEM_LINUX) #if defined(SFML_SYSTEM_WINDOWS)
#include <windows.h>
#include <GL/gl.h>
#include <GL/glu.h>
#elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#elif defined(SFML_SYSTEM_MACOS) #elif defined(SFML_SYSTEM_MACOS)
#include <OpenGL/gl.h> #include <OpenGL/gl.h>
#include <OpenGL/glu.h> #include <OpenGL/glu.h>
#endif #endif
 End of changes. 3 change blocks. 
2 lines changed or deleted 13 lines changed or added


 Packet.hpp   Packet.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 PostFX.hpp   PostFX.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Randomizer.hpp   Randomizer.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Rect.hpp   Rect.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Rect.inl   Rect.inl 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RenderTarget.hpp   RenderTarget.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 RenderWindow.hpp   RenderWindow.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Selector.hpp   Selector.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Selector.inl   Selector.inl 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 SelectorBase.hpp   SelectorBase.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Shape.hpp   Shape.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Sleep.hpp   Sleep.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 38 skipping to change at line 38
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Headers // Headers
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#include <SFML/Config.hpp> #include <SFML/Config.hpp>
namespace sf namespace sf
{ {
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Make the current thread sleep for a given time /// Make the current thread sleep for a given time
/// ///
/// \param Duration : Time to sleep, in seconds /// \param Duration : Time to sleep, in seconds (must be >= 0)
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SFML_API Sleep(float Duration); void SFML_API Sleep(float Duration);
} // namespace sf } // namespace sf
#endif // SFML_SLEEP_HPP #endif // SFML_SLEEP_HPP
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 SocketHelper.hpp   SocketHelper.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 SocketTCP.hpp   SocketTCP.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 SocketUDP.hpp   SocketUDP.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 102 skipping to change at line 102
Socket::Status Send(const char* Data, std::size_t Size, const IPAddress & Address, unsigned short Port); Socket::Status Send(const char* Data, std::size_t Size, const IPAddress & Address, unsigned short Port);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Receive an array of bytes. /// Receive an array of bytes.
/// This function will block if the socket is blocking /// This function will block if the socket is blocking
/// ///
/// \param Data : Pointer to a byte array to fill (make sure it is big enough) /// \param Data : Pointer to a byte array to fill (make sure it is big enough)
/// \param MaxSize : Maximum number of bytes to read /// \param MaxSize : Maximum number of bytes to read
/// \param SizeReceived : Number of bytes received /// \param SizeReceived : Number of bytes received
/// \param Address : Address of the computer which sent the data /// \param Address : Address of the computer which sent the data
/// \param Port : Port on which the remote computer sent the da ta
/// ///
/// \return Status code /// \return Status code
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Socket::Status Receive(char* Data, std::size_t MaxSize, std::size_t& Si zeReceived, IPAddress& Address); Socket::Status Receive(char* Data, std::size_t MaxSize, std::size_t& Si zeReceived, IPAddress& Address, unsigned short& Port);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Send a packet of data /// Send a packet of data
/// ///
/// \param PacketToSend : Packet to send /// \param PacketToSend : Packet to send
/// \param Address : Address of the computer to send the packet to /// \param Address : Address of the computer to send the packet to
/// \param Port : Port to send the data to /// \param Port : Port to send the data to
/// ///
/// \return Status code /// \return Status code
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Socket::Status Send(Packet& PacketToSend, const IPAddress& Address, uns igned short Port); Socket::Status Send(Packet& PacketToSend, const IPAddress& Address, uns igned short Port);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Receive a packet. /// Receive a packet.
/// This function will block if the socket is blocking /// This function will block if the socket is blocking
/// ///
/// \param PacketToReceive : Packet to fill with received data /// \param PacketToReceive : Packet to fill with received data
/// \param Address : Address of the computer which sent the pac ket /// \param Address : Address of the computer which sent the pac ket
/// \param Port : Port on which the remote computer sent the data
/// ///
/// \return Status code /// \return Status code
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Socket::Status Receive(Packet& PacketToReceive, IPAddress& Address); Socket::Status Receive(Packet& PacketToReceive, IPAddress& Address, uns igned short& Port);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Close the socket /// Close the socket
/// ///
/// \return True if operation has been successful /// \return True if operation has been successful
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
bool Close(); bool Close();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
 End of changes. 5 change blocks. 
3 lines changed or deleted 5 lines changed or added


 Sockets.hpp   Sockets.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Sound.hpp   Sound.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 162 skipping to change at line 162
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Set the sound position (take a 3D vector). /// Set the sound position (take a 3D vector).
/// The default position is (0, 0, 0) /// The default position is (0, 0, 0)
/// ///
/// \param Position : Position of the sound in the world /// \param Position : Position of the sound in the world
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SetPosition(const Vector3f& Position); void SetPosition(const Vector3f& Position);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Make the sound's position relative to the listener's
/// position, or absolute.
/// The default value is false (absolute)
///
/// \param Relative : True to set the position relative, false to set i
t absolute
///
////////////////////////////////////////////////////////////
void SetRelativeToListener(bool Relative);
////////////////////////////////////////////////////////////
/// Set the minimum distance - closer than this distance, /// Set the minimum distance - closer than this distance,
/// the listener will hear the sound at its maximum volume. /// the listener will hear the sound at its maximum volume.
/// The default minimum distance is 1.0 /// The default minimum distance is 1.0
/// ///
/// \param MinDistance : New minimum distance for the sound /// \param MinDistance : New minimum distance for the sound
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void SetMinDistance(float MinDistance); void SetMinDistance(float MinDistance);
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
skipping to change at line 230 skipping to change at line 240
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the sound position /// Get the sound position
/// ///
/// \return Position of the sound in the world /// \return Position of the sound in the world
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
Vector3f GetPosition() const; Vector3f GetPosition() const;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Tell if the sound's position is relative to the listener's
/// position, or if it's absolute
///
/// \return True if the position is relative, false if it's absolute
///
////////////////////////////////////////////////////////////
bool IsRelativeToListener() const;
////////////////////////////////////////////////////////////
/// Get the minimum distance /// Get the minimum distance
/// ///
/// \return Minimum distance for the sound /// \return Minimum distance for the sound
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
float GetMinDistance() const; float GetMinDistance() const;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the attenuation factor /// Get the attenuation factor
/// ///
 End of changes. 3 change blocks. 
1 lines changed or deleted 21 lines changed or added


 SoundBuffer.hpp   SoundBuffer.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 SoundBufferRecorder.hpp   SoundBufferRecorder.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 SoundRecorder.hpp   SoundRecorder.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 SoundStream.hpp   SoundStream.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 55 skipping to change at line 55
public : public :
using Sound::Status; using Sound::Status;
using Sound::Stopped; using Sound::Stopped;
using Sound::Paused; using Sound::Paused;
using Sound::Playing; using Sound::Playing;
using Sound::Pause; using Sound::Pause;
using Sound::SetPitch; using Sound::SetPitch;
using Sound::SetVolume; using Sound::SetVolume;
using Sound::SetPosition; using Sound::SetPosition;
using Sound::SetRelativeToListener;
using Sound::SetMinDistance; using Sound::SetMinDistance;
using Sound::SetAttenuation; using Sound::SetAttenuation;
using Sound::GetPitch; using Sound::GetPitch;
using Sound::GetVolume; using Sound::GetVolume;
using Sound::GetPosition; using Sound::GetPosition;
using Sound::IsRelativeToListener;
using Sound::GetMinDistance; using Sound::GetMinDistance;
using Sound::GetAttenuation; using Sound::GetAttenuation;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Structure defining a chunk of audio data to stream /// Structure defining a chunk of audio data to stream
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
struct Chunk struct Chunk
{ {
const Int16* Samples; ///< Pointer to the audio samples const Int16* Samples; ///< Pointer to the audio samples
std::size_t NbSamples; ///< Number of samples pointed by Samples std::size_t NbSamples; ///< Number of samples pointed by Samples
 End of changes. 3 change blocks. 
1 lines changed or deleted 3 lines changed or added


 Sprite.hpp   Sprite.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 String.hpp   String.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 System.hpp   System.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Thread.hpp   Thread.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Unicode.hpp   Unicode.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 277 skipping to change at line 277
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the default system locale /// Get the default system locale
/// ///
/// \return Reference to the default system locale /// \return Reference to the default system locale
/// ///
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
static const std::locale& GetDefaultLocale(); static const std::locale& GetDefaultLocale();
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Static data member // Static member data
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
static const char UTF8TrailingBytes[256]; ///< Lookup table to find t he length of an UTF-8 sequence static const int UTF8TrailingBytes[256]; ///< Lookup table to find t he length of an UTF-8 sequence
static const Uint32 UTF8Offsets[6]; ///< Magic values to subtra ct during UTF-8 conversions static const Uint32 UTF8Offsets[6]; ///< Magic values to subtra ct during UTF-8 conversions
static const Uint8 UTF8FirstBytes[7]; ///< First bytes for UTF-8 sequences static const Uint8 UTF8FirstBytes[7]; ///< First bytes for UTF-8 sequences
}; };
#include <SFML/System/Unicode.inl> #include <SFML/System/Unicode.inl>
} // namespace sf } // namespace sf
#endif // SFML_UNICODE_HPP #endif // SFML_UNICODE_HPP
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 Unicode.inl   Unicode.inl 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 104 skipping to change at line 104
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Generic function to convert an UTF-8 characters range /// Generic function to convert an UTF-8 characters range
/// to an UTF-16 characters range, using the given locale /// to an UTF-16 characters range, using the given locale
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
template <typename In, typename Out> template <typename In, typename Out>
inline Out Unicode::UTF8ToUTF16(In Begin, In End, Out Output, Uint16 Replac ement) inline Out Unicode::UTF8ToUTF16(In Begin, In End, Out Output, Uint16 Replac ement)
{ {
while (Begin < End) while (Begin < End)
{ {
Uint32 c = 0; Uint32 c = 0;
int TrailingBytes = UTF8TrailingBytes[*Begin]; int TrailingBytes = UTF8TrailingBytes[static_cast<int>(*Begin)];
if (Begin + TrailingBytes < End) if (Begin + TrailingBytes < End)
{ {
// First decode the UTF-8 character // First decode the UTF-8 character
switch (TrailingBytes) switch (TrailingBytes)
{ {
case 5 : c += *Begin++; c <<= 6; case 5 : c += *Begin++; c <<= 6;
case 4 : c += *Begin++; c <<= 6; case 4 : c += *Begin++; c <<= 6;
case 3 : c += *Begin++; c <<= 6; case 3 : c += *Begin++; c <<= 6;
case 2 : c += *Begin++; c <<= 6; case 2 : c += *Begin++; c <<= 6;
case 1 : c += *Begin++; c <<= 6; case 1 : c += *Begin++; c <<= 6;
skipping to change at line 164 skipping to change at line 164
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Generic function to convert an UTF-8 characters range /// Generic function to convert an UTF-8 characters range
/// to an UTF-32 characters range, using the given locale /// to an UTF-32 characters range, using the given locale
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
template <typename In, typename Out> template <typename In, typename Out>
inline Out Unicode::UTF8ToUTF32(In Begin, In End, Out Output, Uint32 Replac ement) inline Out Unicode::UTF8ToUTF32(In Begin, In End, Out Output, Uint32 Replac ement)
{ {
while (Begin < End) while (Begin < End)
{ {
Uint32 c = 0; Uint32 c = 0;
int TrailingBytes = UTF8TrailingBytes[*Begin]; int TrailingBytes = UTF8TrailingBytes[static_cast<int>(*Begin)];
if (Begin + TrailingBytes < End) if (Begin + TrailingBytes < End)
{ {
// First decode the UTF-8 character // First decode the UTF-8 character
switch (TrailingBytes) switch (TrailingBytes)
{ {
case 5 : c += *Begin++; c <<= 6; case 5 : c += *Begin++; c <<= 6;
case 4 : c += *Begin++; c <<= 6; case 4 : c += *Begin++; c <<= 6;
case 3 : c += *Begin++; c <<= 6; case 3 : c += *Begin++; c <<= 6;
case 2 : c += *Begin++; c <<= 6; case 2 : c += *Begin++; c <<= 6;
case 1 : c += *Begin++; c <<= 6; case 1 : c += *Begin++; c <<= 6;
skipping to change at line 418 skipping to change at line 418
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Get the number of characters composing an UTF-8 string /// Get the number of characters composing an UTF-8 string
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
template <typename In> template <typename In>
inline std::size_t Unicode::GetUTF8Length(In Begin, In End) inline std::size_t Unicode::GetUTF8Length(In Begin, In End)
{ {
std::size_t Length = 0; std::size_t Length = 0;
while (Begin < End) while (Begin < End)
{ {
int NbBytes = UTF8TrailingBytes[*Begin]; int NbBytes = UTF8TrailingBytes[static_cast<int>(*Begin)];
if (Begin + NbBytes < End) if (Begin + NbBytes < End)
++Length; ++Length;
Begin += NbBytes + 1; Begin += NbBytes + 1;
} }
return Length; return Length;
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 Vector2.hpp   Vector2.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Vector2.inl   Vector2.inl 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Vector3.hpp   Vector3.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Vector3.inl   Vector3.inl 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 VideoMode.hpp   VideoMode.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 View.hpp   View.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Window.hpp   Window.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 WindowHandle.hpp   WindowHandle.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
skipping to change at line 44 skipping to change at line 44
{ {
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
/// Define a low-level window handle type, specific to /// Define a low-level window handle type, specific to
/// each platform /// each platform
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
#if defined(SFML_SYSTEM_WINDOWS) #if defined(SFML_SYSTEM_WINDOWS)
// Windows defines a void* handle (HWND) // Windows defines a void* handle (HWND)
typedef void* WindowHandle; typedef void* WindowHandle;
#elif defined(SFML_SYSTEM_LINUX) #elif defined(SFML_SYSTEM_LINUX) || defined(SFML_SYSTEM_FREEBSD)
// Unix - X11 defines an unsigned integer handle (Window) // Unix - X11 defines an unsigned integer handle (Window)
typedef unsigned long WindowHandle; typedef unsigned long WindowHandle;
#elif defined(SFML_SYSTEM_MACOS) #elif defined(SFML_SYSTEM_MACOS)
// OSX - A GrafPort struct defined as WindowRef // Mac OS X defines a void* handle (NSWindow)
typedef void* WindowHandle; typedef void* WindowHandle;
#endif #endif
} // namespace sf } // namespace sf
#endif // SFML_WINDOWHANDLE_HPP #endif // SFML_WINDOWHANDLE_HPP
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 WindowListener.hpp   WindowListener.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 WindowSettings.hpp   WindowSettings.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 WindowStyle.hpp   WindowStyle.hpp 
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// //
// SFML - Simple and Fast Multimedia Library // SFML - Simple and Fast Multimedia Library
// Copyright (C) 2007-2008 Laurent Gomila (laurent.gom@gmail.com) // Copyright (C) 2007-2009 Laurent Gomila (laurent.gom@gmail.com)
// //
// This software is provided 'as-is', without any express or implied warran ty. // This software is provided 'as-is', without any express or implied warran ty.
// In no event will the authors be held liable for any damages arising from the use of this software. // In no event will the authors be held liable for any damages arising from the use of this software.
// //
// Permission is granted to anyone to use this software for any purpose, // Permission is granted to anyone to use this software for any purpose,
// including commercial applications, and to alter it and redistribute it f reely, // including commercial applications, and to alter it and redistribute it f reely,
// subject to the following restrictions: // subject to the following restrictions:
// //
// 1. The origin of this software must not be misrepresented; // 1. The origin of this software must not be misrepresented;
// you must not claim that you wrote the original software. // you must not claim that you wrote the original software.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/