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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.99 by root, Fri Apr 14 02:03:11 2006 UTC vs.
Revision 1.118 by elmex, Sun Apr 16 17:43:17 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;
43		53
44	our $SDL_ACTIVE;	54	our $SDL_ACTIVE;
45	our $SDL_EV;	55	our $SDL_EV;
46	our %SDL_CB;	56	our %SDL_CB;
47		57
48	our $ALT_ENTER_MESSAGE;	58	our $ALT_ENTER_MESSAGE;
49	our $STATUS_LINE;	59	our $STATUS_LINE;
50	our $DEBUG_STATUS;	60	our $DEBUG_STATUS;
51	our $BUTTONBAR;
52	our $LOGVIEW;
53		61
54	sub status {	62	sub status {
55	$STATUS_LINE->set_text ($_[0]);	63	$STATUS_LINE->set_text ($_[0]);
56	my ($w, $h) = $STATUS_LINE->size_request;	64	my ($w, $h) = $STATUS_LINE->size_request;
57	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	65	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
…		…
64	}	72	}
65		73
66	sub start_game {	74	sub start_game {
67	status "logging in...";	75	status "logging in...";
68		76
69	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	77	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
		78
		79	$MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
70		80
71	$MAP = new CFClient::Map $mapsize, $mapsize;	81	$MAP = new CFClient::Map $mapsize, $mapsize;
		82
		83	my ($host, $port) = split /:/, $CFG->{host};
72		84
73	$CONN = new conn	85	$CONN = new conn
74	host => $CFG->{host},	86	host => $host,
75	port => $CFG->{port},	87	port => $port \|\| 13327,
76	user => $CFG->{user},	88	user => $CFG->{user},
77	pass => $CFG->{password},	89	pass => $CFG->{password},
78	mapw => $mapsize,	90	mapw => $mapsize,
79	maph => $mapsize,	91	maph => $mapsize,
80	;	92	;
…		…
86		98
87	sub stop_game {	99	sub stop_game {
88	undef $CONN;	100	undef $CONN;
89	}	101	}
90		102
91	sub config_dialog {	103	sub client_setup {
92	my $dialog = new CFClient::UI::FancyFrame	104	my $dialog = new CFClient::UI::FancyFrame
93	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
94	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	106	$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]);	107	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
96		108
…		…
136	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	148	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
137	my ($self, $value) = @_;	149	my ($self, $value) = @_;
138	$CFG->{fow_smooth} = $value;	150	$CFG->{fow_smooth} = $value;
139	});	151	});
140		152
		153	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");
		154	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
		155	my ($self, $value) = @_;
		156	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		157	});
		158
141	$table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	159	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
142	destroy_screen ();	160	destroy_screen ();
143	init_screen ();	161	init_screen ();
144	});	162	});
		163
		164	$dialog
		165	}
		166
		167	sub metaserver_dialog {
		168	my $dialog = new CFClient::UI::FancyFrame
		169	child => (my $vbox = new CFClient::UI::VBox);
		170
		171	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		172
		173	$dialog
		174	}
		175
		176	sub update_metaserver {
		177	my ($HOST) = @_;
		178
		179	status "fetching metaserver list...";
		180
		181	my $buf;
		182
		183	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		184
		185	Event->io (fd => $fh, poll => 'r', cb => sub {
		186	my $res = sysread $fh, $buf, 8192, length $buf;
		187
		188	if (!defined $res) {
		189	$_[0]->w->cancel;
		190	status "metaserver: $!";
		191	} elsif ($res == 0) {
		192	$_[0]->w->cancel;
		193	status "server list retrieved";
		194
		195	my $table = $METASERVER->{table};
		196
		197	$table->clear;
		198
		199	my @col = qw(Use #Users Host Uptime Version Description);
		200	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		201	for 0 .. $#col;
		202
		203	my @align = qw(1 0 1 1 -1);
		204
		205	my $y = 0;
		206	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		207	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		208
		209	for ($desc) {
		210	s/<br>/\n/gi;
		211	s/<li>/\n· /gi;
		212	s/<.*?>//sgi;
		213	s/&/&/g;
		214	s/</</g;
		215	s/>/>/g;
		216	}
		217
		218	$uptime = sprintf "%dd %02d:%02d:%02d",
		219	(int $m->[8] / 86400),
		220	(int $m->[8] / 3600) % 24,
		221	(int $m->[8] / 60) % 60,
		222	$m->[8] % 60;
		223
		224	$m = [$users, $host, $uptime, $version, $desc];
		225
		226	$y++;
		227
		228	$table->add (0, $y, new CFClient::UI::VBox children => [
		229	(new CFClient::UI::Button text => " ", connect_activate => sub {
		230	$HOST->set_text ($CFG->{host} = $host);
		231	}),
		232	(new CFClient::UI::Empty expand => 1),
		233	]);
		234
		235	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		236	for 0 .. $#$m;
		237	}
		238	}
		239	});
		240	}
		241
		242	sub server_setup {
		243	my $dialog = new CFClient::UI::FancyFrame
		244	child => (my $vbox = new CFClient::UI::VBox);
145		245
146	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	246	$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]);	247	$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");	248	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
149	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	249
150		250	{
151	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	251	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
152	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	252
		253	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		254	my ($self, $value) = @_;
		255	$CFG->{host} = $value;
		256	});
		257
		258	$METASERVER = metaserver_dialog;
		259
		260	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		261	update_metaserver $HOST;
		262	});
		263	}
