summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2009-06-20 12:43:34 -0400
committerKelly Rauchenberger <fefferburbia@gmail.com>2009-06-20 12:43:34 -0400
commit306c130cc425e96d2088f68551c4bb77dad412d3 (patch)
treea2ce9296ec53f0bdcce7eaeddc3a6292edf5bcf7
parent11decc4e626d0f949d816d9760a1f4012e1769b7 (diff)
downloadmazeoflife-306c130cc425e96d2088f68551c4bb77dad412d3.tar.gz
mazeoflife-306c130cc425e96d2088f68551c4bb77dad412d3.tar.bz2
mazeoflife-306c130cc425e96d2088f68551c4bb77dad412d3.zip
Added BMPs back
-rw-r--r--Makefile4
-rw-r--r--htp1.bmpbin0 -> 921738 bytes
-rw-r--r--htp2.bmpbin0 -> 921738 bytes
-rw-r--r--htpstate.cpp6
-rw-r--r--includes.h1
-rw-r--r--pointer.bmpbin0 -> 2038 bytes
-rw-r--r--title.bmpbin0 -> 921738 bytes
-rw-r--r--titlestate.cpp4
8 files changed, 7 insertions, 8 deletions
diff --git a/Makefile b/Makefile index 0c18181..7f503ba 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 = `sdl-config --cflags` -I/usr/local/include/SDL 3CFLAGS = `pkg-config sdl --cflags`
4LIBS = `sdl-config --libs` -lSDL_image 4LIBS = `pkg-config sdl --libs`
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 new file mode 100644 index 0000000..df06101 --- /dev/null +++ b/htp1.bmp
Binary files differ
diff --git a/htp2.bmp b/htp2.bmp new file mode 100644 index 0000000..5dcb4c4 --- /dev/null +++ b/htp2.bmp
Binary files differ
diff --git a/htpstate.cpp b/htpstate.cpp index f945b8f..ad830da 100644 --- a/htpstate.cpp +++ b/htpstate.cpp
@@ -2,9 +2,9 @@
2 2
3HowToPlayState::HowToPlayState() 3HowToPlayState::HowToPlayState()
4{ 4{
5 background1 = IMG_Load("htp1.png"); 5 background1 = SDL_LoadBMP("htp1.bmp");
6 background2 = IMG_Load("htp2.png"); 6 background2 = SDL_LoadBMP("htp2.bmp");
7 pointer = IMG_Load("pointer.png"); 7 pointer = SDL_LoadBMP("pointer.bmp");
8 secondPage = false; 8 secondPage = false;
9 selection = 0; 9 selection = 0;
10 10
diff --git a/includes.h b/includes.h index aef6714..fa6abeb 100644 --- a/includes.h +++ b/includes.h
@@ -1,5 +1,4 @@
1#include <SDL.h> 1#include <SDL.h>
2#include <SDL_image.h>
3#include <stdio.h> 2#include <stdio.h>
4#include <time.h> 3#include <time.h>
5#include <string> 4#include <string>
diff --git a/pointer.bmp b/pointer.bmp new file mode 100644 index 0000000..e1cee4e --- /dev/null +++ b/pointer.bmp
Binary files differ
diff --git a/title.bmp b/title.bmp new file mode 100644 index 0000000..d816447 --- /dev/null +++ b/title.bmp
Binary files differ
diff --git a/titlestate.cpp b/titlestate.cpp index 4b2c137..425e4ca 100644 --- a/titlestate.cpp +++ b/titlestate.cpp
@@ -2,8 +2,8 @@
2 2
3TitleState::TitleState() 3TitleState::TitleState()
4{ 4{
5 background = IMG_Load("title.png"); 5 background = SDL_LoadBMP("title.bmp");
6 pointer = IMG_Load("pointer.png"); 6 pointer = SDL_LoadBMP("pointer.bmp");
7 selection = 0; 7 selection = 0;
8 8
9 SDL_WM_SetCaption("Maze Of Life", NULL); 9 SDL_WM_SetCaption("Maze Of Life", NULL);