[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/bin/cfplus

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC vs.
Revision 1.206 by root, Thu Aug 9 03:40:44 2007 UTC

…		…
144	our $SETUP_KEYBOARD;	144	our $SETUP_KEYBOARD;
145		145
146	our $PL_NOTEBOOK;	146	our $PL_NOTEBOOK;
147	our $PL_WINDOW;	147	our $PL_WINDOW;
148		148
		149	our $MUSIC_PLAYING_WIDGET;
		150	our $LICENSE_WIDGET;
		151
149	our $INVENTORY_PAGE;	152	our $INVENTORY_PAGE;
150	our $STATS_PAGE;	153	our $STATS_PAGE;
151	our $SKILL_PAGE;	154	our $SKILL_PAGE;
152	our $SPELL_PAGE;	155	our $SPELL_PAGE;
153	our $SPELL_LIST;	156	our $SPELL_LIST;
…		…
159	our $STATWIDS;	162	our $STATWIDS;
160		163
161	our $SDL_ACTIVE;	164	our $SDL_ACTIVE;
162	our %SDL_CB;	165	our %SDL_CB;
163		166
		167	our $ALT_ENTER_MESSAGE;
		168	our $STATUSBOX;
		169	our $DEBUG_STATUS;
		170
		171	our $INV;
		172	our $INVR;
		173	our $INV_RIGHT_HB;
		174
		175	our $PICKUP_CFG;
		176
		177	#############################################################################
		178
		179	sub status {
		180	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
		181	}
		182
		183	sub debug {
		184	$DEBUG_STATUS->set_text ($_[0]);
		185	}
		186
		187	sub message {
		188	my ($para) = @_;
		189	$MESSAGE_WINDOW->message ($para);
		190	}
		191
		192	#############################################################################
		193	#TODO: maybe move into own audio module...
		194
164	our $SDL_MIXER;	195	our $SDL_MIXER;
		196
165	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";	197	our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166	our @MUSIC_WANT;	198	our $MUSIC_WANT; # arryref of ambient music we want to play
		199	our @MUSIC_HAVE; # ambient music we have on disk
167	our $MUSIC_START;	200	our $MUSIC_START;
		201	our @MUSIC_JINGLE; # which jingles to play next
168	our $MUSIC_PLAYING_DATA;	202	our $MUSIC_PLAYING_DATA;
169	our $MUSIC_PLAYING_META;	203	our $MUSIC_PLAYING_META;
170	our $MUSIC_PLAYER;	204	our $MUSIC_PLAYER;
171	our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before	205	our $MUSIC_RESUME = 30; # resume music when played less than these many seconds before
172	our @SOUNDS; # event => file mapping	206
173	our %AUDIO_CHUNKS; # audio files	207	our %AUDIO_CHUNK; # audio "files"
		208	our %AUDIO_PLAY; # which audio faces should be played
174		209
175	our $ALT_ENTER_MESSAGE;	210	sub audio_channel_finished {
176	our $STATUSBOX;	211	my ($channel) = @_;
177	our $DEBUG_STATUS;
178		212
179	our $INV;	213	# warn "channel $channel finished\n";#d#
180	our $INVR;
181	our $INV_RIGHT_HB;
182
183	our $PICKUP_CFG;
184
185	sub status {
186	$STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
187	}	214	}
188		215
189	sub debug {	216	sub audio_sound_push($) {
190	$DEBUG_STATUS->set_text ($_[0]);
191	}
192
193	sub message {
194	my ($para) = @_;	217	my ($face) = @_;
195	$MESSAGE_WINDOW->message ($para);	218
		219	$CFG->{effects_enable}
		220	or return;
		221
		222	$AUDIO_PLAY{$face}
		223	or return;
		224
		225	if (my $chunk = $AUDIO_CHUNK{$face}) {
		226	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) \|\| []}) {
		227	my (undef, $dx, $dy, $vol) = @$_;
		228
		229	my $channel = CFPlus::Channel::find;
		230	$channel->volume ($vol * $CFG->{effects_volume} * 128 / 255);
		231	$dx = $dx / 10 * 255;
		232	$channel->set_panning (255 - $dx, 255 + $dx);
		233
		234	# my $angle = $dx ? : $dx < 0 ?
		235	# my $distance = -$vol;
		236	# $channel->set_position ($angle, $distance);
		237
		238	$chunk->play ($channel);
		239	}
		240	} else {
		241	# sound_meta not set means data is in flight either way
		242	my $meta = $CONN->{sound_meta}{$face}
		243	or return;
		244
		245	# if its a jingle, play it as ambient music
		246	if ($meta->{meta}{jingle}) {
		247	if (delete $AUDIO_PLAY{$face}) { # take the jingle out of the sound queue
		248	push @MUSIC_JINGLE, $meta; # push it oto the music/jingle queue
		249	&audio_music_push ($face);
		250	}
		251	} else {
		252	# fetch from database
		253	CFPlus::DB::get res_data => $meta->{name}, sub {
		254	my $rwops = new CFPlus::RW $_[0];
		255	my $chunk = new CFPlus::MixChunk $rwops
		256	or Carp::confess "sound face " . (JSON::XS::to_json $meta) . " unloadable: " . CFPlus::Mix_GetError;
		257	$chunk->volume (($meta->{meta}{volume} \|\| 1) * 128);
		258	$AUDIO_CHUNK{$face} = $chunk;
		259
		260	audio_sound_push ($face);
		261	};
		262	}
		263	}