153		264
154	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	265	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
155	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	266	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		267	my ($self, $value) = @_;
		268	$CFG->{user} = $value;
		269	});
156		270
157	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	271	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
158	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	272	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		273	my ($self, $value) = @_;
		274	$CFG->{password} = $value;
		275	});
159		276
		277	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		278	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		279	my ($self, $value) = @_;
		280	$CFG->{say_command} = $value;
		281	});
		282
160	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	283	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
161	$table->add (1, 6, new CFClient::UI::Slider	284	$table->add (1, 7, new CFClient::UI::Slider
162	req_w => 100,	285	req_w => 100,
163	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	286	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
164	connect_changed => sub {	287	connect_changed => sub {
165	my ($self, $value) = @_;	288	my ($self, $value) = @_;
166		289
167	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	290	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
168	},	291	},
169	);	292	);
170		293
171	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	294	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
172	start_game;	295	start_game;
173	});	296	});
174		297
175	$vbox->add (my $hbox = new CFClient::UI::HBox);
176
177	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
178	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
179	status "Configuration Saved";
180	});
181
182	$dialog	298	$dialog
183	}	299	}
184		300
185	sub console_window {	301	sub message_window {
186	my $window = new CFClient::UI::FancyFrame	302	my $window = new CFClient::UI::FancyFrame
187	border_bg => [1, 1, 1, 0.5],	303	border_bg => [1, 1, 1, 0.5],
188	bg => [0.3, 0.3, 0.3, 0.8],	304	bg => [0.3, 0.3, 0.3, 0.8],
		305	user_w => $::WIDTH/4,
		306	user_h => $::HEIGHT,
189	child => (my $vbox = new CFClient::UI::VBox);	307	child => (my $vbox = new CFClient::UI::VBox);
190		308
191	$vbox->add ($LOGVIEW = new CFClient::UI::TextView expand => 1);	309	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		310	expand => 1,
		311	fontsize => $::CFG->{log_fontsize},
		312	);
		313
192	$vbox->add (my $input = new CFClient::UI::Entry);	314	$vbox->add (my $input = new CFClient::UI::LineEntry
		315	connect_focus_in => sub {
		316	my ($input, $prev_focus) = @_;
		317
		318	delete $input->{refocus_map};
		319
		320	if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
		321	$input->{refocus_map} = 1;
		322	}
		323	delete $input->{auto_activated};
		324	},
		325	connect_activate => sub {
		326	my ($input, $text) = @_;
		327	$input->set_text ('');
		328
		329	if ($text =~ /^\/(.*)/) {
		330	$::CONN->user_send ("command $1");
		331	} else {
		332	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		333	$::CONN->user_send ("command $say_cmd $text");
		334	}
		335	if ($input->{refocus_map}) {
		336	delete $input->{refocus_map};
		337	$MAPWIDGET->focus_in
		338	}
		339	},
		340	connect_escape => sub {
		341	$MAPWIDGET->focus_in
		342	},
		343	);
		344
		345	$CONSOLE = {
		346	window => $window,
		347	input => $input
		348	};
