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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 22:56:00 2006 UTC

…		…
21	our $VERSION = '0.1';	21	our $VERSION = '0.1';
22		22
23	my $MAX_FPS = 60;	23	my $MAX_FPS = 60;
24	my $MIN_FPS = 5; # unused as of yet	24	my $MIN_FPS = 5; # unused as of yet
25		25
		26	our $META_SERVER = "crossfire.real-time.com:13326";
		27
26	our $FACECACHE;	28	our $FACECACHE;
27		29
28	our $LAST_REFRESH;	30	our $LAST_REFRESH;
29	our $NOW;	31	our $NOW;
30		32
…		…
34		36
35	our @SDL_MODES;	37	our @SDL_MODES;
36	our $WIDTH;	38	our $WIDTH;
37	our $HEIGHT;	39	our $HEIGHT;
38	our $FULLSCREEN;	40	our $FULLSCREEN;
		41	our $FONTSIZE;
39		42
		43	our $MAP;
40	our $MAPWIDGET;	44	our $MAPWIDGET;
41	our $FONTSIZE;	45	our $BUTTONBAR;
		46	our $LOGVIEW;
		47	our $CONSOLE;
		48	our $METASERVER;
42		49
43	our $SDL_ACTIVE;	50	our $SDL_ACTIVE;
44	our $SDL_EV;	51	our $SDL_EV;
45	our %SDL_CB;	52	our %SDL_CB;
46		53
…		…
61	}	68	}
62		69
63	sub start_game {	70	sub start_game {
64	status "logging in...";	71	status "logging in...";
65		72
66	my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;	73	my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
67		74
		75	$MAP = new CFClient::Map $mapsize, $mapsize;
		76
		77	my ($host, $port) = split /:/, $CFG->{host};
		78
68	$CONN = new conn	79	$CONN = new conn
69	host => $CFG->{host},	80	host => $host,
70	port => $CFG->{port},	81	port => $port \|\| 13327,
71	user => $CFG->{user},	82	user => $CFG->{user},
72	pass => $CFG->{password},	83	pass => $CFG->{password},
73	mapw => $mapsize,	84	mapw => $mapsize,
74	maph => $mapsize,	85	maph => $mapsize,
75	;	86	;
…		…
81		92
82	sub stop_game {	93	sub stop_game {
83	undef $CONN;	94	undef $CONN;
84	}	95	}
85		96
86	sub config_dialog {	97	sub client_setup {
87	my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,	98	my $dialog = new CFClient::UI::FancyFrame
88	child => (my $vbox = new CFClient::UI::VBox);	99	child => (my $vbox = new CFClient::UI::VBox);
89	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");	100	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
90	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	101	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
91		102
92	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	103	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
…		…
113	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	124	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
114	my ($self, $value) = @_;	125	my ($self, $value) = @_;
115	$CFG->{fast} = $value;	126	$CFG->{fast} = $value;
116	});	127	});
117		128
118	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fog of War");	129	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
		130	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
		131	my ($self, $value) = @_;
		132	$CFG->{fow_enable} = $value;
		133	});
		134
		135	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
119	$table->add (1, 2, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	136	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
120	my ($self, $value) = @_;	137	my ($self, $value) = @_;
121	$CFG->{fow_intensity} = $value;	138	$CFG->{fow_intensity} = $value;
122	});	139	});
123		140
		141	$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 {
		143	my ($self, $value) = @_;
		144	$CFG->{fow_smooth} = $value;
		145	});
		146
		147	$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 {
		149	my ($self, $value) = @_;
		150	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
		151	});
		152
