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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.45 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.81 by root, Wed Apr 12 02:05:46 2006 UTC

…		…
12	use SDL::Surface;	12	use SDL::Surface;
13	use SDL::OpenGL;	13	use SDL::OpenGL;
14	use SDL::OpenGL::Constants;	14	use SDL::OpenGL::Constants;
15		15
16	use Crossfire;	16	use Crossfire;
17	use Crossfire::Client;
18	use Crossfire::Protocol;	17	use Crossfire::Protocol;
19		18
20	use Crossfire::Client::Widget;	19	use CFClient;
		20	use CFClient::UI;
		21
		22	our $VERSION = '0.1';
		23
		24	my $MAX_FPS = 60;
		25	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
21		26
22	our $FACECACHE;	27	our $FACECACHE;
23
24	our $VERSION = '0.1';
25
26	our %GL_EXT;
27		28
28	our $CFG;	29	our $CFG;
29	our $CONN;	30	our $CONN;
		31	our $FAST; # fast, low-quality mode
30		32
		33	our @SDL_MODES;
31	our $WIDTH;	34	our $WIDTH;
32	our $HEIGHT;	35	our $HEIGHT;
33	our $FULLSCREEN;	36	our $FULLSCREEN;
34		37
		38	our $NOW;
		39
		40	our $MAPWIDGET;
35	our $FONTSIZE;	41	our $FONTSIZE;
36		42
37	our $SDL_TIMER;	43	our $SDL_TIMER;
38	our $SDL_APP;	44	our $SDL_APP;
39	our $SDL_EV = new SDL::Event;	45	our $SDL_EV;
40	our %SDL_CB;	46	our %SDL_CB;
41		47
42	our @GL_INIT; # hooks called on every gl init
43
44	our $ALT_ENTER_MESSAGE;	48	our $ALT_ENTER_MESSAGE;
45		49	our $STATUS_LINE;
46	our $TOPLEVEL;	50	our $DEBUG_STATUS;
47
48	our $tw; # Test widget #d#
49		51
50	my $last_refresh;	52	my $last_refresh;
		53	my %ANIMATE;
		54	my $refresh_handler;
		55
		56	sub config_dialog {
		57	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
		58	child => (my $vbox = new CFClient::UI::VBox);
		59	$vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
		60	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
		61
		62	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
		63	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
		64
		65	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
		66	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
		67
		68	$mode_slider->connect (changed => sub {
		69	my ($self, $value) = @_;
		70
		71	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
		72	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
		73	});
		74	$mode_slider->emit (changed => $mode_slider->{range}[0]);
		75
		76	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
		77	$table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
		78
		79	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
		80	$table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
		81
		82	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
		83	$table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
		84
		85	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
		86	$table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
		87
		88	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
		89	$table->add (1, 5, new CFClient::UI::Slider
		90	req_w => 100,
		91	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		92	connect_changed => sub {
		93	my ($self, $value) = @_;
		94
		95	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
		96	},
		97	);
		98
		99	$vbox->add (my $hbox = new CFClient::UI::HBox);
		100	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
		101	warn "save\n";
		102	});
		103	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
		104	warn "login\n";
		105	});
		106	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		107	warn "apply\n";
		108	});
		109
		110	$CFClient::UI::TOPLEVEL->add ($dialog);
		111	}