193		349
194	$window	350	$window
195	}	351	}
196		352
197	sub sdl_init {	353	sub sdl_init {
		354	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
198	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO	355	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
199	and die "SDL::Init failed!\n";	356	and die "SDL::Init failed!\n";
200	}	357	}
201		358
202	sub init_screen {	359	sub init_screen {
…		…
207	$FAST = $CFG->{fast};	364	$FAST = $CFG->{fast};
208		365
209	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	366	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
210	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	367	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
211	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	368	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
212	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	369	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
213		370
214	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	371	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
215	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	372	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
216	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	373	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
217	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	374	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
239	$FONTSIZE = int $HEIGHT / 40;	396	$FONTSIZE = int $HEIGHT / 40;
240		397
241	#############################################################################	398	#############################################################################
242		399
243	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	400	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
244	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	401	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
245		402
246	$STATUS_LINE = new CFClient::UI::Label	403	$STATUS_LINE = new CFClient::UI::Label
247	padding => 0,	404	padding => 0,
248	y => $HEIGHT * 44 / 45 - $FONTSIZE;	405	y => $HEIGHT * 44 / 45 - $FONTSIZE;
249	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	406	$CFClient::UI::ROOT->add ($STATUS_LINE);
250		407
251	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	408	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
252	padding => 0,	409	padding => 0,
253	y => $HEIGHT * 44 / 45,	410	y => $HEIGHT * 44 / 45,
254	height => $HEIGHT / 45,	411	height => $HEIGHT / 45,
255	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	412	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
256	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	413	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
257		414
258	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);	415	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
259	$MAPWIDGET->focus_in;	416	$MAPWIDGET->focus_in;
		417	$MAPWIDGET->connect (activate_console => sub {
		418	my ($mapwidget, $preset) = @_;
260		419
		420	if ($CONSOLE) {
		421	$CONSOLE->{input}->{auto_activated} = 1;
		422	$CONSOLE->{input}->focus_in;
		423
		424	if ($preset && $CONSOLE->{input}->get_text eq '') {
		425	$CONSOLE->{input}->set_text ($preset);
		426	}
		427	}
		428	});
		429
261	$CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);	430	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
262		431
263	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);	432	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
264	$BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);	433	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		434	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		435
		436	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		437	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		438	status "Configuration Saved";
		439	});
		440
		441	$BUTTONBAR->{children}[0]->emit ("activate");
265	}	442	}
266		443
267	sub destroy_screen {	444	sub destroy_screen {
268	$CFClient::UI::TOPLEVEL->{children} = [];	445	$CFClient::UI::ROOT->{children} = [];
269	undef $SDL_ACTIVE;	446	undef $SDL_ACTIVE;
270	undef $SDL_EV;	447	undef $SDL_EV;
271	SDL::Quit;	448	SDL::Quit;
272	}	449	}
273		450
…		…
284	debug sprintf "%3.2f", $fps;	461	debug sprintf "%3.2f", $fps;
285		462
286	$want_refresh = 0;	463	$want_refresh = 0;
287	$can_refresh = 0;	464	$can_refresh = 0;
288		465
289	glViewport 0, 0, $WIDTH, $HEIGHT;
290
291	glMatrixMode GL_PROJECTION;
292	glLoadIdentity;
293	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
294	glMatrixMode GL_MODELVIEW;
295	glLoadIdentity;
296
297	glClearColor +($CFG->{fow_intensity}) x 3, 1;
298	glClear GL_COLOR_BUFFER_BIT;
299
300	$CFClient::UI::TOPLEVEL->draw;	466	$CFClient::UI::ROOT->draw;
301		467
302	SDL::GLSwapBuffers;	468	SDL::GLSwapBuffers;
303		469
304	$LAST_REFRESH = $NOW;	470	$LAST_REFRESH = $NOW;
305	}	471	}
…		…
353	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});	519	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
354	$MAP->map1a_update ($data);	520	$MAP->map1a_update ($data);
355	$MAPWIDGET->update;	521	$MAPWIDGET->update;
356	}	522	}
357		523
358	#sub conn::map_update {	524	sub conn::flush_map {
359	# my ($self, $dirty) = @_;	525	my ($self) = @_;
360	#	526
361	# $MAPWIDGET->update;	527	my $map_info = delete $self->{map_info}
362	#}	528	or return;
		529
		530	my ($hash, $x, $y, $w, $h) = @$map_info;
		531
		532	my $data = $MAP->get_rect ($x, $y, $w, $h);
		533	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
		534
		535	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
		536
		537	}
