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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.128 by root, Mon Jul 23 21:03:26 2007 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC

…		…
21		21
22	my $self = $class->SUPER::new (%arg,	22	my $self = $class->SUPER::new (%arg,
23	setup_req => {	23	setup_req => {
24	extmap => 1,	24	extmap => 1,
25	excmd => 1,	25	excmd => 1,
26	ywidget => 1,	26	xwidget1 => 1,#d#
27	%{$arg{setup_req} \|\| {}},	27	%{$arg{setup_req} \|\| {}},
28	},	28	},
29	);	29	);
30		30
31	$self->{map_widget}->clr_commands;	31	$self->{map_widget}->clr_commands;
…		…
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	return unless $::CFG->{bgm_enable};
57
58	my $faces = $ev{faces};
59	my @songs;
60
61	# request music from server if appropriate
62	if (my $faces = $ev{faces}) {
63	for (@$faces) {
64	my ($face, $pri, $chksum) = @$_;
65	utf8::downgrade $chksum;
66
67	$chksum = unpack "H*", $chksum;
68	$self->{music_map}{$face} = $chksum;
69
70	# check if already cached
71	CFPlus::DB::get "res-metadata" => $chksum, sub {
72	my ($meta_json) = @_;
73	my $path = CFPlus::DB::path_of_res $chksum;
74
75	if (defined $meta_json) {
76	my $meta = $self->{json_coder}->decode ($meta_json);
77	$meta->{path} = $path;
78	$self->{music_meta}{$chksum} = $meta;
79	&::audio_music_set ($self->{songs});
80	} else {
81	::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
82	$self->ask_face ($face, -100 - $pri, undef, sub {
83	my $len = length $_[1];
84	my ($meta_json, $data) = unpack "(w/a)", $_[1];
85
86	CFPlus::DB::write_file $path, $data, sub {
87	CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
88	my $meta = $self->{json_coder}->decode ($meta_json);
89	$meta->{path} = $path;
90	$self->{music_meta}{$chksum} = $meta;
91
92	::message ({ markup => "downloaded song #$face, size $len octets" });
93	&::audio_music_set ($self->{songs});
94	};
95	};
96	});
97	}
98	}
99	}
100	}
101
102	if (my $play = $ev{play}) {
103	&::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
104	}
105	});	56	});
106		57
107	$self->connect_ext (capabilities => sub {	58	$self->connect_ext (capabilities => sub {
108	my (%cap) = @_;	59	my (%cap) = @_;
		60
		61	#$self->send ("setup sound 0"); # we use a different protocol
		62	$self->update_fx_want;
109		63
110	if (my $ts = $cap{tileset}) {	64	if (my $ts = $cap{tileset}) {
111	if (my ($default) = grep $_->[2] & 1, @$ts) {	65	if (my ($default) = grep $_->[2] & 1, @$ts) {
112	$self->{tileset} = $default;	66	$self->{tileset} = $default;
113	$self->{tilesize} = $default->[3];	67	$self->{tilesize} = $default->[3];
…		…
121	}	75	}
122	});	76	});
123		77
124	$self->{json_coder}	78	$self->{json_coder}
125	->convert_blessed	79	->convert_blessed
126	->filter_json_single_key_object (__widget_ref__ => sub {	80	->filter_json_single_key_object (__w_ => sub {
127	$self->{widget}{$_[0]}	81	$self->{widget}{$_[0]}
128	});	82	});
129		83
130	# widgetset new	84	# widgetset new
131	$self->connect_ext (ws_n => sub {	85	$self->connect_ext (ws_n => sub {
132	my ($arg) = @_;	86	my ($id) = @_;
133		87
134	$self->{widgetset}{$arg{id}} = {	88	$self->{widgetset}{$id} = {
135	w => {},	89	w => {},
136	};	90	};
137	});	91	});
138		92
139	# widgetset destroy	93	# widgetset destroy
140	$self->connect_ext (ws_d => sub {	94	$self->connect_ext (ws_d => sub {
141	my ($arg) = @_;	95	my ($id) = @_;
142		96
143	my $ws = delete $self->{widgetset}{$arg{id}}	97	my $ws = delete $self->{widgetset}{$id}
144	or return;	98	or return;
145		99
146	$_->destroy	100	$_->destroy
147	for values %{$ws->{w}};	101	for values %{$ws->{w}};
148	});	102	});
149		103
150	# widgetset destroy	104	# widgetset create
151	$self->connect_ext (ws_c => sub {	105	$self->connect_ext (ws_c => sub {
152	my ($arg) = @_;	106	my ($ws, $id, $class, $args) = @_;
153
154	my $args = $arg->{args} \|\| {};
155		107
156	for my $ev (grep /^on_/, keys %$args) {	108	for my $ev (grep /^on_/, keys %$args) {
		109	my $rid = $args->{$ev};
157	$args->{$ev} = sub {	110	$args->{$ev} = sub {
158	my $id = shift->{s_id};	111	my $id = shift->{s_id};
159	$self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);	112	$self->send_exti_msg (w_e => $id, $rid, @_);
160		113
161	1	114	1
162	};	115	};
163	}	116	}
164		117
165	if (my $widget = eval {	118	$self->widget_associate (
		119	$ws, $id => scalar eval {
166	local $SIG{__DIE__};	120	local $SIG{__DIE__};
167	"CFPlus::UI::$arg->{class}"->new (	121	"CFPlus::UI::$class"->new (%$args)
168	%$args,
169	s_ws => $arg->{ws},
170	s_id => $arg->{id},
171	)
172	}	122	}
173	) {
174	$self->{widget}{$arg->{id}}
175	= $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
176	= $widget;
177
178	$widget->connect (on_destroy => sub {
179	my ($widget) = @_;
180
181	delete $self->{widget}{$widget->{s_id}};
182	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
183	});
184	} else {
185	warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";	123	) or warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
186	$self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");	124	});
		125
		126	# widgetset associate
		127	$self->connect_ext (ws_a => sub {
		128	my (%ass) = @_;
		129
		130	# everything that has a name, wether conceivably useful or not
		131	my %wkw = (
		132	root => $CFPlus::UI::ROOT,
		133	tooltip => $CFPlus::UI::TOOLTIP,
		134
		135	mapwidget => $::MAPWIDGET,
		136	buttonbar => $::BUTTONBAR,
		137	metaserver => $::METASERVER,
		138	buttonbar => $::BUTTONBAR,
		139	login_button => $::LOGIN_BUTTON,
		140	quit_dialog => $::QUIT_DIALOG,
		141	host_entry => $::HOST_ENTRY,
		142	metaserver => $::METASERVER,
		143	server_info => $::SERVER_INFO,
		144
		145	setup_dialog => $::SETUP_DIALOG,
		146	setup_notebook => $::SETUP_NOTEBOOK,
		147	setup_server => $::SETUP_SERVER,
		148	setup_keyboard => $::SETUP_KEYBOARD,
		149
		150	pl_notebook => $::PL_NOTEBOOK,
		151	pl_window => $::PL_WINDOW,
		152	inventory_page => $::INVENTORY_PAGE,
		153	stats_page => $::STATS_PAGE,
		154	skill_page => $::SKILL_PAGE,
		155	spell_page => $::SPELL_PAGE,
		156	spell_list => $::SPELL_LIST,
		157
		158	floorbox => $::FLOORBOX,
		159	help_window => $::HELP_WINDOW,
		160	message_window => $::MESSAGE_WINDOW,
		161	statusbox => $::SDTATUSBOX,
		162
		163	inv => $::INV,
		164	invr => $::INVR,
		165	invr_hb => $::INVR_HB,
		166
		167	);
		168
		169	while (my ($id, $name) = each %ass) {
		170	$self->widget_associate (undef, $id => $wkw{$name})
		171	or warn "server failed to associate non-existent well-known widget $name\n";
187	}	172	}
188	});	173	});
189		174
190	# widget call	175	# widget call
191	$self->connect_ext (w_c => sub {	176	$self->connect_ext (w_c => sub {
192	my ($arg) = @_;	177	my ($id, $rid, $method, @args) = @_;
193		178
194	my $w = $self->{widget}{$arg->{id}}	179	my $w = $self->{widget}{$id}
195	or return;	180	or return;
196	my $m = $arg->{name};
197		181
198	my $a = $arg->{args} \|\| [];	182	if ($rid) {
199
200	if (exists $arg->{rid}) {
201	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);	183	$self->send_exti_msg (w_r => $rid, $w->$method (@args));
202	} else {	184	} else {
203	$w->$m (@$a);	185	$w->$method (@args);
204	}	186	}
205	});	187	});
206		188
207	# widget set	189	# widget set
208	$self->connect_ext (w_s => sub {	190	$self->connect_ext (w_s => sub {
209	my ($arg) = @_;	191	my ($id, $attr) = @_;
210		192
211	my $w = $self->{widget}{$arg->{id}}	193	my $w = $self->{widget}{$id}
212	or return;	194	or return;
213
214	my $attr = $arg->{attr};
215		195
216	for (my $i = 0; $i < $#$attr; $i += 2) {	196	for (my $i = 0; $i < $#$attr; $i += 2) {
217	my ($member, $value) = @$attr[$i, $i+1];	197	my ($member, $value) = @$attr[$i, $i+1];
218	if (defined $value) {	198	if (defined $value) {
219	$w->{$member} = $value;	199	$w->{$member} = $value;
…		…
224	}	204	}
225	});	205	});
226		206
227	# widget get	207	# widget get
228	$self->connect_ext (w_g => sub {	208	$self->connect_ext (w_g => sub {
229	my ($arg) = @_;	209	my ($id, $rid, $attr) = @_;
230		210
231	my $w = $self->{widget}{$arg->{id}}	211	my $w = $self->{widget}{$id}
232	or return;	212	or return;
233		213
234	$self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{attr}}]);	214	$self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
		215	});
		216
		217	# message window
		218	$self->connect_ext (channel_info => sub {
		219	my ($info) = @_;
		220	$self->{channels}->{$info->{id}} = $info;
		221	$::MESSAGE_WINDOW->add_channel ($info);
235	});	222	});
236		223
237	# destroy widgets on logout	224	# destroy widgets on logout
238	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {	225	$self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
239	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {	226	for my $ws (values %{delete $self->{widgetset} \|\| {}}) {
…		…
263	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";	250	$self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
264		251
265	$self	252	$self
266	}	253	}
267		254
		255	sub widget_associate {
		256	my ($self, $ws, $id, $widget) = @_;
		257
		258	if ($widget) {
		259	$widget->{s_id} = $id;
		260	$self->{widget}{$id} = $widget;
		261
		262	if ($ws) {
		263	$widget->{s_ws} = $ws;
		264	$self->{widgetset}{$ws}{w}{$id} = $widget;
		265	}
		266
		267	$widget->connect (on_destroy => sub {
		268	my ($widget) = @_;
		269
		270	delete $self->{widget}{$widget->{s_id}};
		271	delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}}
		272	if exists $widget->{s_ws};
		273	});
		274
		275	1
		276	} else {
		277	$self->send_exti_msg (w_e => $id, undef);
		278
		279	0
		280	}
		281	}
		282
		283	sub update_fx_want {
		284	my ($self) = @_;
		285
		286	$self->send_exti_msg (fx_want => {
		287	3 => !!$::CFG->{bgm_enable}, # FT_MUSIC
		288	5 => !!$::CFG->{audio_enable}, # FT_SOUND
		289	});
		290	}
		291