124	$table->add (1, 4, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	153	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
125	destroy_screen ();	154	destroy_screen ();
126	init_screen ();	155	init_screen ();
127	});	156	});
		157
		158	$dialog
		159	}
		160
		161	sub metaserver_dialog {
		162	my $dialog = new CFClient::UI::FancyFrame
		163	child => (my $vbox = new CFClient::UI::VBox);
		164
		165	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
		166
		167	$dialog
		168	}
		169
		170	sub update_metaserver {
		171	my ($HOST) = @_;
		172
		173	status "fetching metaserver list...";
		174
		175	my $buf;
		176
		177	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		178
		179	Event->io (fd => $fh, poll => 'r', cb => sub {
		180	my $res = sysread $fh, $buf, 8192, length $buf;
		181
		182	if (!defined $res) {
		183	$_[0]->w->cancel;
		184	status "metaserver: $!";
		185	} elsif ($res == 0) {
		186	$_[0]->w->cancel;
		187	status "server list retrieved";
		188
		189	my $table = $METASERVER->{table};
		190
		191	$table->clear;
		192
		193	my @col = qw(Use #Users Host Uptime Version Description);
		194	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		195	for 0 .. $#col;
		196
		197	my @align = qw(1 0 1 1 -1);
		198
		199	my $y = 0;
		200	for my $m (sort { $b->[3] <=> $a->[3] } map [split /\\|/], split /\015?\012/, $buf) {
		201	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		202
		203	for ($desc) {
		204	s/<br>/\n/gi;
		205	s/<li>/\n· /gi;
		206	s/<.*?>//sgi;
		207	s/&/&/g;
		208	s/</</g;
		209	s/>/>/g;
		210	}
		211
		212	$uptime = sprintf "%dd %02d:%02d:%02d",
		213	(int $m->[8] / 86400),
		214	(int $m->[8] / 3600) % 24,
		215	(int $m->[8] / 60) % 60,
		216	$m->[8] % 60;
		217
		218	$m = [$users, $host, $uptime, $version, $desc];
		219
		220	$y++;
		221
		222	$table->add (0, $y, new CFClient::UI::VBox children => [
		223	(new CFClient::UI::Button text => " ", connect_activate => sub {
		224	$HOST->set_text ($CFG->{host} = $host);
		225	}),
		226	(new CFClient::UI::Empty expand => 1),
		227	]);
		228
		229	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		230	for 0 .. $#$m;
		231	}
		232	}
		233	});
		234	}
		235
		236	sub server_setup {
		237	my $dialog = new CFClient::UI::FancyFrame
		238	child => (my $vbox = new CFClient::UI::VBox);
128		239
129	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	240	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
130	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	241	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
131	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	242	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
132	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	243
133		244	{
134	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	245	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
135	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	246
		247	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		248	my ($self, $value) = @_;
		249	$CFG->{host} = $value;
		250	});
		251
		252	$METASERVER = metaserver_dialog;
		253
		254	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		255	update_metaserver $HOST;
		256	});
		257	}
136		258
137	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	259	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
138	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	260	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		261	my ($self, $value) = @_;
		262	$CFG->{user} = $value;
		263	});
139		264
140	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	265	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
141	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	266	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		267	my ($self, $value) = @_;
		268	$CFG->{password} = $value;
		269	});
142		270
		271	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		272	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		273	my ($self, $value) = @_;
		274	$CFG->{say_command} = $value;
		275	});
		276
143	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	277	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
144	$table->add (1, 6, new CFClient::UI::Slider	278	$table->add (1, 7, new CFClient::UI::Slider
145	req_w => 100,	279	req_w => 100,
146	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	280	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
147	connect_changed => sub {	281	connect_changed => sub {
148	my ($self, $value) = @_;	282	my ($self, $value) = @_;
149		283
150	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	284	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
151	},	285	},
152	);	286	);
153		287
154	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	288	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
155	start_game;	289	start_game;
156	});	290	});
157		291
158	$vbox->add (my $hbox = new CFClient::UI::HBox);	292	$dialog
		293	}
159		294
160	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	295	sub message_window {
161	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	296	my $window = new CFClient::UI::FancyFrame
162	status "Configuration Saved";	297	border_bg => [1, 1, 1, 0.5],
		298	bg => [0.3, 0.3, 0.3, 0.8],
		299	user_w => $::WIDTH/4,
		300	user_h => $::HEIGHT,
		301	child => (my $vbox = new CFClient::UI::VBox);
		302
		303	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		304	expand => 1,
		305	fontsize => $::CFG->{log_fontsize},
163	});	306	);
164	$CFClient::UI::TOPLEVEL->add ($dialog);	307
		308	$vbox->add (my $input = new CFClient::UI::LineEntry);
		309	$input->connect (activate => sub {
		310	my ($input, $text) = @_;
		311	$input->set_text ('');
		312
		313	if ($text =~ /^\/(.*)/) {
		314	$::CONN->user_send ("command $1");
		315	} else {
		316	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		317	$::CONN->user_send ("command $say_cmd $text");
		318	}
		319	1
		320	});
		321	$input->connect (escape => sub {
		322	$MAPWIDGET->focus_in
		323	});
		324	$input->focus_in;
		325
		326	$CONSOLE = {
		327	window => $window,
		328	input => $input
		329	};
		330
		331	$window
