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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.101 by elmex, Fri Apr 14 11:32:22 2006 UTC vs.
Revision 1.127 by elmex, Mon Apr 17 21:07:03 2006 UTC

…		…
13	use SDL::OpenGL;	13	use SDL::OpenGL;
14		14
15	use Crossfire;	15	use Crossfire;
16	use Crossfire::Protocol;	16	use Crossfire::Protocol;
17		17
		18	use Compress::LZF;
		19
18	use CFClient;	20	use CFClient;
19	use CFClient::UI;	21	use CFClient::UI;
20		22
21	our $VERSION = '0.1';	23	our $VERSION = '0.1';
22		24
23	my $MAX_FPS = 60;	25	my $MAX_FPS = 60;
24	my $MIN_FPS = 5; # unused as of yet	26	my $MIN_FPS = 5; # unused as of yet
25		27
		28	our $META_SERVER = "crossfire.real-time.com:13326";
		29
		30	our $FACEMAP;
		31	our $TILECACHE;
26	our $FACECACHE;	32	our $MAPCACHE;
27		33
28	our $LAST_REFRESH;	34	our $LAST_REFRESH;
29	our $NOW;	35	our $NOW;
30		36
31	our $CFG;	37	our $CFG;
…		…
38	our $FULLSCREEN;	44	our $FULLSCREEN;
39	our $FONTSIZE;	45	our $FONTSIZE;
40		46
41	our $MAP;	47	our $MAP;
42	our $MAPWIDGET;	48	our $MAPWIDGET;
		49	our $BUTTONBAR;
		50	our $LOGVIEW;
		51	our $CONSOLE;
		52	our $METASERVER;
		53
		54	our $GAUGES;
43		55
44	our $SDL_ACTIVE;	56	our $SDL_ACTIVE;
45	our $SDL_EV;	57	our $SDL_EV;
46	our %SDL_CB;	58	our %SDL_CB;
47		59
48	our $ALT_ENTER_MESSAGE;	60	our $ALT_ENTER_MESSAGE;
49	our $STATUS_LINE;	61	our $STATUS_LINE;
50	our $DEBUG_STATUS;	62	our $DEBUG_STATUS;
51	our $BUTTONBAR;
52	our $LOGVIEW;
53		63
54	sub status {	64	sub status {
55	$STATUS_LINE->set_text ($_[0]);	65	$STATUS_LINE->set_text ($_[0]);
56	my ($w, $h) = $STATUS_LINE->size_request;	66	my ($w, $h) = $STATUS_LINE->size_request;
57	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	67	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
…		…
64	}	74	}
65		75
66	sub start_game {	76	sub start_game {
67	status "logging in...";	77	status "logging in...";
68		78
69	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	79	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		80
		81	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
70		82
71	$MAP = new CFClient::Map $mapsize, $mapsize;	83	$MAP = new CFClient::Map $mapsize, $mapsize;
		84
		85	my ($host, $port) = split /:/, $CFG->{host};
72		86
73	$CONN = new conn	87	$CONN = new conn
74	host => $CFG->{host},	88	host => $host,
75	port => $CFG->{port},	89	port => $port \|\| 13327,
76	user => $CFG->{user},	90	user => $CFG->{user},
77	pass => $CFG->{password},	91	pass => $CFG->{password},
78	mapw => $mapsize,	92	mapw => $mapsize,
79	maph => $mapsize,	93	maph => $mapsize,
80	;	94	;
…		…
86		100
87	sub stop_game {	101	sub stop_game {
88	undef $CONN;	102	undef $CONN;
89	}	103	}
90		104
91	sub config_dialog {	105	sub client_setup {
92	my $dialog = new CFClient::UI::FancyFrame	106	my $dialog = new CFClient::UI::FancyFrame
93	child => (my $vbox = new CFClient::UI::VBox);	107	child => (my $vbox = new CFClient::UI::VBox);
94	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	108	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
95	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	109	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
96		110
…		…
136	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	150	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
137	my ($self, $value) = @_;	151	my ($self, $value) = @_;
138	$CFG->{fow_smooth} = $value;	152	$CFG->{fow_smooth} = $value;
139	});	153	});
140		154
		155	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		156	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		157	my ($self, $value) = @_;
		158	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		159	});
		160