268	sub logprint {	292	sub logprint {
269	my ($self, @a) = @_;	293	my ($self, @a) = @_;
270		294
271	$self->{log_fh} \|\|= do {	295	CFPlus::DB::logprint "$Crossfire::VARDIR/log.$self->{host}" => (join "", @a), sub { };
272	my $path = "$Crossfire::VARDIR/log.$self->{host}";
273
274	open my $fh, ">>:utf8", $path
275	or die "Couldn't open logfile $path: $!";
276
277	$fh->autoflush (1);
278
279	$fh;
280	};
281
282	my ($sec, $min, $hour, $mday, $mon, $year) = localtime time;
283
284	my $ts = sprintf "%04d-%02d-%02d %02d:%02d:%02d",
285	$year + 1900, $mon + 1, $mday, $hour, $min, $sec;
286
287	print {$self->{log_fh}} "$ts ", @a, "\n";
288	}	296	}
289		297
290	sub _stat_numdiff {	298	sub _stat_numdiff {
291	my ($self, $name, $old, $new) = @_;	299	my ($self, $name, $old, $new) = @_;
292		300
…		…
557	}	565	}
558		566
559	sub feed_map1a {	567	sub feed_map1a {
560	my ($self, $data) = @_;	568	my ($self, $data) = @_;
561		569
562	$self->{map}->map1a_update ($data, $self->{setup}{extmap});	570	my $missing = $self->{map}->map1a_update ($data, $self->{setup}{extmap});
		571	my $delay;
		572
		573	for my $tile (@$missing) {
		574	next if $self->{delay}{$tile};
		575
		576	$delay = 1;
		577
		578	if (my $tex = $::CONN->{texture}[$tile]) {
		579	$tex->upload;
		580	} else {
		581	$self->{delay}{$tile} = 1;
		582
		583	# we assume the face is in-flight and will eventually come
		584	push @{$self->{face_cb}{$tile}}, sub {
		585	delete $self->{delay}{$tile};
		586	$_[0]->upload;
		587	};
		588	}
		589	}
		590
		591	if ($delay) {
		592	# delay the map drawing a tiny bit in the hope of getting the missing fetched
		593	Event->timer (after => 0.03, cb => sub {
		594	$_[0]->w->cancel;
		595	$self->{map_widget}->update;
		596	});
		597	} else {
563	$self->{map_widget}->update;	598	$self->{map_widget}->update;
		599	}
564	}	600	}
565		601
566	sub magicmap {	602	sub magicmap {
567	my ($self, $w, $h, $x, $y, $data) = @_;	603	my ($self, $w, $h, $x, $y, $data) = @_;
568		604
…		…
575	my $map_info = delete $self->{map_info}	611	my $map_info = delete $self->{map_info}
576	or return;	612	or return;
577		613
578	my ($hash, $x, $y, $w, $h) = @$map_info;	614	my ($hash, $x, $y, $w, $h) = @$map_info;
579		615
580	my $data = $self->{map}->get_rect ($x, $y, $w, $h);	616	my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
		617	$self->{map_cache_new}{$hash} = \$data;
581	CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };	618	CFPlus::DB::put $self->{mapcache} => $hash => $data, sub { };
582	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
583	}	619	}
584		620
585	sub map_clear {	621	sub map_clear {
586	my ($self) = @_;	622	my ($self) = @_;
587		623
…		…
600	do {	636	do {
601	$id = pop @{$self->{bg_fetch}}	637	$id = pop @{$self->{bg_fetch}}
602	or return;	638	or return;
603	} while $self->{texture}[$id];	639	} while $self->{texture}[$id];
604		640
605	CFPlus::DB::get tilecache => $id, sub {	641	CFPlus::DB::exists tilecache => $id, sub {
606	my ($data) = @_;	642	my ($exists) = @_;
607		643
608	return unless $self->{map}; # stop when destroyed	644	return unless $self->{map}; # stop when destroyed
609		645
610	$self->set_texture ($id => $data)	646	if ($exists) {
611	if defined $data;	647	$self->have_tile ($id);
		648	$self->{texture}[$id]->upload;
		649	}
612		650
613	$self->bg_fetch;	651	$self->bg_fetch;
614	};	652	};
615	}	653	}
616		654
617	sub load_map($$$) {	655	sub load_map($$$) {
618	my ($self, $hash, $x, $y) = @_;	656	my ($self, $hash, $x, $y) = @_;
619		657
620	my $gen = $self->{map_change_gen};	658	my $gen = $self->{map_change_gen};
621		659
622	CFPlus::DB::get $self->{mapcache} => $hash, sub {	660	my $cb = sub {
623	return unless $gen == $self->{map_change_gen};	661	return unless $gen == $self->{map_change_gen};
624		662
625	my ($data) = @_;	663	my ($data) = @_;
626		664
627	if (defined $data) {	665	if (defined $data) {
		666	$self->{map_cache_new}{$hash} = \$data;
		667
628	$data = Compress::LZF::decompress $data;	668	my $data = Compress::LZF::decompress $data;
629	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
630		669
631	my $inprogress = @{ $self->{bg_fetch} \|\| [] };	670	my $inprogress = @{ $self->{bg_fetch} \|\| [] };
632	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);	671	unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
633	$self->bg_fetch unless $inprogress;	672	$self->bg_fetch unless $inprogress;
634	}	673	}
635	};	674	};
		675
		676	if (my $rdata = $self->{map_cache_old}{$hash}) {
		677	$cb->($$rdata);
		678	} else {
		679	CFPlus::DB::get $self->{mapcache} => $hash, $cb;
		680	}
636	}	681	}
637		682
638	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,	683	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
639	# (server resource,s latency, bandwidth), so this hack is warranted.	684	# (server resource,s latency, bandwidth), so this hack is warranted.
640	# the right fix is to make real tiled maps with an overview file	685	# the right fix is to make real tiled maps with an overview file
…		…
733	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	778	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
734		779
735	$self->flush_map;	780	$self->flush_map;
736		781
737	++$self->{map_change_gen};	782	++$self->{map_change_gen};
		783	$self->{map_cache_old} = delete $self->{map_cache_new};
