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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC vs.
Revision 1.133 by root, Tue Apr 18 02:38:51 2006 UTC

…		…
13	use SDL::OpenGL;	13	use SDL::OpenGL;
14		14
15	use Crossfire;	15	use Crossfire;
16	use Crossfire::Protocol;	16	use Crossfire::Protocol;
17		17
		18	use Compress::LZF;
		19
18	use CFClient;	20	use CFClient;
19	use CFClient::UI;	21	use CFClient::UI;
20		22
21	our $VERSION = '0.1';	23	our $VERSION = '0.1';
22		24
23	my $MAX_FPS = 60;	25	my $MAX_FPS = 60;
24	my $MIN_FPS = 5; # unused as of yet	26	my $MIN_FPS = 5; # unused as of yet
25		27
26	our $META_SERVER = "crossfire.real-time.com:13326";	28	our $META_SERVER = "crossfire.real-time.com:13326";
27		29
		30	our $FACEMAP;
		31	our $TILECACHE;
28	our $FACECACHE;	32	our $MAPCACHE;
29		33
30	our $LAST_REFRESH;	34	our $LAST_REFRESH;
31	our $NOW;	35	our $NOW;
32		36
33	our $CFG;	37	our $CFG;
…		…
45	our $BUTTONBAR;	49	our $BUTTONBAR;
46	our $LOGVIEW;	50	our $LOGVIEW;
47	our $CONSOLE;	51	our $CONSOLE;
48	our $METASERVER;	52	our $METASERVER;
49		53
		54	our $GAUGES;
		55
