[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.134 by elmex, Wed Jul 25 15:06:19 2007 UTC vs.
Revision 1.153 by root, Mon Aug 13 14:24:17 2007 UTC

…		…
48	sort { (length $a) <=> (length $b) }	48	sort { (length $a) <=> (length $b) }
49	@args	49	@args
50	} sort { $a->{par} <=> $b->{par} }	50	} sort { $a->{par} <=> $b->{par} }
51	CFPlus::Pod::find command => "*";	51	CFPlus::Pod::find command => "*";
52		52
53	$self->connect_ext (music => sub {	53	$self->connect_ext (ambient_music => sub {
54	my ($ev) = @_;	54	my ($songs) = @_;
55		55	&::audio_music_set_ambient ($songs);
56	&::audio_music_set ($self->{songs} = $ev->{play})
57	if $ev->{play};
58	});	56	});
59		57
60	$self->connect_ext (capabilities => sub {	58	$self->connect_ext (capabilities => sub {
61	my (%cap) = @_;	59	my (%cap) = @_;
62		60
63	$self->send_exti_msg (fx_want => {	61	#$self->send ("setup sound 0"); # we use a different protocol
64	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC	62	$self->update_fx_want;
65	5 => !!$::CFG->{audio_enable}, # FT_SOUND
66	});
67		63
68	if (my $ts = $cap{tileset}) {	64	if (my $ts = $cap{tileset}) {
69	if (my ($default) = grep $_->[2] & 1, @$ts) {	65	if (my ($default) = grep $_->[2] & 1, @$ts) {
70	$self->{tileset} = $default;	66	$self->{tileset} = $default;
71	$self->{tilesize} = $default->[3];	67	$self->{tilesize} = $default->[3];
…		…
189		185
190	# message window	186	# message window
191	$self->connect_ext (channel_info => sub {	187	$self->connect_ext (channel_info => sub {
192	my ($info) = @_;	188	my ($info) = @_;
193	$self->{channels}->{$info->{id}} = $info;	189	$self->{channels}->{$info->{id}} = $info;
194	$::MESSAGE_WINDOW->add_channel ($_[0]);	190	$::MESSAGE_WINDOW->add_channel ($info);
195	});	191	});
196		192
197	# destroy widgets on logout	193	# destroy widgets on logout
198	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {	194	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
199	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {	195	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
…		…
223	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	219	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
224		220
225	$self	221	$self
226	}	222	}
227		223
		224	sub update_fx_want {
		225	my ($self) = @_;
		226
		227	$self->send_exti_msg (fx_want => {
		228	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		229	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		230	});
		231	}
		232
228	sub logprint {	233	sub logprint {
229	my ($self, @a) = @_;	234	my ($self, @a) = @_;
230		235
231	$self->{log_fh} \|\|= do {	236	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
232	my $path = "$Crossfire::VARDIR/log.$self->{host}";
233
234	open my $fh, ">>:utf8", $path
235	or die "Couldn't open logfile $path: $!";
236
237	$fh->autoflush (1);
238
239	$fh;
240	};
241
242	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
243
244	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
245	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
246
247	print {$self->{log_fh}} "$ts ", @a, "\n";
248	}	237	}
249		238
250	sub _stat_numdiff {	239	sub _stat_numdiff {
251	my ($self, $name, $old, $new) = @_;	240	my ($self, $name, $old, $new) = @_;
252		241
…		…
517	}	506	}
518		507
519	sub feed_map1a {	508	sub feed_map1a {
520	my ($self, $data) = @_;	509	my ($self, $data) = @_;
521		510
522	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	511	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		512	my $delay;
		513
		514	for my $tile (@$missing) {
		515	next if $self->{delay}{$tile};
		516
		517	$delay = 1;
		518
		519	if (my $tex = $::CONN->{texture}[$tile]) {
		520	$tex->upload;
		521	} else {
		522	$self->{delay}{$tile} = 1;
		523
		524	# we assume the face is in-flight and will eventually come
		525	push @{$self->{face_cb}{$tile}}, sub {
		526	delete $self->{delay}{$tile};
		527	$_[0]->upload;
		528	};
		529	}
		530	}
		531
		532	if ($delay) {
		533	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		534	Event->timer (after => 0.03, cb => sub {
		535	$_[0]->w->cancel;
		536	$self->{map_widget}->update;
		537	});
		538	} else {
523	$self->{map_widget}->update;	539	$self->{map_widget}->update;
		540	}
524	}	541	}
525		542
526	sub magicmap {	543	sub magicmap {
527	my ($self, $w, $h, $x, $y, $data) = @_;	544	my ($self, $w, $h, $x, $y, $data) = @_;
528		545
…		…
535	my $map_info = delete $self->{map_info}	552	my $map_info = delete $self->{map_info}
536	or return;	553	or return;
537		554
538	my ($hash, $x, $y, $w, $h) = @$map_info;	555	my ($hash, $x, $y, $w, $h) = @$map_info;
539		556
540	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	557	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		558	$self->{map_cache_new}{$hash} = \$data;
541	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	559	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
542	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
543	}	560	}
544		561
545	sub map_clear {	562	sub map_clear {
546	my ($self) = @_;	563	my ($self) = @_;
547		564
…		…
560	do {	577	do {
561	$id = pop @{$self->{bg_fetch}}	578	$id = pop @{$self->{bg_fetch}}
562	or return;	579	or return;
563	} while $self->{texture}[$id];	580	} while $self->{texture}[$id];
564		581
565	CFPlus::DB::get tilecache => $id, sub {	582	CFPlus::DB::exists tilecache => $id, sub {
566	my ($data) = @_;	583	my ($exists) = @_;
567		584
568	return unless $self->{map}; # stop when destroyed	585	return unless $self->{map}; # stop when destroyed
569		586
570	$self->set_texture ($id => $data)	587	if ($exists) {
571	if defined $data;	588	$self->have_tile ($id);
		589	$self->{texture}[$id]->upload;
		590	}
572		591
573	$self->bg_fetch;	592	$self->bg_fetch;
574	};	593	};
575	}	594	}
576		595
577	sub load_map($$$) {	596	sub load_map($$$) {
578	my ($self, $hash, $x, $y) = @_;	597	my ($self, $hash, $x, $y) = @_;
579		598
580	my $gen = $self->{map_change_gen};	599	my $gen = $self->{map_change_gen};
581		600
582	CFPlus::DB::get $self->{mapcache} => $hash, sub {	601	my $cb = sub {
583	return unless $gen == $self->{map_change_gen};	602	return unless $gen == $self->{map_change_gen};
584		603
585	my ($data) = @_;	604	my ($data) = @_;
586		605
587	if (defined $data) {	606	if (defined $data) {
		607	$self->{map_cache_new}{$hash} = \$data;
		608
588	$data = Compress::LZF::decompress $data;	609	my $data = Compress::LZF::decompress $data;
589	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
590		610
591	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	611	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
592	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	612	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
593	$self->bg_fetch unless $inprogress;	613	$self->bg_fetch unless $inprogress;
594	}	614	}
595	};	615	};
		616
		617	if (my $rdata = $self->{map_cache_old}{$hash}) {
		618	$cb->($$rdata);
		619	} else {
		620	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		621	}
596	}	622	}
597		623
598	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	624	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
599	# (server resource,s latency, bandwidth), so this hack is warranted.	625	# (server resource,s latency, bandwidth), so this hack is warranted.
600	# the right fix is to make real tiled maps with an overview file	626	# the right fix is to make real tiled maps with an overview file
…		…
693	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	719	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
694		720
695	$self->flush_map;	721	$self->flush_map;
696		722
697	++$self->{map_change_gen};	723	++$self->{map_change_gen};
		724	$self->{map_cache_old} = delete $self->{map_cache_new};
698		725
699	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	726	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
700		727
701	my $mapmapw = $self->{mapmap}->{w};	728	my $mapmapw = $self->{mapmap}->{w};
702	my $mapmaph = $self->{mapmap}->{h};	729	my $mapmaph = $self->{mapmap}->{h};
…		…
732	$self->{map}->set_tileid ($facenum => $id);	759	$self->{map}->set_tileid ($facenum => $id);
733		760
734	CFPlus::DB::get tilecache => $id, $cb;	761	CFPlus::DB::get tilecache => $id, $cb;
735		762
736	} elsif ($face->{type} & 1) { # with metadata	763	} elsif ($face->{type} & 1) { # with metadata
737	#::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
738	CFPlus::DB::get "res-metadata" => $face->{name}, $cb;	764	CFPlus::DB::get res_meta => $face->{name}, $cb;
739	}	765	}
740	}	766	}
741		767
742	sub face_update {	768	sub face_update {
743	my ($self, $facenum, $face, $changed) = @_;	769	my ($self, $facenum, $face, $changed) = @_;
744		770
745	if ($face->{type} == 0) { # FT_FACE	771	if ($face->{type} == 0) { # FT_FACE
746	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }	772	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
747	if $changed;	773	if $changed;
748		774
749	$self->set_texture ($face->{id} => delete $face->{data});	775	$self->have_tile ($face->{id});
750		776
751	} elsif ($face->{type} & 1) { # split metadata	777	} elsif ($face->{type} & 1) { # split metadata
752	my $cb = sub { };
753
754	if ($face->{type} == 3) { # FT_MUSIC
755	$cb = sub {
756	$self->{music_meta}{$facenum} = $face;
757
758	::message ({ markup => "downloaded song #$facenum" })
759	if $changed;
760
761	&::audio_music_set ($self->{songs});
762	};
763	}
764
765	if ($changed) { # new data	778	if ($changed) { # new data
766	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};	779	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
767	my $path = CFPlus::DB::path_of_res $face->{name};
768
769	CFPlus::DB::write_file $path, $data, sub {
770	CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
771	$face->{meta} = $self->{json_coder}->decode ($meta_json);	780	$face->{meta} = $self->{json_coder}->decode ($meta_json);
772	$face->{path} = $path;
773		781
774	$cb->();	782	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
775	};	783	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
776	};
777	} else {	784	} else {
778	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});	785	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
779	$cb->();
780	}	786	}
		787
		788	::add_license ($face);
		789
		790	if ($face->{type} == 3) { # FT_MUSIC
		791	$self->{music_meta}{$facenum} = $face;
		792
		793	::message ({ markup => "downloaded song #$facenum" })
		794	if $changed;
		795
		796	&::audio_music_push ($facenum);
		797	} elsif ($face->{type} == 5) { # FT_SOUND
		798	$self->{sound_meta}{$facenum} = $face;
		799
		800	::message ({ markup => "downloaded sound #$facenum" })
		801	if $changed;
		802
		803	&::audio_sound_push ($facenum);
		804	}
		805
781	}	806	}
782	}	807	}
783		808
784	sub smooth_update {	809	sub smooth_update {
785	my ($self, $facenum, $face) = @_;	810	my ($self, $facenum, $face) = @_;
786		811
787	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	812	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
788	}	813	}
789		814
790	sub set_texture {	815	sub have_tile {
791	my ($self, $id, $data) = @_;	816	my ($self, $tile) = @_;
792		817
793	return unless $self->{map};	818	return unless $self->{map};
794		819
795	$self->{texture}[$id] = my $tex =	820	my $tex = $self->{texture}[$tile] \|\|=
796	new_from_image CFPlus::Texture	821	new CFPlus::Texture
797	$data, minify => 1, mipmap => 1;	822	tile => $tile, minify => 1, mipmap => 1, delay => 1;
798		823
799	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
800	$self->{map_widget}->update;
801
802	$_->() for @{(delete $self->{face_cb}{$id}) \|\| []};	824	$_->($tex) for @{(delete $self->{face_cb}{$tile}) \|\| []};
803	}	825	}
804		826
805	sub connect_face_update {	827	sub connect_face_update {
806	my ($self, $id, $cb) = @_;	828	my ($self, $id, $cb) = @_;
807		829
…		…
813	@{$self->{face_cb}{$id}};	835	@{$self->{face_cb}{$id}};
814	}	836	}
815	}	837	}
816		838
817	sub sound_play {	839	sub sound_play {
818	my ($self, $x, $y, $soundnum, $type) = @_;	840	my ($self, $type, $face, $dx, $dy, $vol) = @_;
819		841
820	$self->{sound_play}->($x, $y, $soundnum, $type);	842	&::audio_sound_play ($face, $dx, $dy, $vol)
		843	unless $type & 1; # odd types are silent for future expansion
821	}	844	}
822		845
823	my $LAST_QUERY; # server is stupid, stupid, stupid	846	my $LAST_QUERY; # server is stupid, stupid, stupid
824		847
825	sub query {	848	sub query {
…		…
890	$self->{$type} = $text;	913	$self->{$type} = $text;
891	} else {	914	} else {
892	$self->logprint ("msg: ", $text);	915	$self->logprint ("msg: ", $text);
893	return if $color < 0; # negative color == ignore if not understood	916	return if $color < 0; # negative color == ignore if not understood
894		917
895	my $fg = $CF_COLOR[$color % @CF_COLOR];	918	my $fg = $CF_COLOR[$color & 0x1f] \|\| [1, 0, 0];
896		919
897	## try to create single paragraphs of multiple lines sent by the server	920	## try to create single paragraphs of multiple lines sent by the server
898	# no longer neecssary with TRT servers	921	# no longer neecssary with TRT servers
899	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	922	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
900		923
901	::message ({ fg => $fg, markup => $_, type => $type })	924	::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
902	for split /\n/, $text;	925	for split /\n/, $text;
903		926
904	$self->{statusbox}->add ($text,	927	$self->{statusbox}->add ($text,
905	group => $text,	928	group => $text,
906	fg => $fg,	929	fg => $fg,
…		…
963	$self->{map_widget}->clr_commands;	986	$self->{map_widget}->clr_commands;
964		987
965	::stop_game ();	988	::stop_game ();
966	}	989	}
967		990
968	sub image_info {
969	my ($self, $numfaces) = @_;
970
971	$self->{num_faces} = $numfaces;
972	$self->{face_prefetch} = [1 .. $numfaces];
973	$self->face_prefetch;
974	}
975
976	sub face_prefetch {
977	my ($self) = @_;
978
979	return unless $::CFG->{face_prefetch};
980
981	if ($self->{num_faces}) {
982	return if @{ $self->{send_queue} \|\| [] };
983	my $todo = @{ $self->{face_prefetch} }
984	or return;
985
986	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
987
988	$self->send ("requestinfo image_sums $face $face");
989
990	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
991	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
992	} elsif (!exists $self->{num_faces}) {
993	$self->send ("requestinfo image_info");
994
995	$self->{num_faces} = 0;
996
997	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
998	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
999	}
1000	}
1001
1002	sub update_floorbox {	991	sub update_floorbox {
1003	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	992	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1004	return unless $::CONN;	993	return unless $::CONN;
1005		994
1006	$::FLOORBOX->clear;	995	$::FLOORBOX->clear;
…		…
1035	}	1024	}
1036		1025
1037	$::FLOORBOX->add_at (@add);	1026	$::FLOORBOX->add_at (@add);
1038	});	1027	});
1039		1028
1040	$::WANT_REFRESH++;	1029	$::WANT_REFRESH->start;
1041	}	1030	}
1042		1031
1043	sub set_opencont {	1032	sub set_opencont {
1044	my ($conn, $tag, $name) = @_;	1033	my ($conn, $tag, $name) = @_;
1045	$conn->{open_container} = $tag;	1034	$conn->{open_container} = $tag;
…		…
1162	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1151	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1163	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1152	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1164	. "map size $self->{mapw}×$self->{maph}\n"	1153	. "map size $self->{mapw}×$self->{maph}\n"
1165	);	1154	);
1166		1155
1167	::setup_build_button ($self->{editor_support}->{builder_ui});
1168	}	1156	}
1169		1157
1170	sub logged_in {	1158	sub logged_in {
1171	my ($self) = @_;	1159	my ($self) = @_;
1172		1160
…		…
1192		1180
1193	$self->send_command ("output-sync $::CFG->{output_sync}");	1181	$self->send_command ("output-sync $::CFG->{output_sync}");
1194	$self->send_command ("output-count $::CFG->{output_count}");	1182	$self->send_command ("output-count $::CFG->{output_count}");
1195	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1183	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1196	$self->send_command ("pickup $::CFG->{pickup}");	1184	$self->send_command ("pickup $::CFG->{pickup}");
1197	}
1198
1199	sub buildat {
1200	my ($self, $builditem, $x, $y) = @_;
1201
1202	if ($self->{cfplus_ext}) {
1203	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1204	}
1205	}	1185	}
1206		1186
1207	sub lookat {	1187	sub lookat {
1208	my ($self, $x, $y) = @_;	1188	my ($self, $x, $y) = @_;
1209		1189

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.134 by elmex, Wed Jul 25 15:06:19 2007 UTC vs. Revision 1.153 by root, Mon Aug 13 14:24:17 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.134 by elmex, Wed Jul 25 15:06:19 2007 UTC vs.
Revision 1.153 by root, Mon Aug 13 14:24:17 2007 UTC