Attachment #127730 for bug #188455

Lines 68-74 Link Here

(-)tatan/import/hell2.d (-2 / +2 lines)
68	static bool[] g_joyButton;	68	static bool[] g_joyButton;
69	static SDL_Joystick* g_joy;	69	static SDL_Joystick* g_joy;
70	static int g_joyButtonNum;	70	static int g_joyButtonNum;
71	static char[] FONT_PATH = "resource/font/font.bmp";	71	static char[] FONT_PATH = "/usr/share/games/tatan/resource/font/font.bmp";
72		72
73	static int fps_cnt;	73	static int fps_cnt;
74	static int fps_view;	74	static int fps_view;
Lines 216-222 Link Here
216	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);	216	glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
217	Hell_setCaption(caption);	217	Hell_setCaption(caption);
218	// アイコン設定	218	// アイコン設定
219	SDL_Surface* icon = SDL_LoadBMP("resource/hell.bmp");	219	SDL_Surface* icon = SDL_LoadBMP("/usr/share/games/tatan/resource/hell.bmp");
220	SDL_WM_SetIcon(icon, null);	220	SDL_WM_SetIcon(icon, null);
221	// サウンド初期化（音を良くしたい場合、下のコメントを外す）	221	// サウンド初期化（音を良くしたい場合、下のコメントを外す）
222	// if(Mix_OpenAudio(44100, AUDIO_S16, 2, 8192) < 0)	222	// if(Mix_OpenAudio(44100, AUDIO_S16, 2, 8192) < 0)




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) $<


Lines 6-11 Link Here

(-)tatan/src/br/boot.d (+17 lines)
6	private Mainloop mainloop;	6	private Mainloop mainloop;
7	private Key key;	7	private Key key;
8	private Mouse mouse;	8	private Mouse mouse;
		9
		10	version (Win32_release) {
9		11
10	private:	12	private:
11	import std.c.windows.windows;	13	import std.c.windows.windows;
Lines 37-43 Link Here
37	}	39	}
38	gc_term();	40	gc_term();
39	return result;	41	return result;
		42	}
		43	} else {
		44	// Boot as the general executable.
		45	public int main(char[][] args) {
		46	return boot(args);
		47	}
40	}	48	}
		49
		50	public int boot(char[][] args) {
		51	double d;
		52	key = new Key();
		53	mouse = new Mouse();
		54	mainloop = new Mainloop(key ,mouse);
		55	mainloop.loop();
		56	return 0;
		57	}
41		58
42	int user_start(){	59	int user_start(){
43	double d;	60	double d;

Lines 142-148 Link Here

(-)tatan/src/br/gamemanager.d (-3 / +3 lines)
142	collisionManager = new CollisionManager(1024);	142	collisionManager = new CollisionManager(1024);
143	collisionManager.clear();	143	collisionManager.clear();
144		144
145	Hell_loadTexture("back", "image/back.bmp");	145	Hell_loadTexture("back", "/usr/share/games/tatan/image/back.bmp");
146	Hell_loadFont();	146	Hell_loadFont();
147		147
148	Sound_init();	148	Sound_init();
Lines 453-459 Link Here
453	public void start(){	453	public void start(){
454		454
455	count = 0;	455	count = 0;
456	back = SDL_LoadBMP( "image/back.bmp" );	456	back = SDL_LoadBMP( "/usr/share/games/tatan/image/back.bmp" );
457		457
458	Sound_FadeOutMusic(1000);	458	Sound_FadeOutMusic(1000);
459		459
Lines 695-698 Link Here
695		695
696	public int stagenum(){	696	public int stagenum(){
697	return _stagenum;	697	return _stagenum;
698	}	698	}

Lines 185-194 Link Here

(-)tatan/src/br/screen.d (-3 / +3 lines)
185		185
186	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);	186	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
187		187
188	Hell_loadTexture("back", "image/back.bmp");	188	Hell_loadTexture("back", "/usr/share/games/tatan/image/back.bmp");
189	Hell_loadFont();	189	Hell_loadFont();
190	}	190	}
191	public void saveBMP(char[] name){	191	public void saveBMP(char[] name){
192	SDL_SaveBMP(gScreenSurface, "screenshot.bmp");	192	SDL_SaveBMP(gScreenSurface, "/var/games/screenshot.bmp");
193	}	193	}
194	}	194	}




		return ;
	}
	Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
	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("/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;
}

public int Sound_PlayingMusic(){
	if(Mix_PlayingMusic() == 0)_Sound_PlayingMusic = -1;
	return _Sound_PlayingMusic;
}


Lines 116-122 Link Here

(-)tatan/src/util/ascii.d (-2 / +3 lines)
116	default:break;	116	default:break;
117	}	117	}
118	foreach(int b;bars){	118	foreach(int b;bars){
119	bar[b] = true;	119	// bar[b] = true;
120	}	120	}
121	drawCrossBar(x ,y+20*scale ,scale ,bar[0]);	121	drawCrossBar(x ,y+20*scale ,scale ,bar[0]);
122	drawVerticalBar(x-10scale ,y+10scale ,scale ,bar[1]);	122	drawVerticalBar(x-10scale ,y+10scale ,scale ,bar[1]);
Lines 333-336 Link Here
333		333
334	glPopMatrix();	334	glPopMatrix();
335	}	335	}
336	}	336	}
		337

Return to bug 188455

Line 0 Link Here