50	our $SDL_ACTIVE;	56	our $SDL_ACTIVE;
51	our $SDL_EV;	57	our $SDL_EV;
52	our %SDL_CB;	58	our %SDL_CB;
53		59
54	our $ALT_ENTER_MESSAGE;	60	our $ALT_ENTER_MESSAGE;
55	our $STATUS_LINE;	61	our $STATUS_LINE;
56	our $DEBUG_STATUS;	62	our $DEBUG_STATUS;
57		63
58	sub status {	64	sub status {
59	$STATUS_LINE->set_text ($_[0]);	65	$STATUS_LINE->set_text ($_[0]);
60	my ($w, $h) = $STATUS_LINE->size_request;
61	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	66	$STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
62	}	67	}
63		68
64	sub debug {	69	sub debug {
65	$DEBUG_STATUS->set_text ($_[0]);	70	$DEBUG_STATUS->set_text ($_[0]);
66	my ($w, $h) = $DEBUG_STATUS->size_request;	71	$DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
67	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
68	}	72	}
69		73
70	sub start_game {	74	sub start_game {
71	status "logging in...";	75	status "logging in...";
72		76
73	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	77	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		78
		79	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
74		80
75	$MAP = new CFClient::Map $mapsize, $mapsize;	81	$MAP = new CFClient::Map $mapsize, $mapsize;
76		82
77	my ($host, $port) = split /:/, $CFG->{host};	83	my ($host, $port) = split /:/, $CFG->{host};
78		84
…		…
140		146
141	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	147	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
142	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	148	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
143	my ($self, $value) = @_;	149	my ($self, $value) = @_;
144	$CFG->{fow_smooth} = $value;	150	$CFG->{fow_smooth} = $value;
		151	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
145	});	152	});
146		153
147	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");	154	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
148	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {	155	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
149	my ($self, $value) = @_;	156	my ($self, $value) = @_;
…		…
166		173
167	$dialog	174	$dialog
168	}	175	}
169		176
170	sub update_metaserver {	177	sub update_metaserver {
		178	my ($HOST) = @_;
		179
171	status "fetching metaserver list...";	180	status "fetching metaserver list...";
172		181
173	my $buf;	182	my $buf;
174		183
175	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;	184	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
…		…
181	$_[0]->w->cancel;	190	$_[0]->w->cancel;
182	status "metaserver: $!";	191	status "metaserver: $!";
183	} elsif ($res == 0) {	192	} elsif ($res == 0) {
184	$_[0]->w->cancel;	193	$_[0]->w->cancel;
185	status "server list retrieved";	194	status "server list retrieved";
186	warn $buf;	195
		196	my $table = $METASERVER->{table};
		197
		198	$table->clear;
		199
		200	my @col = qw(Use #Users Host Uptime Version Description);
		201	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		202	for 0 .. $#col;
		203
		204	my @align = qw(1 0 1 1 -1);
		205
		206	my $y = 0;
		207	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		208	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		209
		210	for ($desc) {
		211	s/<br>/\n/gi;
		212	s/<li>/\n· /gi;
		213	s/<.*?>//sgi;
		214	s/&/&/g;
		215	s/</</g;
		216	s/>/>/g;
		217	}
		218
		219	$uptime = sprintf "%dd %02d:%02d:%02d",
		220	(int $m->[8] / 86400),
		221	(int $m->[8] / 3600) % 24,
		222	(int $m->[8] / 60) % 60,
		223	$m->[8] % 60;
		224
		225	$m = [$users, $host, $uptime, $version, $desc];
		226
		227	$y++;
		228
		229	$table->add (0, $y, new CFClient::UI::VBox children => [
		230	(new CFClient::UI::Button text => " ", connect_activate => sub {
		231	$HOST->set_text ($CFG->{host} = $host);
		232	}),
		233	(new CFClient::UI::Empty expand => 1),
		234	]);
		235
		236	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		237	for 0 .. $#$m;
		238	}
187	}	239	}
188	});	240	});
189	}	241	}
190		242
191	sub server_setup {	243	sub server_setup {
…		…
197	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");	249	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
198		250
199	{	251	{
200	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	252	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
201		253
202	$vbox->add (new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	254	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
203	my ($self, $value) = @_;	255	my ($self, $value) = @_;
204	$CFG->{host} = $value;	256	$CFG->{host} = $value;
205	});	257	});
206		258
207	$METASERVER = metaserver_dialog;	259	$METASERVER = metaserver_dialog;
208		260
209	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {	261	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
210	update_metaserver;	262	update_metaserver $HOST;
211	});	263	});
212	}	264	}
213		265
214	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	266	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
215	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	267	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
216	my ($self, $value) = @_;	268	my ($self, $value) = @_;
217	$CFG->{user} = $value;	269	$CFG->{user} = $value;
218	});	270	});
219		271
220	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	272	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
221	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	273	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
222	my ($self, $value) = @_;	274	my ($self, $value) = @_;
223	$CFG->{password} = $value;	275	$CFG->{password} = $value;
224	});	276	});
225		277
226	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	278	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
…		…
249		301
250	sub message_window {	302	sub message_window {
251	my $window = new CFClient::UI::FancyFrame	303	my $window = new CFClient::UI::FancyFrame
252	border_bg => [1, 1, 1, 0.5],	304	border_bg => [1, 1, 1, 0.5],
253	bg => [0.3, 0.3, 0.3, 0.8],	305	bg => [0.3, 0.3, 0.3, 0.8],
254	user_w => $::WIDTH/4,	306	user_w => int $::WIDTH / 3,
255	user_h => $::HEIGHT,	307	user_h => int $::HEIGHT / 5,
256	child => (my $vbox = new CFClient::UI::VBox);	308	child => (my $vbox = new CFClient::UI::VBox);
257		309
258	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	310	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
259	expand => 1,	311	expand => 1,
260	fontsize => $::CFG->{log_fontsize},	312	fontsize => $::CFG->{log_fontsize},
261	);	313	);
262		314
263	$vbox->add (my $input = new CFClient::UI::LineEntry);	315	$vbox->add (my $input = new CFClient::UI::Entry
		316	connect_focus_in => sub {
		317	my ($input, $prev_focus) = @_;
		318
		319	delete $input->{refocus_map};
		320
		321	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
		322	$input->{refocus_map} = 1;
		323	}
		324	delete $input->{auto_activated};
		325	},
