[Gemrb-commits] SF.net SVN: gemrb:[5773] gemrb/trunk/gemrb/plugins

[<ze...@us...>]

Revision: 5773
          http://gemrb.svn.sourceforge.net/gemrb/?rev=5773&view=rev
Author:   zefklop
Date:     2009-03-07 23:16:53 +0000 (Sat, 07 Mar 2009)

Log Message:
-----------
Well... HAVE_SNPRINTF is already declared in SDL.h... Thank you -Werror.

Modified Paths:
--------------
    gemrb/trunk/gemrb/plugins/OpenALAudio/OpenALAudio.h
    gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.cpp
    gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.h

Modified: gemrb/trunk/gemrb/plugins/OpenALAudio/OpenALAudio.h
===================================================================
--- gemrb/trunk/gemrb/plugins/OpenALAudio/OpenALAudio.h	2009-03-07 23:11:38 UTC (rev 5772)
+++ gemrb/trunk/gemrb/plugins/OpenALAudio/OpenALAudio.h	2009-03-07 23:16:53 UTC (rev 5773)
@@ -29,6 +29,7 @@
 #define REFERENCE_DISTANCE 50
 #define ACM_BUFFERSIZE 8192
 
+#include "SDL.h"
 #include "../Core/Audio.h"
 #include "../Core/LRUCache.h"
 #include "../Core/Interface.h"
@@ -39,7 +40,6 @@
 #include "AmbientMgrAL.h"
 #include "../Core/ResourceMgr.h"
 #include "StackLock.h"
-#include "SDL.h"
 
 #ifndef WIN32
 #include <AL/al.h>

Modified: gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.cpp
===================================================================
--- gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.cpp	2009-03-07 23:11:38 UTC (rev 5772)
+++ gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.cpp	2009-03-07 23:16:53 UTC (rev 5773)
@@ -21,7 +21,6 @@
 
 #include <cmath>
 #include <cassert>
-#include "../../includes/win32def.h"
 #include "SDLVideoDriver.h"
 #include "../Core/Interface.h"
 #include "../Core/SpriteCover.h"

Modified: gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.h
===================================================================
--- gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.h	2009-03-07 23:11:38 UTC (rev 5772)
+++ gemrb/trunk/gemrb/plugins/SDLVideo/SDLVideoDriver.h	2009-03-07 23:16:53 UTC (rev 5773)
@@ -22,11 +22,10 @@
 #ifndef SDLVIDEODRIVER_H
 #define SDLVIDEODRIVER_H
 
+#include <SDL.h>
+#include "../../includes/win32def.h"
 #include "../Core/Video.h"
 
-#include <SDL.h>
-
-
 class SDLVideoDriver : public Video {
 private:
 	SDL_Surface* disp;
@@ -168,7 +167,7 @@
 	Color SpriteGetPixel (Sprite2D* sprite, unsigned short x, unsigned short y);
 	Color SpriteGetPixelSum (Sprite2D* sprite, unsigned short xbase, unsigned short ybase, unsigned int ratio);
 	bool IsSpritePixelTransparent (Sprite2D* sprite, unsigned short x, unsigned short y);
-	Sprite2D* SpriteScaleDown( Sprite2D* sprite, unsigned int ratio );  
+	Sprite2D* SpriteScaleDown( Sprite2D* sprite, unsigned int ratio );
 	Sprite2D* CreateLight(int radius, int intensity); //both parameters must be signed
 	void SetGamma(int brightness, int contrast);
 	void SetMouseScrollSpeed(int speed);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.