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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.84 by root, Wed Apr 12 15:46:14 2006 UTC vs.
Revision 1.96 by root, Thu Apr 13 23:11:11 2006 UTC

…		…
1	#!/opt/bin/perl	1	#!/opt/bin/perl
2		2
3	use strict;	3	use strict;
4	use utf8;	4	use utf8;
5		5
6	use Glib;	6	use Time::HiRes 'time';
7	use Gtk2 -init;	7	use Event;
8		8
9	use SDL;	9	use SDL;
10	use SDL::App;	10	use SDL::App;
11	use SDL::Event;	11	use SDL::Event;
12	use SDL::Surface;	12	use SDL::Surface;
13	use SDL::OpenGL;	13	use SDL::OpenGL;
14	use SDL::OpenGL::Constants;
15		14
16	use Crossfire;	15	use Crossfire;
17	use Crossfire::Protocol;	16	use Crossfire::Protocol;
18		17
19	use CFClient;	18	use CFClient;
20	use CFClient::UI;	19	use CFClient::UI;
21		20
22	our $VERSION = '0.1';	21	our $VERSION = '0.1';
23		22
24	my $MAX_FPS = 60;	23	my $MAX_FPS = 60;
25	my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame	24	my $MIN_FPS = 5; # unused as of yet
26		25
27	our $FACECACHE;	26	our $FACECACHE;
		27
		28	our $LAST_REFRESH;
		29	our $NOW;
28		30
29	our $CFG;	31	our $CFG;
30	our $CONN;	32	our $CONN;
31	our $FAST; # fast, low-quality mode	33	our $FAST; # fast, low-quality mode, possibly useful for software-rendering
32		34
33	our @SDL_MODES;	35	our @SDL_MODES;
34	our $WIDTH;	36	our $WIDTH;
35	our $HEIGHT;	37	our $HEIGHT;
36	our $FULLSCREEN;	38	our $FULLSCREEN;
37		39
38	our $NOW;	40	our $MAP;
39
40	our $MAPWIDGET;	41	our $MAPWIDGET;
41	our $FONTSIZE;	42	our $FONTSIZE;
42		43
43	our $SDL_TIMER;	44	our $SDL_ACTIVE;
44	our $SDL_APP;
45	our $SDL_EV;	45	our $SDL_EV;
46	our %SDL_CB;	46	our %SDL_CB;
47		47
48	our $ALT_ENTER_MESSAGE;	48	our $ALT_ENTER_MESSAGE;
49	our $STATUS_LINE;	49	our $STATUS_LINE;
50	our $DEBUG_STATUS;	50	our $DEBUG_STATUS;
51
52	my $last_refresh;
53	my %ANIMATE;
54	my $refresh_handler;
55		51
56	sub status {	52	sub status {
57	$STATUS_LINE->set_text ($_[0]);	53	$STATUS_LINE->set_text ($_[0]);
58	my ($w, $h) = $STATUS_LINE->size_request;	54	my ($w, $h) = $STATUS_LINE->size_request;
59	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	55	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
64	my ($w, $h) = $DEBUG_STATUS->size_request;	60	my ($w, $h) = $DEBUG_STATUS->size_request;
65	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);	61	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
66	}	62	}
67		63
68	sub start_game {	64	sub start_game {
		65	status "logging in...";
		66
69	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	67	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
70		68
		69	$MAP = new CFClient::Map $mapsize, $mapsize;
		70
71	$CONN = new conn	71	$CONN = new conn
72	host => $CFG->{host},	72	host => $CFG->{host},
73	port => $CFG->{port},	73	port => $CFG->{port},
74	user => $CFG->{user},	74	user => $CFG->{user},
75	pass => $CFG->{password},	75	pass => $CFG->{password},
76	mapw => $mapsize,	76	mapw => $mapsize,
77	maph => $mapsize,	77	maph => $mapsize,
78	;	78	;
79		79
		80	status "login successful";
		81
80	CFClient::lowdelay fileno $CONN->{fh};	82	CFClient::lowdelay fileno $CONN->{fh};
81	}	83	}
82		84
83	sub stop_game {	85	sub stop_game {
84	undef $CONN;	86	undef $CONN;
…		…
102	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	104	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
103	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	105	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
104	});	106	});
105	$mode_slider->emit (changed => $mode_slider->{range}[0]);	107	$mode_slider->emit (changed => $mode_slider->{range}[0]);
106		108
		109	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");
		110	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
		111	my ($self, $value) = @_;
		112	$CFG->{fullscreen} = $value;
		113	});
		114
		115	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		116	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		117	my ($self, $value) = @_;
		118	$CFG->{fast} = $value;
		119	});
		120
		121	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		122	$table->add (1, 3, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		123	my ($self, $value) = @_;
		124	$CFG->{fow_intensity} = $value;
		125	});
		126
		127	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Smooth FoW");
		128	$table->add (1, 4, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
		129	my ($self, $value) = @_;
		130	$CFG->{fow_smooth} = $value;
		131	});
		132
