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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.114 by root, Sat Apr 15 21:16:51 2006 UTC vs.
Revision 1.136 by root, Tue Apr 18 06:34:30 2006 UTC

…		…
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
		14	use SDL::Mixer;
		15	use SDL::Sound;
		16	use SDL::Music;
		17
13	use SDL::OpenGL;	18	use SDL::OpenGL;
14		19
15	use Crossfire;	20	use Crossfire;
16	use Crossfire::Protocol;	21	use Crossfire::Protocol;
17		22
		23	use Compress::LZF;
		24
18	use CFClient;	25	use CFClient;
19	use CFClient::UI;	26	use CFClient::UI;
20		27
21	our $VERSION = '0.1';	28	our $VERSION = '0.1';
22		29
23	my $MAX_FPS = 60;	30	my $MAX_FPS = 60;
24	my $MIN_FPS = 5; # unused as of yet	31	my $MIN_FPS = 5; # unused as of yet
25		32
26	our $META_SERVER = "crossfire.real-time.com:13326";	33	our $META_SERVER = "crossfire.real-time.com:13326";
27		34
		35	our $FACEMAP;
		36	our $TILECACHE;
28	our $FACECACHE;	37	our $MAPCACHE;
29		38
30	our $LAST_REFRESH;	39	our $LAST_REFRESH;
31	our $NOW;	40	our $NOW;
32		41
33	our $CFG;	42	our $CFG;
…		…
45	our $BUTTONBAR;	54	our $BUTTONBAR;
46	our $LOGVIEW;	55	our $LOGVIEW;
47	our $CONSOLE;	56	our $CONSOLE;
48	our $METASERVER;	57	our $METASERVER;
49		58
		59	our $GAUGES;
		60
50	our $SDL_ACTIVE;	61	our $SDL_ACTIVE;
51	our $SDL_EV;	62	our $SDL_EV;
52	our %SDL_CB;	63	our %SDL_CB;
53		64
		65	our $SDL_MIXER;
		66	our @SOUNDS; # event => file mapping
		67	our %AUDIO_CHUNKS; # audio files
		68
54	our $ALT_ENTER_MESSAGE;	69	our $ALT_ENTER_MESSAGE;
55	our $STATUS_LINE;	70	our $STATUS_LINE;
56	our $DEBUG_STATUS;	71	our $DEBUG_STATUS;
57		72
58	sub status {	73	sub status {
59	$STATUS_LINE->set_text ($_[0]);	74	$STATUS_LINE->set_text ($_[0]);
60	my ($w, $h) = $STATUS_LINE->size_request;
61	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	75	$STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
62	}	76	}
63		77
64	sub debug {	78	sub debug {
65	$DEBUG_STATUS->set_text ($_[0]);	79	$DEBUG_STATUS->set_text ($_[0]);
66	my ($w, $h) = $DEBUG_STATUS->size_request;	80	$DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
67	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
68	}	81	}
69		82
70	sub start_game {	83	sub start_game {
71	status "logging in...";	84	status "logging in...";
72		85
73	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	86	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		87
		88	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
74		89
75	$MAP = new CFClient::Map $mapsize, $mapsize;	90	$MAP = new CFClient::Map $mapsize, $mapsize;
76		91
77	my ($host, $port) = split /:/, $CFG->{host};	92	my ($host, $port) = split /:/, $CFG->{host};
78		93
…		…
140		155
141	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	156	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
142	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	157	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
143	my ($self, $value) = @_;	158	my ($self, $value) = @_;
144	$CFG->{fow_smooth} = $value;	159	$CFG->{fow_smooth} = $value;
		160	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
145	});	161	});
146		162
147	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");	163	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
148	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {	164	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
149	my ($self, $value) = @_;	165	my ($self, $value) = @_;
150	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	166	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
151	});	167	});
152		168
153	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	169	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
154	destroy_screen ();	170	video_shutdown ();
155	init_screen ();	171	video_init ();
156	});	172	});
157		173
158	$dialog	174	$dialog
159	}	175	}
160		176
…		…
294		310
295	sub message_window {	311	sub message_window {
296	my $window = new CFClient::UI::FancyFrame	312	my $window = new CFClient::UI::FancyFrame
297	border_bg => [1, 1, 1, 0.5],	313	border_bg => [1, 1, 1, 0.5],
298	bg => [0.3, 0.3, 0.3, 0.8],	314	bg => [0.3, 0.3, 0.3, 0.8],
299	user_w => $::WIDTH/4,	315	user_w => int $::WIDTH / 3,
300	user_h => $::HEIGHT,	316	user_h => int $::HEIGHT / 5,
301	child => (my $vbox = new CFClient::UI::VBox);	317	child => (my $vbox = new CFClient::UI::VBox);
302		318
303	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	319	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
304	expand => 1,	320	expand => 1,
305	fontsize => $::CFG->{log_fontsize},	321	fontsize => $::CFG->{log_fontsize},
306	);	322	);
307		323
308	$vbox->add (my $input = new CFClient::UI::LineEntry);	324	$vbox->add (my $input = new CFClient::UI::Entry
		325	connect_focus_in => sub {
		326	my ($input, $prev_focus) = @_;
		327
		328	delete $input->{refocus_map};
		329
		330	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
		331	$input->{refocus_map} = 1;
		332	}
		333	delete $input->{auto_activated};
		334	},
