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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.6 by elmex, Thu May 25 21:24:40 2006 UTC vs.
Revision 1.13 by root, Fri May 26 20:50:35 2006 UTC

…		…
29	use Time::HiRes 'time';	29	use Time::HiRes 'time';
30	use Pod::POM;	30	use Pod::POM;
31	use Event;	31	use Event;
32		32
33	use Crossfire;	33	use Crossfire;
34	use Crossfire::Protocol;	34	use Crossfire::Protocol::Constants;
35		35
36	use Compress::LZF;	36	use Compress::LZF;
37		37
38	use CFClient;	38	use CFClient;
		39	use CFClient::OpenGL ();
		40	use CFClient::Protocol;
39	use CFClient::UI;	41	use CFClient::UI;
40	use CFClient::MapWidget;	42	use CFClient::MapWidget;
41		43
42	$Event::DIED = sub {	44	$Event::DIED = sub {
43	# TODO: display dialog box or so	45	# TODO: display dialog box or so
…		…
50		52
51	my $MAX_FPS = 60;	53	my $MAX_FPS = 60;
52	my $MIN_FPS = 5; # unused as of yet	54	my $MIN_FPS = 5; # unused as of yet
53		55
54	our $META_SERVER = "crossfire.real-time.com:13326";	56	our $META_SERVER = "crossfire.real-time.com:13326";
55
56	our $FACEMAP;
57	our $TILECACHE;
58	our $MAPCACHE;
59		57
60	our $LAST_REFRESH;	58	our $LAST_REFRESH;
61	our $NOW;	59	our $NOW;
62		60
63	our $CFG;	61	our $CFG;
…		…
119	sub start_game {	117	sub start_game {
120	status "logging in...";	118	status "logging in...";
121		119
122	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	120	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
123		121
124	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";	122	my ($host, $port) = split /:/, $CFG->{host};
		123
125	$MAP = new CFClient::Map $mapsize, $mapsize;	124	$MAP = new CFClient::Map $mapsize, $mapsize;
126
127	my ($host, $port) = split /:/, $CFG->{host};
128		125
129	$CONN = eval {	126	$CONN = eval {
130	new conn	127	new CFClient::Protocol
131	host => $host,	128	host => $host,
132	port => $port \|\| 13327,	129	port => $port \|\| 13327,
133	user => $CFG->{user},	130	user => $CFG->{user},
134	pass => $CFG->{password},	131	pass => $CFG->{password},
135	mapw => $mapsize,	132	mapw => $mapsize,
136	maph => $mapsize,	133	maph => $mapsize,
137	;	134
		135	map_widget => $MAPWIDGET,
		136	logview => $LOGVIEW,
		137	statusbox => $STATUSBOX,
		138	map => $MAP,
		139	mapmap => $MAPMAP,
		140
		141	sound_play => sub {
		142	my ($x, $y, $soundnum, $type) = @_;
		143
		144	$SDL_MIXER
		145	or return;
		146
		147	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
		148	or return;
		149
		150	$chunk->play;
		151	},
138	};	152	};
139		153
140	if ($CONN) {	154	if ($CONN) {
141	CFClient::lowdelay fileno $CONN->{fh};	155	CFClient::lowdelay fileno $CONN->{fh};
142		156
…		…
160	$CONN->destroy;	174	$CONN->destroy;
161	$CONN = 0; # false, does not autovivify	175	$CONN = 0; # false, does not autovivify
162		176
163	$BUTTONBAR->{children}[1]->emit ("activate")	177	$BUTTONBAR->{children}[1]->emit ("activate")
164	unless $BUTTONBAR->{children}[1]->{state};	178	unless $BUTTONBAR->{children}[1]->{state};
165
166	undef $MAPCACHE;
167	undef $MAP;
168	}	179	}
169		180
170	sub client_setup {	181	sub client_setup {
171	my $dialog = new CFClient::UI::FancyFrame	182	my $dialog = new CFClient::UI::FancyFrame
172	title => "Client Setup",	183	title => "Client Setup",
…		…
537	}	548	}
538		549
539	sub update_stats_window {	550	sub update_stats_window {
540	my ($stats) = @_;	551	my ($stats) = @_;
541		552
542	# i love text protocols!!!	553	# I love text protocols...
		554
543	my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1;	555	my $hp = $stats->{+CS_STAT_HP} * 1;
544	my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1;	556	my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
545	my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1;	557	my $sp = $stats->{+CS_STAT_SP} * 1;
546	my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1;	558	my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
547	my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1;	559	my $fo = $stats->{+CS_STAT_FOOD} * 1;
548	my $fo_m = 999;	560	my $fo_m = 999;
549	my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1;	561	my $gr = $stats->{+CS_STAT_GRACE} * 1;
550	my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1;	562	my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
551		563
552	$GAUGES->{hp} ->set_value ($hp, $hp_m);	564	$GAUGES->{hp} ->set_value ($hp, $hp_m);
553	$GAUGES->{mana} ->set_value ($sp, $sp_m);	565	$GAUGES->{mana} ->set_value ($sp, $sp_m);
554	$GAUGES->{food} ->set_value ($fo, $fo_m);	566	$GAUGES->{food} ->set_value ($fo, $fo_m);
555	$GAUGES->{grace} ->set_value ($gr, $gr_m);	567	$GAUGES->{grace} ->set_value ($gr, $gr_m);
556	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64})	568	$GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
557	. " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")");	569	. " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
558	my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE};	570	my $rng = $stats->{+CS_STAT_RANGE};
559	$rng =~ s/^Range: //; # thank you so much dear server	571	$rng =~ s/^Range: //; # thank you so much dear server
560	$GAUGES->{range} ->set_text ("Rng: " . $rng);	572	$GAUGES->{range} ->set_text ("Rng: " . $rng);
561	my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE};	573	my $title = $stats->{+CS_STAT_TITLE};
562	$title =~ s/^Player: //;	574	$title =~ s/^Player: //;
563	$STATWIDS->{title} ->set_text ("Title: " . $title);	575	$STATWIDS->{title} ->set_text ("Title: " . $title);
564		576
565	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});	577	$STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
566	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});	578	$STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
567	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});	579	$STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
568	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});	580	$STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
569	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});	581	$STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
570	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});	582	$STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
571	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});	583	$STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
572	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});	584	$STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
573	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});	585	$STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
574	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});	586	$STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
575	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});	587	$STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR});
576	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED});	588	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
577	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP});	589	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
578		590
579	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::CS_STAT_WEIGHT_LIM} / 1000);	591	$STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
580		592
		593	# TODO: replace by CS_STAT_RES_xxx constants