196	}	264	}
		265
		266	sub audio_sound_play {
		267	my ($face, $dx, $dy, $vol) = @_;
		268
		269	$SDL_MIXER
		270	or return;
		271	$CFG->{effects_enable}
		272	or return;
		273
		274	my $queue = $AUDIO_PLAY{$face} \|\|= [];
		275	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
		276	audio_sound_push $face
		277	unless @$queue > 1;
		278	}
		279
		280	sub audio_music_set_meta {
		281	my ($meta) = @_;
		282
		283	$MUSIC_PLAYING_META = $meta;
		284	$MUSIC_PLAYING_WIDGET->set_markup (
		285	"<b>Name</b>: " . (CFPlus::asxml $meta->{meta}{name}) . "\n"
		286	. "<b>Author</b>: " . (CFPlus::asxml $meta->{meta}{author}) . "\n"
		287	. "<b>Source</b>: " . (CFPlus::asxml $meta->{meta}{source}) . "\n"
		288	. "<b>License</b>: " . (CFPlus::asxml $meta->{meta}{license})
		289	);
		290	}
		291
		292	sub audio_music_update_volume {
		293	return unless $MUSIC_PLAYING_META;
		294	my $volume = $MUSIC_PLAYING_META->{meta}{volume} \|\| 1;
		295	my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
		296	CFPlus::MixMusic::volume $base * $volume * 128;
		297	}
		298
		299	sub audio_music_start {
		300	my $meta = $MUSIC_PLAYING_META;
		301
		302	CFPlus::DB::get res_data => $meta->{name}, sub {
		303	return unless $SDL_MIXER;
		304
		305	# music might have changed...
		306	$meta eq $MUSIC_PLAYING_META
		307	or return &audio_music_start ();
		308
		309	audio_music_update_volume;
		310
		311	$MUSIC_PLAYING_DATA = \$_[0];
		312
		313	my $rwops = $meta->{path}
		314	? new_from_file CFPlus::RW $meta->{path}
		315	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
		316
		317	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
		318	or Carp::confess "music face $meta->{face} unloadable: " . CFPlus::Mix_GetError;
		319
		320	my $NOW = time;
		321
		322	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
		323	my $pos = $MUSIC_PLAYING_META->{stop_pos};
		324	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
		325	$MUSIC_START = time - $pos;
		326	} else {
		327	$MUSIC_PLAYER->play (0);
		328	$MUSIC_START = time;
		329	}
		330
		331	delete $meta->{stop_time};
		332	delete $meta->{stop_pos};
		333	}
		334	}
		335
		336	sub audio_music_push {
		337	return unless $SDL_MIXER;
		338
		339	my $fade_out;
		340
		341	if (@MUSIC_JINGLE) {
		342	@MUSIC_HAVE = $MUSIC_JINGLE[0];
		343	$fade_out = 333;
		344	} else {
		345	return unless $CFG->{bgm_enable};
		346
		347	my @have =
		348	grep $_,
		349	map $CONN->{music_meta}{$_},
		350	@$MUSIC_WANT;
		351
		352	@MUSIC_HAVE = @have
		353	if @have;
		354
		355	# default MUSIC_HAVE == MUSIC_DEFAULT
		356	@MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
		357	$fade_out = 1000;
		358	}
		359
		360	# if the currently playing song is acceptable, let it continue
		361	return if grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
		362
		363	my $NOW = time;
		364
		365	if ($MUSIC_PLAYING_META) {
		366	$MUSIC_PLAYING_META->{stop_time} = $NOW;
		367	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
		368	CFPlus::MixMusic::fade_out $fade_out;
		369	} else {
		370	# sort by stop time, oldest first
		371	@MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
		372
		373	# if the most recently-played piece played very recently,
		374	# resume it, else choose the oldest piece for rotation.
		375	audio_music_set_meta
		376	$MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
		377	? $MUSIC_HAVE[-1]
		378	: $MUSIC_HAVE[0];
		379
		380	audio_music_start;
		381	}
		382	}
		383
		384	sub audio_music_set_ambient {
		385	my ($songs) = @_;
		386
		387	$MUSIC_WANT = $songs;
		388	audio_music_push;
		389	}
		390
		391	sub audio_music_finished {
		392	# we compress multiple jingles of the same type
		393	shift @MUSIC_JINGLE
		394	while @MUSIC_JINGLE && $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
		395
		396	$MUSIC_PLAYING_WIDGET->clear;
		397
		398	undef $MUSIC_PLAYER;
		399	undef $MUSIC_PLAYING_META;
		400	undef $MUSIC_PLAYING_DATA;
		401
		402	audio_music_push;
		403	}
		404
		405	sub audio_init {
		406	if ($CFG->{audio_enable}) {
		407	$ENV{MIX_EFFECTSMAXSPEED} = 1;
		408	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
		409
		410	unless ($SDL_MIXER) {
		411	status "Unable to open sound device: there will be no sound";
		412	return;
		413	}
		414
		415	CFPlus::Mix_AllocateChannels 16;
		416
		417	audio_music_finished;
		418	} else {
		419	undef $SDL_MIXER;
		420	}
		421	}
		422
		423	sub audio_shutdown {
		424	undef $MUSIC_PLAYER;
		425	undef $MUSIC_PLAYING_META;
		426	undef $MUSIC_PLAYING_DATA;
		427
		428	$MUSIC_WANT = [];
		429	@MUSIC_JINGLE = ();
		430	%AUDIO_PLAY = ();
		431	%AUDIO_CHUNK = ();
		432
		433	CFPlus::Mix_CloseAudio if $SDL_MIXER;
		434	undef $SDL_MIXER;
		435	}
		436
		437	#############################################################################