165	}	332	}
166		333
167	sub sdl_init {	334	sub sdl_init {
		335	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
168	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO	336	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
169	and die "SDL::Init failed!\n";	337	and die "SDL::Init failed!\n";
170	}	338	}
171		339
172	sub init_screen {	340	sub init_screen {
173	sdl_init;	341	sdl_init;
…		…
177	$FAST = $CFG->{fast};	345	$FAST = $CFG->{fast};
178		346
179	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	347	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
180	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	348	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
181	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	349	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
182	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	350	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
183		351
184	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;	352	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
185	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;	353	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
186	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;	354	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
187	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;	355	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
…		…
208		376
209	$FONTSIZE = int $HEIGHT / 40;	377	$FONTSIZE = int $HEIGHT / 40;
210		378
211	#############################################################################	379	#############################################################################
212		380
213	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	381	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
214	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	382	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
215		383
216	$STATUS_LINE = new CFClient::UI::Label	384	$STATUS_LINE = new CFClient::UI::Label
217	padding => 0,	385	padding => 0,
218	y => $HEIGHT * 49 / 50 - $FONTSIZE;	386	y => $HEIGHT * 44 / 45 - $FONTSIZE;
219	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	387	$CFClient::UI::ROOT->add ($STATUS_LINE);
220		388
221	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	389	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
222	padding => 0,	390	padding => 0,
223	y => $HEIGHT * 49 / 50,	391	y => $HEIGHT * 44 / 45,
224	height => $HEIGHT / 50,	392	height => $HEIGHT / 45,
225	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	393	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
226	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	394	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
227		395
228	$MAPWIDGET = new CFClient::UI::MapWidget;	396	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
229	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
230	$MAPWIDGET->focus_in;	397	$MAPWIDGET->focus_in;
		398	$MAPWIDGET->connect (activate_console => sub {
		399	my ($mapwidget, $preset) = @_;
231		400
232	config_dialog;	401	if ($CONSOLE) {
		402	$CONSOLE->{input}->focus_in;
		403
		404	if ($preset && $CONSOLE->{input}->get_text eq '') {
		405	$CONSOLE->{input}->set_text ($preset);
		406	}
		407	}
		408	});
		409
		410	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		411
		412	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		413	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		414	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		415
		416	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		417	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		418	status "Configuration Saved";
		419	});
		420
		421	$BUTTONBAR->{children}[0]->emit ("activate");
233	}	422	}
234		423
235	sub destroy_screen {	424	sub destroy_screen {
236	$CFClient::UI::TOPLEVEL->{children} = [];	425	$CFClient::UI::ROOT->{children} = [];
237	undef $SDL_ACTIVE;	426	undef $SDL_ACTIVE;
238	undef $SDL_EV;	427	undef $SDL_EV;
239	SDL::Quit;	428	SDL::Quit;
240	}	429	}
241		430
…		…
252	debug sprintf "%3.2f", $fps;	441	debug sprintf "%3.2f", $fps;
253		442
254	$want_refresh = 0;	443	$want_refresh = 0;
255	$can_refresh = 0;	444	$can_refresh = 0;
256		445
257	glViewport 0, 0, $WIDTH, $HEIGHT;
258
259	glMatrixMode GL_PROJECTION;
260	glLoadIdentity;
261	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
262	glMatrixMode GL_MODELVIEW;
263	glLoadIdentity;
264
265	glClearColor +($CFG->{fow_intensity}) x 3, 1;
266	glClear GL_COLOR_BUFFER_BIT;
267
268	$CFClient::UI::TOPLEVEL->draw;	446	$CFClient::UI::ROOT->draw;
269		447
270	SDL::GLSwapBuffers;	448	SDL::GLSwapBuffers;
271		449
272	$LAST_REFRESH = $NOW;	450	$LAST_REFRESH = $NOW;
273	}	451	}
…		…
311		489
312	$self->send ($command);	490	$self->send ($command);
313	status $command;	491	status $command;
314	}	492	}
315		493
316	sub conn::map_update {	494	sub conn::feed_map1a {
317	my ($self, $dirty) = @_;	495	my ($self, $data) = @_;
318		496
		497	# $self->Crossfire::Protocol::feed_map1a ($data);
		498
		499	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		500	$MAP->map1a_update ($data);
319	$MAPWIDGET->update;	501	$MAPWIDGET->update;
320	}	502	}
321		503
322	sub conn::map_scroll {	504	#sub conn::map_update {
323	my ($self, $dx, $dy) = @_;	505	# my ($self, $dirty) = @_;
324		506	#
325	# refresh;	507	# $MAPWIDGET->update;
326	}	508	#}
327		509
328	sub conn::map_clear {	510	sub conn::map_clear {
329	my ($self) = @_;	511	my ($self) = @_;
330		512
		513	$MAP->clear;
		514
331	# refresh;	515	# refresh;
		516	}
		517
		518	sub conn::map_info {
		519	my ($self, $mode, $x, $y, $w, $h, $hash) = @_;
		520
		521	warn "mapinfo <$mode,$x,$y,$w,$h,$hash>\n";#d#
332	}	522	}
333		523
334	sub conn::face_find {	524	sub conn::face_find {
335	my ($self, $face) = @_;	525	my ($self, $face) = @_;
336		526
		527	my $data;
		528
337	$FACECACHE->{"$face->{chksum},$face->{name}"}	529	$FACECACHE->get ("$face->{chksum},$face->{name}")
338	}	530	}
339		531
340	sub conn::face_update {	532	sub conn::face_update {
341	my ($self, $face) = @_;	533	my ($self, $facenum, $face) = @_;
342		534
343	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	535	$FACECACHE->put ("$face->{chksum},$face->{name}" => $face->{image});
344		536
345	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};	537	my $tex = $face->{texture} =
		538	new_from_image CFClient::Texture
		539	delete $face->{image}, minify => 1;
		540
		541	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		542	$MAPWIDGET->update;
346	}	543	}
347		544
348	sub conn::query {	545	sub conn::query {
349	my ($self, $flags, $prompt) = @_;	546	my ($self, $flags, $prompt) = @_;
350		547
		548	#TODO
351	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	549	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		550	}
		551
		552	sub conn::drawinfo {
		553	my ($self, $color, $text) = @_;
		554
		555	my @color = (
		556	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		557	[1.00, 1.00, 1.00],
		558	[0.00, 0.00, 0.55],
		559	[1.00, 0.00, 0.00],
		560	[1.00, 0.54, 0.00],
		561	[0.11, 0.56, 1.00],
		562	[0.93, 0.46, 0.00],
		563	[0.18, 0.54, 0.34],
		564	[0.56, 0.73, 0.56],
		565	[0.80, 0.80, 0.80],
		566	[0.55, 0.41, 0.13],
		567	[0.99, 0.77, 0.26],
		568	[0.74, 0.65, 0.41],
		569	);
		570
		571	$LOGVIEW->add_paragraph ($color[$color], $text);
352	}	572	}
353		573
354	%SDL_CB = (	574	%SDL_CB = (
355	SDL_QUIT() => sub {	575	SDL_QUIT() => sub {
356	Event::unloop -1;	576	Event::unloop -1;
…		…
361	refresh;	581	refresh;
362	},	582	},
363	SDL_KEYDOWN() => sub {	583	SDL_KEYDOWN() => sub {
364	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	584	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
365	# alt-enter	585	# alt-enter
366	$FULLSCREEN = !$FULLSCREEN;
367	destroy_screen;	586	destroy_screen;
		587	$CFG->{fullscreen} = !$CFG->{fullscreen};
368	init_screen;	588	init_screen;
369	} else {	589	} else {
370	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	590	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
371	}	591	}
372	},	592	},
…		…
387	},	607	},
388	);	608	);
389		609
390	#############################################################################	610	#############################################################################
391		611
		612	$FACECACHE = CFClient::db_table "facecache";
		613