141	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	161	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
142	destroy_screen ();	162	destroy_screen ();
143	init_screen ();	163	init_screen ();
144	});	164	});
		165
		166	$dialog
		167	}
		168
		169	sub metaserver_dialog {
		170	my $dialog = new CFClient::UI::FancyFrame
		171	child => (my $vbox = new CFClient::UI::VBox);
		172
		173	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		174
		175	$dialog
		176	}
		177
		178	sub update_metaserver {
		179	my ($HOST) = @_;
		180
		181	status "fetching metaserver list...";
		182
		183	my $buf;
		184
		185	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		186
		187	Event->io (fd => $fh, poll => 'r', cb => sub {
		188	my $res = sysread $fh, $buf, 8192, length $buf;
		189
		190	if (!defined $res) {
		191	$_[0]->w->cancel;
		192	status "metaserver: $!";
		193	} elsif ($res == 0) {
		194	$_[0]->w->cancel;
		195	status "server list retrieved";
		196
		197	my $table = $METASERVER->{table};
		198
		199	$table->clear;
		200
		201	my @col = qw(Use #Users Host Uptime Version Description);
		202	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		203	for 0 .. $#col;
		204
		205	my @align = qw(1 0 1 1 -1);
		206
		207	my $y = 0;
		208	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		209	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		210
		211	for ($desc) {
		212	s/<br>/\n/gi;
		213	s/<li>/\n· /gi;
		214	s/<.*?>//sgi;
		215	s/&/&/g;
		216	s/</</g;
		217	s/>/>/g;
		218	}
		219
		220	$uptime = sprintf "%dd %02d:%02d:%02d",
		221	(int $m->[8] / 86400),
		222	(int $m->[8] / 3600) % 24,
		223	(int $m->[8] / 60) % 60,
		224	$m->[8] % 60;
		225
		226	$m = [$users, $host, $uptime, $version, $desc];
		227
		228	$y++;
		229
		230	$table->add (0, $y, new CFClient::UI::VBox children => [
		231	(new CFClient::UI::Button text => " ", connect_activate => sub {
		232	$HOST->set_text ($CFG->{host} = $host);
		233	}),
		234	(new CFClient::UI::Empty expand => 1),
		235	]);
		236
		237	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		238	for 0 .. $#$m;
		239	}
		240	}
		241	});
		242	}
		243
		244	sub server_setup {
		245	my $dialog = new CFClient::UI::FancyFrame
		246	child => (my $vbox = new CFClient::UI::VBox);
145		247
146	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	248	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
147	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	249	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
148	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	250	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
		251
		252	{
		253	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
		254
149	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	255	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
150	my ($self, $value) = @_;	256	my ($self, $value) = @_;
151	$CFG->{host} = $value;	257	$CFG->{host} = $value;
152	});	258	});
153		259
154	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	260	$METASERVER = metaserver_dialog;
155	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {	261
156	my ($self, $value) = @_;	262	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
157	$CFG->{port} = $value;	263	update_metaserver $HOST;
158	});	264	});
		265	}
