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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.110 by root, Sat Apr 15 12:30:53 2006 UTC vs.
Revision 1.116 by root, Sun Apr 16 07:25:30 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
		28	our $META_SERVER = "crossfire.real-time.com:13326";
		29
		30	our $FACEMAP;
		31	our $TILECACHE;
26	our $FACECACHE;	32	our $MAPCACHE;
27		33
28	our $LAST_REFRESH;	34	our $LAST_REFRESH;
29	our $NOW;	35	our $NOW;
30		36
31	our $CFG;	37	our $CFG;
…		…
38	our $FULLSCREEN;	44	our $FULLSCREEN;
39	our $FONTSIZE;	45	our $FONTSIZE;
40		46
41	our $MAP;	47	our $MAP;
42	our $MAPWIDGET;	48	our $MAPWIDGET;
		49	our $BUTTONBAR;
		50	our $LOGVIEW;
		51	our $CONSOLE;
		52	our $METASERVER;
43		53
44	our $SDL_ACTIVE;	54	our $SDL_ACTIVE;
45	our $SDL_EV;	55	our $SDL_EV;
46	our %SDL_CB;	56	our %SDL_CB;
47		57
48	our $ALT_ENTER_MESSAGE;	58	our $ALT_ENTER_MESSAGE;
49	our $STATUS_LINE;	59	our $STATUS_LINE;
50	our $DEBUG_STATUS;	60	our $DEBUG_STATUS;
51	our $BUTTONBAR;
52	our $LOGVIEW;
53	our $CONSOLE;
54		61
55	sub status {	62	sub status {
56	$STATUS_LINE->set_text ($_[0]);	63	$STATUS_LINE->set_text ($_[0]);
57	my ($w, $h) = $STATUS_LINE->size_request;	64	my ($w, $h) = $STATUS_LINE->size_request;
58	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	65	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
…		…
67	sub start_game {	74	sub start_game {
68	status "logging in...";	75	status "logging in...";
69		76
70	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;
71		78
		79	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
		80
72	$MAP = new CFClient::Map $mapsize, $mapsize;	81	$MAP = new CFClient::Map $mapsize, $mapsize;
		82
		83	my ($host, $port) = split /:/, $CFG->{host};
73		84
74	$CONN = new conn	85	$CONN = new conn
75	host => $CFG->{host},	86	host => $host,
76	port => $CFG->{port},	87	port => $port \|\| 13327,
77	user => $CFG->{user},	88	user => $CFG->{user},
78	pass => $CFG->{password},	89	pass => $CFG->{password},
79	mapw => $mapsize,	90	mapw => $mapsize,
80	maph => $mapsize,	91	maph => $mapsize,
81	;	92	;
…		…
87		98
88	sub stop_game {	99	sub stop_game {
89	undef $CONN;	100	undef $CONN;
90	}	101	}
91		102
92	sub config_dialog {	103	sub client_setup {
93	my $dialog = new CFClient::UI::FancyFrame	104	my $dialog = new CFClient::UI::FancyFrame
94	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
95	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	106	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
96	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	107	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
97		108
…		…
137	$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 {
138	my ($self, $value) = @_;	149	my ($self, $value) = @_;
139	$CFG->{fow_smooth} = $value;	150	$CFG->{fow_smooth} = $value;
140	});	151	});
141		152
142	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize");	153	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
143	$table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {	154	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
144	my ($self, $value) = @_;	155	my ($self, $value) = @_;
145	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	156	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
146	});	157	});
147		158
148	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	159	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
149	destroy_screen ();	160	destroy_screen ();
150	init_screen ();	161	init_screen ();
151	});	162	});
		163
		164	$dialog
		165	}
		166
		167	sub metaserver_dialog {
		168	my $dialog = new CFClient::UI::FancyFrame
		169	child => (my $vbox = new CFClient::UI::VBox);
		170
		171	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		172
		173	$dialog
		174	}
		175
		176	sub update_metaserver {
		177	my ($HOST) = @_;
		178
		179	status "fetching metaserver list...";
		180
		181	my $buf;
		182
		183	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		184
		185	Event->io (fd => $fh, poll => 'r', cb => sub {
		186	my $res = sysread $fh, $buf, 8192, length $buf;
		187
		188	if (!defined $res) {
		189	$_[0]->w->cancel;
		190	status "metaserver: $!";
		191	} elsif ($res == 0) {
		192	$_[0]->w->cancel;
		193	status "server list retrieved";
		194
		195	my $table = $METASERVER->{table};
		196
		197	$table->clear;
		198
		199	my @col = qw(Use #Users Host Uptime Version Description);
		200	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		201	for 0 .. $#col;
		202
		203	my @align = qw(1 0 1 1 -1);
		204
		205	my $y = 0;
		206	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		207	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		208
		209	for ($desc) {
		210	s/<br>/\n/gi;
		211	s/<li>/\n· /gi;
		212	s/<.*?>//sgi;
		213	s/&/&/g;
		214	s/</</g;
		215	s/>/>/g;
		216	}
		217
		218	$uptime = sprintf "%dd %02d:%02d:%02d",
		219	(int $m->[8] / 86400),
		220	(int $m->[8] / 3600) % 24,
		221	(int $m->[8] / 60) % 60,
		222	$m->[8] % 60;
		223
		224	$m = [$users, $host, $uptime, $version, $desc];
		225
		226	$y++;
		227
		228	$table->add (0, $y, new CFClient::UI::VBox children => [
		229	(new CFClient::UI::Button text => " ", connect_activate => sub {
		230	$HOST->set_text ($CFG->{host} = $host);
		231	}),
		232	(new CFClient::UI::Empty expand => 1),
		233	]);
		234
		235	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		236	for 0 .. $#$m;
		237	}
		238	}
		239	});
		240	}
		241
		242	sub server_setup {
		243	my $dialog = new CFClient::UI::FancyFrame
		244	child => (my $vbox = new CFClient::UI::VBox);
152		245
153	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	246	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
154	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	247	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
155	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	248	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
		249
		250	{
		251	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
		252
156	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	253	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
157	my ($self, $value) = @_;	254	my ($self, $value) = @_;
158	$CFG->{host} = $value;	255	$CFG->{host} = $value;
159	});	256	});
160		257
161	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	258	$METASERVER = metaserver_dialog;
162	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {	259
163	my ($self, $value) = @_;	260	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
164	$CFG->{port} = $value;	261	update_metaserver $HOST;
165	});	262	});
		263	}
