diff -Naur tatan/import/hell2.d tatan-gentoo/import/hell2.d --- tatan/import/hell2.d 2007-07-28 16:50:38.000000000 +0200 +++ tatan-gentoo/import/hell2.d 2007-08-05 12:19:44.000000000 +0200 @@ -68,7 +68,7 @@ static bool[] g_joyButton; static SDL_Joystick* g_joy; static int g_joyButtonNum; -static char[] FONT_PATH = "resource/font/font.bmp"; +static char[] FONT_PATH = "/usr/share/games/tatan/resource/font/font.bmp"; static int fps_cnt; static int fps_view; @@ -216,7 +216,7 @@ glClearColor(0.0f, 0.0f, 0.0f, 0.0f); Hell_setCaption(caption); // アイコン設定 - SDL_Surface* icon = SDL_LoadBMP("resource/hell.bmp"); + SDL_Surface* icon = SDL_LoadBMP("/usr/share/games/tatan/resource/hell.bmp"); SDL_WM_SetIcon(icon, null); // サウンド初期化(音を良くしたい場合、下のコメントを外す) // if(Mix_OpenAudio(44100, AUDIO_S16, 2, 8192) < 0) diff -Naur tatan/Makefile tatan-gentoo/Makefile --- tatan/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ tatan-gentoo/Makefile 2007-08-05 12:12:37.000000000 +0200 @@ -0,0 +1,17 @@ +DC=gdmd +DFLAGS=-g -O -d -release -Iimport -Isrc +DOUT=-of + +DSRC=$(shell find src/ -name "*.d") +SOURCES=$(DSRC) import/SDL_video.d import/SDL_mouse.d import/hell2.d import/SDL_mixer.d +OBJS=$(SOURCES:.d=.o) +EXE=tatan + +all: $(EXE) + +$(EXE): $(OBJS) + gcc -o $@ $(OBJS) -lbulletml_d -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer + +$(OBJS): %.o: %.d + $(DC) -c $(DOUT)$@ $(DFLAGS) $< + diff -Naur tatan/src/br/boot.d tatan-gentoo/src/br/boot.d --- tatan/src/br/boot.d 2007-07-28 16:09:10.000000000 +0200 +++ tatan-gentoo/src/br/boot.d 2007-08-04 19:01:29.000000000 +0200 @@ -6,6 +6,8 @@ private Mainloop mainloop; private Key key; private Mouse mouse; + +version (Win32_release) { private: import std.c.windows.windows; @@ -37,7 +39,22 @@ } gc_term(); return result; +} +} else { + // Boot as the general executable. + public int main(char[][] args) { + return boot(args); + } } + +public int boot(char[][] args) { + double d; + key = new Key(); + mouse = new Mouse(); + mainloop = new Mainloop(key ,mouse); + mainloop.loop(); + return 0; +} int user_start(){ double d; diff -Naur tatan/src/br/gamemanager.d tatan-gentoo/src/br/gamemanager.d --- tatan/src/br/gamemanager.d 2007-07-29 21:59:46.000000000 +0200 +++ tatan-gentoo/src/br/gamemanager.d 2007-08-05 12:22:28.000000000 +0200 @@ -142,7 +142,7 @@ collisionManager = new CollisionManager(1024); collisionManager.clear(); - Hell_loadTexture("back", "image/back.bmp"); + Hell_loadTexture("back", "/usr/share/games/tatan/image/back.bmp"); Hell_loadFont(); Sound_init(); @@ -453,7 +453,7 @@ public void start(){ count = 0; - back = SDL_LoadBMP( "image/back.bmp" ); + back = SDL_LoadBMP( "/usr/share/games/tatan/image/back.bmp" ); Sound_FadeOutMusic(1000); @@ -695,4 +695,4 @@ public int stagenum(){ return _stagenum; -} \ Kein Zeilenumbruch am Dateiende. +} diff -Naur tatan/src/br/screen.d tatan-gentoo/src/br/screen.d --- tatan/src/br/screen.d 2007-07-28 18:52:44.000000000 +0200 +++ tatan-gentoo/src/br/screen.d 2007-08-05 12:21:42.000000000 +0200 @@ -185,10 +185,10 @@ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - Hell_loadTexture("back", "image/back.bmp"); + Hell_loadTexture("back", "/usr/share/games/tatan/image/back.bmp"); Hell_loadFont(); } public void saveBMP(char[] name){ - SDL_SaveBMP(gScreenSurface, "screenshot.bmp"); + SDL_SaveBMP(gScreenSurface, "/var/games/screenshot.bmp"); } -} \ Kein Zeilenumbruch am Dateiende. +} diff -Naur tatan/src/br/sound.d tatan-gentoo/src/br/sound.d --- tatan/src/br/sound.d 2007-07-28 18:57:44.000000000 +0200 +++ tatan-gentoo/src/br/sound.d 2007-08-05 12:27:58.000000000 +0200 @@ -59,36 +59,36 @@ return ; } Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels); - chunk_star = Mix_LoadWAV("se/cursor18.wav"); - chunk_don = Mix_LoadWAV("se/don18_d.wav"); + chunk_star = Mix_LoadWAV("/usr/share/games/tatan/se/cursor18.wav"); + chunk_don = Mix_LoadWAV("/usr/share/games/tatan/se/don18_d.wav"); - chunk_miss = Mix_LoadWAV("se/don20.wav"); - chunk_speedup = Mix_LoadWAV("se/power34.wav"); - chunk_bomb = Mix_LoadWAV("se/bom13_c.wav"); - chunk_beep = Mix_LoadWAV("se/beep00.wav"); - chunk_warning = Mix_LoadWAV("se/emergency.wav"); - chunk_reverse = Mix_LoadWAV("se/hit_s03_a.wav"); - voice_0 = Mix_LoadWAV("voice/FREQ_A500_0.wav"); - voice_1 = Mix_LoadWAV("voice/FREQ_A500_1.wav"); - voice_2 = Mix_LoadWAV("voice/FREQ_A500_2.wav"); - voice_3 = Mix_LoadWAV("voice/FREQ_A500_3.wav"); - voice_4 = Mix_LoadWAV("voice/FREQ_A500_4.wav"); - voice_5 = Mix_LoadWAV("voice/FREQ_A500_5.wav"); - voice_6 = Mix_LoadWAV("voice/FREQ_A500_6.wav"); - voice_7 = Mix_LoadWAV("voice/FREQ_A500_7.wav"); - voice_8 = Mix_LoadWAV("voice/FREQ_A500_8.wav"); - voice_9 = Mix_LoadWAV("voice/FREQ_A500_9.wav"); - - - music1 = Mix_LoadMUS("music/cyrf_ogg_difficulties.ogg"); - music2 = Mix_LoadMUS("music/cyrf_ogg_proving_area.ogg"); - music3 = Mix_LoadMUS("music/FREQ_loop002.ogg"); - music4 = Mix_LoadMUS("music/mix_loop004_3.ogg"); - music5 = Mix_LoadMUS("music/division_bell.ogg"); - music6 = Mix_LoadMUS("music/untitled.ogg"); - music7 = Mix_LoadMUS("music/splash_intro.ogg"); - music8 = Mix_LoadMUS("music/splash_main.ogg"); - music9 = Mix_LoadMUS("music/transmigration.ogg"); + chunk_miss = Mix_LoadWAV("/usr/share/games/tatan/se/don20.wav"); + chunk_speedup = Mix_LoadWAV("/usr/share/games/tatan/se/power34.wav"); + chunk_bomb = Mix_LoadWAV("/usr/share/games/tatan/se/bom13_c.wav"); + chunk_beep = Mix_LoadWAV("/usr/share/games/tatan/se/beep00.wav"); + chunk_warning = Mix_LoadWAV("/usr/share/games/tatan/se/emergency.wav"); + chunk_reverse = Mix_LoadWAV("/usr/share/games/tatan/se/hit_s03_a.wav"); + voice_0 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_0.wav"); + voice_1 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_1.wav"); + voice_2 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_2.wav"); + voice_3 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_3.wav"); + voice_4 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_4.wav"); + voice_5 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_5.wav"); + voice_6 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_6.wav"); + voice_7 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_7.wav"); + voice_8 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_8.wav"); + voice_9 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_9.wav"); + + + music1 = Mix_LoadMUS("/usr/share/games/tatan/music/cyrf_ogg_difficulties.ogg"); + music2 = Mix_LoadMUS("/usr/share/games/tatan/music/cyrf_ogg_proving_area.ogg"); + music3 = Mix_LoadMUS("/usr/share/games/tatan/music/FREQ_loop002.ogg"); + music4 = Mix_LoadMUS("/usr/share/games/tatan/music/mix_loop004_3.ogg"); + music5 = Mix_LoadMUS("/usr/share/games/tatan/music/division_bell.ogg"); + music6 = Mix_LoadMUS("/usr/share/games/tatan/music/untitled.ogg"); + music7 = Mix_LoadMUS("/usr/share/games/tatan/music/splash_intro.ogg"); + music8 = Mix_LoadMUS("/usr/share/games/tatan/music/splash_main.ogg"); + music9 = Mix_LoadMUS("/usr/share/games/tatan/music/transmigration.ogg"); _Sound_PlayingMusic = -1; } @@ -213,4 +213,5 @@ public int Sound_PlayingMusic(){ if(Mix_PlayingMusic() == 0)_Sound_PlayingMusic = -1; return _Sound_PlayingMusic; -} \ Kein Zeilenumbruch am Dateiende. +} + diff -Naur tatan/src/util/ascii.d tatan-gentoo/src/util/ascii.d --- tatan/src/util/ascii.d 2007-07-29 21:57:04.000000000 +0200 +++ tatan-gentoo/src/util/ascii.d 2007-08-05 12:27:32.000000000 +0200 @@ -116,7 +116,7 @@ default:break; } foreach(int b;bars){ - bar[b] = true; + // bar[b] = true; } drawCrossBar(x ,y+20*scale ,scale ,bar[0]); drawVerticalBar(x-10*scale ,y+10*scale ,scale ,bar[1]); @@ -333,4 +333,5 @@ glPopMatrix(); } -} \ Kein Zeilenumbruch am Dateiende. +} +