(-)tatan/Makefile (+17 lines)
	1	DC=gdmd
	2	DFLAGS=-g -O -d -release -Iimport -Isrc
	3	DOUT=-of
	4
	5	DSRC=$(shell find src/ -name "*.d")
	6	SOURCES=$(DSRC) import/SDL_video.d import/SDL_mouse.d import/hell2.d import/SDL_mixer.d
	7	OBJS=$(SOURCES:.d=.o)
	8	EXE=tatan
	9
	10	all: $(EXE)
	11
	12	$(EXE): $(OBJS)
	13	gcc -o $@ $(OBJS) -lbulletml_d -lgphobos -lpthread -lm -lSDL -lGL -lGLU -lSDL_mixer
	14
	15	$(OBJS): %.o: %.d
	16	$(DC) -c $(DOUT)$@ $(DFLAGS) $<
	17

Lines 59-94 Link Here

(-)tatan/src/br/sound.d (-30 / +31 lines)
59	return ;	59	return ;
60	}	60	}
61	Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);	61	Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
62	chunk_star = Mix_LoadWAV("se/cursor18.wav");	62	chunk_star = Mix_LoadWAV("/usr/share/games/tatan/se/cursor18.wav");
63	chunk_don = Mix_LoadWAV("se/don18_d.wav");	63	chunk_don = Mix_LoadWAV("/usr/share/games/tatan/se/don18_d.wav");
64		64
65	chunk_miss = Mix_LoadWAV("se/don20.wav");	65	chunk_miss = Mix_LoadWAV("/usr/share/games/tatan/se/don20.wav");
66	chunk_speedup = Mix_LoadWAV("se/power34.wav");	66	chunk_speedup = Mix_LoadWAV("/usr/share/games/tatan/se/power34.wav");
67	chunk_bomb = Mix_LoadWAV("se/bom13_c.wav");	67	chunk_bomb = Mix_LoadWAV("/usr/share/games/tatan/se/bom13_c.wav");
68	chunk_beep = Mix_LoadWAV("se/beep00.wav");	68	chunk_beep = Mix_LoadWAV("/usr/share/games/tatan/se/beep00.wav");
69	chunk_warning = Mix_LoadWAV("se/emergency.wav");	69	chunk_warning = Mix_LoadWAV("/usr/share/games/tatan/se/emergency.wav");
70	chunk_reverse = Mix_LoadWAV("se/hit_s03_a.wav");	70	chunk_reverse = Mix_LoadWAV("/usr/share/games/tatan/se/hit_s03_a.wav");
71	voice_0 = Mix_LoadWAV("voice/FREQ_A500_0.wav");	71	voice_0 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_0.wav");
72	voice_1 = Mix_LoadWAV("voice/FREQ_A500_1.wav");	72	voice_1 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_1.wav");
73	voice_2 = Mix_LoadWAV("voice/FREQ_A500_2.wav");	73	voice_2 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_2.wav");
74	voice_3 = Mix_LoadWAV("voice/FREQ_A500_3.wav");	74	voice_3 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_3.wav");
75	voice_4 = Mix_LoadWAV("voice/FREQ_A500_4.wav");	75	voice_4 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_4.wav");
76	voice_5 = Mix_LoadWAV("voice/FREQ_A500_5.wav");	76	voice_5 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_5.wav");
77	voice_6 = Mix_LoadWAV("voice/FREQ_A500_6.wav");	77	voice_6 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_6.wav");
78	voice_7 = Mix_LoadWAV("voice/FREQ_A500_7.wav");	78	voice_7 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_7.wav");
79	voice_8 = Mix_LoadWAV("voice/FREQ_A500_8.wav");	79	voice_8 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_8.wav");
80	voice_9 = Mix_LoadWAV("voice/FREQ_A500_9.wav");	80	voice_9 = Mix_LoadWAV("/usr/share/games/tatan/voice/FREQ_A500_9.wav");
81		81
82		82
83	music1 = Mix_LoadMUS("music/cyrf_ogg_difficulties.ogg");	83	music1 = Mix_LoadMUS("/usr/share/games/tatan/music/cyrf_ogg_difficulties.ogg");
84	music2 = Mix_LoadMUS("music/cyrf_ogg_proving_area.ogg");	84	music2 = Mix_LoadMUS("/usr/share/games/tatan/music/cyrf_ogg_proving_area.ogg");
85	music3 = Mix_LoadMUS("music/FREQ_loop002.ogg");	85	music3 = Mix_LoadMUS("/usr/share/games/tatan/music/FREQ_loop002.ogg");
86	music4 = Mix_LoadMUS("music/mix_loop004_3.ogg");	86	music4 = Mix_LoadMUS("/usr/share/games/tatan/music/mix_loop004_3.ogg");
87	music5 = Mix_LoadMUS("music/division_bell.ogg");	87	music5 = Mix_LoadMUS("/usr/share/games/tatan/music/division_bell.ogg");
88	music6 = Mix_LoadMUS("music/untitled.ogg");	88	music6 = Mix_LoadMUS("/usr/share/games/tatan/music/untitled.ogg");
89	music7 = Mix_LoadMUS("music/splash_intro.ogg");	89	music7 = Mix_LoadMUS("/usr/share/games/tatan/music/splash_intro.ogg");
90	music8 = Mix_LoadMUS("music/splash_main.ogg");	90	music8 = Mix_LoadMUS("/usr/share/games/tatan/music/splash_main.ogg");
91	music9 = Mix_LoadMUS("music/transmigration.ogg");	91	music9 = Mix_LoadMUS("/usr/share/games/tatan/music/transmigration.ogg");
92		92
93	_Sound_PlayingMusic = -1;	93	_Sound_PlayingMusic = -1;
94	}	94	}
Lines 213-216 Link Here
213	public int Sound_PlayingMusic(){	213	public int Sound_PlayingMusic(){
214	if(Mix_PlayingMusic() == 0)_Sound_PlayingMusic = -1;	214	if(Mix_PlayingMusic() == 0)_Sound_PlayingMusic = -1;
215	return _Sound_PlayingMusic;	215	return _Sound_PlayingMusic;
216	}	216	}
		217