363		538
364	sub conn::map_clear {	539	sub conn::map_clear {
365	my ($self) = @_;	540	my ($self) = @_;
366		541
		542	$self->flush_map;
		543
367	$MAP->clear;	544	$MAP->clear;
		545	}
368		546
369	# refresh;	547	sub conn::map_info {
		548	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
		549
		550	$self->flush_map;
		551
		552	$x = $::MAP->ox - $x;
		553	$y = $::MAP->oy - $y;
		554
		555	$self->{map_info} = [$hash, $x, $y, $w, $h];
		556
		557	if (defined (my $data = $MAPCACHE->get ($hash))) {
		558	$data = Compress::LZF::decompress $data;
		559	warn sprintf "LOADmap[%s] length %d\n", $hash, length $data;#d#
		560	for my $id ($MAP->set_rect ($x, $y, $data)) {
		561	my $data = $TILECACHE->get ($id)
		562	or next;
		563
		564	$self->set_texture ($id => $data);
		565	}
		566	}
370	}	567	}
371		568
372	sub conn::face_find {	569	sub conn::face_find {
373	my ($self, $face) = @_;	570	my ($self, $facenum, $face) = @_;
374		571
375	$FACECACHE->{"$face->{chksum},$face->{name}"}	572	my $hash = "$face->{chksum},$face->{name}";
		573
		574	my $id = $FACEMAP->get ($hash);
		575
		576	unless ($id) {
		577	# create new id for face
		578	# i love transactions
		579	for (1..100) {
		580	my $txn = $CFClient::DB_ENV->txn_begin;
		581	my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
		582	if ($status == 0 \|\| $status == BerkeleyDB::DB_NOTFOUND) {
		583	$id++;
		584	if ($FACEMAP->put (id => $id) == 0
		585	&& $FACEMAP->put ($hash => $id) == 0) {
		586	$txn->txn_commit;
		587
		588	goto gotid;
		589	}
		590	}
		591	$txn->abort;
		592	}
		593
		594	CFClient::fatal "maximum number of transaction retries reached - database problems?";
		595	}
		596
		597	gotid:
		598	$face->{id} = $id;
		599	$MAP->set_face ($facenum => $id);
		600	$TILECACHE->get ($id)
376	}	601	}
377		602
378	sub conn::face_update {	603	sub conn::face_update {
379	my ($self, $facenum, $face) = @_;	604	my ($self, $facenum, $face) = @_;
380		605
381	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	606	$TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
382		607
383	my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};	608	$self->set_texture ($face->{id} => delete $face->{image});
		609	}
384		610
		611	sub conn::set_texture {
		612	my ($self, $id, $data) = @_;
		613
		614	$self->{texture}[$id] \|\|= do {
		615	my $tex =
		616	new_from_image CFClient::Texture
		617	$data, minify => 1;
		618
385	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)});	619	$MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
386	$MAPWIDGET->update;	620	$MAPWIDGET->update;
		621
		622	$tex
		623	};
387	}	624	}
388		625
389	sub conn::query {	626	sub conn::query {
390	my ($self, $flags, $prompt) = @_;	627	my ($self, $flags, $prompt) = @_;
391		628
…		…
397	my ($self, $color, $text) = @_;	634	my ($self, $color, $text) = @_;
398		635
399	my @color = (	636	my @color = (
400	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],	637	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
401	[1.00, 1.00, 1.00],	638	[1.00, 1.00, 1.00],
402	[0.00, 0.00, 0.55],	639	[0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
403	[1.00, 0.00, 0.00],	640	[1.00, 0.00, 0.00],
404	[1.00, 0.54, 0.00],	641	[1.00, 0.54, 0.00],
405	[0.11, 0.56, 1.00],	642	[0.11, 0.56, 1.00],
406	[0.93, 0.46, 0.00],	643	[0.93, 0.46, 0.00],
407	[0.18, 0.54, 0.34],	644	[0.18, 0.54, 0.34],
…		…
451	},	688	},
452	);	689	);
453		690
454	#############################################################################	691	#############################################################################
455		692
		693	$TILECACHE = CFClient::db_table "tilecache";
		694	$FACEMAP = CFClient::db_table "facemap";
		695
456	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	696	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
457		697
458	my %DEF_CFG = (	698	my %DEF_CFG = (
		699	sdl_mode => 0,
459	width => 640,	700	width => 640,
460	height => 480,	701	height => 480,
		702	fullscreen => 0,
461	fast => 0,	703	fast => 0,
462	fow_enable => 1,	704	fow_enable => 1,
463	fow_intensity => 0.45,	705	fow_intensity => 0.45,
464	fow_smooth => 0,	706	fow_smooth => 0,
465	fullscreen => 0,	707	log_fontsize => 14,
466	sdl_mode => 0,
467	mapsize => 100,	708	mapsize => 100,
468	host => "crossfire.schmorp.de",	709	host => "crossfire.schmorp.de",
469	port => 13327,	710	say_command => 'say',
470	);	711	);
471		712
472	while (my ($k, $v) = each %DEF_CFG) {	713	while (my ($k, $v) = each %DEF_CFG) {
473	$CFG->{$k} = $v unless exists $CFG->{$k};	714	$CFG->{$k} = $v unless exists $CFG->{$k};
474	}	715	}
…		…
491		732
492	CFClient::add_font $_ for @fonts;	733	CFClient::add_font $_ for @fonts;
493	CFClient::set_font $fonts[0];	734	CFClient::set_font $fonts[0];
494	}	735	}
495		736
496	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
497
498	Event::loop;	737	Event::loop;
499		738
500	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
501		739

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.99 by root, Fri Apr 14 02:03:11 2006 UTC vs. Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.99 by root, Fri Apr 14 02:03:11 2006 UTC vs.
Revision 1.118 by elmex, Sun Apr 16 17:43:17 2006 UTC