309	$input->connect (activate => sub {	335	connect_activate => sub {
310	my ($input, $text) = @_;	336	my ($input, $text) = @_;
311	$input->set_text ('');	337	$input->set_text ('');
312		338
313	if ($text =~ /^\/(.*)/) {	339	if ($text =~ /^\/(.*)/) {
314	$::CONN->user_send ("command $1");	340	$::CONN->user_send ($1);
315	} else {	341	} else {
316	my $say_cmd = $::CFG->{say_command} \|\| 'say';	342	my $say_cmd = $::CFG->{say_command} \|\| 'say';
317	$::CONN->user_send ("command $say_cmd $text");	343	$::CONN->user_send ("$say_cmd $text");
318	}	344	}
		345	if ($input->{refocus_map}) {
		346	delete $input->{refocus_map};
		347	$MAPWIDGET->focus_in
319	1	348	}
320	});	349	},
321	$input->connect (escape => sub {	350	connect_escape => sub {
322	$MAPWIDGET->focus_in	351	$MAPWIDGET->focus_in
323	});	352	},
324	$input->focus_in;	353	);
325		354
326	$CONSOLE = {	355	$CONSOLE = {
327	window => $window,	356	window => $window,
328	input => $input	357	input => $input
329	};	358	};
…		…
335	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	364	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
336	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO	365	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
337	and die "SDL::Init failed!\n";	366	and die "SDL::Init failed!\n";
338	}	367	}
339		368
340	sub init_screen {	369	sub video_init {
341	sdl_init;	370	sdl_init;
342		371
343	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	372	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
344	$FULLSCREEN = $CFG->{fullscreen};	373	$FULLSCREEN = $CFG->{fullscreen};
345	$FAST = $CFG->{fast};	374	$FAST = $CFG->{fast};
…		…
385	padding => 0,	414	padding => 0,
386	y => $HEIGHT * 44 / 45 - $FONTSIZE;	415	y => $HEIGHT * 44 / 45 - $FONTSIZE;
387	$CFClient::UI::ROOT->add ($STATUS_LINE);	416	$CFClient::UI::ROOT->add ($STATUS_LINE);
388		417
389	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	418	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
390	padding => 0,	419	padding => 0,
391	y => $HEIGHT * 44 / 45,	420	y => $HEIGHT * 44 / 45,
392	height => $HEIGHT / 45,	421	fontsize => $HEIGHT / 45,
393	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	422	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
394	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);	423	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
395		424
396	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);	425	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
397	$MAPWIDGET->focus_in;	426	$MAPWIDGET->focus_in;
398	$MAPWIDGET->connect (activate_console => sub {	427	$MAPWIDGET->connect (activate_console => sub {
399	my ($mapwidget, $preset) = @_;	428	my ($mapwidget, $preset) = @_;
400		429
401	if ($CONSOLE) {	430	if ($CONSOLE) {
		431	$CONSOLE->{input}->{auto_activated} = 1;
402	$CONSOLE->{input}->focus_in;	432	$CONSOLE->{input}->focus_in;
403		433
404	if ($preset && $CONSOLE->{input}->get_text eq '') {	434	if ($preset && $CONSOLE->{input}->get_text eq '') {
405	$CONSOLE->{input}->set_text ($preset);	435	$CONSOLE->{input}->set_text ($preset);
406	}	436	}
…		…
416	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	446	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
417	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	447	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
418	status "Configuration Saved";	448	status "Configuration Saved";
419	});	449	});
420		450
421	$BUTTONBAR->{children}[0]->emit ("activate");	451	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
422	}
423		452
424	sub destroy_screen {	453	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
		454	$tgw->add (my $hbox = new CFClient::UI::HBox ());
		455
		456	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
		457	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
		458	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
		459	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
		460
		461	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
		462	$CFClient::UI::ROOT->add ($tgw);
		463	}
		464
		465	sub video_shutdown {
425	$CFClient::UI::ROOT->{children} = [];	466	$CFClient::UI::ROOT->{children} = [];
426	undef $SDL_ACTIVE;	467	undef $SDL_ACTIVE;
427	undef $SDL_EV;	468	undef $SDL_EV;
428	SDL::Quit;	469	}
		470
		471	my $bgmusic;#TODO#hack#d#
		472
		473	sub audio_init {
		474	if ($CFG->{sound} \|\| 1) {
		475	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
		476	$SDL_MIXER = new SDL::Mixer;
		477	$SDL_MIXER->allocate_channels (8);
		478
		479	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
		480	$SDL_MIXER->play_music ($bgmusic, -1);
		481
		482	while (<$fh>) {
		483	next if /^\s*#/;
		484	next if /^\s*$/;
		485
		486	my ($file, $volume, $event) = split /\s+/, $_, 3;
		487
		488	push @SOUNDS, "$volume,$file";
		489
		490	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
		491	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";
		492	$chunk->volume ($volume * 128 / 100);
		493	$chunk
		494	};
		495	}
		496	} else {
		497	status "unable to open sound config: $!";
		498	}
		499	}
		500	}
		501
		502	sub audio_shutdown {
		503	undef $SDL_MIXER;
		504	@SOUNDS = ();
		505	%AUDIO_CHUNKS = ();
429	}	506	}
430		507
431	my %animate_object;	508	my %animate_object;
432	my $animate_timer;	509	my $animate_timer;
433		510
…		…
482	delete $animate_object{$widget};	559	delete $animate_object{$widget};
483	}	560	}
484		561
485	@conn::ISA = Crossfire::Protocol::;	562	@conn::ISA = Crossfire::Protocol::;
486		563
		564	sub conn::stats_update {
		565	my ($self, $stats) = @_;
		566
		567	# i love text protocols!!!
		568	# FIXME: the stats are somehow weird
		569	my $hp = $stats->{1};
		570	my $hp_m = $stats->{2};
		571	my $sp = $stats->{3};
		572	my $sp_m = $stats->{4};
		573	my $fo = $stats->{18};
		574	my $fo_m = 1000;
		575	my $gr = $stats->{23};
		576	my $gr_m = $stats->{24};
		577
		578	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
		579	$GAUGES->{hp}->set_value ($hp, $hp_m);
		580	$GAUGES->{mana}->set_value ($sp, $sp_m);
		581	$GAUGES->{food}->set_value ($fo, $fo_m);
		582	$GAUGES->{grace}->set_value ($gr, $gr_m);
		583	}
		584