159		266
160	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	267	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
161	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	268	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
162	my ($self, $value) = @_;	269	my ($self, $value) = @_;
163	$CFG->{user} = $value;	270	$CFG->{user} = $value;
164	});	271	});
165		272
166	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	273	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
167	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	274	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
168	my ($self, $value) = @_;	275	my ($self, $value) = @_;
169	$CFG->{password} = $value;	276	$CFG->{password} = $value;
170	});	277	});
171		278
172	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	279	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
…		…
188		295
189	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	296	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
190	start_game;	297	start_game;
191	});	298	});
192		299
193	$vbox->add (my $hbox = new CFClient::UI::HBox);
194
195	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
196	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
197	status "Configuration Saved";
198	});
199
200	$dialog	300	$dialog
201	}	301	}
202		302
203	sub console_window {	303	sub message_window {
204	my $window = new CFClient::UI::FancyFrame	304	my $window = new CFClient::UI::FancyFrame
205	border_bg => [1, 1, 1, 0.5],	305	border_bg => [1, 1, 1, 0.5],
206	bg => [0.3, 0.3, 0.3, 0.8],	306	bg => [0.3, 0.3, 0.3, 0.8],
		307	user_w => int $::WIDTH / 3,
		308	user_h => int $::HEIGHT / 5,
207	child => (my $vbox = new CFClient::UI::VBox);	309	child => (my $vbox = new CFClient::UI::VBox);
208		310
209	$vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);	311	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		312	expand => 1,
		313	fontsize => $::CFG->{log_fontsize},
		314	);
		315
210	$vbox->add (my $input = new CFClient::UI::LineEntry);	316	$vbox->add (my $input = new CFClient::UI::Entry
		317	connect_focus_in => sub {
		318	my ($input, $prev_focus) = @_;
		319
		320	delete $input->{refocus_map};
		321
		322	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
		323	$input->{refocus_map} = 1;
		324	}
		325	delete $input->{auto_activated};
		326	},
211	$input->connect (activate => sub {	327	connect_activate => sub {
212	my ($input, $text) = @_;	328	my ($input, $text) = @_;
213	$input->set_text ('');	329	$input->set_text ('');
214		330
215	if ($text =~ /^\/(.*)/) {	331	if ($text =~ /^\/(.*)/) {
216	$::CONN->user_send ("command $1");	332	$::CONN->user_send ($1);
217	} else {	333	} else {
218	my $say_cmd = $::CFG->{say_command} \|\| 'say';	334	my $say_cmd = $::CFG->{say_command} \|\| 'say';
219	$::CONN->user_send ("command $say_cmd $text");	335	$::CONN->user_send ("$say_cmd $text");
220	}	336	}
		337	if ($input->{refocus_map}) {
		338	delete $input->{refocus_map};
		339	$MAPWIDGET->focus_in
221	1	340	}
222	});	341	},
		342	connect_escape => sub {
		343	$MAPWIDGET->focus_in
		344	},
		345	);
		346
		347	$CONSOLE = {
		348	window => $window,
		349	input => $input
		350	};
223		351
224	$window	352	$window
225	}	353	}
226		354
227	sub sdl_init {	355	sub sdl_init {
		356	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
228	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO	357	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
229	and die "SDL::Init failed!\n";	358	and die "SDL::Init failed!\n";
230	}	359	}
231		360
232	sub init_screen {	361	sub init_screen {
…		…
237	$FAST = $CFG->{fast};	366	$FAST = $CFG->{fast};
238		367
239	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	368	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
240	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	369	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
241	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	370	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
242	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	371	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
243		372
244	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	373	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
245	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	374	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
246	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	375	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
247	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	376	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
269	$FONTSIZE = int $HEIGHT / 40;	398	$FONTSIZE = int $HEIGHT / 40;
270		399
271	#############################################################################	400	#############################################################################
272		401
273	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	402	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
274	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	403	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
275		404
276	$STATUS_LINE = new CFClient::UI::Label	405	$STATUS_LINE = new CFClient::UI::Label
277	padding => 0,	406	padding => 0,
278	y => $HEIGHT * 44 / 45 - $FONTSIZE;	407	y => $HEIGHT * 44 / 45 - $FONTSIZE;
279	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	408	$CFClient::UI::ROOT->add ($STATUS_LINE);
280		409
281	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	410	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
282	padding => 0,	411	padding => 0,
283	y => $HEIGHT * 44 / 45,	412	y => $HEIGHT * 44 / 45,
284	height => $HEIGHT / 45,	413	fontsize => $HEIGHT / 45,
285	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	414	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
286	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	415	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
287		416
288	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);	417	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
289	$MAPWIDGET->focus_in;	418	$MAPWIDGET->focus_in;
		419	$MAPWIDGET->connect (activate_console => sub {
		420	my ($mapwidget, $preset) = @_;
290		421
		422	if ($CONSOLE) {
		423	$CONSOLE->{input}->{auto_activated} = 1;
		424	$CONSOLE->{input}->focus_in;
		425
		426	if ($preset && $CONSOLE->{input}->get_text eq '') {
		427	$CONSOLE->{input}->set_text ($preset);
		428	}
		429	}
		430	});
		431
291	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);	432	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
292		433
293	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);	434	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
294	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);	435	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		436	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		437
		438	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		439	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		440	status "Configuration Saved";
		441	});
		442
		443	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
		444
		445	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
		446	$tgw->add (my $hbox = new CFClient::UI::HBox ());
		447
		448	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food', expand => 1));
		449	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana', expand => 1));
		450	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp', expand => 1));
		451	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace', expand => 1));
		452
		453	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
		454	$CFClient::UI::ROOT->add ($tgw);
