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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.145 by root, Wed Apr 19 20:46:45 2006 UTC vs.
Revision 1.156 by elmex, Fri Apr 21 12:27:20 2006 UTC

…		…
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use Time::HiRes 'time';	6	use Time::HiRes 'time';
7	use Event;	7	use Event;
8
9	use SDL::Event;
10
11	use SDL::Mixer;
12	use SDL::Sound;
13	use SDL::Music;
14
15	use SDL::OpenGL;
16		8
17	use Crossfire;	9	use Crossfire;
18	use Crossfire::Protocol;	10	use Crossfire::Protocol;
19		11
20	use Compress::LZF;	12	use Compress::LZF;
…		…
53	our $LOGVIEW;	45	our $LOGVIEW;
54	our $CONSOLE;	46	our $CONSOLE;
55	our $METASERVER;	47	our $METASERVER;
56		48
57	our $GAUGES;	49	our $GAUGES;
		50	our $STATWIDS;
58		51
59	our $SDL_ACTIVE;	52	our $SDL_ACTIVE;
60	our $SDL_EV;
61	our %SDL_CB;	53	our %SDL_CB;
62		54
63	our $SDL_MIXER;	55	our $SDL_MIXER;
64	our @SOUNDS; # event => file mapping	56	our @SOUNDS; # event => file mapping
65	our %AUDIO_CHUNKS; # audio files	57	our %AUDIO_CHUNKS; # audio files
…		…
107	undef $CONN;	99	undef $CONN;
108	}	100	}
109		101
110	sub client_setup {	102	sub client_setup {
111	my $dialog = new CFClient::UI::FancyFrame	103	my $dialog = new CFClient::UI::FancyFrame
		104	title => "Client Setup",
112	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
113	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
114	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	106	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
115		107
116	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	108	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
117	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	109	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
118		110
119	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);	111	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
120	$hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8);	112	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
121		113
122	$mode_slider->connect (changed => sub {	114	$mode_slider->connect (changed => sub {
123	my ($self, $value) = @_;	115	my ($self, $value) = @_;
124		116
125	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	117	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
185	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	177	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
186	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);	178	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);
187	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {	179	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
188	$CFG->{bgm_enable} = $_[1];	180	$CFG->{bgm_enable} = $_[1];
189	});	181	});
190	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 128, 1], connect_changed => sub {	182	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
191	$CFG->{bgm_volume} = $_[1];	183	$CFG->{bgm_volume} = $_[1];
192	$SDL_MIXER->music_volume ($_[1]);	184	CFClient::MixMusic::volume $_[1] * 128;
193	});	185	});
194		186
195	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	187	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
196	audio_shutdown ();	188	audio_shutdown ();
197	audio_init ();	189	audio_init ();
198	});	190	});
199		191
200	$dialog	192	$dialog
201	}	193	}
202		194
		195	sub make_stats_window {
		196	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		197
		198	$tgw->add (my $vb = new CFClient::UI::VBox);
		199	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:");
		200	$vb->add (my $lhb = new CFClient::UI::HBox);
		201	$lhb->add ($STATWIDS->{exp} = new CFClient::UI::Label valign => 0, align => -1, text => "Exp:", expand => 1);
		202	$lhb->add ($STATWIDS->{lvl} = new CFClient::UI::Label valign => 0, align => -1, text => "Level:", expand => 1);
		203
		204	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		205	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', expand => 1);
		206	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', expand => 1);
		207	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);
		208	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', expand => 1);
		209	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
		210
		211	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		212
		213	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		214	$tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "S");
		215	$tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "D");
		216	$tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "Co");
		217	$tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "I");
		218	$tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "W");
		219	$tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "P");
		220	$tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "Ch");
		221
		222	$tbl->add (1, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
		223	$tbl->add (1, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
		224	$tbl->add (1, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
		225	$tbl->add (1, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
		226	$tbl->add (1, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
		227	$tbl->add (1, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
		228	} else {
		229	$tbl->add (0, 0, new CFClient::UI::Label valign => 0, align => +1, text => "S");
		230	$tbl->add (0, 1, new CFClient::UI::Label valign => 0, align => +1, text => "D");
		231	$tbl->add (0, 2, new CFClient::UI::Label valign => 0, align => +1, text => "Co");
		232	$tbl->add (0, 3, new CFClient::UI::Label valign => 0, align => +1, text => "I");
		233	$tbl->add (0, 4, new CFClient::UI::Label valign => 0, align => +1, text => "W");
		234	$tbl->add (0, 5, new CFClient::UI::Label valign => 0, align => +1, text => "P");
		235	$tbl->add (0, 6, new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
		236
		237	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		238	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		239	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		240	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		241	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		242	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		243	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		244
		245	$tbl->add (2, 0, new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
		246	$tbl->add (2, 1, new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
		247	$tbl->add (2, 2, new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
		248	$tbl->add (2, 3, new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
		249	$tbl->add (2, 4, new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
		250	$tbl->add (2, 5, new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
		251
		252	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		253	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		254	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		255	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		256	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		257	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		258	}
		259
		260	$hb->add (my $tbl2 = new CFClient::UI::Table);
		261
		262	my $row = 0;
		263	my $col = 0;
		264
		265	for (qw/slow holyw conf fire depl magic
		266	drain acid pois para deat phys
		267	blind fear tund elec cold ghit/)
		268	{
		269	$tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
		270	$tbl2->add ($col + 1, $row,
		271	$STATWIDS->{"res_$_"} =
		272	new CFClient::UI::Label text => "0", align => -1, valign => 0
		273	);
		274
		275	$row++;
		276	if ($row % 6 == 0) {
		277	$col += 2;
		278	$row = 0;
		279	}
		280	}
		281
		282	update_stats_window ({});
		283
		284	$tgw
		285	}
		286
		287	sub update_stats_window {
		288	my ($stats) = @_;
		289
		290	# i love text protocols!!!
		291	my $hp = $stats->{1};
		292	my $hp_m = $stats->{2};
		293	my $sp = $stats->{3};
		294	my $sp_m = $stats->{4};
		295	my $fo = $stats->{18};
		296	my $fo_m = 999;
		297	my $gr = $stats->{23};
		298	my $gr_m = $stats->{24};
		299
		300	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		301	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		302	$GAUGES->{food} ->set_value ($fo, $fo_m);
		303	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		304	$STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
		305	$STATWIDS->{exp} ->set_text ("Exp.: " . ($stats->{11} \|\| $stats->{28}));
		306	$STATWIDS->{lvl} ->set_text ("Level: " . $stats->{12});
		307
		308	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		309	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
		310	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
		311	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
		312	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
		313	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
		314	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
		315	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
		316	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
		317	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
		318	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
		319	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
		320	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
		321	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
		322	} else {
		323	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		324	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		325	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		326	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		327	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		328	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		329	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		330	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		331	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		332	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		333	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		334	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
		335	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
		336	}
		337
		338	my %tbl = (
		339	phys => 100,
		340	magic => 101,
		341	fire => 102,
		342	elec => 103,
		343	cold => 104,
		344	conf => 105,
		345	acid => 106,
		346	drain => 107,
		347	ghit => 108,
		348	pois => 109,
		349	slow => 110,
		350	para => 111,
		351	tund => 112,
		352	fear => 113,
		353	deat => 115,
		354	holyw => 116,
		355	blind => 117
		356	);
		357
		358	for (keys %tbl) {
		359	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		360	}
		361
		362	}
		363
203	sub metaserver_dialog {	364	sub metaserver_dialog {
204	my $dialog = new CFClient::UI::FancyFrame	365	my $dialog = new CFClient::UI::FancyFrame
		366	title => "Metaserver",
205	child => (my $vbox = new CFClient::UI::VBox);	367	child => (my $vbox = new CFClient::UI::VBox);
206		368
207	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	369	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
208		370
209	$dialog	371	$dialog
…		…
275	});	437	});
276	}	438	}
277		439
278	sub server_setup {	440	sub server_setup {
279	my $dialog = new CFClient::UI::FancyFrame	441	my $dialog = new CFClient::UI::FancyFrame
		442	title => "Server Setup",
280	child => (my $vbox = new CFClient::UI::VBox);	443	child => (my $vbox = new CFClient::UI::VBox);
281		444
282	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
283	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	445	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
284	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	446	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
285		447
286	{	448	{
287	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	449	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
…		…
334	$dialog	496	$dialog
335	}	497	}
336		498
337	sub message_window {	499	sub message_window {
338	my $window = new CFClient::UI::FancyFrame	500	my $window = new CFClient::UI::FancyFrame
		501	title => "Messages",
339	border_bg => [1, 1, 1, 0.5],	502	border_bg => [1, 1, 1, 0.5],
340	bg => [0.3, 0.3, 0.3, 0.8],	503	bg => [0.3, 0.3, 0.3, 0.8],
341	user_w => int $::WIDTH / 3,	504	user_w => int $::WIDTH / 3,
342	user_h => int $::HEIGHT / 5,	505	user_h => int $::HEIGHT / 5,
343	child => (my $vbox = new CFClient::UI::VBox);	506	child => (my $vbox = new CFClient::UI::VBox);
…		…
399	$FAST = $CFG->{fast};	562	$FAST = $CFG->{fast};
400		563
401	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN	564	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
402	or die "SDL_SetVideoMode failed!\n";	565	or die "SDL_SetVideoMode failed!\n";
403		566
404	$SDL_EV = new SDL::Event;
405	$SDL_EV->set_unicode (1);
406
407	$SDL_ACTIVE = 1;	567	$SDL_ACTIVE = 1;
408		568
409	$LAST_REFRESH = time - 0.01;	569	$LAST_REFRESH = time - 0.01;
410		570
411	CFClient::gl_init;	571	CFClient::gl_init;
…		…
455	status "Configuration Saved";	615	status "Configuration Saved";
456	});	616	});
457		617
458	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	618	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
459		619
460	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
461	$tgw->add (my $hbox = new CFClient::UI::HBox ());
462		620
463	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
464	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
465	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
466	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
467
468	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
469	$CFClient::UI::ROOT->add ($tgw);	621	$CFClient::UI::ROOT->add (make_stats_window);
470	}	622	}
471		623
472	sub video_shutdown {	624	sub video_shutdown {
473	$CFClient::UI::ROOT->{children} = [];	625	$CFClient::UI::ROOT->{children} = [];
474	undef $SDL_ACTIVE;	626	undef $SDL_ACTIVE;
475	undef $SDL_EV;
476	}	627	}
477		628
		629	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
478	my $bgmusic;#TODO#hack#d#	630	my $bgmusic;#TODO#hack#d#
		631
		632	sub audio_music_finished {
		633	return unless $CFG->{bgm_enable};
		634
		635	# TODO: hack, do play loop and mood music
		636	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		637	$bgmusic->play (0);
		638
		639	push @bgmusic, shift @bgmusic;
		640	}
479		641
480	sub audio_init {	642	sub audio_init {
481	if ($CFG->{audio_enable}) {	643	if ($CFG->{audio_enable}) {
482	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	644	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
483		645	$SDL_MIXER = !CFClient::Mix_OpenAudio;
484	$SDL_MIXER = new SDL::Mixer	646	CFClient::Mix_AllocateChannels 8;
485	-rate => 22050,	647	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
486	-channels => 1, # mono
487	-size => 512;
488		648
489	$SDL_MIXER->allocate_channels (8);	649	audio_music_finished;
490
491	# TODO: hack, do play loop and mood music
492	if ($CFG->{bgm_enable}) {
493	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
494	$SDL_MIXER->play_music ($bgmusic, -1);
495	$SDL_MIXER->music_volume ($CFG->{bgm_volume});
496	}
497		650
498	while (<$fh>) {	651	while (<$fh>) {
499	next if /^\s*#/;	652	next if /^\s*#/;
500	next if /^\s*$/;	653	next if /^\s*$/;
501		654
502	my ($file, $volume, $event) = split /\s+/, $_, 3;	655	my ($file, $volume, $event) = split /\s+/, $_, 3;
503		656
504	push @SOUNDS, "$volume,$file";	657	push @SOUNDS, "$volume,$file";
505		658
506	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {	659	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
507	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";	660	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
508	$chunk->volume ($volume * 128 / 100);	661	$chunk->volume ($volume * 128 / 100);
509	$chunk	662	$chunk
510	};	663	};
511	}	664	}
512	} else {	665	} else {
…		…
514	}	667	}
515	}	668	}
516	}	669	}
517		670
518	sub audio_shutdown {	671	sub audio_shutdown {
		672	CFClient::Mix_CloseAudio if $SDL_MIXER;
519	undef $SDL_MIXER;	673	undef $SDL_MIXER;
520	@SOUNDS = ();	674	@SOUNDS = ();
521	%AUDIO_CHUNKS = ();	675	%AUDIO_CHUNKS = ();
522	}	676	}
523		677
…		…
536	$want_refresh = 0;	690	$want_refresh = 0;
537	$can_refresh = 0;	691	$can_refresh = 0;
538		692
539	$CFClient::UI::ROOT->draw;	693	$CFClient::UI::ROOT->draw;
540		694
541	SDL::GLSwapBuffers;	695	CFClient::SDL_GL_SwapBuffers;
542		696
543	$LAST_REFRESH = $NOW;	697	$LAST_REFRESH = $NOW;
544	}	698	}
545		699
546	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	700	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
547	$NOW = time;	701	$NOW = time;
548		702
549	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	703	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
550	while $SDL_EV->poll;	704	for CFClient::SDL_PollEvent;
551		705
552	if (%animate_object) {	706	if (%animate_object) {
553	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	707	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
554	$want_refresh++;	708	$want_refresh++;
555	}	709	}
…		…
578	@conn::ISA = Crossfire::Protocol::;	732	@conn::ISA = Crossfire::Protocol::;
579		733
580	sub conn::stats_update {	734	sub conn::stats_update {
581	my ($self, $stats) = @_;	735	my ($self, $stats) = @_;
582		736
583	# i love text protocols!!!	737	update_stats_window ($stats);
584	# FIXME: the stats are somehow weird
585	my $hp = $stats->{1};
586	my $hp_m = $stats->{2};
587	my $sp = $stats->{3};
588	my $sp_m = $stats->{4};
589	my $fo = $stats->{18};
590	my $fo_m = 1000;
591	my $gr = $stats->{23};
592	my $gr_m = $stats->{24};
593
594	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
595	$GAUGES->{hp}->set_value ($hp, $hp_m);
596	$GAUGES->{mana}->set_value ($sp, $sp_m);
597	$GAUGES->{food}->set_value ($fo, $fo_m);
598	$GAUGES->{grace}->set_value ($gr, $gr_m);
599	}	738	}
600		739
601	sub conn::user_send {	740	sub conn::user_send {
602	my ($self, $command) = @_;	741	my ($self, $command) = @_;
603		742
…		…
628		767
629	my ($hash, $x, $y, $w, $h) = @$map_info;	768	my ($hash, $x, $y, $w, $h) = @$map_info;
630		769
631	my $data = $MAP->get_rect ($x, $y, $w, $h);	770	my $data = $MAP->get_rect ($x, $y, $w, $h);
632	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	771	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
633
634	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	772	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
635
636	}	773	}
637		774
638	sub conn::map_clear {	775	sub conn::map_clear {
639	my ($self) = @_;	776	my ($self) = @_;
640		777
641	$self->flush_map;	778	$self->flush_map;
642	delete $self->{neigh};	779	delete $self->{neigh_map};
643		780
644	$MAP->clear;	781	$MAP->clear;
645	}	782	}
646		783
647		784
648	sub conn::load_map($$$) {	785	sub conn::load_map($$$) {
649	my ($self, $hash, $x, $y) = @_;	786	my ($self, $hash, $x, $y) = @_;
650		787
651	if (defined (my $data = $MAPCACHE->get ($hash))) {	788	if (defined (my $data = $MAPCACHE->get ($hash))) {
652	$data = Compress::LZF::decompress $data;	789	$data = Compress::LZF::decompress $data;
653	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	790	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
654	for my $id ($MAP->set_rect ($x, $y, $data)) {	791	for my $id ($MAP->set_rect ($x, $y, $data)) {
655	my $data = $TILECACHE->get ($id)	792	my $data = $TILECACHE->get ($id)
656	or next;	793	or next;
657		794
658	$self->set_texture ($id => $data);	795	$self->set_texture ($id => $data);
659	}	796	}
660	}	797	}
661	}	798	}
662		799
		800	# this method does a "flood fill" into every tile direction
		801	# it assumes that tiles are arranged in a rectangular grid,
		802	# i.e. a map is the same as the left of the right map etc.
		803	# failure to comply are harmless and result in display errors
		804	# at worst.