107	$table->add (1, 1, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	133	$table->add (1, 5, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
108	destroy_screen ();	134	destroy_screen ();
109	init_screen ();	135	init_screen ();
110	});	136	});
111		137
112	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");	138	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
113	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	139	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
114	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	140	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
115	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	141	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});
116		142
117	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	143	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
…		…
145	status "Configuration Saved";	171	status "Configuration Saved";
146	});	172	});
147	$CFClient::UI::TOPLEVEL->add ($dialog);	173	$CFClient::UI::TOPLEVEL->add ($dialog);
148	}	174	}
149		175
		176	sub sdl_init {
		177	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		178	and die "SDL::Init failed!\n";
		179	}
		180
150	sub init_screen {	181	sub init_screen {
		182	sdl_init;
		183
151	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	184	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
152	$FULLSCREEN = $CFG->{fullscreen};	185	$FULLSCREEN = $CFG->{fullscreen};
		186	$FAST = $CFG->{fast};
153		187
154	$SDL_APP = new SDL::App	188	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
155	-flags => SDL_ANYFORMAT \| SDL_HWSURFACE,	189	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
156	-title => "Crossfire+ Client",	190	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
157	-width => $WIDTH,	191	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
158	-height => $HEIGHT,	192
159	-opengl => 1,	193	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
160	-red_size => 5,	194	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
161	-green_size => 5,	195	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
162	-blue_size => 5,	196	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
163	-alpha_size => 0,	197
164	-double_buffer => 1,	198	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
165	-fullscreen => $FULLSCREEN,	199	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
166	-resizeable => 0;	200	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
		201
		202	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
		203	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
		204	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
		205	or die "SDL::SetVideoMode failed!\n";
		206
		207	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
167		208
168	$SDL_EV = new SDL::Event;	209	$SDL_EV = new SDL::Event;
169	$SDL_EV->set_unicode (1);	210	$SDL_EV->set_unicode (1);
170		211
171	$SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {	212	$SDL_ACTIVE = 1;
172	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
173	while $SDL_EV->poll;
174		213
175	1	214	$LAST_REFRESH = time - 0.01;
176	};
177
178	$last_refresh = SDL::GetTicks;
179		215
180	CFClient::gl_init;	216	CFClient::gl_init;
181		217
182	$FONTSIZE = int $HEIGHT / 40;	218	$FONTSIZE = int $HEIGHT / 40;
183		219
…		…
205	config_dialog;	241	config_dialog;
206	}	242	}
207		243
208	sub destroy_screen {	244	sub destroy_screen {
209	$CFClient::UI::TOPLEVEL->{children} = [];	245	$CFClient::UI::TOPLEVEL->{children} = [];
210	remove Glib::Source $SDL_TIMER;
211	remove Glib::Source $refresh_handler if $refresh_handler;
212	undef $refresh_handler;
213	undef $SDL_APP;	246	undef $SDL_ACTIVE;
214	undef $SDL_EV;	247	undef $SDL_EV;
215	SDL::Quit;	248	SDL::Quit;
216	}	249	}
217		250
		251	my %animate_object;
		252	my $animate_timer;
		253
		254	my $want_refresh;
		255	my $can_refresh;
		256
		257	my $fps = 9;
		258
