32 files changed, 35 insertions, 36 deletions
diff --git a/noncore/games/sfcave-sdl/animatedimage.cpp b/noncore/games/sfcave-sdl/animatedimage.cpp
index 441c647..680b603 100644
--- a/noncore/games/sfcave-sdl/animatedimage.cpp
+++ b/noncore/games/sfcave-sdl/animatedimage.cpp
@@ -1,8 +1,8 @@
-#include "SDL.h"
+#include <SDL/SDL.h>
-#include "SDL_image.h"
+#include <SDL/SDL_image.h>
 #include "constants.h"
 #include "animatedimage.h"
 AnimatedImage :: AnimatedImage( string file, int nFrames )
 {
diff --git a/noncore/games/sfcave-sdl/animatedimage.h b/noncore/games/sfcave-sdl/animatedimage.h
index 3c03f52..ecebf03 100644
--- a/noncore/games/sfcave-sdl/animatedimage.h
+++ b/noncore/games/sfcave-sdl/animatedimage.h
@@ -1,10 +1,10 @@
 #ifndef __ANIMATED_IMAGE_H
 #define __ANIMATED_IMAGE_H
-#include "SDL.h"
+#include <SDL/SDL.h>
 class AnimatedImage
 {
 public:
        AnimatedImage( string file, int nFrames );
        ~AnimatedImage();
diff --git a/noncore/games/sfcave-sdl/bfont.cpp b/noncore/games/sfcave-sdl/bfont.cpp
index 7dec8f5..3ba0f4f 100644
--- a/noncore/games/sfcave-sdl/bfont.cpp
+++ b/noncore/games/sfcave-sdl/bfont.cpp
@@ -6,13 +6,13 @@
 #include "iostream"
 using namespace std;
 #include "string.h"
 #include "stdlib.h"
 #include "stdarg.h"
-#include "SDL_image.h"
+#include <SDL/SDL_image.h>
 #include "bfont.h"
 void BFont::InitFont()
 {
    int x = 0, i = '!';
    Uint32 sentry = GetPixel(0,0);
diff --git a/noncore/games/sfcave-sdl/bfont.h b/noncore/games/sfcave-sdl/bfont.h
index dee97f1..5c2d7e7 100644
--- a/noncore/games/sfcave-sdl/bfont.h
+++ b/noncore/games/sfcave-sdl/bfont.h
@@ -6,13 +6,13 @@
 ************************************************************/
 #ifndef __BFONT_HEADER_H__
 #define __BFONT_HEADER_H__
 #include <iostream>
-#include "SDL.h"
+#include <SDL/SDL.h>
 class BFont
 {
    int h;                  // font height
    SDL_Surface *Surface;   // font surface
    SDL_Rect Chars[256];    // characters width
diff --git a/noncore/games/sfcave-sdl/fly_game.cpp b/noncore/games/sfcave-sdl/fly_game.cpp
index 8b05d8f..69413ba 100644
--- a/noncore/games/sfcave-sdl/fly_game.cpp
+++ b/noncore/games/sfcave-sdl/fly_game.cpp
@@ -1,7 +1,7 @@
-#include "SDL_gfxPrimitives.h"
+#include <SDL/SDL_gfxPrimitives.h>
 #include "constants.h"
 #include "fly_game.h"
 #include "random.h"
 FlyGame :: FlyGame( SFCave *p, int w, int h, int diff )
diff --git a/noncore/games/sfcave-sdl/fly_game.h b/noncore/games/sfcave-sdl/fly_game.h
index 1ab081a..f648deb 100644
--- a/noncore/games/sfcave-sdl/fly_game.h
+++ b/noncore/games/sfcave-sdl/fly_game.h
@@ -2,13 +2,13 @@
 #define __FLY_GAME_H
 #include "sfcave.h"
 #include "flyterrain.h"
 #include "player.h"
 #include "game.h"
-#include "SDL.h"
+#include <SDL/SDL.h>
 class FlyGame : public Game
 {
 public:
        FlyGame( SFCave *p, int w, int h, int diff );
        ~FlyGame();
diff --git a/noncore/games/sfcave-sdl/flyterrain.cpp b/noncore/games/sfcave-sdl/flyterrain.cpp
index b1b8db5..bffe5c9 100644
--- a/noncore/games/sfcave-sdl/flyterrain.cpp
+++ b/noncore/games/sfcave-sdl/flyterrain.cpp
@@ -1,8 +1,7 @@
+#include <SDL/SDL_gfxPrimitives.h>
-#include "SDL_gfxPrimitives.h"
 #include "constants.h"
 #include "flyterrain.h"
 #include "random.h"
diff --git a/noncore/games/sfcave-sdl/flyterrain.h b/noncore/games/sfcave-sdl/flyterrain.h
index 63b5731..6258fa0 100644
--- a/noncore/games/sfcave-sdl/flyterrain.h
+++ b/noncore/games/sfcave-sdl/flyterrain.h
@@ -1,10 +1,10 @@
 #ifndef __FLYTERRAIN_H
 #define __FLYTERRAIN_H
-#include <SDL.h>
+#include <SDL/SDL.h>
 #include "terrain.h"
 class FlyTerrain : public Terrain
 {
 public:
diff --git a/noncore/games/sfcave-sdl/font.h b/noncore/games/sfcave-sdl/font.h
index 5f0674a..ed9c590 100644
--- a/noncore/games/sfcave-sdl/font.h
+++ b/noncore/games/sfcave-sdl/font.h
@@ -1,10 +1,10 @@
 #ifndef __FONT_H
 #define __FONT_H
-#include "SDL.h"
+#include <SDL/SDL.h>
 #include "bfont.h"
        #define FONT_MENU_HIGHLIGHTED   1
        #define FONT_MENU_UNHIGHLIGHTED         2
        #define FONT_WHITE_TEXT                         3
        #define FONT_COLOURED_TEXT              4
diff --git a/noncore/games/sfcave-sdl/game.cpp b/noncore/games/sfcave-sdl/game.cpp
index 1ee0230..bf9c46f 100644
--- a/noncore/games/sfcave-sdl/game.cpp
+++ b/noncore/games/sfcave-sdl/game.cpp
@@ -1,11 +1,11 @@
 #include <stdio.h>
 #include <time.h>
-#include <SDL.h>
+#include <SDL/SDL.h>
-#include <SDL_image.h>
+#include <SDL/SDL_image.h>
 #include "font.h"
 #include "constants.h"
 #include "game.h"
 #include "player.h"
diff --git a/noncore/games/sfcave-sdl/gates_game.cpp b/noncore/games/sfcave-sdl/gates_game.cpp
index 700a6ec..638658b 100644
--- a/noncore/games/sfcave-sdl/gates_game.cpp
+++ b/noncore/games/sfcave-sdl/gates_game.cpp
@@ -1,7 +1,7 @@
-#include "SDL_gfxPrimitives.h"
+#include <SDL/SDL_gfxPrimitives.h>
 #include "constants.h"
 #include "gates_game.h"
 #include "random.h"
 GatesGame :: GatesGame( SFCave *p, int w, int h, int diff )
diff --git a/noncore/games/sfcave-sdl/gates_game.h b/noncore/games/sfcave-sdl/gates_game.h
index 8499ff9..b44336a 100644
--- a/noncore/games/sfcave-sdl/gates_game.h
+++ b/noncore/games/sfcave-sdl/gates_game.h
@@ -1,10 +1,10 @@
 #ifndef __GATES_GAME_H
 #define __GATES_GAME_H
-#include "SDL.h"
+#include <SDL/SDL.h>
 #include "rect.h"
 #include "sfcave.h"
 #include "terrain.h"
 #include "player.h"
diff --git a/noncore/games/sfcave-sdl/help.cpp b/noncore/games/sfcave-sdl/help.cpp
index f1728f6..0a7924b 100644
--- a/noncore/games/sfcave-sdl/help.cpp
+++ b/noncore/games/sfcave-sdl/help.cpp
@@ -1,7 +1,7 @@
-#include "SDL.h"
+#include <SDL/SDL.h>
 #include "constants.h"
 #include "font.h"
 #include "help.h"
 #include "sfcave.h"
 #include "starfield.h"
diff --git a/noncore/games/sfcave-sdl/help.h b/noncore/games/sfcave-sdl/help.h
index dc9e80e..2cc32cd 100644
--- a/noncore/games/sfcave-sdl/help.h
+++ b/noncore/games/sfcave-sdl/help.h
diff --git a/noncore/games/sfcave-sdl/menu.cpp b/noncore/games/sfcave-sdl/menu.cpp
index a4a4216..fb2a635 100644
--- a/noncore/games/sfcave-sdl/menu.cpp
+++ b/noncore/games/sfcave-sdl/menu.cpp
@@ -1,8 +1,8 @@
-#include <SDL_image.h>
+#include <SDL/SDL_image.h>
-#include "SDL_rotozoom.h"
+#include <SDL/SDL_rotozoom.h>
 #include "constants.h"
 #include "sfcave.h"
 #include "game.h"
 #include "menu.h"
 #include "font.h"
diff --git a/noncore/games/sfcave-sdl/menu.h b/noncore/games/sfcave-sdl/menu.h
index 6a5ef40..c263bcc 100644
--- a/noncore/games/sfcave-sdl/menu.h
+++ b/noncore/games/sfcave-sdl/menu.h
@@ -1,13 +1,13 @@
 #ifndef __MENU_H
 #define __MENU_H
 #include <list>
 using namespace std;
-#include <SDL.h>
+#include <SDL/SDL.h>
 class SFCave;
 class StarField;
 class Menu;
 class MenuOption
diff --git a/noncore/games/sfcave-sdl/player.cpp b/noncore/games/sfcave-sdl/player.cpp
index f024d6b..b491e53 100644
--- a/noncore/games/sfcave-sdl/player.cpp
+++ b/noncore/games/sfcave-sdl/player.cpp
@@ -1,8 +1,8 @@
-#include <SDL.h>
+#include <SDL/SDL.h>
-#include "SDL_gfxPrimitives.h"
+#include <SDL/SDL_gfxPrimitives.h>
 #include "constants.h"
 #include "player.h"
 #include "random.h"
 #include "animatedimage.h"
diff --git a/noncore/games/sfcave-sdl/rect.h b/noncore/games/sfcave-sdl/rect.h
index dc9c9d5..30f082c 100644
--- a/noncore/games/sfcave-sdl/rect.h
+++ b/noncore/games/sfcave-sdl/rect.h
@@ -1,10 +1,10 @@
 #ifndef __RECT_H
 #define __RECT_H
-#include "SDL.h"
+#include <SDL/SDL.h>
 class Rect
 {
 public:
        Rect() { r.x = r.y = r.w = r.h = 0; }
        Rect( int x, int y, int w, int h ) { setRect( x, y, w, h ); }
diff --git a/noncore/games/sfcave-sdl/sfcave-sdl.pro b/noncore/games/sfcave-sdl/sfcave-sdl.pro
index a4eb918..a02eeb3 100644
--- a/noncore/games/sfcave-sdl/sfcave-sdl.pro
+++ b/noncore/games/sfcave-sdl/sfcave-sdl.pro
diff --git a/noncore/games/sfcave-sdl/sfcave.cpp b/noncore/games/sfcave-sdl/sfcave.cpp
index dbd788c..5d1cdd5 100644
--- a/noncore/games/sfcave-sdl/sfcave.cpp
+++ b/noncore/games/sfcave-sdl/sfcave.cpp
@@ -1,14 +1,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <sys/timeb.h>
-#include "SDL.h"
+#include <SDL/SDL.h>
-#include "SDL_gfxPrimitives.h"
+#include <SDL/SDL_gfxPrimitives.h>
 #include "constants.h"
 #include "sound.h"
 #include "menu.h"
 #include "help.h"
diff --git a/noncore/games/sfcave-sdl/sfcave.h b/noncore/games/sfcave-sdl/sfcave.h
index c707919..4e45ec2 100644
--- a/noncore/games/sfcave-sdl/sfcave.h
+++ b/noncore/games/sfcave-sdl/sfcave.h
@@ -1,10 +1,10 @@
 #ifndef __SFCAVE_H
 #define __SFCAVE_H
-#include "SDL.h"
+#include <SDL/SDL.h>
 #include "terrain.h"
 class Game;
 class Menu;
 class Help;
diff --git a/noncore/games/sfcave-sdl/sfcave_game.cpp b/noncore/games/sfcave-sdl/sfcave_game.cpp
index 8fdbbe5..ccdd625 100644
--- a/noncore/games/sfcave-sdl/sfcave_game.cpp
+++ b/noncore/games/sfcave-sdl/sfcave_game.cpp
@@ -1,7 +1,7 @@
-#include "SDL_gfxPrimitives.h"
+#include <SDL/SDL_gfxPrimitives.h>
 #include "constants.h"
 #include "sfcave_game.h"
 #include "random.h"
 SFCaveGame :: SFCaveGame( SFCave *p, int w, int h, int diff )
diff --git a/noncore/games/sfcave-sdl/sfcave_game.h b/noncore/games/sfcave-sdl/sfcave_game.h
index 92a0f5d..6dddf5e 100644
--- a/noncore/games/sfcave-sdl/sfcave_game.h
+++ b/noncore/games/sfcave-sdl/sfcave_game.h
@@ -1,10 +1,10 @@
 #ifndef __SFCAVE_GAME_H
 #define __SFCAVE_GAME_H
-#include "SDL.h"
+#include <SDL/SDL.h>
 #include "rect.h"
 #include "sfcave.h"
 #include "terrain.h"
 #include "player.h"
diff --git a/noncore/games/sfcave-sdl/sound.cpp b/noncore/games/sfcave-sdl/sound.cpp
index 855f2e6..0be1abf 100644
--- a/noncore/games/sfcave-sdl/sound.cpp
+++ b/noncore/games/sfcave-sdl/sound.cpp
diff --git a/noncore/games/sfcave-sdl/sound.h b/noncore/games/sfcave-sdl/sound.h
index d46b5bc..180429a 100644
--- a/noncore/games/sfcave-sdl/sound.h
+++ b/noncore/games/sfcave-sdl/sound.h
@@ -1,11 +1,11 @@
 #ifndef __SOUND_H
 #define __SOUND_H
-#include <SDL.h>
+#include <SDL/SDL.h>
-#include "SDL_mixer.h"
+#include <SDL/SDL_mixer.h>
 #define NR_SOUNDS 3
 class SoundHandler
 {
 public:
diff --git a/noncore/games/sfcave-sdl/starfield.cpp b/noncore/games/sfcave-sdl/starfield.cpp
index 82edfc1..3b26895 100644
--- a/noncore/games/sfcave-sdl/starfield.cpp
+++ b/noncore/games/sfcave-sdl/starfield.cpp
@@ -1,8 +1,8 @@
-#include "SDL.h"
+#include <SDL/SDL.h>
-#include "SDL_gfxPrimitives.h"
+#include <SDL/SDL_gfxPrimitives.h>
 #include <stdlib.h>
 #include "starfield.h"
 #include "random.h"
 #include "util.h"
diff --git a/noncore/games/sfcave-sdl/starfield.h b/noncore/games/sfcave-sdl/starfield.h
index ae9bd34..133cb54 100644
--- a/noncore/games/sfcave-sdl/starfield.h
+++ b/noncore/games/sfcave-sdl/starfield.h
diff --git a/noncore/games/sfcave-sdl/stringtokenizer.h b/noncore/games/sfcave-sdl/stringtokenizer.h
index 3f299a6..51daa42 100644
--- a/noncore/games/sfcave-sdl/stringtokenizer.h
+++ b/noncore/games/sfcave-sdl/stringtokenizer.h
diff --git a/noncore/games/sfcave-sdl/terrain.cpp b/noncore/games/sfcave-sdl/terrain.cpp
index b243f45..5943275 100644
--- a/noncore/games/sfcave-sdl/terrain.cpp
+++ b/noncore/games/sfcave-sdl/terrain.cpp
@@ -1,9 +1,9 @@
-#include "SDL.h"
+#include <SDL/SDL.h>
-#include "SDL_rotozoom.h"
+#include <SDL/SDL_rotozoom.h>
-#include "SDL_gfxPrimitives.h"
+#include <SDL/SDL_gfxPrimitives.h>
 #include "constants.h"
 #include "terrain.h"
 #include "random.h"
 #include "util.h"
 #include "starfield.h"
diff --git a/noncore/games/sfcave-sdl/terrain.h b/noncore/games/sfcave-sdl/terrain.h
index 4070318..3cc9691 100644
--- a/noncore/games/sfcave-sdl/terrain.h
+++ b/noncore/games/sfcave-sdl/terrain.h
@@ -1,10 +1,10 @@
 #ifndef __TERRAIN_H
 #define __TERRAIN_H
-#include <SDL.h>
+#include <SDL/SDL.h>
 class StarField;
 class Terrain
 {
 public:
        Terrain( int w, int h, bool drawTop = true, bool drawBottom = true );
diff --git a/noncore/games/sfcave-sdl/util.cpp b/noncore/games/sfcave-sdl/util.cpp
index f73e256..743f16e 100644
--- a/noncore/games/sfcave-sdl/util.cpp
+++ b/noncore/games/sfcave-sdl/util.cpp
@@ -1,7 +1,7 @@
-#include "SDL.h"
+#include <SDL/SDL.h>
 #include <dirent.h>
 #include <vector>
 using namespace std;
diff --git a/noncore/games/sfcave-sdl/util.h b/noncore/games/sfcave-sdl/util.h
index e3aa31a..a67707b 100644
--- a/noncore/games/sfcave-sdl/util.h
+++ b/noncore/games/sfcave-sdl/util.h

diff --git a/noncore/games/sfcave-sdl/animatedimage.cpp b/noncore/games/sfcave-sdl/animatedimage.cpp index 441c647..680b603 100644 --- a/noncore/games/sfcave-sdl/animatedimage.cpp +++ b/noncore/games/sfcave-sdl/animatedimage.cpp
@@ -1,8 +1,8 @@
1	#include "SDL.h"	1	#include <SDL/SDL.h>
2	#include "SDL_image.h"	2	#include <SDL/SDL_image.h>
3		3
4	#include "constants.h"	4	#include "constants.h"
5	#include "animatedimage.h"	5	#include "animatedimage.h"
6		6
7	AnimatedImage :: AnimatedImage( string file, int nFrames )	7	AnimatedImage :: AnimatedImage( string file, int nFrames )
8	{	8	{


diff --git a/noncore/games/sfcave-sdl/animatedimage.h b/noncore/games/sfcave-sdl/animatedimage.h index 3c03f52..ecebf03 100644 --- a/noncore/games/sfcave-sdl/animatedimage.h +++ b/noncore/games/sfcave-sdl/animatedimage.h
@@ -1,10 +1,10 @@
1	#ifndef __ANIMATED_IMAGE_H	1	#ifndef __ANIMATED_IMAGE_H
2	#define __ANIMATED_IMAGE_H	2	#define __ANIMATED_IMAGE_H
3		3
4	#include "SDL.h"	4	#include <SDL/SDL.h>
5		5
6	class AnimatedImage	6	class AnimatedImage
7	{	7	{
8	public:	8	public:
9	AnimatedImage( string file, int nFrames );	9	AnimatedImage( string file, int nFrames );
10	~AnimatedImage();	10	~AnimatedImage();


diff --git a/noncore/games/sfcave-sdl/bfont.cpp b/noncore/games/sfcave-sdl/bfont.cpp index 7dec8f5..3ba0f4f 100644 --- a/noncore/games/sfcave-sdl/bfont.cpp +++ b/noncore/games/sfcave-sdl/bfont.cpp
@@ -6,13 +6,13 @@
6	#include "iostream"	6	#include "iostream"
7	using namespace std;	7	using namespace std;
8	#include "string.h"	8	#include "string.h"
9	#include "stdlib.h"	9	#include "stdlib.h"
10	#include "stdarg.h"	10	#include "stdarg.h"
11		11
12	#include "SDL_image.h"	12	#include <SDL/SDL_image.h>
13	#include "bfont.h"	13	#include "bfont.h"
14		14
15	void BFont::InitFont()	15	void BFont::InitFont()
16	{	16	{
17	int x = 0, i = '!';	17	int x = 0, i = '!';
18	Uint32 sentry = GetPixel(0,0);	18	Uint32 sentry = GetPixel(0,0);


diff --git a/noncore/games/sfcave-sdl/bfont.h b/noncore/games/sfcave-sdl/bfont.h index dee97f1..5c2d7e7 100644 --- a/noncore/games/sfcave-sdl/bfont.h +++ b/noncore/games/sfcave-sdl/bfont.h
@@ -6,13 +6,13 @@
6	************************************************************/	6	************************************************************/
7		7
8	#ifndef __BFONT_HEADER_H__	8	#ifndef __BFONT_HEADER_H__
9	#define __BFONT_HEADER_H__	9	#define __BFONT_HEADER_H__
10		10
11	#include <iostream>	11	#include <iostream>
12	#include "SDL.h"	12	#include <SDL/SDL.h>
13		13
14	class BFont	14	class BFont
15	{	15	{
16	int h; // font height	16	int h; // font height
17	SDL_Surface *Surface; // font surface	17	SDL_Surface *Surface; // font surface
18	SDL_Rect Chars[256]; // characters width	18	SDL_Rect Chars[256]; // characters width


diff --git a/noncore/games/sfcave-sdl/fly_game.cpp b/noncore/games/sfcave-sdl/fly_game.cpp index 8b05d8f..69413ba 100644 --- a/noncore/games/sfcave-sdl/fly_game.cpp +++ b/noncore/games/sfcave-sdl/fly_game.cpp
@@ -1,7 +1,7 @@
1	#include "SDL_gfxPrimitives.h"	1	#include <SDL/SDL_gfxPrimitives.h>
2		2
3	#include "constants.h"	3	#include "constants.h"
4	#include "fly_game.h"	4	#include "fly_game.h"
5	#include "random.h"	5	#include "random.h"
6		6
7	FlyGame :: FlyGame( SFCave *p, int w, int h, int diff )	7	FlyGame :: FlyGame( SFCave *p, int w, int h, int diff )


diff --git a/noncore/games/sfcave-sdl/fly_game.h b/noncore/games/sfcave-sdl/fly_game.h index 1ab081a..f648deb 100644 --- a/noncore/games/sfcave-sdl/fly_game.h +++ b/noncore/games/sfcave-sdl/fly_game.h
@@ -2,13 +2,13 @@
2	#define __FLY_GAME_H	2	#define __FLY_GAME_H
3		3
4	#include "sfcave.h"	4	#include "sfcave.h"
5	#include "flyterrain.h"	5	#include "flyterrain.h"
6	#include "player.h"	6	#include "player.h"
7	#include "game.h"	7	#include "game.h"
8	#include "SDL.h"	8	#include <SDL/SDL.h>
9		9
10	class FlyGame : public Game	10	class FlyGame : public Game
11	{	11	{
12	public:	12	public:
13	FlyGame( SFCave *p, int w, int h, int diff );	13	FlyGame( SFCave *p, int w, int h, int diff );
14	~FlyGame();	14	~FlyGame();


diff --git a/noncore/games/sfcave-sdl/flyterrain.cpp b/noncore/games/sfcave-sdl/flyterrain.cpp index b1b8db5..bffe5c9 100644 --- a/noncore/games/sfcave-sdl/flyterrain.cpp +++ b/noncore/games/sfcave-sdl/flyterrain.cpp
@@ -1,8 +1,7 @@
1		1	#include <SDL/SDL_gfxPrimitives.h>
2	#include "SDL_gfxPrimitives.h"
3		2
4	#include "constants.h"	3	#include "constants.h"
5	#include "flyterrain.h"	4	#include "flyterrain.h"
6	#include "random.h"	5	#include "random.h"
7		6
8		7


diff --git a/noncore/games/sfcave-sdl/flyterrain.h b/noncore/games/sfcave-sdl/flyterrain.h index 63b5731..6258fa0 100644 --- a/noncore/games/sfcave-sdl/flyterrain.h +++ b/noncore/games/sfcave-sdl/flyterrain.h
@@ -1,10 +1,10 @@
1	#ifndef __FLYTERRAIN_H	1	#ifndef __FLYTERRAIN_H
2	#define __FLYTERRAIN_H	2	#define __FLYTERRAIN_H
3		3
4	#include <SDL.h>	4	#include <SDL/SDL.h>
5		5
6	#include "terrain.h"	6	#include "terrain.h"
7		7
8	class FlyTerrain : public Terrain	8	class FlyTerrain : public Terrain
9	{	9	{
10	public:	10	public:


diff --git a/noncore/games/sfcave-sdl/font.h b/noncore/games/sfcave-sdl/font.h index 5f0674a..ed9c590 100644 --- a/noncore/games/sfcave-sdl/font.h +++ b/noncore/games/sfcave-sdl/font.h
@@ -1,10 +1,10 @@
1	#ifndef __FONT_H	1	#ifndef __FONT_H
2	#define __FONT_H	2	#define __FONT_H
3		3
4	#include "SDL.h"	4	#include <SDL/SDL.h>
5	#include "bfont.h"	5	#include "bfont.h"
6		6
7	#define FONT_MENU_HIGHLIGHTED 1	7	#define FONT_MENU_HIGHLIGHTED 1
8	#define FONT_MENU_UNHIGHLIGHTED 2	8	#define FONT_MENU_UNHIGHLIGHTED 2
9	#define FONT_WHITE_TEXT 3	9	#define FONT_WHITE_TEXT 3
10	#define FONT_COLOURED_TEXT 4	10	#define FONT_COLOURED_TEXT 4


diff --git a/noncore/games/sfcave-sdl/game.cpp b/noncore/games/sfcave-sdl/game.cpp index 1ee0230..bf9c46f 100644 --- a/noncore/games/sfcave-sdl/game.cpp +++ b/noncore/games/sfcave-sdl/game.cpp
@@ -1,11 +1,11 @@
1	#include <stdio.h>	1	#include <stdio.h>
2	#include <time.h>	2	#include <time.h>
3		3
4	#include <SDL.h>	4	#include <SDL/SDL.h>
5	#include <SDL_image.h>	5	#include <SDL/SDL_image.h>
6		6
7	#include "font.h"	7	#include "font.h"
8		8
9	#include "constants.h"	9	#include "constants.h"
10	#include "game.h"	10	#include "game.h"
11	#include "player.h"	11	#include "player.h"


diff --git a/noncore/games/sfcave-sdl/gates_game.cpp b/noncore/games/sfcave-sdl/gates_game.cpp index 700a6ec..638658b 100644 --- a/noncore/games/sfcave-sdl/gates_game.cpp +++ b/noncore/games/sfcave-sdl/gates_game.cpp
@@ -1,7 +1,7 @@
1	#include "SDL_gfxPrimitives.h"	1	#include <SDL/SDL_gfxPrimitives.h>
2		2
3	#include "constants.h"	3	#include "constants.h"
4	#include "gates_game.h"	4	#include "gates_game.h"
5	#include "random.h"	5	#include "random.h"
6		6
7	GatesGame :: GatesGame( SFCave *p, int w, int h, int diff )	7	GatesGame :: GatesGame( SFCave *p, int w, int h, int diff )


diff --git a/noncore/games/sfcave-sdl/gates_game.h b/noncore/games/sfcave-sdl/gates_game.h index 8499ff9..b44336a 100644 --- a/noncore/games/sfcave-sdl/gates_game.h +++ b/noncore/games/sfcave-sdl/gates_game.h
@@ -1,10 +1,10 @@
1	#ifndef __GATES_GAME_H	1	#ifndef __GATES_GAME_H
2	#define __GATES_GAME_H	2	#define __GATES_GAME_H
3		3
4	#include "SDL.h"	4	#include <SDL/SDL.h>
5		5
6	#include "rect.h"	6	#include "rect.h"
7		7
8	#include "sfcave.h"	8	#include "sfcave.h"
9	#include "terrain.h"	9	#include "terrain.h"
10	#include "player.h"	10	#include "player.h"


diff --git a/noncore/games/sfcave-sdl/help.cpp b/noncore/games/sfcave-sdl/help.cpp index f1728f6..0a7924b 100644 --- a/noncore/games/sfcave-sdl/help.cpp +++ b/noncore/games/sfcave-sdl/help.cpp
@@ -1,7 +1,7 @@
1	#include "SDL.h"	1	#include <SDL/SDL.h>
2	#include "constants.h"	2	#include "constants.h"
3		3
4	#include "font.h"	4	#include "font.h"
5	#include "help.h"	5	#include "help.h"
6	#include "sfcave.h"	6	#include "sfcave.h"
7	#include "starfield.h"	7	#include "starfield.h"


diff --git a/noncore/games/sfcave-sdl/help.h b/noncore/games/sfcave-sdl/help.h index dc9e80e..2cc32cd 100644 --- a/noncore/games/sfcave-sdl/help.h +++ b/noncore/games/sfcave-sdl/help.h


diff --git a/noncore/games/sfcave-sdl/menu.cpp b/noncore/games/sfcave-sdl/menu.cpp index a4a4216..fb2a635 100644 --- a/noncore/games/sfcave-sdl/menu.cpp +++ b/noncore/games/sfcave-sdl/menu.cpp
@@ -1,8 +1,8 @@
1	#include <SDL_image.h>	1	#include <SDL/SDL_image.h>
2	#include "SDL_rotozoom.h"	2	#include <SDL/SDL_rotozoom.h>
3		3
4	#include "constants.h"	4	#include "constants.h"
5	#include "sfcave.h"	5	#include "sfcave.h"
6	#include "game.h"	6	#include "game.h"
7	#include "menu.h"	7	#include "menu.h"
8	#include "font.h"	8	#include "font.h"


diff --git a/noncore/games/sfcave-sdl/menu.h b/noncore/games/sfcave-sdl/menu.h index 6a5ef40..c263bcc 100644 --- a/noncore/games/sfcave-sdl/menu.h +++ b/noncore/games/sfcave-sdl/menu.h
@@ -1,13 +1,13 @@
1	#ifndef __MENU_H	1	#ifndef __MENU_H
2	#define __MENU_H	2	#define __MENU_H
3		3
4	#include <list>	4	#include <list>
5	using namespace std;	5	using namespace std;
6		6
7	#include <SDL.h>	7	#include <SDL/SDL.h>
8		8
9	class SFCave;	9	class SFCave;
10	class StarField;	10	class StarField;
11	class Menu;	11	class Menu;
12		12
13	class MenuOption	13	class MenuOption


diff --git a/noncore/games/sfcave-sdl/player.cpp b/noncore/games/sfcave-sdl/player.cpp index f024d6b..b491e53 100644 --- a/noncore/games/sfcave-sdl/player.cpp +++ b/noncore/games/sfcave-sdl/player.cpp
@@ -1,8 +1,8 @@
1	#include <SDL.h>	1	#include <SDL/SDL.h>
2	#include "SDL_gfxPrimitives.h"	2	#include <SDL/SDL_gfxPrimitives.h>
3		3
4	#include "constants.h"	4	#include "constants.h"
5	#include "player.h"	5	#include "player.h"
6	#include "random.h"	6	#include "random.h"
7	#include "animatedimage.h"	7	#include "animatedimage.h"
8		8


diff --git a/noncore/games/sfcave-sdl/rect.h b/noncore/games/sfcave-sdl/rect.h index dc9c9d5..30f082c 100644 --- a/noncore/games/sfcave-sdl/rect.h +++ b/noncore/games/sfcave-sdl/rect.h
@@ -1,10 +1,10 @@
1	#ifndef __RECT_H	1	#ifndef __RECT_H
2	#define __RECT_H	2	#define __RECT_H
3		3
4	#include "SDL.h"	4	#include <SDL/SDL.h>
5		5
6	class Rect	6	class Rect
7	{	7	{
8	public:	8	public:
9	Rect() { r.x = r.y = r.w = r.h = 0; }	9	Rect() { r.x = r.y = r.w = r.h = 0; }
10	Rect( int x, int y, int w, int h ) { setRect( x, y, w, h ); }	10	Rect( int x, int y, int w, int h ) { setRect( x, y, w, h ); }


diff --git a/noncore/games/sfcave-sdl/sfcave-sdl.pro b/noncore/games/sfcave-sdl/sfcave-sdl.pro index a4eb918..a02eeb3 100644 --- a/noncore/games/sfcave-sdl/sfcave-sdl.pro +++ b/noncore/games/sfcave-sdl/sfcave-sdl.pro


diff --git a/noncore/games/sfcave-sdl/sfcave.cpp b/noncore/games/sfcave-sdl/sfcave.cpp index dbd788c..5d1cdd5 100644 --- a/noncore/games/sfcave-sdl/sfcave.cpp +++ b/noncore/games/sfcave-sdl/sfcave.cpp
@@ -1,14 +1,14 @@
1	#include <stdio.h>	1	#include <stdio.h>
2	#include <stdlib.h>	2	#include <stdlib.h>
3		3
4	#include <time.h>	4	#include <time.h>
5	#include <sys/timeb.h>	5	#include <sys/timeb.h>
6		6
7	#include "SDL.h"	7	#include <SDL/SDL.h>
8	#include "SDL_gfxPrimitives.h"	8	#include <SDL/SDL_gfxPrimitives.h>
9		9
10	#include "constants.h"	10	#include "constants.h"
11		11
12	#include "sound.h"	12	#include "sound.h"
13	#include "menu.h"	13	#include "menu.h"
14	#include "help.h"	14	#include "help.h"


diff --git a/noncore/games/sfcave-sdl/sfcave.h b/noncore/games/sfcave-sdl/sfcave.h index c707919..4e45ec2 100644 --- a/noncore/games/sfcave-sdl/sfcave.h +++ b/noncore/games/sfcave-sdl/sfcave.h
@@ -1,10 +1,10 @@
1	#ifndef __SFCAVE_H	1	#ifndef __SFCAVE_H
2	#define __SFCAVE_H	2	#define __SFCAVE_H
3		3
4	#include "SDL.h"	4	#include <SDL/SDL.h>
5		5
6	#include "terrain.h"	6	#include "terrain.h"
7		7
8	class Game;	8	class Game;
9	class Menu;	9	class Menu;
10	class Help;	10	class Help;


diff --git a/noncore/games/sfcave-sdl/sfcave_game.cpp b/noncore/games/sfcave-sdl/sfcave_game.cpp index 8fdbbe5..ccdd625 100644 --- a/noncore/games/sfcave-sdl/sfcave_game.cpp +++ b/noncore/games/sfcave-sdl/sfcave_game.cpp
@@ -1,7 +1,7 @@
1	#include "SDL_gfxPrimitives.h"	1	#include <SDL/SDL_gfxPrimitives.h>
2		2
3	#include "constants.h"	3	#include "constants.h"
4	#include "sfcave_game.h"	4	#include "sfcave_game.h"
5	#include "random.h"	5	#include "random.h"
6		6
7	SFCaveGame :: SFCaveGame( SFCave *p, int w, int h, int diff )	7	SFCaveGame :: SFCaveGame( SFCave *p, int w, int h, int diff )


diff --git a/noncore/games/sfcave-sdl/sfcave_game.h b/noncore/games/sfcave-sdl/sfcave_game.h index 92a0f5d..6dddf5e 100644 --- a/noncore/games/sfcave-sdl/sfcave_game.h +++ b/noncore/games/sfcave-sdl/sfcave_game.h
@@ -1,10 +1,10 @@
1	#ifndef __SFCAVE_GAME_H	1	#ifndef __SFCAVE_GAME_H
2	#define __SFCAVE_GAME_H	2	#define __SFCAVE_GAME_H
3		3
4	#include "SDL.h"	4	#include <SDL/SDL.h>
5		5
6	#include "rect.h"	6	#include "rect.h"
7		7
8	#include "sfcave.h"	8	#include "sfcave.h"
9	#include "terrain.h"	9	#include "terrain.h"
10	#include "player.h"	10	#include "player.h"


diff --git a/noncore/games/sfcave-sdl/sound.cpp b/noncore/games/sfcave-sdl/sound.cpp index 855f2e6..0be1abf 100644 --- a/noncore/games/sfcave-sdl/sound.cpp +++ b/noncore/games/sfcave-sdl/sound.cpp


diff --git a/noncore/games/sfcave-sdl/sound.h b/noncore/games/sfcave-sdl/sound.h index d46b5bc..180429a 100644 --- a/noncore/games/sfcave-sdl/sound.h +++ b/noncore/games/sfcave-sdl/sound.h
@@ -1,11 +1,11 @@
1	#ifndef __SOUND_H	1	#ifndef __SOUND_H
2	#define __SOUND_H	2	#define __SOUND_H
3		3
4	#include <SDL.h>	4	#include <SDL/SDL.h>
5	#include "SDL_mixer.h"	5	#include <SDL/SDL_mixer.h>
6		6
7	#define NR_SOUNDS 3	7	#define NR_SOUNDS 3
8		8
9	class SoundHandler	9	class SoundHandler
10	{	10	{
11	public:	11	public:


diff --git a/noncore/games/sfcave-sdl/starfield.cpp b/noncore/games/sfcave-sdl/starfield.cpp index 82edfc1..3b26895 100644 --- a/noncore/games/sfcave-sdl/starfield.cpp +++ b/noncore/games/sfcave-sdl/starfield.cpp
@@ -1,8 +1,8 @@
1	#include "SDL.h"	1	#include <SDL/SDL.h>
2	#include "SDL_gfxPrimitives.h"	2	#include <SDL/SDL_gfxPrimitives.h>
3		3
4	#include <stdlib.h>	4	#include <stdlib.h>
5		5
6	#include "starfield.h"	6	#include "starfield.h"
7	#include "random.h"	7	#include "random.h"
8	#include "util.h"	8	#include "util.h"


diff --git a/noncore/games/sfcave-sdl/starfield.h b/noncore/games/sfcave-sdl/starfield.h index ae9bd34..133cb54 100644 --- a/noncore/games/sfcave-sdl/starfield.h +++ b/noncore/games/sfcave-sdl/starfield.h


diff --git a/noncore/games/sfcave-sdl/stringtokenizer.h b/noncore/games/sfcave-sdl/stringtokenizer.h index 3f299a6..51daa42 100644 --- a/noncore/games/sfcave-sdl/stringtokenizer.h +++ b/noncore/games/sfcave-sdl/stringtokenizer.h


diff --git a/noncore/games/sfcave-sdl/terrain.cpp b/noncore/games/sfcave-sdl/terrain.cpp index b243f45..5943275 100644 --- a/noncore/games/sfcave-sdl/terrain.cpp +++ b/noncore/games/sfcave-sdl/terrain.cpp
@@ -1,9 +1,9 @@
1	#include "SDL.h"	1	#include <SDL/SDL.h>
2	#include "SDL_rotozoom.h"	2	#include <SDL/SDL_rotozoom.h>
3	#include "SDL_gfxPrimitives.h"	3	#include <SDL/SDL_gfxPrimitives.h>
4		4
5	#include "constants.h"	5	#include "constants.h"
6	#include "terrain.h"	6	#include "terrain.h"
7	#include "random.h"	7	#include "random.h"
8	#include "util.h"	8	#include "util.h"
9	#include "starfield.h"	9	#include "starfield.h"


diff --git a/noncore/games/sfcave-sdl/terrain.h b/noncore/games/sfcave-sdl/terrain.h index 4070318..3cc9691 100644 --- a/noncore/games/sfcave-sdl/terrain.h +++ b/noncore/games/sfcave-sdl/terrain.h
@@ -1,10 +1,10 @@
1	#ifndef __TERRAIN_H	1	#ifndef __TERRAIN_H
2	#define __TERRAIN_H	2	#define __TERRAIN_H
3		3
4	#include <SDL.h>	4	#include <SDL/SDL.h>
5		5
6	class StarField;	6	class StarField;
7	class Terrain	7	class Terrain
8	{	8	{
9	public:	9	public:
10	Terrain( int w, int h, bool drawTop = true, bool drawBottom = true );	10	Terrain( int w, int h, bool drawTop = true, bool drawBottom = true );


diff --git a/noncore/games/sfcave-sdl/util.cpp b/noncore/games/sfcave-sdl/util.cpp index f73e256..743f16e 100644 --- a/noncore/games/sfcave-sdl/util.cpp +++ b/noncore/games/sfcave-sdl/util.cpp
@@ -1,7 +1,7 @@
1	#include "SDL.h"	1	#include <SDL/SDL.h>
2		2
3	#include <dirent.h>	3	#include <dirent.h>
4		4
5	#include <vector>	5	#include <vector>
6	using namespace std;	6	using namespace std;
7		7


diff --git a/noncore/games/sfcave-sdl/util.h b/noncore/games/sfcave-sdl/util.h index e3aa31a..a67707b 100644 --- a/noncore/games/sfcave-sdl/util.h +++ b/noncore/games/sfcave-sdl/util.h