summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--htp1.bmpbin921738 -> 0 bytes
-rw-r--r--htp2.bmpbin921738 -> 0 bytes
-rw-r--r--htpstate.cpp6
-rw-r--r--includes.h1
-rw-r--r--pointer.bmpbin2038 -> 0 bytes
-rw-r--r--title.bmpbin921738 -> 0 bytes
-rw-r--r--titlestate.cpp4
8 files changed, 8 insertions, 7 deletions
diff --git a/Makefile b/Makefile index 7f503ba..0c18181 100644 --- a/Makefile +++ b/Makefile
@@ -1,7 +1,7 @@
1OBJS = mazeoflife.o titlestate.o htpstate.o gamestate.o 1OBJS = mazeoflife.o titlestate.o htpstate.o gamestate.o
2CC = g++ 2CC = g++
3CFLAGS = `pkg-config sdl --cflags` 3CFLAGS = `sdl-config --cflags` -I/usr/local/include/SDL
4LIBS = `pkg-config sdl --libs` 4LIBS = `sdl-config --libs` -lSDL_image
5 5
6mazeoflife: $(OBJS) 6mazeoflife: $(OBJS)
7 $(CC) $(OBJS) $(LIBS) -o mazeoflife 7 $(CC) $(OBJS) $(LIBS) -o mazeoflife
diff --git a/htp1.bmp b/htp1.bmp deleted file mode 100644 index df06101..0000000 --- a/htp1.bmp +++ /dev/null
Binary files differ
diff --git a/htp2.bmp b/htp2.bmp deleted file mode 100644 index 5dcb4c4..0000000 --- a/htp2.bmp +++ /dev/null
Binary files differ
diff --git a/htpstate.cpp b/htpstate.cpp index ad830da..f945b8f 100644 --- a/htpstate.cpp +++ b/htpstate.cpp
@@ -2,9 +2,9 @@
2 2
3HowToPlayState::HowToPlayState() 3HowToPlayState::HowToPlayState()
4{ 4{
5 background1 = SDL_LoadBMP("htp1.bmp"); 5 background1 = IMG_Load("htp1.png");
6 background2 = SDL_LoadBMP("htp2.bmp"); 6 background2 = IMG_Load("htp2.png");
7 pointer = SDL_LoadBMP("pointer.bmp"); 7 pointer = IMG_Load("pointer.png");
8 secondPage = false; 8 secondPage = false;
9 selection = 0; 9 selection = 0;
10 10
diff --git a/includes.h b/includes.h index fa6abeb..aef6714 100644 --- a/includes.h +++ b/includes.h
@@ -1,4 +1,5 @@
1#include <SDL.h> 1#include <SDL.h>
2#include <SDL_image.h>
2#include <stdio.h> 3#include <stdio.h>
3#include <time.h> 4#include <time.h>
4#include <string> 5#include <string>
diff --git a/pointer.bmp b/pointer.bmp deleted file mode 100644 index e1cee4e..0000000 --- a/pointer.bmp +++ /dev/null
Binary files differ
diff --git a/title.bmp b/title.bmp deleted file mode 100644 index d816447..0000000 --- a/title.bmp +++ /dev/null
Binary files differ
diff --git a/titlestate.cpp b/titlestate.cpp index 425e4ca..4b2c137 100644 --- a/titlestate.cpp +++ b/titlestate.cpp
@@ -2,8 +2,8 @@
2 2
3TitleState::TitleState() 3TitleState::TitleState()
4{ 4{
5 background = SDL_LoadBMP("title.bmp"); 5 background = IMG_Load("title.png");
6 pointer = SDL_LoadBMP("pointer.bmp"); 6 pointer = IMG_Load("pointer.png");
7 selection = 0; 7 selection = 0;
8 8
9 SDL_WM_SetCaption("Maze Of Life", NULL); 9 SDL_WM_SetCaption("Maze Of Life", NULL);