197		438
198	sub destroy_query_dialog {	439	sub destroy_query_dialog {
199	(delete $_[0]{query_dialog})->destroy	440	(delete $_[0]{query_dialog})->destroy
200	if $_[0]{query_dialog};	441	if $_[0]{query_dialog};
201	}	442	}
…		…
481	$SETUP_DIALOG->show;	722	$SETUP_DIALOG->show;
482	$PL_WINDOW->hide;	723	$PL_WINDOW->hide;
483	$SPELL_LIST->clear_spells;	724	$SPELL_LIST->clear_spells;
484	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);	725	$CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
485		726
486	&audio_music_set ([]);	727	&audio_music_set_ambient ([]);
487		728
488	return unless $CONN;	729	return unless $CONN;
489		730
490	status "connection closed";	731	status "connection closed";
491		732
…		…
624	}	865	}
625		866
626	sub audio_setup {	867	sub audio_setup {
627	my $vbox = new CFPlus::UI::VBox;	868	my $vbox = new CFPlus::UI::VBox;
628		869
629	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);	870	$vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 0, 1]);
630		871
631	my $row = 0;	872	my $row = 0;
632		873
633	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");	874	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
634	$table->add_at (1, $row++, new CFPlus::UI::CheckBox	875	$table->add_at (1, $row++, new CFPlus::UI::CheckBox
…		…
638	);	879	);
639	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");	880	# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
640	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {	881	# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
641	# $CFG->{effects_volume} = $_[1];	882	# $CFG->{effects_volume} = $_[1];
642	# });	883	# });
		884
		885	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Sound Effects");
		886	$table->add_at (1, $row, new CFPlus::UI::CheckBox
		887	expand => 1, state => $CFG->{effects_enable},
		888	tooltip => "If enabled, sound effects are enabled. If disabled, no sound effects will be played.",
		889	on_changed => sub {
		890	$CFG->{effects_enable} = $_[1];
		891	$CONN->update_fx_want if $CONN;
		892	0
		893	}
		894	);
		895	$table->add_at (2, $row++, new CFPlus::UI::Slider
		896	expand => 1, range => [$CFG->{effects_volume}, 0, 1, 0, 1/128],
		897	tooltip => "The relative volume of sound effects. Best audio quality is achieved if this "
		898	. "is set highest (rightmost) and you use your operating system volume setting. Changes are instant.",
		899	on_changed => sub { $CFG->{effects_volume} = $_[1]; 0 }
		900	);
		901
643	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");	902	$table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
644	$table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);	903	$table->add_at (1, $row, new CFPlus::UI::CheckBox
645	$hbox->add (new CFPlus::UI::CheckBox
646	expand => 1, state => $CFG->{bgm_enable},	904	expand => 1, state => $CFG->{bgm_enable},
647	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",	905	tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
648	on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }	906	on_changed => sub {
		907	$CFG->{bgm_enable} = $_[1];
		908	$CONN->update_fx_want if $CONN;
		909	0
		910	}
649	);	911	);
650	$hbox->add (new CFPlus::UI::Slider	912	$table->add_at (2, $row++, new CFPlus::UI::Slider
651	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],	913	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
652	tooltip => "The volume of the background music. Changes are instant.",	914	tooltip => "The volume of the background music. Changes are instant.",
653	on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }	915	on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
654	);	916	);
655		917
656	$table->add_at (1, $row++, new CFPlus::UI::Button	918	$table->add_at (1, $row++, new CFPlus::UI::Button
657	expand => 1, align => 0, text => "Apply",	919	c_colspan => 2, expand => 1, align => 0, text => "Apply",
658	tooltip => "Apply the audio settings",	920	tooltip => "Apply the audio settings",
659	on_activate => sub {	921	on_activate => sub {
660	audio_shutdown ();	922	audio_shutdown ();
661	audio_init ();	923	audio_init ();
662	0	924	0
…		…
733	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );	995	$table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
734		996
735	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#	997	$table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
736		998
737	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);	999	$table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
738	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);	1000	$t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", c_rowspan => 1, c_colspan => 2);
739	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);	1001	$t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", c_rowspan => 2, c_colspan => 1);
740	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);	1002	$t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", c_rowspan => 1, c_colspan => 2);
741	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);	1003	$t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", c_rowspan => 2, c_colspan => 1);
742	$t->add_at (1,1, new CFPlus::UI::Label text => "e");	1004	$t->add_at (1,1, new CFPlus::UI::Label text => "e");
743		1005
744	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);	1006	$table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
745		1007
746	$c->add_items ({	1008	$c->add_items ({
…		…
1353	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");	1615	CFPlus::Protocol::set_opencont ($::CONN, 0, "Floor");
1354		1616
1355	$hb	1617	$hb
1356	}	1618	}
1357		1619
		1620	sub media_window {
		1621	my $vb = new CFPlus::UI::VBox;
		1622
		1623	$vb->add (new CFPlus::UI::FancyFrame
		1624	label => "Currently playing music",
		1625	child => new CFPlus::UI::ScrolledWindow scroll_x => 1, scroll_y => 0,
		1626	child => ($MUSIC_PLAYING_WIDGET = new CFPlus::UI::Label ellipsise => 0, fontsize => 0.8),
		1627	);
		1628
		1629	$vb->add (new CFPlus::UI::FancyFrame
		1630	label => "Other media used in this session",
		1631	expand => 1,
		1632	child => ($LICENSE_WIDGET = new CFPlus::UI::TextScroller
		1633	expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4),
		1634	);
		1635
		1636	$vb
		1637	}
		1638
		1639	sub add_license {
		1640	my ($meta) = @_;
		1641
		1642	$meta = $meta->{meta}
		1643	or return;
		1644
		1645	$meta->{license} \|\| $meta->{author} \|\| $meta->{source}
		1646	or return;
		1647
		1648	$LICENSE_WIDGET->add_paragraph ({
		1649	fg => [1, 1, 1, 1],
		1650	markup => "<small>"
		1651	. "<b>Name:</b> " . (CFPlus::asxml $meta->{name}) . "\n"
		1652	. "<b>Author:</b> " . (CFPlus::asxml $meta->{author}) . "\n"
		1653	. "<b>Source:</b> " . (CFPlus::asxml $meta->{source}) . "\n"
		1654	. "<b>License:</b> " . (CFPlus::asxml $meta->{license}) . "\n"
		1655	. "</small>",
		1656	});
		1657	$LICENSE_WIDGET->scroll_to_bottom;
		1658	}
		1659
1358	sub toggle_player_page {	1660	sub toggle_player_page {
1359	my ($widget) = @_;	1661	my ($widget) = @_;
1360		1662
1361	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {	1663	if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1362	$PL_WINDOW->hide;	1664	$PL_WINDOW->hide;
…		…
1399	$ntb->add_tab (	1701	$ntb->add_tab (
1400	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,	1702	"Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1401	"Toggles the inventory window, where you can manage your loot (or treasures :). "	1703	"Toggles the inventory window, where you can manage your loot (or treasures :). "
1402	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."	1704	. "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1403	);	1705	);
1404	$ntb->add_tab (Pickup => autopickup_setup,	1706	$ntb->add_tab (Pickup => autopickup_setup,
1405	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");	1707	"Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
		1708
		1709	$ntb->add_tab (Media => media_window,
		1710	"License, Author and Source info for media sent by the server.");
1406		1711
1407	$ntb->set_current_page ($INVENTORY_PAGE);	1712	$ntb->set_current_page ($INVENTORY_PAGE);
1408		1713
1409	$plwin->add ($ntb);	1714	$plwin->add ($ntb);
1410	$plwin	1715	$plwin
…		…
1787	CFPlus::OpenGL::shutdown;	2092	CFPlus::OpenGL::shutdown;
1788		2093
1789	undef $SDL_ACTIVE;	2094	undef $SDL_ACTIVE;
1790	}	2095	}
1791		2096
1792	sub audio_channel_finished {
1793	my ($channel) = @_;
1794
1795	# warn "channel $channel finished\n";#d#
1796	}
1797
1798	our %AUDIO_PLAY;
1799	our %AUDIO_CHUNK;
1800
1801	sub audio_sound_push($) {
1802	my ($face) = @_;
1803
1804	if (my $chunk = $AUDIO_CHUNK{$face}) {
1805	for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) \|\| []}) {
1806	my (undef, $dx, $dy, $vol) = @$_;
1807
1808	my $channel = $chunk->play
1809	or return;
1810
1811	$channel->volume (128 + $vol);
1812	$dx = $dx / 10 * 255;
1813	$channel->set_panning ((min 255, 255 - $dx), (min 255, 255 + $dx));
1814	# my $angle = $dx ? : $dx < 0 ?
1815	# my $distance = -$vol;
1816	# $channel->set_position ($angle, $distance);
1817	}
1818	} else {
1819	# sound_meta not set means data is in flight either way
1820	my $meta = $CONN->{sound_meta}{$face}
1821	or return;
1822
1823	# fetch from database
1824	CFPlus::DB::get res_data => $meta->{name}, sub {
1825	my $vol = $meta->{meta}{volume} \|\| 100;
1826	my $rwops = new CFPlus::RW $_[0];
1827	my $chunk = new CFPlus::MixChunk $rwops;
1828	$chunk->volume ($vol * 128 / 100);
1829	$AUDIO_CHUNK{$face} = $chunk;
1830
1831	audio_sound_push ($face);
1832	};
1833	}
1834	}
1835
1836	sub audio_sound_play {
1837	my ($face, $dx, $dy, $vol) = @_;
1838
1839	$SDL_MIXER
1840	or return;
1841
1842	my $queue = $AUDIO_PLAY{$face} \|\|= [];
1843	push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
1844	audio_sound_push $face
1845	unless @$queue > 1;
1846	}
1847
1848	sub audio_music_set {
1849	my ($songs) = @_;
1850
1851	my @want =
1852	grep $_,
1853	map $CONN->{music_meta}{$_},
1854	@$songs;
1855
1856	if (@want) {
1857	@MUSIC_WANT = @want;
1858	&audio_music_changed ();
1859	}
1860	}
1861
1862	sub audio_music_start {
1863	my $meta = $MUSIC_PLAYING_META;
1864
1865	CFPlus::DB::get res_data => $meta->{name}, sub {
1866	return unless $SDL_MIXER;
1867
1868	# music might have changed...
1869	$meta eq $MUSIC_PLAYING_META
1870	or return &audio_music_start ();
1871
1872	$MUSIC_PLAYING_DATA = \$_[0];
1873
1874	my $rwops = $meta->{path}
1875	? new_from_file CFPlus::RW $meta->{path}
1876	: new CFPlus::RW $$MUSIC_PLAYING_DATA;
1877
1878	$MUSIC_PLAYER = new CFPlus::MixMusic $rwops
1879	or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
1880
1881	my $NOW = time;
1882
1883	if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
1884	my $pos = $MUSIC_PLAYING_META->{stop_pos};
1885	$MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
1886	$MUSIC_START = time - $pos;
1887	} else {
1888	$MUSIC_PLAYER->play (0);
1889	$MUSIC_START = time;
1890	}
1891
1892	delete $MUSIC_PLAYING_META->{stop_time};
1893	delete $MUSIC_PLAYING_META->{stop_pos};
1894	}
1895	}
1896
1897	sub audio_music_changed {
1898	return unless $CFG->{bgm_enable};
1899	return unless $SDL_MIXER;
1900
1901	# default MUSIC_WANT == MUSIC_DEFAULT
1902	@MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
1903
1904	# if the currently playing song is acceptable, let it continue
1905	return if $MUSIC_PLAYING_META
1906	&& grep $MUSIC_PLAYING_META == $_, @MUSIC_WANT;
1907
1908	my $NOW = time;
1909
1910	if ($MUSIC_PLAYING_META) {
1911	$MUSIC_PLAYING_META->{stop_time} = $NOW;
1912	$MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
1913	CFPlus::MixMusic::fade_out 1000;
1914	} else {
1915	# sort by stop time, oldest first
1916	@MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
1917
1918	# if the most recently-played piece played very recently,
1919	# resume it, else choose the oldest piece for rotation.
1920	$MUSIC_PLAYING_META =
1921	$MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
1922	? $MUSIC_WANT[-1]
1923	: $MUSIC_WANT[0];
1924
1925	audio_music_start;
1926	}
1927	}
1928
1929	sub audio_music_finished {
1930	undef $MUSIC_PLAYER;
1931	undef $MUSIC_PLAYING_META;
1932	undef $MUSIC_PLAYING_DATA;
1933
1934	audio_music_changed;
1935	}
1936
1937	sub audio_init {
1938	if ($CFG->{audio_enable}) {
1939	$ENV{MIX_EFFECTSMAXSPEED} = 1;
1940	$SDL_MIXER = !CFPlus::Mix_OpenAudio;
1941
1942	unless ($SDL_MIXER) {
1943	status "Unable to open sound device: there will be no sound";
1944	return;
1945	}
1946
1947	CFPlus::Mix_AllocateChannels 16;
1948	CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1949
1950	audio_music_finished;
1951	} else {
1952	undef $SDL_MIXER;
1953	}
1954	}
1955
1956	sub audio_shutdown {
1957	CFPlus::Mix_CloseAudio if $SDL_MIXER;
1958	undef $SDL_MIXER;
1959	@SOUNDS = ();
1960	%AUDIO_CHUNKS = ();
1961	}
1962
1963	my %animate_object;	2097	my %animate_object;
1964	my $animate_timer;	2098	my $animate_timer;
1965		2099
1966	my $fps = 9;	2100	my $fps = 9;
1967
1968	my %demo;#d#
1969		2101
1970	sub force_refresh {	2102	sub force_refresh {
1971	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;	2103	$fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) \|\| 0.1) * 0.05;
1972	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;	2104	debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1973		2105
…		…
2058		2190
2059	CFPlus::UI::set_layout ($::CFG->{layout});	2191	CFPlus::UI::set_layout ($::CFG->{layout});
2060		2192
2061	my %DEF_CFG = (	2193	my %DEF_CFG = (
2062	sdl_mode => 0,	2194	sdl_mode => 0,
2063	width => 640,
2064	height => 480,
2065	fullscreen => 0,	2195	fullscreen => 0,
2066	fast => 0,	2196	fast => 0,
2067	map_scale => 1,	2197	map_scale => 1,
2068	fow_enable => 1,	2198	fow_enable => 1,
2069	fow_intensity => 0,	2199	fow_intensity => 0,
…		…
2073	gauge_fontsize => 1,	2203	gauge_fontsize => 1,
2074	gauge_size => 0.35,	2204	gauge_size => 0.35,
2075	stat_fontsize => 0.7,	2205	stat_fontsize => 0.7,
2076	mapsize => 100,	2206	mapsize => 100,
2077	audio_enable => 1,	2207	audio_enable => 1,
		2208	effects_enable => 1,
		2209	effects_volume => 1,
2078	bgm_enable => 1,	2210	bgm_enable => 1,
2079	bgm_volume => 0.25,	2211	bgm_volume => 0.5,
2080	output_sync => 1,	2212	output_sync => 1,
2081	output_count => 1,	2213	output_count => 1,
2082	output_rate => "",	2214	output_rate => "",
2083	pickup => 0,	2215	pickup => 0,
2084	inv_sort => "mtime",	2216	inv_sort => "mtime",
…		…
2162	Event::loop;	2294	Event::loop;
2163	#CFPlus::SDL_Quit;	2295	#CFPlus::SDL_Quit;
2164	#CFPlus::_exit 0;	2296	#CFPlus::_exit 0;
2165		2297
2166	END {	2298	END {
		2299	video_shutdown;
		2300	audio_shutdown;
2167	CFPlus::SDL_Quit;	2301	CFPlus::SDL_Quit;
2168	CFPlus::DB::Server::stop;	2302	CFPlus::DB::Server::stop;
2169	}	2303	}
2170		2304
2171	=head1 NAME	2305	=head1 NAME
2172		2306
2173	cfplus - A Crossfire+ and Crossfire game client	2307	cfplus - A Crossfire TRT and Crossfire game client
2174		2308
2175	=head1 SYNOPSIS	2309	=head1 SYNOPSIS
2176		2310
2177	Just run it - no commandline arguments are supported.	2311	Just run it - no commandline arguments are supported.
2178		2312
2179	=head1 USAGE	2313	=head1 USAGE
2180		2314
2181	cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used	2315	cfplus utilises OpenGL for all UI elements and the game. It is supposed to
2182	fullscreen and interactively.	2316	be used in fullscreen mode and interactively.
2183		2317
2184	=head1 DEBUGGING	2318	=head1 DEBUGGING
2185		2319
2186		2320
2187	CFPLUS_DEBUG - environment variable	2321	CFPLUS_DEBUG - environment variable

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC vs. Revision 1.206 by root, Thu Aug 9 03:40:44 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.192 by root, Mon Jul 30 02:16:16 2007 UTC vs.
Revision 1.206 by root, Thu Aug 9 03:40:44 2007 UTC