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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.49 by elmex, Sun Apr 9 18:35:09 2006 UTC vs. Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.49 by elmex, Sun Apr 9 18:35:09 2006 UTC vs.
Revision 1.85 by root, Wed Apr 12 17:11:02 2006 UTC