264	$input->connect (activate => sub {	326	connect_activate => sub {
265	my ($input, $text) = @_;	327	my ($input, $text) = @_;
266	$input->set_text ('');	328	$input->set_text ('');
267		329
268	if ($text =~ /^\/(.*)/) {	330	if ($text =~ /^\/(.*)/) {
269	$::CONN->user_send ("command $1");	331	$::CONN->user_send ($1);
270	} else {	332	} else {
271	my $say_cmd = $::CFG->{say_command} \|\| 'say';	333	my $say_cmd = $::CFG->{say_command} \|\| 'say';
272	$::CONN->user_send ("command $say_cmd $text");	334	$::CONN->user_send ("$say_cmd $text");
273	}	335	}
		336	if ($input->{refocus_map}) {
		337	delete $input->{refocus_map};
		338	$MAPWIDGET->focus_in
274	1	339	}
275	});	340	},
276	$input->connect (escape => sub {	341	connect_escape => sub {
277	$MAPWIDGET->focus_in	342	$MAPWIDGET->focus_in
278	});	343	},
279	$input->focus_in;	344	);
280		345
281	$CONSOLE = {	346	$CONSOLE = {
282	window => $window,	347	window => $window,
283	input => $input	348	input => $input
284	};	349	};
…		…
300	$FAST = $CFG->{fast};	365	$FAST = $CFG->{fast};
301		366
302	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	367	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
303	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	368	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
304	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	369	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
305	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	370	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
306		371
307	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	372	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
308	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	373	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
309	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	374	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
310	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	375	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
340	padding => 0,	405	padding => 0,
341	y => $HEIGHT * 44 / 45 - $FONTSIZE;	406	y => $HEIGHT * 44 / 45 - $FONTSIZE;
342	$CFClient::UI::ROOT->add ($STATUS_LINE);	407	$CFClient::UI::ROOT->add ($STATUS_LINE);
343		408
344	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	409	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
345	padding => 0,	410	padding => 0,
346	y => $HEIGHT * 44 / 45,	411	y => $HEIGHT * 44 / 45,
347	height => $HEIGHT / 45,	412	fontsize => $HEIGHT / 45,
348	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	413	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
349	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);	414	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
350		415
351	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);	416	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
352	$MAPWIDGET->focus_in;	417	$MAPWIDGET->focus_in;
353	$MAPWIDGET->connect (activate_console => sub {	418	$MAPWIDGET->connect (activate_console => sub {
354	my ($mapwidget, $preset) = @_;	419	my ($mapwidget, $preset) = @_;
355		420
356	if ($CONSOLE) {	421	if ($CONSOLE) {
		422	$CONSOLE->{input}->{auto_activated} = 1;
357	$CONSOLE->{input}->focus_in;	423	$CONSOLE->{input}->focus_in;
358		424
359	if ($preset && $CONSOLE->{input}->get_text eq '') {	425	if ($preset && $CONSOLE->{input}->get_text eq '') {
360	$CONSOLE->{input}->set_text ($preset);	426	$CONSOLE->{input}->set_text ($preset);
361	}	427	}
…		…
371	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	437	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
372	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	438	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
373	status "Configuration Saved";	439	status "Configuration Saved";
374	});	440	});
375		441
376	$BUTTONBAR->{children}[0]->emit ("activate");	442	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
		443
		444	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
		445	$tgw->add (my $hbox = new CFClient::UI::HBox ());
		446
		447	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
		448	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
		449	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
		450	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
		451
		452	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
		453	$CFClient::UI::ROOT->add ($tgw);
377	}	454	}
378		455
379	sub destroy_screen {	456	sub destroy_screen {
380	$CFClient::UI::ROOT->{children} = [];	457	$CFClient::UI::ROOT->{children} = [];
381	undef $SDL_ACTIVE;	458	undef $SDL_ACTIVE;
…		…
437	delete $animate_object{$widget};	514	delete $animate_object{$widget};
438	}	515	}
439		516
440	@conn::ISA = Crossfire::Protocol::;	517	@conn::ISA = Crossfire::Protocol::;
441		518
		519	sub conn::stats_update {
		520	my ($self, $stats) = @_;
		521
		522	# i love text protocols!!!
		523	# FIXME: the stats are somehow weird
		524	my $hp = $stats->{1};
		525	my $hp_m = $stats->{2};
		526	my $sp = $stats->{3};
		527	my $sp_m = $stats->{4};
		528	my $fo = $stats->{18};
		529	my $fo_m = 1000;
		530	my $gr = $stats->{23};
		531	my $gr_m = $stats->{24};
		532
		533	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
		534	$GAUGES->{hp}->set_value ($hp, $hp_m);
		535	$GAUGES->{mana}->set_value ($sp, $sp_m);
		536	$GAUGES->{food}->set_value ($fo, $fo_m);
		537	$GAUGES->{grace}->set_value ($gr, $gr_m);
		538	}
		539