392	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	614	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
393		615
394	my %DEF_CFG = (	616	my %DEF_CFG = (
		617	sdl_mode => 0,
395	width => 640,	618	width => 640,
396	height => 480,	619	height => 480,
		620	fullscreen => 0,
397	fast => 0,	621	fast => 0,
		622	fow_enable => 1,
398	fow_intensity => 0.45,	623	fow_intensity => 0.45,
399	fullscreen => 0,	624	fow_smooth => 0,
400	sdl_mode => 0,	625	log_fontsize => 14,
401	mapsize => 100,	626	mapsize => 100,
402	host => "crossfire.schmorp.de",	627	host => "crossfire.schmorp.de",
403	port => 13327,	628	say_command => 'say',
404	);	629	);
405		630
406	while (my ($k, $v) = each %DEF_CFG) {	631	while (my ($k, $v) = each %DEF_CFG) {
407	$CFG->{$k} = $v unless exists $CFG->{$k};	632	$CFG->{$k} = $v unless exists $CFG->{$k};
408	}	633	}
409		634
410	sdl_init;	635	sdl_init;
411		636
412	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],	637	@SDL_MODES = reverse
		638	grep $_->[0] >= 640 && $_->[1] >= 480,
		639	map [SDL::RectW ($_), SDL::RectH ($_)],
413	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };	640	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
414		641
415	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	642	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
416		643
417	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	644	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
418		645
…		…
423		650
424	CFClient::add_font $_ for @fonts;	651	CFClient::add_font $_ for @fonts;
425	CFClient::set_font $fonts[0];	652	CFClient::set_font $fonts[0];
426	}	653	}
427		654
428	$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } \|\| {};
429
430	Event::loop;	655	Event::loop;
431		656
432	Crossfire::save_ref $FACECACHE, "$Crossfire::VARDIR/pclient.faces";
433		657

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC vs. Revision 1.115 by root, Sat Apr 15 22:56:00 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.90 by root, Wed Apr 12 21:35:11 2006 UTC vs.
Revision 1.115 by root, Sat Apr 15 22:56:00 2006 UTC