51		112
52	sub init_screen {	113	sub init_screen {
53	$SDL_APP = new SDL::App	114	$SDL_APP = new SDL::App
54	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	115	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,
55	-title => "Crossfire+ Client",	116	-title => "Crossfire+ Client",
56	-width => $WIDTH,	117	-width => $WIDTH,
57	-height => $HEIGHT,	118	-height => $HEIGHT,
58	-opengl => 1,	119	-opengl => 1,
59	-red_size => 8,	120	-red_size => 5,
60	-green_size => 8,	121	-green_size => 5,
61	-blue_size => 8,	122	-blue_size => 5,
		123	-alpha_size => 0,
62	-double_buffer => 1,	124	-double_buffer => 1,
63	-fullscreen => $FULLSCREEN,	125	-fullscreen => $FULLSCREEN,
64	-resizeable => 0;	126	-resizeable => 0;
65		127
66	$last_refresh = SDL::GetTicks;	128	$SDL_EV = new SDL::Event;
		129	$SDL_EV->set_unicode (1);
67		130
68	%GL_EXT = map +($_ => 1), split /\s+/, Crossfire::Client::gl_extensions;
69
70	$GL_EXT{GL_ARB_texture_non_power_of_two}
71	or warn "WARNING: non-power-of-two opengl extension required";
72
73	$FONTSIZE = int $HEIGHT / 50;
74
75	$ALT_ENTER_MESSAGE = new Crossfire::Client::Widget::Label
76	0, $FONTSIZE, $HEIGHT - $FONTSIZE, $FONTSIZE,
77	"Use <b>Alt-Enter</b> to toggle fullscreen mode";
78	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - ($ALT_ENTER_MESSAGE->size_request)[1]);
79	$TOPLEVEL->add ($ALT_ENTER_MESSAGE);
80
81	# Test code #d#
82	unless ($tw) { # haha...
83	$tw = new Crossfire::Client::Widget::Animator;
84	$tw->add (my $f = new Crossfire::Client::Widget::FancyFrame);
85	$f->add (
86	my $te = new Crossfire::Client::Widget::Label
87	0, 0, 10, $FONTSIZE, "<i>This</i> is a\n<u>TEST</u>!\nOf a themed\nFrame!"
88	);
89
90	$tw->move ($WIDTH - 200, 0);
91	$tw->moveto (0, 0);
92	$TOPLEVEL->add ($tw);
93	}
94
95	glClearColor 0, 0, 0, 0;
96
97	glEnable GL_TEXTURE_2D;
98	glEnable GL_COLOR_MATERIAL;
99	glShadeModel GL_FLAT;
100	glDisable GL_DEPTH_TEST;
101	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
102
103	$_->() for @GL_INIT;
104	}
105
106	sub start_game {
107	$SDL_TIMER = add Glib::Timeout 1000/100, sub {	131	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
108	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	132	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
109	while $SDL_EV->poll;	133	while $SDL_EV->poll;
110		134
111	1	135	1
112	};	136	};
113		137
		138	$last_refresh = SDL::GetTicks;
		139
		140	CFClient::gl_init;
		141
		142	$FONTSIZE = int $HEIGHT / 40;
		143
		144	#############################################################################
		145
		146	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;
		147	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
		148
		149	$STATUS_LINE = new CFClient::UI::Label
		150	padding => 0,
		151	y => $HEIGHT * 49 / 50 - $FONTSIZE;
		152	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
		153
		154	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
		155	padding => 0,
		156	y => $HEIGHT * 49 / 50,
		157	height => $HEIGHT / 50,
		158	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
		159	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
		160
		161	$MAPWIDGET = new CFClient::UI::MapWidget;
		162	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
		163	$MAPWIDGET->focus_in;
		164
		165	config_dialog;
		166	}
		167
		168	sub destroy_screen {
		169	$CFClient::UI::TOPLEVEL->{children} = [];
		170	remove Glib::Source $SDL_TIMER;
		171	undef $SDL_APP;
		172	undef $SDL_EV;
		173	SDL::Quit;
		174	}
		175
		176	sub start_game {
114	$WIDTH = $CFG->{width};	177	$WIDTH = $CFG->{width};
115	$HEIGHT = $CFG->{height};	178	$HEIGHT = $CFG->{height};
116	$FULLSCREEN = 0;	179	$FULLSCREEN = 0;
117		180
118	init_screen;	181	init_screen;
		182
		183	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
119		184
120	$CONN = new conn	185	$CONN = new conn
121	host => $CFG->{host},	186	host => $CFG->{host},
122	port => $CFG->{port},	187	port => $CFG->{port},
123	user => $CFG->{user},	188	user => $CFG->{user},
124	pass => $CFG->{password},	189	pass => $CFG->{password},
125	mapw => 50,	190	mapw => $mapsize,
126	maph => 37,	191	maph => $mapsize,
127	;	192	;
128		193
129	Crossfire::Client::lowdelay fileno $CONN->{fh};	194	CFClient::lowdelay fileno $CONN->{fh};
130	}	195	}
131		196
132	sub stop_game {	197	sub stop_game {
133	remove Glib::Source $SDL_TIMER;	198	remove Glib::Source $refresh_handler if $refresh_handler;
		199	undef $refresh_handler;
134		200
135	undef $SDL_APP;	201	undef $CONN;
136	SDL::Quit;	202	destroy_screen;
137	}	203	}
138
139		204
140	sub force_refresh {	205	sub force_refresh {
141	glViewport 0, 0, $WIDTH, $HEIGHT;	206	glViewport 0, 0, $WIDTH, $HEIGHT;
142		207
143	glMatrixMode GL_PROJECTION;	208	glMatrixMode GL_PROJECTION;
144	glLoadIdentity;	209	glLoadIdentity;
145	glOrtho 0, $WIDTH, $HEIGHT, 0, -6000 , 6000;	210	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
146	glMatrixMode GL_MODELVIEW;	211	glMatrixMode GL_MODELVIEW;
		212	glLoadIdentity;
147		213
148	glClear GL_COLOR_BUFFER_BIT;	214	glClear GL_COLOR_BUFFER_BIT;
149		215
150	$TOPLEVEL->draw;	216	$CFClient::UI::TOPLEVEL->draw;
151		217
152	SDL::GLSwapBuffers;	218	SDL::GLSwapBuffers;
153	}	219	}
154		220
155	my %ANIMATE;	221	sub debug {
		222	$DEBUG_STATUS->set_text ($_[0]);
		223	my ($w, $h) = $DEBUG_STATUS->size_request;
		224	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
		225	}