442	sub conn::user_send {	540	sub conn::user_send {
443	my ($self, $command) = @_;	541	my ($self, $command) = @_;
444		542
445	$self->send ($command);	543	$self->send_command ($command);
446	status $command;	544	status $command;
		545	}
		546
		547	sub conn::map_scroll {
		548	my ($self, $dx, $dy) = @_;
		549
		550	$MAP->scroll ($dx, $dy);
447	}	551	}
448		552
449	sub conn::feed_map1a {	553	sub conn::feed_map1a {
450	my ($self, $data) = @_;	554	my ($self, $data) = @_;
451		555
452	# $self->Crossfire::Protocol::feed_map1a ($data);	556	# $self->Crossfire::Protocol::feed_map1a ($data);
453		557
454	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
455	$MAP->map1a_update ($data);	558	$MAP->map1a_update ($data);
456	$MAPWIDGET->update;	559	$MAPWIDGET->update;
457	}	560	}
458		561
459	#sub conn::map_update {	562	sub conn::flush_map {
460	# my ($self, $dirty) = @_;	563	my ($self) = @_;
461	#	564
462	# $MAPWIDGET->update;	565	my $map_info = delete $self->{map_info}
463	#}	566	or return;
		567
		568	my ($hash, $x, $y, $w, $h) = @$map_info;
		569
		570	my $data = $MAP->get_rect ($x, $y, $w, $h);
		571	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		572
		573	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		574
		575	}
464		576
465	sub conn::map_clear {	577	sub conn::map_clear {
466	my ($self) = @_;	578	my ($self) = @_;
467		579
		580	$self->flush_map;
		581	delete $self->{neigh};
		582
468	$MAP->clear;	583	$MAP->clear;
		584	}
469		585
470	# refresh;	586
		587	sub conn::load_map($$$) {
		588	my ($self, $hash, $x, $y) = @_;
		589
		590	if (defined (my $data = $MAPCACHE->get ($hash))) {
		591	$data = Compress::LZF::decompress $data;
		592	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
		593	for my $id ($MAP->set_rect ($x, $y, $data)) {
		594	my $data = $TILECACHE->get ($id)
		595	or next;
		596
		597	$self->set_texture ($id => $data);
		598	}
		599	}
		600	}
		601
		602	sub conn::flood_fill {
		603	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
		604
		605	# the server does not allow map paths > 6
		606	return if 6 <= length $path;
		607
		608	for my $tile (1..4) {
		609	next if $self->{neigh}{$hash}[$tile];
		610	next unless $flags & (1 << ($tile - 1));
		611
		612	my $neigh = $self->{neigh}{$hash} \|\|= [];
		613
		614	$self->send_mapinfo ("spatial $path$tile", sub {
		615	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		616
		617	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
		618	return if $mode ne "spatial";
		619
		620	$x += $MAP->ox;
		621	$y += $MAP->oy;
		622
		623	$self->load_map ($hash, $x, $y)
		624	unless $self->{neigh}{$hash}[5]++;#d#
		625
		626	$neigh->[$tile] = [$x, $y, $w, $h];
		627
		628	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
		629	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		630	});
		631	}
		632	}
		633
		634	sub conn::map_change {
		635	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		636
		637	$self->flush_map;
		638
		639	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
		640
		641	my $mapmapw = 250;
		642	my $mapmaph = 250;
		643
		644	$self->flood_fill ("", $hash, $flags,
		645	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		646	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
		647
		648	$x += $ox;
		649	$y += $oy;
		650
		651	$self->{map_info} = [$hash, $x, $y, $w, $h];
		652
		653	$self->load_map ($hash, $x, $y);
471	}	654	}
472		655
473	sub conn::face_find {	656	sub conn::face_find {
474	my ($self, $face) = @_;	657	my ($self, $facenum, $face) = @_;
475		658
476	$FACECACHE->{"$face->{chksum},$face->{name}"}	659	my $hash = "$face->{chksum},$face->{name}";
		660
		661	my $id = $FACEMAP->get ($hash);
		662
		663	unless ($id) {
		664	# create new id for face
		665	# i love transactions
		666	for (1..100) {
		667	my $txn = $CFClient::DB_ENV->txn_begin;
		668	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		669	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		670	$id++;
		671	if ($FACEMAP->put (id => $id) == 0
		672	&& $FACEMAP->put ($hash => $id) == 0) {
		673	$txn->txn_commit;
		674
		675	goto gotid;
		676	}
		677	}
		678	$txn->abort;
		679	}
		680
		681	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		682	}
		683
		684	gotid:
		685	$face->{id} = $id;
		686	$MAP->set_face ($facenum => $id);
		687	$TILECACHE->get ($id)
477	}	688	}
478		689
479	sub conn::face_update {	690	sub conn::face_update {
480	my ($self, $facenum, $face) = @_;	691	my ($self, $facenum, $face) = @_;
481		692
482	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	693	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
483		694
484	my $tex = $face->{texture} =	695	$self->set_texture ($face->{id} => delete $face->{image});
		696	}
		697
		698	sub conn::set_texture {
		699	my ($self, $id, $data) = @_;
		700
		701	$self->{texture}[$id] \|\|= do {
		702	my $tex =
485	new_from_image CFClient::Texture	703	new_from_image CFClient::Texture
486	delete $face->{image}, minify => 1;	704	$data, minify => 1;
487		705
488	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});	706	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
489	$MAPWIDGET->update;	707	$MAPWIDGET->update;
		708
		709	$tex
		710	};