487	sub conn::user_send {	585	sub conn::user_send {
488	my ($self, $command) = @_;	586	my ($self, $command) = @_;
489		587
490	$self->send ($command);	588	$self->send_command ($command);
491	status $command;	589	status $command;
		590	}
		591
		592	sub conn::map_scroll {
		593	my ($self, $dx, $dy) = @_;
		594
		595	$MAP->scroll ($dx, $dy);
492	}	596	}
493		597
494	sub conn::feed_map1a {	598	sub conn::feed_map1a {
495	my ($self, $data) = @_;	599	my ($self, $data) = @_;
496		600
497	# $self->Crossfire::Protocol::feed_map1a ($data);	601	# $self->Crossfire::Protocol::feed_map1a ($data);
498		602
499	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
500	$MAP->map1a_update ($data);	603	$MAP->map1a_update ($data);
501	$MAPWIDGET->update;	604	$MAPWIDGET->update;
502	}	605	}
503		606
504	#sub conn::map_update {	607	sub conn::flush_map {
505	# my ($self, $dirty) = @_;	608	my ($self) = @_;
506	#	609
507	# $MAPWIDGET->update;	610	my $map_info = delete $self->{map_info}
508	#}	611	or return;
		612
		613	my ($hash, $x, $y, $w, $h) = @$map_info;
		614
		615	my $data = $MAP->get_rect ($x, $y, $w, $h);
		616	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		617
		618	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		619
		620	}