166		264
167	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	265	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
168	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	266	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
169	my ($self, $value) = @_;	267	my ($self, $value) = @_;
170	$CFG->{user} = $value;	268	$CFG->{user} = $value;
171	});	269	});
172		270
173	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	271	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
174	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	272	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
175	my ($self, $value) = @_;	273	my ($self, $value) = @_;
176	$CFG->{password} = $value;	274	$CFG->{password} = $value;
177	});	275	});
178		276
179	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	277	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
…		…
195		293
196	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	294	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
197	start_game;	295	start_game;
198	});	296	});
199		297
200	$vbox->add (my $hbox = new CFClient::UI::HBox);
201
202	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
203	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
204	status "Configuration Saved";
205	});
206
207	$dialog	298	$dialog
208	}	299	}
209		300
210	sub console_window {	301	sub message_window {
211	my $window = new CFClient::UI::FancyFrame	302	my $window = new CFClient::UI::FancyFrame
212	border_bg => [1, 1, 1, 0.5],	303	border_bg => [1, 1, 1, 0.5],
213	bg => [0.3, 0.3, 0.3, 0.8],	304	bg => [0.3, 0.3, 0.3, 0.8],
214	user_w => $::WIDTH/4,	305	user_w => $::WIDTH/4,
215	user_h => $::HEIGHT,	306	user_h => $::HEIGHT,
…		…
218	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	309	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
219	expand => 1,	310	expand => 1,
220	fontsize => $::CFG->{log_fontsize},	311	fontsize => $::CFG->{log_fontsize},
221	);	312	);
222		313
223	$vbox->add (my $input = new CFClient::UI::LineEntry);	314	$vbox->add (my $input = new CFClient::UI::LineEntry
224	$input->connect (activate => sub {	315	connect_activate => sub {
225	my ($input, $text) = @_;	316	my ($input, $text) = @_;
226	$input->set_text ('');	317	$input->set_text ('');
227		318
228	if ($text =~ /^\/(.*)/) {	319	if ($text =~ /^\/(.*)/) {
229	$::CONN->user_send ("command $1");	320	$::CONN->user_send ("command $1");
230	} else {	321	} else {
231	my $say_cmd = $::CFG->{say_command} \|\| 'say';	322	my $say_cmd = $::CFG->{say_command} \|\| 'say';
232	$::CONN->user_send ("command $say_cmd $text");	323	$::CONN->user_send ("command $say_cmd $text");
233	}	324	}
234	1
235	});	325	},
236	$input->connect (escape => sub {	326	connect_escape => sub {
237	$MAPWIDGET->focus_in	327	$MAPWIDGET->focus_in
238	});	328	},
239	$input->focus_in;	329	);
240		330
241	$CONSOLE = {	331	$CONSOLE = {
242	window => $window,	332	window => $window,
243	input => $input	333	input => $input
244	};	334	};
…		…
260	$FAST = $CFG->{fast};	350	$FAST = $CFG->{fast};
261		351
262	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	352	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
263	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	353	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
264	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	354	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
265	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	355	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
266		356
267	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	357	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
268	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	358	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
269	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	359	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
270	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	360	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
292	$FONTSIZE = int $HEIGHT / 40;	382	$FONTSIZE = int $HEIGHT / 40;
293		383
294	#############################################################################	384	#############################################################################
295		385
296	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	386	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
297	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	387	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
298		388
299	$STATUS_LINE = new CFClient::UI::Label	389	$STATUS_LINE = new CFClient::UI::Label
300	padding => 0,	390	padding => 0,
301	y => $HEIGHT * 44 / 45 - $FONTSIZE;	391	y => $HEIGHT * 44 / 45 - $FONTSIZE;
302	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	392	$CFClient::UI::ROOT->add ($STATUS_LINE);
303		393
304	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	394	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
305	padding => 0,	395	padding => 0,
306	y => $HEIGHT * 44 / 45,	396	y => $HEIGHT * 44 / 45,
307	height => $HEIGHT / 45,	397	height => $HEIGHT / 45,
308	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	398	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
309	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	399	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
310		400
311	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);	401	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
312	$MAPWIDGET->focus_in;	402	$MAPWIDGET->focus_in;
313	$MAPWIDGET->connect (activate_console => sub {	403	$MAPWIDGET->connect (activate_console => sub {
314	my ($mapwidget, $preset) = @_;	404	my ($mapwidget, $preset) = @_;
315		405
316	if ($CONSOLE) {	406	if ($CONSOLE) {
…		…
320	$CONSOLE->{input}->set_text ($preset);	410	$CONSOLE->{input}->set_text ($preset);
321	}	411	}
322	}	412	}
323	});	413	});
324		414
325	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);	415	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
326		416
327	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper text => "Client Setup", other => config_dialog, state => 1);	417	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
328	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper text => "Server", other => config_dialog, state => 1);	418	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
329	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper text => "Console", other => console_window);	419	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
330	$BUTTONBAR->add (my $setup = new CFClient::UI::Button text => "Save Config", other => console_window);	420
		421	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		422	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		423	status "Configuration Saved";
		424	});
		425
		426	$BUTTONBAR->{children}[0]->emit ("activate");
