From 306c130cc425e96d2088f68551c4bb77dad412d3 Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Sat, 20 Jun 2009 12:43:34 -0400 Subject: Added BMPs back --- Makefile | 4 ++-- htp1.bmp | Bin 0 -> 921738 bytes htp2.bmp | Bin 0 -> 921738 bytes htpstate.cpp | 6 +++--- includes.h | 1 - pointer.bmp | Bin 0 -> 2038 bytes title.bmp | Bin 0 -> 921738 bytes titlestate.cpp | 4 ++-- 8 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 htp1.bmp create mode 100644 htp2.bmp create mode 100644 pointer.bmp create mode 100644 title.bmp diff --git a/Makefile b/Makefile index 0c18181..7f503ba 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ OBJS = mazeoflife.o titlestate.o htpstate.o gamestate.o CC = g++ -CFLAGS = `sdl-config --cflags` -I/usr/local/include/SDL -LIBS = `sdl-config --libs` -lSDL_image +CFLAGS = `pkg-config sdl --cflags` +LIBS = `pkg-config sdl --libs` mazeoflife: $(OBJS) $(CC) $(OBJS) $(LIBS) -o mazeoflife diff --git a/htp1.bmp b/htp1.bmp new file mode 100644 index 0000000..df06101 Binary files /dev/null and b/htp1.bmp differ diff --git a/htp2.bmp b/htp2.bmp new file mode 100644 index 0000000..5dcb4c4 Binary files /dev/null and b/htp2.bmp differ diff --git a/htpstate.cpp b/htpstate.cpp index f945b8f..ad830da 100644 --- a/htpstate.cpp +++ b/htpstate.cpp @@ -2,9 +2,9 @@ HowToPlayState::HowToPlayState() { - background1 = IMG_Load("htp1.png"); - background2 = IMG_Load("htp2.png"); - pointer = IMG_Load("pointer.png"); + background1 = SDL_LoadBMP("htp1.bmp"); + background2 = SDL_LoadBMP("htp2.bmp"); + pointer = SDL_LoadBMP("pointer.bmp"); secondPage = false; selection = 0; diff --git a/includes.h b/includes.h index aef6714..fa6abeb 100644 --- a/includes.h +++ b/includes.h @@ -1,5 +1,4 @@ #include -#include #include #include #include diff --git a/pointer.bmp b/pointer.bmp new file mode 100644 index 0000000..e1cee4e Binary files /dev/null and b/pointer.bmp differ diff --git a/title.bmp b/title.bmp new file mode 100644 index 0000000..d816447 Binary files /dev/null and b/title.bmp differ diff --git a/titlestate.cpp b/titlestate.cpp index 4b2c137..425e4ca 100644 --- a/titlestate.cpp +++ b/titlestate.cpp @@ -2,8 +2,8 @@ TitleState::TitleState() { - background = IMG_Load("title.png"); - pointer = IMG_Load("pointer.png"); + background = SDL_LoadBMP("title.bmp"); + pointer = SDL_LoadBMP("pointer.bmp"); selection = 0; SDL_WM_SetCaption("Maze Of Life", NULL); -- cgit 1.4.1