509		621
510	sub conn::map_clear {	622	sub conn::map_clear {
511	my ($self) = @_;	623	my ($self) = @_;
512		624
		625	$self->flush_map;
		626	delete $self->{neigh};
		627
513	$MAP->clear;	628	$MAP->clear;
		629	}
514		630
515	# refresh;	631
		632	sub conn::load_map($$$) {
		633	my ($self, $hash, $x, $y) = @_;
		634
		635	if (defined (my $data = $MAPCACHE->get ($hash))) {
		636	$data = Compress::LZF::decompress $data;
		637	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
		638	for my $id ($MAP->set_rect ($x, $y, $data)) {
		639	my $data = $TILECACHE->get ($id)
		640	or next;
		641
		642	$self->set_texture ($id => $data);
		643	}
		644	}
		645	}
		646
		647	sub conn::flood_fill {
		648	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
		649
		650	# the server does not allow map paths > 6
		651	return if 6 <= length $path;
		652
		653	for my $tile (1..4) {
		654	next if $self->{neigh}{$hash}[$tile];
		655	next unless $flags & (1 << ($tile - 1));
		656
		657	my $neigh = $self->{neigh}{$hash} \|\|= [];
		658
		659	$self->send_mapinfo ("spatial $path$tile", sub {
		660	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		661
		662	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
		663	return if $mode ne "spatial";
		664
		665	$x += $MAP->ox;
		666	$y += $MAP->oy;
		667
		668	$self->load_map ($hash, $x, $y)
		669	unless $self->{neigh}{$hash}[5]++;#d#
		670
		671	$neigh->[$tile] = [$x, $y, $w, $h];
		672
		673	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
		674	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		675	});
		676	}
		677	}
		678
		679	sub conn::map_change {
		680	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		681
		682	$self->flush_map;
		683
		684	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
		685
		686	my $mapmapw = 250;
		687	my $mapmaph = 250;
		688
		689	$self->flood_fill ("", $hash, $flags,
		690	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		691	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
		692
		693	$x += $ox;
		694	$y += $oy;
		695
		696	$self->{map_info} = [$hash, $x, $y, $w, $h];
		697
		698	$self->load_map ($hash, $x, $y);
516	}	699	}
517		700
518	sub conn::face_find {	701	sub conn::face_find {
519	my ($self, $face) = @_;	702	my ($self, $facenum, $face) = @_;
520		703
521	my $data;	704	my $hash = "$face->{chksum},$face->{name}";
522		705
523	$FACECACHE->get ("$face->{chksum},$face->{name}")	706	my $id = $FACEMAP->get ($hash);
		707
		708	unless ($id) {
		709	# create new id for face
		710	# i love transactions
		711	for (1..100) {
		712	my $txn = $CFClient::DB_ENV->txn_begin;
		713	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		714	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		715	$id++;
		716	if ($FACEMAP->put (id => $id) == 0
		717	&& $FACEMAP->put ($hash => $id) == 0) {
		718	$txn->txn_commit;
		719
		720	goto gotid;
		721	}
		722	}
		723	$txn->abort;
		724	}
		725
		726	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		727	}
		728
		729	gotid:
		730	$face->{id} = $id;
		731	$MAP->set_face ($facenum => $id);
		732	$TILECACHE->get ($id)
524	}	733	}
525		734
526	sub conn::face_update {	735	sub conn::face_update {
527	my ($self, $facenum, $face) = @_;	736	my ($self, $facenum, $face) = @_;
528		737
529	$FACECACHE->put ("$face->{chksum},$face->{name}" => $face->{image});	738	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
530		739
531	my $tex = $face->{texture} =	740	$self->set_texture ($face->{id} => delete $face->{image});
		741	}
		742
		743	sub conn::set_texture {
		744	my ($self, $id, $data) = @_;
		745
		746	$self->{texture}[$id] \|\|= do {
		747	my $tex =
532	new_from_image CFClient::Texture	748	new_from_image CFClient::Texture
533	delete $face->{image}, minify => 1;	749	$data, minify => 1;
534		750
535	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});	751	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
536	$MAPWIDGET->update;	752	$MAPWIDGET->update;
		753
		754	$tex
		755	};
		756	}
		757
		758	sub conn::sound_play {
		759	my ($self, $x, $y, $soundnum, $type) = @_;
		760
		761	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
		762	or return;
		763
		764	$SDL_MIXER->play_channel (-1, $chunk);
		765	warn "sound $x,$y,$soundnum,$type\n";#d#
537	}	766	}
538		767
539	sub conn::query {	768	sub conn::query {
540	my ($self, $flags, $prompt) = @_;	769	my ($self, $flags, $prompt) = @_;
541		770
…		…
547	my ($self, $color, $text) = @_;	776	my ($self, $color, $text) = @_;
548		777
549	my @color = (	778	my @color = (
550	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	779	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
551	[1.00, 1.00, 1.00],	780	[1.00, 1.00, 1.00],
552	[0.00, 0.00, 0.55],	781	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
553	[1.00, 0.00, 0.00],	782	[1.00, 0.00, 0.00],
554	[1.00, 0.54, 0.00],	783	[1.00, 0.54, 0.00],
555	[0.11, 0.56, 1.00],	784	[0.11, 0.56, 1.00],
556	[0.93, 0.46, 0.00],	785	[0.93, 0.46, 0.00],
557	[0.18, 0.54, 0.34],	786	[0.18, 0.54, 0.34],
…		…
575	refresh;	804	refresh;
576	},	805	},
577	SDL_KEYDOWN() => sub {	806	SDL_KEYDOWN() => sub {
578	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	807	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
579	# alt-enter	808	# alt-enter
580	destroy_screen;	809	video_shutdown;
581	$CFG->{fullscreen} = !$CFG->{fullscreen};	810	$CFG->{fullscreen} = !$CFG->{fullscreen};
582	init_screen;	811	video_init;
583	} else {	812	} else {
584	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	813	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
585	}	814	}
586	},	815	},
587	SDL_KEYUP() => sub {	816	SDL_KEYUP() => sub {
…		…
601	},	830	},
602	);	831	);
603		832
604	#############################################################################	833	#############################################################################
605		834
		835	$SIG{INT} = $SIG{TERM} = sub { exit };
		836
606	$FACECACHE = CFClient::db_table "facecache";	837	$TILECACHE = CFClient::db_table "tilecache";
		838	$FACEMAP = CFClient::db_table "facemap";
607		839
608	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	840	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
609		841
610	my %DEF_CFG = (	842	my %DEF_CFG = (
611	sdl_mode => 0,	843	sdl_mode => 0,
…		…
635		867
636	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	868	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
637		869
638	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	870	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
639		871
640	init_screen;
641
642	{	872	{
643	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	873	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
644		874
645	CFClient::add_font $_ for @fonts;	875	CFClient::add_font $_ for @fonts;
646	CFClient::set_font $fonts[0];	876	CFClient::set_font $fonts[0];
647	}	877	}
648		878
		879	video_init;
		880	audio_init;
		881
649	Event::loop;	882	Event::loop;
650		883
		884	END { SDL::Quit }
651		885
		886

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.114 by root, Sat Apr 15 21:16:51 2006 UTC vs. Revision 1.136 by root, Tue Apr 18 06:34:30 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.114 by root, Sat Apr 15 21:16:51 2006 UTC vs.
Revision 1.136 by root, Tue Apr 18 06:34:30 2006 UTC