331	}	427	}
332		428
333	sub destroy_screen {	429	sub destroy_screen {
334	$CFClient::UI::TOPLEVEL->{children} = [];	430	$CFClient::UI::ROOT->{children} = [];
335	undef $SDL_ACTIVE;	431	undef $SDL_ACTIVE;
336	undef $SDL_EV;	432	undef $SDL_EV;
337	SDL::Quit;	433	SDL::Quit;
338	}	434	}
339		435
…		…
350	debug sprintf "%3.2f", $fps;	446	debug sprintf "%3.2f", $fps;
351		447
352	$want_refresh = 0;	448	$want_refresh = 0;
353	$can_refresh = 0;	449	$can_refresh = 0;
354		450
355	$CFClient::UI::TOPLEVEL->draw;	451	$CFClient::UI::ROOT->draw;
356		452
357	SDL::GLSwapBuffers;	453	SDL::GLSwapBuffers;
358		454
359	$LAST_REFRESH = $NOW;	455	$LAST_REFRESH = $NOW;
360	}	456	}
…		…
408	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});	504	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
409	$MAP->map1a_update ($data);	505	$MAP->map1a_update ($data);
410	$MAPWIDGET->update;	506	$MAPWIDGET->update;
411	}	507	}
412		508
413	#sub conn::map_update {	509	sub conn::flush_map {
414	# my ($self, $dirty) = @_;	510	my ($self) = @_;
415	#	511
416	# $MAPWIDGET->update;	512	my $map_info = delete $self->{map_info}
417	#}	513	or return;
		514
		515	my ($hash, $x, $y, $w, $h) = @$map_info;
		516
		517	my $data = $MAP->get_rect ($x, $y, $w, $h);
		518	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		519
		520	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		521
		522	}
