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