218	sub force_refresh {	259	sub force_refresh {
		260	$fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
		261	debug sprintf "%3.2f", $fps;
		262
		263	$want_refresh = 0;
		264	$can_refresh = 0;
		265
219	glViewport 0, 0, $WIDTH, $HEIGHT;	266	glViewport 0, 0, $WIDTH, $HEIGHT;
220		267
221	glMatrixMode GL_PROJECTION;	268	glMatrixMode GL_PROJECTION;
222	glLoadIdentity;	269	glLoadIdentity;
223	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;	270	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
224	glMatrixMode GL_MODELVIEW;	271	glMatrixMode GL_MODELVIEW;
225	glLoadIdentity;	272	glLoadIdentity;
226		273
		274	glClearColor +($CFG->{fow_intensity}) x 3, 1;
227	glClear GL_COLOR_BUFFER_BIT;	275	glClear GL_COLOR_BUFFER_BIT;
228		276
229	$CFClient::UI::TOPLEVEL->draw;	277	$CFClient::UI::TOPLEVEL->draw;
230		278
231	SDL::GLSwapBuffers;	279	SDL::GLSwapBuffers;
232	}
233		280
234	my $FPS;	281	$LAST_REFRESH = $NOW;
		282	}
		283
		284	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
		285	$NOW = time;
		286
		287	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()
		288	while $SDL_EV->poll;
		289
		290	if (%animate_object) {
		291	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
		292	$want_refresh++;
		293	}
		294
		295	if ($want_refresh) {
		296	force_refresh;
		297	} else {
		298	$can_refresh = 1;
		299	}
		300	});