490	}	711	}
491		712
492	sub conn::query {	713	sub conn::query {
493	my ($self, $flags, $prompt) = @_;	714	my ($self, $flags, $prompt) = @_;
494		715
…		…
500	my ($self, $color, $text) = @_;	721	my ($self, $color, $text) = @_;
501		722
502	my @color = (	723	my @color = (
503	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	724	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
504	[1.00, 1.00, 1.00],	725	[1.00, 1.00, 1.00],
505	[0.00, 0.00, 0.55],	726	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
506	[1.00, 0.00, 0.00],	727	[1.00, 0.00, 0.00],
507	[1.00, 0.54, 0.00],	728	[1.00, 0.54, 0.00],
508	[0.11, 0.56, 1.00],	729	[0.11, 0.56, 1.00],
509	[0.93, 0.46, 0.00],	730	[0.93, 0.46, 0.00],
510	[0.18, 0.54, 0.34],	731	[0.18, 0.54, 0.34],
…		…
554	},	775	},
555	);	776	);
556		777
557	#############################################################################	778	#############################################################################
558		779
		780	$SIG{INT} = $SIG{TERM} = sub { exit };
		781
		782	$TILECACHE = CFClient::db_table "tilecache";
		783	$FACEMAP = CFClient::db_table "facemap";
		784
559	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	785	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
560		786
561	my %DEF_CFG = (	787	my %DEF_CFG = (
562	sdl_mode => 0,	788	sdl_mode => 0,
563	width => 640,	789	width => 640,
…		…
586		812
587	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	813	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
588		814
589	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	815	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
590		816
591	init_screen;
592
593	{	817	{
594	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	818	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
595		819
596	CFClient::add_font $_ for @fonts;	820	CFClient::add_font $_ for @fonts;
597	CFClient::set_font $fonts[0];	821	CFClient::set_font $fonts[0];
598	}	822	}
599		823
600	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	824	init_screen;
601		825
602	Event::loop;	826	Event::loop;
603		827
604	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	828	END { SDL::Quit }
605		829
		830

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC vs. Revision 1.133 by root, Tue Apr 18 02:38:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC vs.
Revision 1.133 by root, Tue Apr 18 02:38:51 2006 UTC