581	my %tbl = (	594	my %tbl = (
582	phys => 100,	595	phys => 100,
583	magic => 101,	596	magic => 101,
584	fire => 102,	597	fire => 102,
585	elec => 103,	598	elec => 103,
…		…
594	tund => 112,	607	tund => 112,
595	fear => 113,	608	fear => 113,
596	depl => 113,	609	depl => 113,
597	deat => 115,	610	deat => 115,
598	holyw => 116,	611	holyw => 116,
599	blind => 117	612	blind => 117,
600	);	613	);
601		614
602	for (keys %tbl) {
603	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});	615	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
604	}	616	for keys %tbl;
605
606	}	617	}
607		618
608	sub metaserver_dialog {	619	sub metaserver_dialog {
609	my $dialog = new CFClient::UI::FancyFrame	620	my $dialog = new CFClient::UI::FancyFrame
610	title => "Server List",	621	title => "Server List",
…		…
894	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";	905	user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
895		906
896	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);	907	$invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
897		908
898	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);	909	$hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
899	$vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5);	910	$vb1->add (my $lbl = new CFClient::UI::Label align => 0);
900	$lbl->set_text ("Player");	911	$lbl->set_text ("Player");
901	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);	912	$vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
902		913
903	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);	914	$hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
904	$vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5);	915	$vb2->add ($INVR_LBL = new CFClient::UI::Label align => 0);
905	$INVR_LBL->set_text ("Floor");	916	$INVR_LBL->set_text ("Floor");
906	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);	917	$vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
907		918
908	$invwin	919	$invwin
909	}	920	}
…		…
966	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";	977	or die "SDL_SetVideoMode failed: " . (CFClient::SDL_GetError) . "\n";
967		978
968	$SDL_ACTIVE = 1;	979	$SDL_ACTIVE = 1;
969	$LAST_REFRESH = time - 0.01;	980	$LAST_REFRESH = time - 0.01;
970		981
971	CFClient::gl_init;	982	CFClient::OpenGL::init;
972		983
973	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	984	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
974		985
975	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#	986	$CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
976		987
…		…
1245	sub animation_stop {	1256	sub animation_stop {
1246	my ($widget) = @_;	1257	my ($widget) = @_;
1247	delete $animate_object{$widget};	1258	delete $animate_object{$widget};
1248	}	1259	}
1249		1260
1250	@conn::ISA = Crossfire::Protocol::;
1251
1252	sub conn::new {
1253	my $class = shift;
1254
1255	my $self = $class->Crossfire::Protocol::new (@_);
1256
1257	$MAPWIDGET->clr_commands;
1258
1259	my $parser = new Pod::POM;
1260	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1261
1262	for my $head2 ($pod->head2) {
1263	$head2->title =~ /^(\S+) (?:\s+ $ ([^$]*) \) )?/x
1264	or next;
1265
1266	my $cmd = $1;
1267	my @args = split /\\|/, $2;
1268	@args = (".*") unless @args;
1269
1270	my $text = CFClient::pod_to_pango $head2->content;
1271
1272	for my $arg (@args) {
1273	$arg = $arg eq ".*" ? "" : " $arg";
1274
1275	$MAPWIDGET->add_command ("$cmd$arg", $text);
1276	}
1277	}
1278
1279	$self->{noface} = new_from_file CFClient::Texture
1280	CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1281
1282	$self->{open_container} = 0;
1283
1284	$self
1285	}
1286
1287	sub conn::stats_update {
1288	my ($self, $stats) = @_;
1289
1290	if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1291	my $diff = $exp - $self->{prev_exp};
1292	$STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1293	if exists $self->{prev_exp} && $diff;
1294	$self->{prev_exp} = $exp;
1295	}
1296
1297	update_stats_window ($stats);
1298	}
1299
1300	sub conn::user_send {
1301	my ($self, $command) = @_;
1302
1303	$self->send_command ($command);
1304	status $command;
1305	}
1306
1307	sub conn::map_scroll {
1308	my ($self, $dx, $dy) = @_;
1309
1310	$MAP->scroll ($dx, $dy);
1311	}
1312
1313	sub conn::feed_map1a {
1314	my ($self, $data) = @_;
1315
1316	# $self->Crossfire::Protocol::feed_map1a ($data);
1317
1318	$MAP->map1a_update ($data);
1319	$MAPWIDGET->update;
1320	}
1321
1322	sub conn::flush_map {
1323	my ($self) = @_;
1324
1325	my $map_info = delete $self->{map_info}
1326	or return;
1327
1328	my ($hash, $x, $y, $w, $h) = @$map_info;
1329
1330	my $data = $MAP->get_rect ($x, $y, $w, $h);
1331	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
1332	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
1333	}
1334
1335	sub conn::map_clear {
1336	my ($self) = @_;
1337
1338	$self->flush_map;
1339	delete $self->{neigh_map};
1340
1341	$MAP->clear;
1342	}
1343
1344
1345	sub conn::load_map($$$) {
1346	my ($self, $hash, $x, $y) = @_;
1347
1348	if (defined (my $data = $MAPCACHE->get ($hash))) {
1349	$data = Compress::LZF::decompress $data;
1350	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
1351	for my $id ($MAP->set_rect ($x, $y, $data)) {
1352	my $data = $TILECACHE->get ($id)
1353	or next;
1354
1355	$self->set_texture ($id => $data);
1356	}
1357	}
1358	}
1359
1360	# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1361	# (server resource,s latency, bandwidth), so this hack is warranted.
1362	# the right fix is to make real tiled maps with an overview file
1363	sub conn::send_mapinfo {
1364	my ($self, $data, $cb) = @_;
1365
1366	if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1367	my ($wx, $wy) = ($1, $2);
1368
1369	if ($data =~ /^spatial ([1-4]+)$/) {
1370	my @dx = (0, 0, 1, 0, -1);
1371	my @dy = (0, -1, 0, 1, 0);
1372	my ($dx, $dy);
1373
1374	for (split //, $1) {
1375	$dx += $dx[$_];
1376	$dy += $dy[$_];
1377	}
1378
1379	$cb->(spatial => 15,
1380	$self->{map_info}[1] - $MAP->ox + $dx * 50,
1381	$self->{map_info}[2] - $MAP->oy + $dy * 50,
1382	50, 50,
1383	sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1384	);
1385
1386	return;
1387	}
1388	}
1389
1390	$self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1391	}
1392
1393	# this method does a "flood fill" into every tile direction
1394	# it assumes that tiles are arranged in a rectangular grid,
1395	# i.e. a map is the same as the left of the right map etc.
1396	# failure to comply are harmless and result in display errors
1397	# at worst.
1398	sub conn::flood_fill {
1399	my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1400
1401	# the server does not allow map paths > 6
1402	return if 7 <= length $path;
1403
1404	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1405
1406	for (
1407	[1, 3, 0, -1],
1408	[2, 4, 1, 0],
1409	[3, 1, 0, 1],
1410	[4, 2, -1, 0],
1411	) {
1412	my ($tile, $tile2, $dx, $dy) = @$_;
1413
1414	next if $block & (1 << $tile);
1415	my $block = $block \| (1 << $tile2);
1416
1417	my $gx = $gx + $dx;
1418	my $gy = $gy + $dy;
1419
1420	next unless $flags & (1 << ($tile - 1));
1421	next if $self->{neigh_grid}{$gx, $gy}++;
1422
1423	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
1424	if (my $info = $neigh->[$tile]) {
1425	my ($flags, $x, $y, $w, $h, $hash) = @$info;
1426
1427	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1428	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1429
1430	} else {
1431	$self->send_mapinfo ("spatial $path$tile", sub {
1432	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1433
1434	return if $mode ne "spatial";
1435
1436	$x += $MAP->ox;
1437	$y += $MAP->oy;
1438
1439	$self->load_map ($hash, $x, $y)
1440	unless $self->{neigh_map}{$hash}[5]++;#d#
1441
1442	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1443
1444	$self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1445	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1446	});
1447	}
1448	}
1449	}
1450
1451	sub conn::map_change {
1452	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1453
1454	$self->flush_map;
1455
1456	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1457
1458	my $mapmapw = $MAPMAP->{w};
1459	my $mapmaph = $MAPMAP->{h};
1460
1461	$self->{neigh_rect} = [
1462	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1463	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1464	];
1465
1466	delete $self->{neigh_grid};
1467
1468	$x += $ox;
1469	$y += $oy;
1470
1471	$self->{map_info} = [$hash, $x, $y, $w, $h];
1472
1473	(my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1474	$STATWIDS->{map}->set_text ("Map: " . $map);
1475
1476	$self->load_map ($hash, $x, $y);
1477	$self->flood_fill (0, 0, 0, "", $hash, $flags);
1478	}
1479
1480	sub conn::face_find {
1481	my ($self, $facenum, $face) = @_;
1482
1483	my $hash = "$face->{chksum},$face->{name}";
1484
1485	my $id = $FACEMAP->get ($hash);
1486
1487	unless ($id) {
1488	# create new id for face
1489	# I love transactions
1490	for (1..100) {
1491	my $txn = $CFClient::DB_ENV->txn_begin;
1492	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1493	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
1494	$id = ($id \|\| 16) + 1;
1495	if ($FACEMAP->put (id => $id) == 0
1496	&& $FACEMAP->put ($hash => $id) == 0) {
1497	$txn->txn_commit;
1498
1499	goto gotid;
1500	}
1501	}
1502	$txn->abort;
1503	}
1504
1505	CFClient::fatal "maximum number of transaction retries reached - database problems?";
1506	}
1507
1508	gotid:
1509	$face->{id} = $id;
1510	$MAP->set_face ($facenum => $id);
1511	$self->{faceid}[$facenum] = $id;#d#
1512
1513	my $face = $TILECACHE->get ($id);
1514
1515	if ($face) {
1516	#$self->face_prefetch;
1517	$face
1518	} else {
1519	my $tex = $self->{noface};
1520	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1521	undef
1522	};
1523	}
1524
1525	sub conn::face_update {
1526	my ($self, $facenum, $face) = @_;
1527
1528	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
1529
1530	$self->set_texture ($face->{id} => delete $face->{image});
1531	}
1532
1533	sub conn::set_texture {
1534	my ($self, $id, $data) = @_;
1535
1536	$self->{texture}[$id] \|\|= do {
1537	my $tex =
1538	new_from_image CFClient::Texture
1539	$data, minify => 1, mipmap => 1;
1540
1541	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1542	$MAPWIDGET->update;
1543
1544	$tex
1545	};
1546	}
1547
1548	sub conn::sound_play {
1549	my ($self, $x, $y, $soundnum, $type) = @_;
1550
1551	$SDL_MIXER
1552	or return;
1553
1554	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1555	or return;
1556
1557	$chunk->play;
1558	# warn "sound $x,$y,$soundnum,$type\n";#d#
1559	}
1560
1561	my $LAST_QUERY; # server is stupid, stupid, stupid
1562
1563	sub conn::query {
1564	my ($self, $flags, $prompt) = @_;
1565
1566	$prompt = $LAST_QUERY unless length $prompt;
1567	$LAST_QUERY = $prompt;
1568
1569	my $dialog = new CFClient::UI::FancyFrame
1570	title => "Query",
1571	child => my $vbox = new CFClient::UI::VBox;
1572
1573	$vbox->add (new CFClient::UI::Label
1574	max_w => $::WIDTH * 0.4,
1575	ellipsise => 0,
1576	text => $prompt);
1577
1578	if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1579	$vbox->add (my $hbox = new CFClient::HBox);
1580	$hbox->add (new CFClient::Button
1581	text => "No",
1582	connect_activate => sub {
1583	$self->send ("reply n");
1584	$dialog->destroy;
1585	$MAPWIDGET->focus_in;
1586	}
1587	);
1588	$hbox->add (new CFClient::Button
1589	text => "Yes",
1590	connect_activate => sub {
1591	$self->send ("reply y");
1592	$dialog->destroy;
1593	},
1594	);
1595
1596	$dialog->focus_in;
1597
1598	} elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1599	$dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1600	$vbox->add (my $entry = new CFClient::UI::Entry
1601	connect_changed => sub {
1602	$self->send ("reply $_[1]");
1603	$dialog->destroy;
1604	},
1605	);
1606
1607	$entry->focus_in;
1608
1609	} else {
1610	$dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1611
1612	$vbox->add (my $entry = new CFClient::UI::Entry
1613	$flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1614	connect_activate => sub {
1615	$self->send ("reply $_[1]");
1616	$dialog->destroy;
1617	},
1618	);
1619
1620	$entry->focus_in;
1621	}
1622
1623	$dialog->show_centered;
1624	}
1625
1626	sub conn::drawinfo {
1627	my ($self, $color, $text) = @_;
1628
1629	my @color = (
1630	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1631	[1.00, 1.00, 1.00],
1632	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
1633	[1.00, 0.00, 0.00],
1634	[1.00, 0.54, 0.00],
1635	[0.11, 0.56, 1.00],
1636	[0.93, 0.46, 0.00],
1637	[0.18, 0.54, 0.34],
1638	[0.56, 0.73, 0.56],
1639	[0.80, 0.80, 0.80],
1640	[0.55, 0.41, 0.13],
1641	[0.99, 0.77, 0.26],
1642	[0.74, 0.65, 0.41],
1643	);
1644
1645	my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1646
1647	$text = CFClient::UI::Label::escape $text;
1648	$text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1649	$text =~ s/\[color=(.?)\](.?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1650
1651	$LOGVIEW->add_paragraph ($color[$color],
1652	join "\n", map "$time $_", split /\n/, $text);
1653
1654	$STATUSBOX->add ($text,
1655	group => $text,
1656	fg => $color[$color],
1657	timeout => 10,
1658	tooltip_font => $::FONT_FIXED,
1659	);
1660	}
1661
1662	sub conn::drawextinfo {
1663	my ($self, $color, $type, $subtype, $message) = @_;
1664
1665	$self->drawinfo ($color, $message);
1666	}
1667
1668	sub conn::spell_add {
1669	my ($self, $spell) = @_;
1670
1671	# TODO
1672	# create a widget dynamically, using spell face (CF::Protocol downloads them)
1673	$MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1674	$MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1675	}
1676
1677	sub conn::spell_delete {
1678	my ($self, $spell) = @_;
1679	}
1680
1681	sub conn::addme_success {
1682	my ($self) = @_;
1683
1684	$self->send ("command output-sync $CFG->{output_sync}");
1685	$self->send ("command output-count $CFG->{output_count}");
1686
1687	my $parser = new Pod::POM;
1688	my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1689
1690	my %skill_tooltip;
1691
1692	for my $head2 ($pod->head2) {
1693	$skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1694	}
1695
1696	for my $skill (values %{$self->{skill_info}}) {
1697	$MAPWIDGET->add_command ("ready_skill $skill",
1698	(CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1699	. $skill_tooltip{$skill});
1700	$MAPWIDGET->add_command ("use_skill $skill",
1701	(CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1702	. $skill_tooltip{$skill});
1703	}
1704	}
1705
1706	sub conn::eof {
1707	$MAPWIDGET->clr_commands;
1708
1709	stop_game;
1710	}
1711
1712	sub conn::image_info {
1713	my ($self, $numfaces) = @_;
1714
1715	$self->{num_faces} = $numfaces;
1716	$self->{face_prefetch} = [1 .. $numfaces];
1717	$self->face_prefetch;
1718	}
1719
1720	sub conn::face_prefetch {
1721	my ($self) = @_;
1722
1723	return unless $CFG->{face_prefetch};
1724
1725	if ($self->{num_faces}) {
1726	return if @{ $self->{send_queue} \|\| [] };
1727	my $todo = @{ $self->{face_prefetch} }
1728	or return;
1729
1730	my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
1731
1732	$self->send ("requestinfo image_sums $face $face");
1733
1734	$STATUSBOX->add (CFClient::UI::Label::escape "prefetching $todo",
1735	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1736	} elsif (!exists $self->{num_faces}) {
1737	$self->send ("requestinfo image_info");
1738
1739	$self->{num_faces} = 0;
1740
1741	$STATUSBOX->add (CFClient::UI::Label::escape "starting to prefetch",
1742	group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1743	}
1744	}
1745
1746	# check once/second for faces that need to be prefetched	1261	# check once/second for faces that need to be prefetched
1747	# this should, of course, only run on demand, but	1262	# this should, of course, only run on demand, but
1748	# SDL forces worse things on us....	1263	# SDL forces worse things on us....
1749		1264
1750	Event->timer (after => 1, interval => 0.25, cb => sub {	1265	Event->timer (after => 1, interval => 0.25, cb => sub {
1751	$CONN->face_prefetch	1266	$CONN->face_prefetch
1752	if $CONN;	1267	if $CONN;
1753	});	1268	});
1754
1755	sub update_floorbox {
1756	$CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1757	return unless $CONN;
1758
1759	$FLOORBOX->clear;
1760	$FLOORBOX->add (0, 1, new CFClient::UI::Empty expand => 1);
1761
1762	my $row;
1763	for (@{ $CONN->{container}{0} }) {
1764	if (++$row < 7) {
1765	local $_->{face_widget}; # hack to force recreation of widget
1766	local $_->{desc_widget}; # hack to force recreation of widget
1767	CFClient::Item::update_widgets $_;
1768
1769	$FLOORBOX->add (0, $row, $_->{face_widget});
1770	$FLOORBOX->add (1, $row, $_->{desc_widget});
1771	} else {
1772	$FLOORBOX->add (new CFClient::UI::Label text => "More...");
1773	last;
1774	}
1775	}
1776	});
1777
1778	$WANT_REFRESH++;
1779	}
1780
1781	sub set_opencont {
1782	my ($conn, $tag, $name) = @_;
1783	$conn->{open_container} = $tag;
1784	$INVR_LBL->set_text ($name);
1785	$INVR->set_items ($conn->{container}{$tag});
1786	}
1787
1788	sub update_container {
1789	my ($tag) = @_;
1790	$INVR->set_items ($::CONN->{container}{$CONN->{open_container}})
1791	if $tag == $CONN->{open_container};
1792	}
1793
1794	sub conn::container_add {
1795	my ($self, $tag, $items) = @_;
1796
1797	#d# print "container_add: container $tag ($self->{player}{tag})\n";
1798
1799	if ($tag == 0) {
1800	update_floorbox;
1801	update_container (0);
1802	} elsif ($tag == $self->{player}{tag}) {
1803	$INV->set_items ($self->{container}{$self->{player}{tag}})
1804	} else {
1805	update_container ($tag);
1806	}
1807
1808	# $self-<{player}{tag} => player inv
1809	#use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1810	}
1811
1812	sub conn::container_clear {
1813	my ($self, $tag) = @_;
1814
1815	#d# print "container_clear: container $tag ($self->{player}{tag})\n";
1816
1817	if ($tag == 0) {
1818	update_floorbox;
1819	update_container (0);
1820	} elsif ($tag == $self->{player}{tag}) {
1821	$INV->set_items ($self->{container}{$tag})
1822	}
1823
1824	# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1825	}
1826
1827	sub conn::item_delete {
1828	my ($self, @items) = @_;
1829
1830	for (@items) {
1831	#d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1832
1833	if ($_->{container} == 0) {
1834	update_floorbox;
1835	update_container ($_->{tag});
1836	} elsif ($_->{container} == $self->{player}{tag}) {
1837	$INV->set_items ($self->{container}{$self->{player}{tag}})
1838	} else {
1839	update_container ($_->{tag});
1840	}
1841	}
1842	}
1843
1844	sub conn::item_update {
1845	my ($self, $item) = @_;
1846
1847	#d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($CONN->{open_container})\n";
1848
1849	if ($item->{tag} == $self->{player}{tag}) {
1850	$STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
1851	return
1852	}
1853
1854	CFClient::Item::update_widgets $item;
1855
1856	if ($item->{tag} == $CONN->{open_container} && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1857	set_opencont ($CONN, 0, "Floor");
1858
1859	} elsif ($item->{flags} & Crossfire::Protocol::F_OPEN) {
1860	set_opencont ($CONN, $item->{tag}, CFClient::Item::desc_string $item);
1861	} else {
1862	if ($item->{container} == 0) {
1863	update_floorbox;
1864	update_container (0);
1865	} elsif ($item->{container} == $self->{player}{tag}) {
1866	$INV->set_items ($self->{container}{$item->{container}})
1867	}
1868	}
1869	}
1870		1269
1871	%SDL_CB = (	1270	%SDL_CB = (
1872	CFClient::SDL_QUIT => sub {	1271	CFClient::SDL_QUIT => sub {
1873	Event::unloop -1;	1272	Event::unloop -1;
1874	},	1273	},
…		…
1909		1308
1910	{	1309	{
1911	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };	1310	local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1912		1311
1913	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1312	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1914
1915	$TILECACHE = CFClient::db_table "tilecache";
1916	$FACEMAP = CFClient::db_table "facemap";
1917		1313
1918	my %DEF_CFG = (	1314	my %DEF_CFG = (
1919	sdl_mode => 0,	1315	sdl_mode => 0,
1920	width => 640,	1316	width => 640,
1921	height => 480,	1317	height => 480,

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents): Revision 1.6 by elmex, Thu May 25 21:24:40 2006 UTC vs. Revision 1.13 by root, Fri May 26 20:50:35 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.6 by elmex, Thu May 25 21:24:40 2006 UTC vs.
Revision 1.13 by root, Fri May 26 20:50:35 2006 UTC