235		301
236	sub refresh {	302	sub refresh {
237	$refresh_handler \|\|= add Glib::Idle sub {	303	$want_refresh++;
238	if ($SDL_APP) {
239	$NOW = SDL::GetTicks;
240
241	if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
242	SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
243	$NOW = SDL::GetTicks;
244	}
245
246	my $interval = ($NOW - $last_refresh) * 0.001;
247	$last_refresh = $NOW;
248
249	if ($interval) {
250	$FPS \|\|= 1 / $interval;
251	$FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
252	debug sprintf "%5.02f", $FPS;
253	}
254
255	force_refresh;
256	$_->animate ($interval) for grep $_, values %ANIMATE;
257
258	if (%ANIMATE) {
259	1
260	} else {
261	undef $refresh_handler;
262	0
263	}
264	} else {
265	undef $refresh_handler;
266	0
267	}
268	};
269	}	304	}
270		305
271	sub animation_start {	306	sub animation_start {
272	my ($widget) = @_;	307	my ($widget) = @_;
273	$ANIMATE{$widget} = $widget;	308	$animate_object{$widget} = $widget;
274	Scalar::Util::weaken $ANIMATE{$widget};
275
276	refresh;
277	}	309	}
278		310
279	sub animation_stop {	311	sub animation_stop {
280	my ($widget) = @_;	312	my ($widget) = @_;
281	delete $ANIMATE{$widget};	313	delete $animate_object{$widget};
		314	}
		315
		316	@conn::ISA = Crossfire::Protocol::;
		317
		318	sub conn::user_send {
		319	my ($self, $command) = @_;
		320
		321	$self->send ($command);
		322	status $command;
		323	}
		324
		325	sub conn::feed_map1a {
		326	my ($self, $data) = @_;
		327
		328	# $self->Crossfire::Protocol::feed_map1a ($data);
		329
		330	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		331	$MAP->map1a_update ($data);
		332	$MAPWIDGET->update;
		333	}
		334
		335	#sub conn::map_update {
		336	# my ($self, $dirty) = @_;
		337	#
		338	# $MAPWIDGET->update;
		339	#}
		340
		341	sub conn::map_clear {
		342	my ($self) = @_;
		343
		344	$MAP->clear;
		345
		346	# refresh;
		347	}
		348
		349	sub conn::face_find {
		350	my ($self, $face) = @_;
		351
		352	$FACECACHE->{"$face->{chksum},$face->{name}"}
		353	}
		354
		355	sub conn::face_update {
		356	my ($self, $facenum, $face) = @_;
		357
		358	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
		359
		360	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
		361
		362	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
		363	$MAPWIDGET->update;
		364	}
		365
		366	sub conn::query {
		367	my ($self, $flags, $prompt) = @_;
		368
		369	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
282	}	370	}
283		371
284	%SDL_CB = (	372	%SDL_CB = (
285	SDL_QUIT() => sub {	373	SDL_QUIT() => sub {
286	main_quit Gtk2;	374	Event::unloop -1;
287	},	375	},
288	SDL_VIDEORESIZE() => sub {	376	SDL_VIDEORESIZE() => sub {
289	},	377	},
290	SDL_VIDEOEXPOSE() => sub {	378	SDL_VIDEOEXPOSE() => sub {
291	refresh;	379	refresh;
…		…
315	SDL_ACTIVEEVENT() => sub {	403	SDL_ACTIVEEVENT() => sub {
316	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	404	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
317	},	405	},
318	);	406	);
319		407
320	@conn::ISA = Crossfire::Protocol::;
321
322	sub conn::map_update {
323	my ($self, $dirty) = @_;
324
325	$MAPWIDGET->update;
326	}
327
328	sub conn::map_scroll {
329	my ($self, $dx, $dy) = @_;
330
331	# refresh;
332	}
333
334	sub conn::map_clear {
335	my ($self) = @_;
336
337	# refresh;
338	}
339
340	sub conn::face_find {
341	my ($self, $face) = @_;
342
343	$FACECACHE->{"$face->{chksum},$face->{name}"}
344	}
345
346	sub conn::face_update {
347	my ($self, $face) = @_;
348
349	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
350
351	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};
352	}
353
354	sub conn::query {
355	my ($self, $flags, $prompt) = @_;
356
357	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
358	}
359
360	sub gtk_add_cfg_field {
361	my ($tbl, $cfg, $klbl, $key, $value) = @_;
362	my $i = $cfg->{_i}++;
363	$tbl->attach_defaults (my $lbl = Gtk2::Label->new ($klbl), 0, 1, $i, $i + 1);
364	$tbl->attach_defaults (my $ent = Gtk2::Entry->new, 1, 2, $i, $i + 1);
365	if ($key eq 'password') {
366	$ent->set_invisible_char ("*");
367	$ent->set (visibility => 0)
368	}
369	$ent->set_text ($value);
370	$ent->signal_connect (changed => sub {
371	my ($ent) = @_;
372	$cfg->{$key} = $ent->get_text;
373	# TODO: Mapsize should be a slider in the game gui
374	if ($key eq 'mapsize' and $cfg->{$key} > 100) {
375	$cfg->{$key} = 100;
376	} elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
377	$cfg->{$key} = 50;
378	}
379	});
380	}
381
382	sub run_config_dialog {
383	my (%events) = @_;
384
385	my $w = Gtk2::Window->new;
386
387	my @cfg = (
388	[qw/Host host/],
389	[qw/Port port/],
390	[qw/Mapsize% mapsize/],
391	[qw/Username user/],
392	[qw/Password password/],
393	);
394
395	my $cfg = {};
396
397	$w->add (my $vb = Gtk2::VBox->new);
398	$vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
399	my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
400	$t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
401	$t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
402	my $i = 0;
403	my $act = 0;
404	for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
405	if ($_ eq $selmode) { $act = $i }
406	$cb->append_text ($_);
407	$i++;
408	}
409	$cb->set_active ($act);
410	$cb->signal_connect (changed => sub {
411	my ($cb) = @_;
412	my $txt = $cb->get_active_text;
413	if ($txt =~ m/(\d+)x(\d+)/) {
414	$::CFG->{width} = $1;
415	$::CFG->{height} = $2;
416	}
417	});
418
419	$cfg->{_i} = 1;
420	for (@cfg) {
421	gtk_add_cfg_field ($t, $cfg, $_->[0], $_->[1], $::CFG->{$_->[1]});
422	}
423
424	$vb->pack_start (my $hb = Gtk2::HBox->new, 0, 0, 0);
425	$hb->pack_start (my $cb = Gtk2::Button->new ("save"), 1, 1, 5);
426	$cb->signal_connect (clicked => sub {
427	for (keys %$cfg) {
428	$::CFG->{$_} = $cfg->{$_}
429	if $_ ne '_i';
430	}
431	CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
432	});
433	$hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
434	$cb->signal_connect (clicked => sub {
435	for (keys %$cfg) {
436	$::CFG->{$_} = $cfg->{$_}
437	if $_ ne '_i';
438	}
439	my $cb = $events{login} \|\| sub {};
440	$cb->($::CFG->{user}, $::CFG->{password});
441	});
442	$hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
443	$cb->signal_connect (clicked => sub {
444	my $cb = $events{logout} \|\| sub {};
445	$cb->();
446	});
447	$hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
448	$cb->signal_connect (clicked => sub { $w->destroy });
449
450	$w->show_all;
451
452	$w->signal_connect (destroy => sub { Gtk2->main_quit });
453	}
454
455
456	#############################################################################	408	#############################################################################
457		409
458	SDL::Init SDL_INIT_EVERYTHING;
459
460	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
461	@{ SDL::ListModes 0, SDL_FULLSCREEN\|SDL_HWSURFACE };
462
463	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	410	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
464		411
465	$CFG \|\|= {	412	my %DEF_CFG = (
466	width => 640,	413	width => 640,
467	height => 480,	414	height => 480,
		415	fast => 0,
		416	fow_intensity => 0.45,
		417	fow_smooth => 0,
468	fullscreen => 0,	418	fullscreen => 0,
469	sdl_mode => 0,	419	sdl_mode => 0,
470	mapsize => 100,	420	mapsize => 100,
471	host => "crossfire.schmorp.de",	421	host => "crossfire.schmorp.de",
472	port => 13327,	422	port => 13327,
473	};	423	);
		424
		425	while (my ($k, $v) = each %DEF_CFG) {
		426	$CFG->{$k} = $v unless exists $CFG->{$k};
		427	}
		428
		429	sdl_init;
		430
		431	@SDL_MODES = reverse
		432	grep $_->[0] >= 640 && $_->[1] >= 480,
		433	map [SDL::RectW ($_), SDL::RectH ($_)],
		434	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		435
		436	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		437
		438	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
		439
		440	init_screen;
474		441
475	{	442	{
476	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	443	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
477		444
478	CFClient::add_font $_ for @fonts;	445	CFClient::add_font $_ for @fonts;
479	CFClient::set_font $fonts[0];	446	CFClient::set_font $fonts[0];
480	}	447	}
481		448
482	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	449	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
483		450
484	init_screen;	451	Event::loop;
485
486	main Gtk2;
487		452
488	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";	453	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
489		454

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.84 by root, Wed Apr 12 15:46:14 2006 UTC vs. Revision 1.96 by root, Thu Apr 13 23:11:11 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.84 by root, Wed Apr 12 15:46:14 2006 UTC vs.
Revision 1.96 by root, Thu Apr 13 23:11:11 2006 UTC