418		523
419	sub conn::map_clear {	524	sub conn::map_clear {
420	my ($self) = @_;	525	my ($self) = @_;
421		526
		527	$self->flush_map;
		528
422	$MAP->clear;	529	$MAP->clear;
		530	}
423		531
424	# refresh;	532	sub conn::map_info {
		533	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		534
		535	$self->flush_map;
		536
		537	$x = $::MAP->ox - $x;
		538	$y = $::MAP->oy - $y;
		539
		540	$self->{map_info} = [$hash, $x, $y, $w, $h];
		541
		542	if (defined (my $data = $MAPCACHE->get ($hash))) {
		543	$data = Compress::LZF::decompress $data;
		544	warn sprintf "LOADmap[%s] length %d\n", $hash, length $data;#d#
		545	for my $id ($MAP->set_rect ($x, $y, $data)) {
		546	my $data = $TILECACHE->get ($id)
		547	or next;
		548
		549	$self->set_texture ($id => $data);
		550	}
		551	}
425	}	552	}
426		553
427	sub conn::face_find {	554	sub conn::face_find {
428	my ($self, $face) = @_;	555	my ($self, $facenum, $face) = @_;
429		556
430	$FACECACHE->{"$face->{chksum},$face->{name}"}	557	my $hash = "$face->{chksum},$face->{name}";
		558
		559	my $id = $FACEMAP->get ($hash);
		560
		561	unless ($id) {
		562	# create new id for face
		563	# i love transactions
		564	for (1..100) {
		565	my $txn = $CFClient::DB_ENV->txn_begin;
		566	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		567	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		568	$id++;
		569	if ($FACEMAP->put (id => $id) == 0
		570	&& $FACEMAP->put ($hash => $id) == 0) {
		571	$txn->txn_commit;
		572
		573	goto gotid;
		574	}
		575	}
		576	$txn->abort;
		577	}
		578
		579	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		580	}
		581
		582	gotid:
		583	$face->{id} = $id;
		584	$MAP->set_face ($facenum => $id);
		585	$TILECACHE->get ($id)
431	}	586	}
432		587
433	sub conn::face_update {	588	sub conn::face_update {
434	my ($self, $facenum, $face) = @_;	589	my ($self, $facenum, $face) = @_;
435		590
436	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	591	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
437		592
438	my $tex = $face->{texture} =	593	$self->set_texture ($face->{id} => delete $face->{image});
		594	}
		595
		596	sub conn::set_texture {
		597	my ($self, $id, $data) = @_;
		598
		599	$self->{texture}[$id] \|\|= do {
		600	my $tex =
439	new_from_image CFClient::Texture	601	new_from_image CFClient::Texture
440	delete $face->{image}, minify => 1;	602	$data, minify => 1;
441		603
442	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});	604	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
443	$MAPWIDGET->update;	605	$MAPWIDGET->update;
		606
		607	$tex
		608	};
444	}	609	}
445		610
446	sub conn::query {	611	sub conn::query {
447	my ($self, $flags, $prompt) = @_;	612	my ($self, $flags, $prompt) = @_;
448		613
…		…
454	my ($self, $color, $text) = @_;	619	my ($self, $color, $text) = @_;
455		620
456	my @color = (	621	my @color = (
457	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	622	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
458	[1.00, 1.00, 1.00],	623	[1.00, 1.00, 1.00],
459	[0.00, 0.00, 0.55],	624	[0.50, 0.50, 1.00], # changed
460	[1.00, 0.00, 0.00],	625	[1.00, 0.00, 0.00],
461	[1.00, 0.54, 0.00],	626	[1.00, 0.54, 0.00],
462	[0.11, 0.56, 1.00],	627	[0.11, 0.56, 1.00],
463	[0.93, 0.46, 0.00],	628	[0.93, 0.46, 0.00],
464	[0.18, 0.54, 0.34],	629	[0.18, 0.54, 0.34],
…		…
507	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	672	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
508	},	673	},
509	);	674	);
510		675
511	#############################################################################	676	#############################################################################
		677
		678	$TILECACHE = CFClient::db_table "tilecache";
		679	$FACEMAP = CFClient::db_table "facemap";
512		680
513	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	681	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
514		682
515	my %DEF_CFG = (	683	my %DEF_CFG = (
516	sdl_mode => 0,	684	sdl_mode => 0,
…		…
522	fow_intensity => 0.45,	690	fow_intensity => 0.45,
523	fow_smooth => 0,	691	fow_smooth => 0,
524	log_fontsize => 14,	692	log_fontsize => 14,
525	mapsize => 100,	693	mapsize => 100,
526	host => "crossfire.schmorp.de",	694	host => "crossfire.schmorp.de",
527	port => 13327,
528	say_command => 'say',	695	say_command => 'say',
529	);	696	);
530		697
531	while (my ($k, $v) = each %DEF_CFG) {	698	while (my ($k, $v) = each %DEF_CFG) {
532	$CFG->{$k} = $v unless exists $CFG->{$k};	699	$CFG->{$k} = $v unless exists $CFG->{$k};
…		…
550		717
551	CFClient::add_font $_ for @fonts;	718	CFClient::add_font $_ for @fonts;
552	CFClient::set_font $fonts[0];	719	CFClient::set_font $fonts[0];
553	}	720	}
554		721
555	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
556
557	Event::loop;	722	Event::loop;
558		723
559	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
560		724

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.110 by root, Sat Apr 15 12:30:53 2006 UTC vs. Revision 1.116 by root, Sun Apr 16 07:25:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.110 by root, Sat Apr 15 12:30:53 2006 UTC vs.
Revision 1.116 by root, Sun Apr 16 07:25:30 2006 UTC