663	sub conn::flood_fill {	805	sub conn::flood_fill {
664	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	806	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
665		807
666	# the server does not allow map paths > 6	808	# the server does not allow map paths > 6
667	return if 6 <= length $path;	809	return if 6 <= length $path;
668		810
669	for my $tile (1..4) {	811	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
670	next if $self->{neigh}{$hash}[$tile];	812
		813	for (
		814	[1, 0, -1],
		815	[2, 1, 0],
		816	[3, 0, 1],
		817	[4, -1, 0],
		818	) {
		819	my ($tile, $dx, $dy) = @$_;
		820
		821	my $gx = $gx + $dx;
		822	my $gy = $gy + $dy;
		823
671	next unless $flags & (1 << ($tile - 1));	824	next unless $flags & (1 << ($tile - 1));
		825	next if $self->{neigh_grid}{$gx, $gy}++;
672		826
673	my $neigh = $self->{neigh}{$hash} \|\|= [];	827	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
674		828	if (my $info = $neigh->[$tile]) {
675	$self->send_mapinfo ("spatial $path$tile", sub {
676	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	829	my ($flags, $x, $y, $w, $h, $hash) = @$info;
677		830
678	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
679	return if $mode ne "spatial";
680
681	$x += $MAP->ox;
682	$y += $MAP->oy;
683
684	$self->load_map ($hash, $x, $y)
685	unless $self->{neigh}{$hash}[5]++;#d#
686
687	$neigh->[$tile] = [$x, $y, $w, $h];
688
689	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)	831	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
690	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	832	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		833
		834	} else {
		835	$self->send_mapinfo ("spatial $path$tile", sub {
		836	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		837
		838	return if $mode ne "spatial";
		839
		840	$x += $MAP->ox;
		841	$y += $MAP->oy;
		842
		843	$self->load_map ($hash, $x, $y)
		844	unless $self->{neigh_map}{$hash}[5]++;#d#
		845
		846	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		847
		848	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		849	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		850	});
691	});	851	}
692	}	852	}
693	}	853	}
694		854
695	sub conn::map_change {	855	sub conn::map_change {
696	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	856	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
699		859
700	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	860	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
701		861
702	my $mapmapw = 250;	862	my $mapmapw = 250;
703	my $mapmaph = 250;	863	my $mapmaph = 250;
		864
		865	$self->{neigh_rect} = [
		866	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		867	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		868	];
704		869
		870	delete $self->{neigh_grid};
705	$self->flood_fill ("", $hash, $flags,	871	$self->flood_fill (0, 0, "", $hash, $flags);
706	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
707	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
708		872
709	$x += $ox;	873	$x += $ox;
710	$y += $oy;	874	$y += $oy;
711		875
712	$self->{map_info} = [$hash, $x, $y, $w, $h];	876	$self->{map_info} = [$hash, $x, $y, $w, $h];
…		…
778	or return;	942	or return;
779		943
780	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}	944	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
781	or return;	945	or return;
782		946
783	$SDL_MIXER->play_channel (-1, $chunk);	947	$chunk->play;
784	# warn "sound $x,$y,$soundnum,$type\n";#d#	948	# warn "sound $x,$y,$soundnum,$type\n";#d#
785	}	949	}
786		950
787	sub conn::query {	951	sub conn::query {
788	my ($self, $flags, $prompt) = @_;	952	my ($self, $flags, $prompt) = @_;
…		…
841	CFClient::SDL_QUIT => sub {	1005	CFClient::SDL_QUIT => sub {
842	Event::unloop -1;	1006	Event::unloop -1;
843	},	1007	},
844	CFClient::SDL_VIDEORESIZE => sub {	1008	CFClient::SDL_VIDEORESIZE => sub {
845	},	1009	},
846	CFClient::SDL_VIDEOEXPOSE => sub {	1010	CFClient::SDL_VIDEOEXPOSE => \&refresh,
847	refresh;	1011	CFClient::SDL_ACTIVEEVENT => sub {
		1012	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
848	},	1013	},
849	CFClient::SDL_KEYDOWN => sub {	1014	CFClient::SDL_KEYDOWN => sub {
850	if ($SDL_EV->key_mod & CFClient::KMOD_ALT && $SDL_EV->key_sym == 13) {	1015	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
851	# alt-enter	1016	# alt-enter
852	video_shutdown;	1017	video_shutdown;
853	$CFG->{fullscreen} = !$CFG->{fullscreen};	1018	$CFG->{fullscreen} = !$CFG->{fullscreen};
854	video_init;	1019	video_init;
855	} else {	1020	} else {
856	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	1021	CFClient::UI::feed_sdl_key_down_event ($_[0]);
857	}	1022	}
858	},	1023	},
859	CFClient::SDL_KEYUP => sub {	1024	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
860	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);	1025	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
861	},	1026	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
862	CFClient::SDL_MOUSEMOTION => sub {	1027	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
863	CFClient::UI::feed_sdl_motion_event ($SDL_EV);	1028	CFClient::SDL_USEREVENT => \&audio_music_finished,
864	},
865	CFClient::SDL_MOUSEBUTTONDOWN => sub {
866	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
867	},
868	CFClient::SDL_MOUSEBUTTONUP => sub {
869	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
870	},
871	CFClient::SDL_ACTIVEEVENT => sub {
872	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
873	},
874	);	1029	);
875		1030
876	#############################################################################	1031	#############################################################################
877		1032
878	$SIG{INT} = $SIG{TERM} = sub { exit };	1033	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
896	mapsize => 100,	1051	mapsize => 100,
897	host => "crossfire.schmorp.de",	1052	host => "crossfire.schmorp.de",
898	say_command => 'say',	1053	say_command => 'say',
899	audio_enable => 1,	1054	audio_enable => 1,
900	bgm_enable => 1,	1055	bgm_enable => 1,
901	bgm_volume => 64,	1056	bgm_volume => 0.25,
902	);	1057	);
903		1058
904	while (my ($k, $v) = each %DEF_CFG) {	1059	while (my ($k, $v) = each %DEF_CFG) {
905	$CFG->{$k} = $v unless exists $CFG->{$k};	1060	$CFG->{$k} = $v unless exists $CFG->{$k};
906	}	1061	}
…		…
925	video_init;	1080	video_init;
926	audio_init;	1081	audio_init;
927		1082
928	Event::loop;	1083	Event::loop;
929		1084
930	END { SDL::Quit }	1085	END { CFClient::SDL_Quit }
931		1086
932		1087

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.145 by root, Wed Apr 19 20:46:45 2006 UTC vs. Revision 1.156 by elmex, Fri Apr 21 12:27:20 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.145 by root, Wed Apr 19 20:46:45 2006 UTC vs.
Revision 1.156 by elmex, Fri Apr 21 12:27:20 2006 UTC