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