295	}	455	}
296		456
297	sub destroy_screen {	457	sub destroy_screen {
298	$CFClient::UI::TOPLEVEL->{children} = [];	458	$CFClient::UI::ROOT->{children} = [];
299	undef $SDL_ACTIVE;	459	undef $SDL_ACTIVE;
300	undef $SDL_EV;	460	undef $SDL_EV;
301	SDL::Quit;	461	SDL::Quit;
302	}	462	}
303		463
…		…
314	debug sprintf "%3.2f", $fps;	474	debug sprintf "%3.2f", $fps;
315		475
316	$want_refresh = 0;	476	$want_refresh = 0;
317	$can_refresh = 0;	477	$can_refresh = 0;
318		478
319	glViewport 0, 0, $WIDTH, $HEIGHT;
320
321	glMatrixMode GL_PROJECTION;
322	glLoadIdentity;
323	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
324	glMatrixMode GL_MODELVIEW;
325	glLoadIdentity;
326
327	glClearColor +($CFG->{fow_intensity}) x 3, 1;
328	glClear GL_COLOR_BUFFER_BIT;
329
330	$CFClient::UI::TOPLEVEL->draw;	479	$CFClient::UI::ROOT->draw;
331		480
332	SDL::GLSwapBuffers;	481	SDL::GLSwapBuffers;
333		482
334	$LAST_REFRESH = $NOW;	483	$LAST_REFRESH = $NOW;
335	}	484	}
…		…
366	delete $animate_object{$widget};	515	delete $animate_object{$widget};
367	}	516	}
368		517
369	@conn::ISA = Crossfire::Protocol::;	518	@conn::ISA = Crossfire::Protocol::;
370		519
		520	sub conn::stats_update {
		521	my ($self, $stats) = @_;
		522
		523	# i love text protocols!!!
		524	# FIXME: the stats are somehow weird
		525	my $hp = $stats->{1};
		526	my $hp_m = $stats->{2};
		527	my $sp = $stats->{3};
		528	my $sp_m = $stats->{4};
		529	my $fo = $stats->{18};
		530	my $fo_m = 1000;
		531	my $gr = $stats->{23};
		532	my $gr_m = $stats->{24};
		533
		534	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
		535	$GAUGES->{hp}->set_value ($hp, $hp_m);
		536	$GAUGES->{mana}->set_value ($sp, $sp_m);
		537	$GAUGES->{food}->set_value ($fo, $fo_m);
		538	$GAUGES->{grace}->set_value ($gr, $gr_m);
		539	}
		540