738		784
739	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	785	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
740		786
741	my $mapmapw = $self->{mapmap}->{w};	787	my $mapmapw = $self->{mapmap}->{w};
742	my $mapmaph = $self->{mapmap}->{h};	788	my $mapmaph = $self->{mapmap}->{h};
…		…
761	}	807	}
762		808
763	sub face_find {	809	sub face_find {
764	my ($self, $facenum, $face, $cb) = @_;	810	my ($self, $facenum, $face, $cb) = @_;
765		811
766	my $hash = "$face->{chksum},$face->{name}";	812	if ($face->{type} == 0) { # FT_FACE
767
768	my $id = CFPlus::DB::get_tile_id_sync $hash;	813	my $id = CFPlus::DB::get_tile_id_sync $face->{name};
769		814
770	$face->{id} = $id;	815	$face->{id} = $id;
771	$self->{faceid}[$facenum] = $id;	816	$self->{faceid}[$facenum] = $id;
772		817
773	$self->{map}->set_tileid ($facenum => $id);	818	$self->{map}->set_tileid ($facenum => $id);
774		819
775	CFPlus::DB::get tilecache => $id, $cb;	820	CFPlus::DB::get tilecache => $id, $cb;
		821
		822	} elsif ($face->{type} & 1) { # with metadata
		823	CFPlus::DB::get res_meta => $face->{name}, $cb;
		824	}
776	}	825	}
777		826
778	sub face_update {	827	sub face_update {
779	my ($self, $facenum, $face, $changed) = @_;	828	my ($self, $facenum, $face, $changed) = @_;
780		829
		830	if ($face->{type} == 0) { # FT_FACE
781	CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }	831	CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
782	if $changed;	832	if $changed;
783		833
784	$self->set_texture ($face->{id} => delete $face->{image});	834	$self->have_tile ($face->{id});
		835
		836	} elsif ($face->{type} & 1) { # split metadata
		837	if ($changed) { # new data
		838	my ($meta_json, $data) = unpack "(w/a)", delete $face->{data};
		839	$face->{meta} = $self->{json_coder}->decode ($meta_json);
		840
		841	CFPlus::DB::put res_data => $face->{name} => $data, sub { };
		842	CFPlus::DB::put res_meta => $face->{name} => $meta_json, sub { };
		843	} else {
		844	$face->{meta} = $self->{json_coder}->decode (delete $face->{data});
		845	}
		846
		847	::add_license ($face);
		848
		849	if ($face->{type} == 3) { # FT_MUSIC
		850	$self->{music_meta}{$facenum} = $face;
		851
		852	::message ({ markup => "downloaded song #$facenum" })
		853	if $changed;
		854
		855	&::audio_music_push ($facenum);
		856	} elsif ($face->{type} == 5) { # FT_SOUND
		857	$self->{sound_meta}{$facenum} = $face;
		858
		859	::message ({ markup => "downloaded sound #$facenum" })
		860	if $changed;
		861
		862	&::audio_sound_push ($facenum);
		863	}
		864
		865	}
785	}	866	}
786		867
787	sub smooth_update {	868	sub smooth_update {
788	my ($self, $facenum, $face) = @_;	869	my ($self, $facenum, $face) = @_;
789		870
790	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});	871	$self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
791	}	872	}
792		873
793	sub set_texture {	874	sub have_tile {
794	my ($self, $id, $data) = @_;	875	my ($self, $tile) = @_;
795		876
796	return unless $self->{map};	877	return unless $self->{map};
797		878
798	$self->{texture}[$id] = my $tex =	879	my $tex = $self->{texture}[$tile] \|\|=
799	new_from_image CFPlus::Texture	880	new CFPlus::Texture
800	$data, minify => 1, mipmap => 1;	881	tile => $tile, minify => 1, mipmap => 1, delay => 1;
801		882
802	$self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
803	$self->{map_widget}->update;
804
805	$_->() for @{(delete $self->{face_cb}{$id}) \|\| []};	883	$_->($tex) for @{(delete $self->{face_cb}{$tile}) \|\| []};
806	}	884	}
807		885
808	sub connect_face_update {	886	sub connect_face_update {
809	my ($self, $id, $cb) = @_;	887	my ($self, $id, $cb) = @_;
810		888
…		…
816	@{$self->{face_cb}{$id}};	894	@{$self->{face_cb}{$id}};
817	}	895	}
818	}	896	}
819		897
820	sub sound_play {	898	sub sound_play {
821	my ($self, $x, $y, $soundnum, $type) = @_;	899	my ($self, $type, $face, $dx, $dy, $vol) = @_;
822		900
823	$self->{sound_play}->($x, $y, $soundnum, $type);	901	&::audio_sound_play ($face, $dx, $dy, $vol)
		902	unless $type & 1; # odd types are silent for future expansion
824	}	903	}
825		904
826	my $LAST_QUERY; # server is stupid, stupid, stupid	905	my $LAST_QUERY; # server is stupid, stupid, stupid
827		906
828	sub query {	907	sub query {
…		…
893	$self->{$type} = $text;	972	$self->{$type} = $text;
894	} else {	973	} else {
895	$self->logprint ("msg: ", $text);	974	$self->logprint ("msg: ", $text);
896	return if $color < 0; # negative color == ignore if not understood	975	return if $color < 0; # negative color == ignore if not understood
897		976
898	my $fg = $CF_COLOR[$color % @CF_COLOR];	977	my $fg = $CF_COLOR[$color & NDI_COLOR_MASK] \|\| [1, 0, 0];
899		978
900	## try to create single paragraphs of multiple lines sent by the server	979	## try to create single paragraphs of multiple lines sent by the server
901	# no longer neecssary with TRT servers	980	# no longer neecssary with TRT servers
902	#$text =~ s/(?<=\S)\n(?=\w)/ /g;	981	#$text =~ s/(?<=\S)\n(?=\w)/ /g;
903		982
904	::message ({ fg => $fg, markup => $_ })	983	::message ({
		984	fg => $fg,
		985	markup => $_,
		986	type => $type,
		987	extra => [@extra],
		988	color_flags => $color
905	for split /\n/, $text;	989	}) for split /\n/, $text;
906		990
907	$self->{statusbox}->add ($text,	991	$self->{statusbox}->add ($text,
908	group => $text,	992	group => $text,
909	fg => $fg,	993	fg => $fg,
910	timeout => $color >= 2 ? 180 : 10,	994	timeout => $color >= 2 ? 180 : 10,
…		…
966	$self->{map_widget}->clr_commands;	1050	$self->{map_widget}->clr_commands;
967		1051
968	::stop_game ();	1052	::stop_game ();
969	}	1053	}
970		1054
971	sub image_info {
972	my ($self, $numfaces) = @_;
973
974	$self->{num_faces} = $numfaces;
975	$self->{face_prefetch} = [1 .. $numfaces];
976	$self->face_prefetch;
977	}
978
979	sub face_prefetch {
980	my ($self) = @_;
981
982	return unless $::CFG->{face_prefetch};
983
984	if ($self->{num_faces}) {
985	return if @{ $self->{send_queue} \|\| [] };
986	my $todo = @{ $self->{face_prefetch} }
987	or return;
988
989	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
990
991	$self->send ("requestinfo image_sums $face $face");
992
993	$self->{statusbox}->add (CFPlus::asxml "prefetching $todo",
994	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
995	} elsif (!exists $self->{num_faces}) {
996	$self->send ("requestinfo image_info");
997
998	$self->{num_faces} = 0;
999
1000	$self->{statusbox}->add (CFPlus::asxml "starting to prefetch",
1001	group => "prefetch", timeout => 3, fg => [1, 1, 0, 0.5]);
1002	}
1003	}
1004
1005	sub update_floorbox {	1055	sub update_floorbox {
1006	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {	1056	$CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
1007	return unless $::CONN;	1057	return unless $::CONN;
1008		1058
1009	$::FLOORBOX->clear;	1059	$::FLOORBOX->clear;
…		…
1038	}	1088	}
1039		1089
1040	$::FLOORBOX->add_at (@add);	1090	$::FLOORBOX->add_at (@add);
1041	});	1091	});
1042		1092
1043	$::WANT_REFRESH++;	1093	$::WANT_REFRESH->start;
1044	}	1094	}
1045		1095
1046	sub set_opencont {	1096	sub set_opencont {
1047	my ($conn, $tag, $name) = @_;	1097	my ($conn, $tag, $name) = @_;
1048	$conn->{open_container} = $tag;	1098	$conn->{open_container} = $tag;
1049	update_floorbox;	1099	update_floorbox;
1050		1100
1051	$::INV_RIGHT_HB->clear ();	1101	$::INVR_HB->clear ();
1052	$::INV_RIGHT_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);	1102	$::INVR_HB->add (new CFPlus::UI::Label align => 0, expand => 1, text => $name);
1053		1103
1054	if ($tag != 0) { # Floor isn't closable, is it?	1104	if ($tag != 0) { # Floor isn't closable, is it?
1055	$::INV_RIGHT_HB->add (new CFPlus::UI::Button	1105	$::INVR_HB->add (new CFPlus::UI::Button
1056	text => "Close container",	1106	text => "Close container",
1057	tooltip => "Close the currently open container (if one is open)",	1107	tooltip => "Close the currently open container (if one is open)",
1058	on_activate => sub {	1108	on_activate => sub {
1059	$::CONN->send ("apply $tag") # $::CONN->{open_container}")	1109	$::CONN->send ("apply $tag") # $::CONN->{open_container}")
1060	if $tag != 0;	1110	if $tag != 0;
1061	#if $CONN->{open_container} != 0;
1062	0	1111	0
1063	},	1112	},
1064	);	1113	);
1065	}	1114	}
1066		1115
…		…
1165	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"	1214	. "cfplus support $yesno[$self->{cfplus_ext} > 0]"
1166	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"	1215	. ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
1167	. "map size $self->{mapw}×$self->{maph}\n"	1216	. "map size $self->{mapw}×$self->{maph}\n"
1168	);	1217	);
1169		1218
1170	::setup_build_button ($self->{editor_support}->{builder_ui});
1171	}	1219	}
1172		1220
1173	sub logged_in {	1221	sub logged_in {
1174	my ($self) = @_;	1222	my ($self) = @_;
1175		1223
…		…
1195		1243
1196	$self->send_command ("output-sync $::CFG->{output_sync}");	1244	$self->send_command ("output-sync $::CFG->{output_sync}");
1197	$self->send_command ("output-count $::CFG->{output_count}");	1245	$self->send_command ("output-count $::CFG->{output_count}");
1198	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;	1246	$self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
1199	$self->send_command ("pickup $::CFG->{pickup}");	1247	$self->send_command ("pickup $::CFG->{pickup}");
1200	}
1201
1202	sub buildat {
1203	my ($self, $builditem, $x, $y) = @_;
1204
1205	if ($self->{cfplus_ext}) {
1206	$self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
1207	}
1208	}	1248	}
1209		1249
1210	sub lookat {	1250	sub lookat {
1211	my ($self, $x, $y) = @_;	1251	my ($self, $x, $y) = @_;
1212		1252

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.128 by root, Mon Jul 23 21:03:26 2007 UTC vs. Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.128 by root, Mon Jul 23 21:03:26 2007 UTC vs.
Revision 1.155 by root, Fri Aug 17 21:18:01 2007 UTC