156		226
157	my $refresh_handler;	227	my $FPS;
158		228
159	sub refresh {	229	sub refresh {
160	$refresh_handler \|\|= add Glib::Idle sub {	230	$refresh_handler \|\|= add Glib::Idle sub {
161	my $next_refresh = SDL::GetTicks;	231	if ($SDL_APP) {
		232	$NOW = SDL::GetTicks;
		233
		234	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
		235	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
		236	$NOW = SDL::GetTicks;
		237	}
		238
162	my $interval = ($next_refresh - $last_refresh) * 0.001;	239	my $interval = ($NOW - $last_refresh) * 0.001;
163	$last_refresh = $next_refresh;	240	$last_refresh = $NOW;
164		241
		242	if ($interval) {
		243	$FPS \|\|= 1 / $interval;
		244	$FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
		245	debug sprintf "%5.02f", $FPS;
		246	}
		247
165	force_refresh;	248	force_refresh;
166	$_->animate ($interval) for grep $_, values %ANIMATE;	249	$_->animate ($interval) for grep $_, values %ANIMATE;
167		250
168	if (%ANIMATE) {	251	if (%ANIMATE) {
		252	1
		253	} else {
		254	undef $refresh_handler;
		255	0
169	1	256	}
170	} else {	257	} else {
171	undef $refresh_handler;	258	undef $refresh_handler;
172	0	259	0
173	}	260	}
174	};	261	};
…		…
198	},	285	},
199	SDL_KEYDOWN() => sub {	286	SDL_KEYDOWN() => sub {
200	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	287	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
201	# alt-enter	288	# alt-enter
202	$FULLSCREEN = !$FULLSCREEN;	289	$FULLSCREEN = !$FULLSCREEN;
		290	destroy_screen;
203	init_screen;	291	init_screen;
204	} else {	292	} else {
205	Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV);	293	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
206	}	294	}
207	},	295	},
208	SDL_KEYUP() => sub {	296	SDL_KEYUP() => sub {
209	Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV);	297	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
210	},	298	},
211	SDL_MOUSEMOTION() => sub {	299	SDL_MOUSEMOTION() => sub {
212	warn "sdl motion\n";#d#	300	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
213	},	301	},
214	SDL_MOUSEBUTTONDOWN() => sub {	302	SDL_MOUSEBUTTONDOWN() => sub {
215	Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV);	303	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
216	},	304	},
217	SDL_MOUSEBUTTONUP() => sub {	305	SDL_MOUSEBUTTONUP() => sub {
218	Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV);	306	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
219	},	307	},
220	SDL_ACTIVEEVENT() => sub {	308	SDL_ACTIVEEVENT() => sub {
221	warn "active\n";#d#	309	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
222	},	310	},
223	);	311	);
224		312
225	@conn::ISA = Crossfire::Protocol::;	313	@conn::ISA = Crossfire::Protocol::;
226		314
227	sub conn::map_update {	315	sub conn::map_update {
228	my ($self, $dirty) = @_;	316	my ($self, $dirty) = @_;
229		317
230	refresh;	318	$MAPWIDGET->update;
231	}	319	}
232		320
233	sub conn::map_scroll {	321	sub conn::map_scroll {
234	my ($self, $dx, $dy) = @_;	322	my ($self, $dx, $dy) = @_;
235		323
…		…
251	sub conn::face_update {	339	sub conn::face_update {
252	my ($self, $face) = @_;	340	my ($self, $face) = @_;
253		341
254	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	342	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
255		343
256	$face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image};	344	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
257	}	345	}
258		346
259	sub conn::query {	347	sub conn::query {
260	my ($self, $flags, $prompt) = @_;	348	my ($self, $flags, $prompt) = @_;
261		349
…		…
273	}	361	}
274	$ent->set_text ($value);	362	$ent->set_text ($value);
275	$ent->signal_connect (changed => sub {	363	$ent->signal_connect (changed => sub {
276	my ($ent) = @_;	364	my ($ent) = @_;
277	$cfg->{$key} = $ent->get_text;	365	$cfg->{$key} = $ent->get_text;
		366	# TODO: Mapsize should be a slider in the game gui
		367	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
		368	$cfg->{$key} = 100;
		369	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
		370	$cfg->{$key} = 50;
		371	}
278	});	372	});
279	}	373	}
280		374
281	sub run_config_dialog {	375	sub run_config_dialog {
282	my (%events) = @_;	376	my (%events) = @_;
…		…
284	my $w = Gtk2::Window->new;	378	my $w = Gtk2::Window->new;
285		379
286	my @cfg = (	380	my @cfg = (
287	[qw/Host host/],	381	[qw/Host host/],
288	[qw/Port port/],	382	[qw/Port port/],
		383	[qw/Mapsize% mapsize/],
289	[qw/Username user/],	384	[qw/Username user/],
290	[qw/Password password/],	385	[qw/Password password/],
291	);	386	);
292		387
293	my $cfg = {};	388	my $cfg = {};
294
295	my $a = SDL::ListModes (0, SDL_FULLSCREEN\|SDL_HWSURFACE);
296	my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
297		389
298	$w->add (my $vb = Gtk2::VBox->new);	390	$w->add (my $vb = Gtk2::VBox->new);
299	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);	391	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
300	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};	392	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
301	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);	393	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
302	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);	394	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
303	my $i = 0;	395	my $i = 0;
304	my $act = 0;	396	my $act = 0;
305	for (map { "$_->[0]x$_->[1]" } reverse @modes) {	397	for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
306	if ($_ eq $selmode) { $act = $i }	398	if ($_ eq $selmode) { $act = $i }
307	$cb->append_text ($_);	399	$cb->append_text ($_);
308	$i++;	400	$i++;
309	}	401	}
310	$cb->set_active ($act);	402	$cb->set_active ($act);
…		…
327	$cb->signal_connect (clicked => sub {	419	$cb->signal_connect (clicked => sub {
328	for (keys %$cfg) {	420	for (keys %$cfg) {
329	$::CFG->{$_} = $cfg->{$_}	421	$::CFG->{$_} = $cfg->{$_}
330	if $_ ne '_i';	422	if $_ ne '_i';
331	}	423	}
332	Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc";	424	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
333	});	425	});
334	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);	426	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
335	$cb->signal_connect (clicked => sub {	427	$cb->signal_connect (clicked => sub {
336	for (keys %$cfg) {	428	for (keys %$cfg) {
337	$::CFG->{$_} = $cfg->{$_}	429	$::CFG->{$_} = $cfg->{$_}
…		…
340	my $cb = $events{login} \|\| sub {};	432	my $cb = $events{login} \|\| sub {};
341	$cb->($::CFG->{user}, $::CFG->{password});	433	$cb->($::CFG->{user}, $::CFG->{password});
342	});	434	});
343	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);	435	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
344	$cb->signal_connect (clicked => sub {	436	$cb->signal_connect (clicked => sub {
345	my $cb = $events{login} \|\| sub {};	437	my $cb = $events{logout} \|\| sub {};
346	$cb->();	438	$cb->();
347	});	439	});
348	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);	440	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
349	$cb->signal_connect (clicked => sub { $w->destroy });	441	$cb->signal_connect (clicked => sub { $w->destroy });
350		442
…		…
356		448
357	#############################################################################	449	#############################################################################
358		450
359	SDL::Init SDL_INIT_EVERYTHING;	451	SDL::Init SDL_INIT_EVERYTHING;
360		452
361	$TOPLEVEL = Crossfire::Client::Widget::Toplevel->new;	453	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
		454	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };
362		455
363	my $mapwidget = Crossfire::Client::Widget::MapWidget->new;
364
365	$TOPLEVEL->add ($mapwidget);
366	$mapwidget->focus_in;
367
368	Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc";	456	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
369		457
370	$CFG \|\|= {	458	$CFG \|\|= {
371	width => 640,	459	width => 640,
372	height => 480,	460	height => 480,
		461	mapsize => 100,
373	fullscreen => 0,	462	fullscreen => 0,
374	host => "crossfire.schmorp.de",	463	host => "crossfire.schmorp.de",
375	port => 13327,	464	port => 13327,
376	};	465	};
377		466
378	Crossfire::Client::set_font Crossfire::Client::find_rcfile "uifont.ttf";	467	{
		468	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
		469
		470	CFClient::add_font $_ for @fonts;
		471	CFClient::set_font $fonts[0];
		472	}
379		473
380	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	474	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
381		475
382	run_config_dialog	476	run_config_dialog
383	login => sub { start_game },	477	login => sub { start_game },

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.45 by root, Sun Apr 9 17:34:15 2006 UTC vs. Revision 1.81 by root, Wed Apr 12 02:05:46 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.45 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.81 by root, Wed Apr 12 02:05:46 2006 UTC