371	sub conn::user_send {	541	sub conn::user_send {
372	my ($self, $command) = @_;	542	my ($self, $command) = @_;
373		543
374	$self->send ($command);	544	$self->send_command ($command);
375	status $command;	545	status $command;
		546	}
		547
		548	sub conn::map_scroll {
		549	my ($self, $dx, $dy) = @_;
		550
		551	$MAP->scroll ($dx, $dy);
376	}	552	}
377		553
378	sub conn::feed_map1a {	554	sub conn::feed_map1a {
379	my ($self, $data) = @_;	555	my ($self, $data) = @_;
380		556
381	# $self->Crossfire::Protocol::feed_map1a ($data);	557	# $self->Crossfire::Protocol::feed_map1a ($data);
382		558
383	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
384	$MAP->map1a_update ($data);	559	$MAP->map1a_update ($data);
385	$MAPWIDGET->update;	560	$MAPWIDGET->update;
386	}	561	}
387		562
388	#sub conn::map_update {	563	sub conn::flush_map {
389	# my ($self, $dirty) = @_;	564	my ($self) = @_;
390	#	565
391	# $MAPWIDGET->update;	566	my $map_info = delete $self->{map_info}
392	#}	567	or return;
		568
		569	my ($hash, $x, $y, $w, $h) = @$map_info;
		570
		571	my $data = $MAP->get_rect ($x, $y, $w, $h);
		572	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		573
		574	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		575
		576	}
393		577
394	sub conn::map_clear {	578	sub conn::map_clear {
395	my ($self) = @_;	579	my ($self) = @_;
396		580
		581	$self->flush_map;
		582	delete $self->{neigh};
		583
397	$MAP->clear;	584	$MAP->clear;
		585	}
398		586
399	# refresh;	587
		588	sub conn::load_map($$$) {
		589	my ($self, $hash, $x, $y) = @_;
		590
		591	if (defined (my $data = $MAPCACHE->get ($hash))) {
		592	$data = Compress::LZF::decompress $data;
		593	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
		594	for my $id ($MAP->set_rect ($x, $y, $data)) {
		595	my $data = $TILECACHE->get ($id)
		596	or next;
		597
		598	$self->set_texture ($id => $data);
		599	}
		600	}
		601	}
		602
		603	sub conn::flood_fill {
		604	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;
		605
		606	# the server does not allow map paths > 6
		607	return if 6 <= length $path;
		608
		609	for my $tile (1..4) {
		610	next if $self->{neigh}{$hash}[$tile];
		611	next unless $flags & (1 << ($tile - 1));
		612
		613	my $neigh = $self->{neigh}{$hash} \|\|= [];
		614
		615	$self->send_mapinfo ("spatial $path$tile", sub {
		616	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		617
		618	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
		619	return if $mode ne "spatial";
		620
		621	$x += $MAP->ox;
		622	$y += $MAP->oy;
		623
		624	$self->load_map ($hash, $x, $y)
		625	unless $self->{neigh}{$hash}[5]++;#d#
		626
		627	$neigh->[$tile] = [$x, $y, $w, $h];
		628
		629	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)
		630	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		631	});
		632	}
		633	}
		634
		635	sub conn::map_change {
		636	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		637
		638	$self->flush_map;
		639
		640	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
		641
		642	warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
		643
		644	my $mapmapw = 250;
		645	my $mapmaph = 250;
		646
		647	$self->flood_fill ("", $hash, $flags,
		648	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		649	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
		650
		651	$x += $ox;
		652	$y += $oy;
		653
		654	$self->{map_info} = [$hash, $x, $y, $w, $h];
		655
		656	$self->load_map ($hash, $x, $y);
400	}	657	}
401		658
402	sub conn::face_find {	659	sub conn::face_find {
403	my ($self, $face) = @_;	660	my ($self, $facenum, $face) = @_;
404		661
405	$FACECACHE->{"$face->{chksum},$face->{name}"}	662	my $hash = "$face->{chksum},$face->{name}";
		663
		664	my $id = $FACEMAP->get ($hash);
		665
		666	unless ($id) {
		667	# create new id for face
		668	# i love transactions
		669	for (1..100) {
		670	my $txn = $CFClient::DB_ENV->txn_begin;
		671	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		672	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		673	$id++;
		674	if ($FACEMAP->put (id => $id) == 0
		675	&& $FACEMAP->put ($hash => $id) == 0) {
		676	$txn->txn_commit;
		677
		678	goto gotid;
		679	}
		680	}
		681	$txn->abort;
		682	}
		683
		684	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		685	}
		686
		687	gotid:
		688	$face->{id} = $id;
		689	$MAP->set_face ($facenum => $id);
		690	$TILECACHE->get ($id)
406	}	691	}
407		692
408	sub conn::face_update {	693	sub conn::face_update {
409	my ($self, $facenum, $face) = @_;	694	my ($self, $facenum, $face) = @_;
410		695
411	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	696	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
412		697
413	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};	698	$self->set_texture ($face->{id} => delete $face->{image});
		699	}
