From 387685d34e6c4ebee776a700a01fed4df05446be Mon Sep 17 00:00:00 2001 From: Starla Insigna Date: Sun, 25 Aug 2013 14:41:26 -0400 Subject: Replaced internal resources with external ones for compatibility --- .hgignore | 1 + Makefile | 12 ++++++------ chlstate.cpp | 4 ++-- hsglobal.cpp | 4 ++-- hslocal.cpp | 6 +++--- hsnew.cpp | 4 ++-- hssubmit.cpp | 6 +++--- htpstate.cpp | 6 +++--- includes.h | 1 - mazeoflife.cpp | 5 ++--- resources.h | 24 ------------------------ titlestate.cpp | 4 ++-- 12 files changed, 26 insertions(+), 51 deletions(-) delete mode 100644 resources.h diff --git a/.hgignore b/.hgignore index 378eac2..d76b74e 100644 --- a/.hgignore +++ b/.hgignore @@ -1 +1,2 @@ build +.DS_Store diff --git a/Makefile b/Makefile index 27d70a9..8a9d3b5 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ MODULES = $(patsubst %.cpp,%,$(FILES)) SOURCES = $(addsuffix .o,$(MODULES)) WINSRC = $(addsuffix win,$(SOURCES)) RES = $(wildcard resources/*) -CRES = $(patsubst resources/%,build/%,$(addsuffix .o,$(RES))) -LINCCFL = `sdl-config --cflags` +CRES = $(patsubst resources/%,build/%,$(RES)) +LINCCFL = `sdl-config --cflags` -I/usr/local/Cellar/sdl_net/1.2.8/include/SDL/ -I/usr/local/Cellar/sdl_ttf/2.0.11/include/SDL/ LINLDFL = `sdl-config --libs` -lSDL_ttf -lSDL_net WINCCFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --cflags` -DWINDOWS WINLDFL = `/opt/SDL-1.2.9/bin/i386-mingw32msvc-sdl-config --libs` -lSDL_ttf -lSDL_net @@ -27,13 +27,13 @@ clean: rm -rdfv build $(LTARGET): $(SOURCES) $(CRES) - $(CC) $(SOURCES) $(CRES) -o $(LTARGET) $(LINLDFL) + $(CC) $(SOURCES) -o $(LTARGET) $(LINLDFL) $(SOURCES): build/%.o: %.cpp $(HEADERS) $(CC) -c $< -o $@ $(LINCCFL) $(WTARGET): $(WINSRC) $(CRES) build/winres.o - $(WINCC) $(WINSRC) $(CRES) build/winres.o -o $(WTARGET) $(WINLDFL) + $(WINCC) $(WINSRC) build/winres.o -o $(WTARGET) $(WINLDFL) $(WINSRC): build/%.owin: %.cpp $(HEADERS) $(WINCC) -c $< -o $@ $(WINCCFL) @@ -41,5 +41,5 @@ $(WINSRC): build/%.owin: %.cpp $(HEADERS) build/winres.o: winres.rc $(WINDRES) $? $@ -$(CRES): build/%.o: resources/% - objcopy --input binary --output elf32-i386 -B i386 $? $@ +$(CRES): build/%: resources/% + cp $? $@ diff --git a/chlstate.cpp b/chlstate.cpp index 14182a2..48bf8c2 100644 --- a/chlstate.cpp +++ b/chlstate.cpp @@ -2,8 +2,8 @@ ChooseHighscoreListState::ChooseHighscoreListState() { - LOADIMAGE(background,chl) - LOADIMAGE(pointer,pointer) + background = SDL_LoadBMP("chl.bmp"); + pointer = SDL_LoadBMP("pointer.bmp"); selection = 0; } diff --git a/hsglobal.cpp b/hsglobal.cpp index 37db44b..c21d314 100644 --- a/hsglobal.cpp +++ b/hsglobal.cpp @@ -2,8 +2,8 @@ GlobalHighscoreListState::GlobalHighscoreListState() { - LOADIMAGE(options,hlo_rtm) - LOADIMAGE(pointer,pointer) + options = SDL_LoadBMP("hlo_rtm.bmp"); + pointer = SDL_LoadBMP("pointer.bmp"); list = SDL_CreateRGBSurface(SDL_SWSURFACE || SDL_SRCCOLORKEY, 480, 480, 32, 0,0,0,0); Uint32 bgColor = SDL_MapRGB(list->format, 255, 255, 255); diff --git a/hslocal.cpp b/hslocal.cpp index c53f397..b33a094 100644 --- a/hslocal.cpp +++ b/hslocal.cpp @@ -6,12 +6,12 @@ LocalHighscoreListState::LocalHighscoreListState(bool fromGame) if (fromGame) { - LOADIMAGE(options,hlo_paartm) + options = SDL_LoadBMP("hlo_paartm.bmp"); } else { - LOADIMAGE(options,hlo_rtm) + options = SDL_LoadBMP("hlo_rtm.bmp"); } - LOADIMAGE(pointer,pointer) + pointer = SDL_LoadBMP("pointer.bmp"); LocalHighscoreList* lhl = new LocalHighscoreList(); list = lhl->render(); diff --git a/hsnew.cpp b/hsnew.cpp index 8b752a6..2f3e0a2 100644 --- a/hsnew.cpp +++ b/hsnew.cpp @@ -4,8 +4,8 @@ NewHighscoreState::NewHighscoreState(int level) { this->level = level; - LOADIMAGE(options,hlo_passartm) - LOADIMAGE(pointer,pointer) + options = SDL_LoadBMP("hlo_passartm.bmp"); + pointer = SDL_LoadBMP("pointer.bmp"); lhl = new NewHighscoreList(level); newpos = lhl->getNewPos(); diff --git a/hssubmit.cpp b/hssubmit.cpp index 690749a..7d4c551 100644 --- a/hssubmit.cpp +++ b/hssubmit.cpp @@ -2,7 +2,7 @@ SubmitHighscoreListState::SubmitHighscoreListState(char* hsname, int level) { - LOADIMAGE(pointer,pointer) + pointer = SDL_LoadBMP("pointer.bmp"); this->hsname = hsname; this->level = level; @@ -38,9 +38,9 @@ int SubmitHighscoreListState::LoadHighscoreList(void* pParam) if (lhl->hasFailed()) { - LOADIMAGE(((SubmitHighscoreListState*)pParam)->options,hlo_passartm) + ((SubmitHighscoreListState*)pParam)->options = SDL_LoadBMP("hlo_passartm.bmp"); } else { - LOADIMAGE(((SubmitHighscoreListState*)pParam)->options,hlo_paartm) + ((SubmitHighscoreListState*)pParam)->options = SDL_LoadBMP("hlo_paartm.bmp"); } SDL_Rect oSpace = {0, 440, ((SubmitHighscoreListState*)pParam)->options->w, ((SubmitHighscoreListState*)pParam)->options->h}; diff --git a/htpstate.cpp b/htpstate.cpp index 03d02c6..fbf6b71 100644 --- a/htpstate.cpp +++ b/htpstate.cpp @@ -2,9 +2,9 @@ HowToPlayState::HowToPlayState() { - LOADIMAGE(background1,htp1) - LOADIMAGE(background2,htp2) - LOADIMAGE(pointer,pointer) + 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 b7c0d56..6023709 100644 --- a/includes.h +++ b/includes.h @@ -11,7 +11,6 @@ #include #include "state.h" #include "mazeoflife.h" -#include "resources.h" #include "titlestate.h" #include "htpstate.h" #include "chlstate.h" diff --git a/mazeoflife.cpp b/mazeoflife.cpp index 45fc377..9033526 100644 --- a/mazeoflife.cpp +++ b/mazeoflife.cpp @@ -33,7 +33,7 @@ int main(int argc, char *argv[]) SDL_WM_SetCaption("Maze Of Life", NULL); SDL_Surface* icon; - LOADIMAGE(icon,icon) + icon = SDL_LoadBMP("icon.bmp"); SDL_WM_SetIcon(icon, NULL); /* @@ -118,8 +118,7 @@ Uint32 tick(Uint32 interval, void *param) TTF_Font* loadFont(int size) { - SDL_RWops* mono_rw = SDL_RWFromMem(&RESNAME(mono_ttf,start), (int) &RESNAME(mono_ttf,size)); - TTF_Font* tmpfont = TTF_OpenFontRW(mono_rw, 1, size); + TTF_Font* tmpfont = TTF_OpenFont("mono.ttf", size); if (tmpfont == NULL) { diff --git a/resources.h b/resources.h deleted file mode 100644 index 4743950..0000000 --- a/resources.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef RESOURCES_H -#define RESOURCES_H - -#ifdef WINDOWS -#define RESNAME(title,part) binary_resources_ ## title ## _ ## part -#else -#define RESNAME(title,part) _binary_resources_ ## title ## _ ## part -#endif - -#define DEFRES(title) extern int* RESNAME(title,start); extern int* RESNAME(title,size); -#define LOADIMAGE(var,title) SDL_RWops * title ## _rw = SDL_RWFromMem(&RESNAME(title ## _bmp,start), (int) &RESNAME(title ## _bmp,size)); var = SDL_LoadBMP_RW( title ## _rw, 1); - -DEFRES(icon_bmp) -DEFRES(title_bmp) -DEFRES(pointer_bmp) -DEFRES(htp1_bmp) -DEFRES(htp2_bmp) -DEFRES(chl_bmp) -DEFRES(hlo_rtm_bmp) -DEFRES(hlo_paartm_bmp) -DEFRES(hlo_passartm_bmp) -DEFRES(mono_ttf) - -#endif diff --git a/titlestate.cpp b/titlestate.cpp index 2622caa..95023e5 100644 --- a/titlestate.cpp +++ b/titlestate.cpp @@ -2,8 +2,8 @@ TitleState::TitleState() { - LOADIMAGE(background,title) - LOADIMAGE(pointer,pointer) + background = SDL_LoadBMP("title.bmp"); + pointer = SDL_LoadBMP("pointer.bmp"); selection = 0; } -- cgit 1.4.1