414		700
		701	sub conn::set_texture {
		702	my ($self, $id, $data) = @_;
		703
		704	$self->{texture}[$id] \|\|= do {
		705	my $tex =
		706	new_from_image CFClient::Texture
		707	$data, minify => 1;
		708
415	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});	709	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
416	$MAPWIDGET->update;	710	$MAPWIDGET->update;
		711
		712	$tex
		713	};
417	}	714	}
418		715
419	sub conn::query {	716	sub conn::query {
420	my ($self, $flags, $prompt) = @_;	717	my ($self, $flags, $prompt) = @_;
421		718
…		…
427	my ($self, $color, $text) = @_;	724	my ($self, $color, $text) = @_;
428		725
429	my @color = (	726	my @color = (
430	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	727	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
431	[1.00, 1.00, 1.00],	728	[1.00, 1.00, 1.00],
432	[0.00, 0.00, 0.55],	729	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
433	[1.00, 0.00, 0.00],	730	[1.00, 0.00, 0.00],
434	[1.00, 0.54, 0.00],	731	[1.00, 0.54, 0.00],
435	[0.11, 0.56, 1.00],	732	[0.11, 0.56, 1.00],
436	[0.93, 0.46, 0.00],	733	[0.93, 0.46, 0.00],
437	[0.18, 0.54, 0.34],	734	[0.18, 0.54, 0.34],
…		…
481	},	778	},
482	);	779	);
483		780
484	#############################################################################	781	#############################################################################
485		782
		783	$TILECACHE = CFClient::db_table "tilecache";
		784	$FACEMAP = CFClient::db_table "facemap";
		785
486	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	786	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
487		787
488	my %DEF_CFG = (	788	my %DEF_CFG = (
		789	sdl_mode => 0,
489	width => 640,	790	width => 640,
490	height => 480,	791	height => 480,
		792	fullscreen => 0,
491	fast => 0,	793	fast => 0,
492	fow_enable => 1,	794	fow_enable => 1,
493	fow_intensity => 0.45,	795	fow_intensity => 0.45,
494	fow_smooth => 0,	796	fow_smooth => 0,
495	fullscreen => 0,	797	log_fontsize => 14,
496	sdl_mode => 0,
497	mapsize => 100,	798	mapsize => 100,
498	host => "crossfire.schmorp.de",	799	host => "crossfire.schmorp.de",
499	port => 13327,
500	say_command => 'say',	800	say_command => 'say',
501	);	801	);
502		802
503	while (my ($k, $v) = each %DEF_CFG) {	803	while (my ($k, $v) = each %DEF_CFG) {
504	$CFG->{$k} = $v unless exists $CFG->{$k};	804	$CFG->{$k} = $v unless exists $CFG->{$k};
…		…
513		813
514	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	814	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
515		815
516	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	816	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
517		817
518	init_screen;
519
520	{	818	{
521	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	819	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
522		820
523	CFClient::add_font $_ for @fonts;	821	CFClient::add_font $_ for @fonts;
524	CFClient::set_font $fonts[0];	822	CFClient::set_font $fonts[0];
525	}	823	}
526		824
527	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};	825	init_screen;
528		826
529	Event::loop;	827	Event::loop;
530		828
531	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
532		829

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.101 by elmex, Fri Apr 14 11:32:22 2006 UTC vs. Revision 1.127 by elmex, Mon Apr 17 21:07:03 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.101 by elmex, Fri Apr 14 11:32:22 2006 UTC vs.
Revision 1.127 by elmex, Mon Apr 17 21:07:03 2006 UTC