[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.113 by root, Sat Apr 15 19:35:22 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	status "fetching metaserver list...";
		172
		173	my $buf;
		174
		175	my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
		176
		177	Event->io (fd => $fh, poll => 'r', cb => sub {
		178	my $res = sysread $fh, $buf, 8192, length $buf;
		179
		180	if (!defined $res) {
		181	$_[0]->w->cancel;
		182	status "metaserver: $!";
		183	} elsif ($res == 0) {
		184	$_[0]->w->cancel;
		185	status "server list retrieved";
		186
		187	my $table = $METASERVER->{table};
		188
		189	$table->clear;
		190
		191	my @col = qw(#Users Host Uptime Version Description);
		192	$table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_])
		193	for 0 .. $#col;
		194
		195	my @align = qw(1 0 1 1 -1);
		196
		197	my $y = 0;
		198	for my $m (map [split /\\|/], split /\015?\012/, $buf) {
		199	my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m;
		200
		201	for ($desc) {
		202	s/<br>/\n/gi;
		203	s/<li>/\n· /gi;
		204	s/<.*?>//sgi;
		205	s/&/&/g;
		206	s/</</g;
		207	s/>/>/g;
		208	}
		209
		210	$uptime = sprintf "%dd %02d:%02d:%02d",
		211	(int $m->[8] / 86400),
		212	(int $m->[8] / 3600) % 24,
		213	(int $m->[8] / 60) % 60,
		214	$m->[8] % 60;
		215
		216	$m = [$users, $host, $uptime, $version, $desc];
		217
		218	$y++;
		219	$table->add ($_, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)
		220	for 0 .. $#$m;
		221	}
		222	}
		223	});
		224	}
		225
		226	sub server_setup {
		227	my $dialog = new CFClient::UI::FancyFrame
		228	child => (my $vbox = new CFClient::UI::VBox);
128		229
129	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");	230	$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]);	231	$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");	232	$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});	233
133		234	{
134	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	235	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
135	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	236
		237	$vbox->add (new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		238	my ($self, $value) = @_;
		239	$CFG->{host} = $value;
		240	});
		241
		242	$METASERVER = metaserver_dialog;
		243
		244	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		245	update_metaserver;
		246	});
		247	}
136		248
137	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	249	$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});	250	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		251	my ($self, $value) = @_;
		252	$CFG->{user} = $value;
		253	});
139		254
140	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	255	$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);	256	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		257	my ($self, $value) = @_;
		258	$CFG->{password} = $value;
		259	});
142		260
		261	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		262	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		263	my ($self, $value) = @_;
		264	$CFG->{say_command} = $value;
		265	});
		266
143	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	267	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
144	$table->add (1, 6, new CFClient::UI::Slider	268	$table->add (1, 7, new CFClient::UI::Slider
145	req_w => 100,	269	req_w => 100,
146	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	270	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
147	connect_changed => sub {	271	connect_changed => sub {
148	my ($self, $value) = @_;	272	my ($self, $value) = @_;
149		273
150	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	274	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
151	},	275	},
152	);	276	);
153		277
154	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	278	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
155	start_game;	279	start_game;
156	});	280	});
157		281
158	$vbox->add (my $hbox = new CFClient::UI::HBox);	282	$dialog
		283	}
159		284
160	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	285	sub message_window {
161	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	286	my $window = new CFClient::UI::FancyFrame
162	status "Configuration Saved";	287	border_bg => [1, 1, 1, 0.5],
		288	bg => [0.3, 0.3, 0.3, 0.8],
		289	user_w => $::WIDTH/4,
		290	user_h => $::HEIGHT,
		291	child => (my $vbox = new CFClient::UI::VBox);
		292
		293	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		294	expand => 1,
		295	fontsize => $::CFG->{log_fontsize},
163	});	296	);
164	$CFClient::UI::TOPLEVEL->add ($dialog);	297
		298	$vbox->add (my $input = new CFClient::UI::LineEntry);
		299	$input->connect (activate => sub {
		300	my ($input, $text) = @_;
		301	$input->set_text ('');
		302
		303	if ($text =~ /^\/(.*)/) {
		304	$::CONN->user_send ("command $1");
		305	} else {
		306	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		307	$::CONN->user_send ("command $say_cmd $text");
		308	}
		309	1
		310	});
		311	$input->connect (escape => sub {
		312	$MAPWIDGET->focus_in
		313	});
		314	$input->focus_in;
		315
		316	$CONSOLE = {
		317	window => $window,
		318	input => $input
		319	};
		320
		321	$window
165	}	322	}
166		323
167	sub sdl_init {	324	sub sdl_init {
		325	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
168	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO	326	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
169	and die "SDL::Init failed!\n";	327	and die "SDL::Init failed!\n";
170	}	328	}
171		329
172	sub init_screen {	330	sub init_screen {
173	sdl_init;	331	sdl_init;
…		…
208		366
209	$FONTSIZE = int $HEIGHT / 40;	367	$FONTSIZE = int $HEIGHT / 40;
210		368
211	#############################################################################	369	#############################################################################
212		370
213	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	371	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
214	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	372	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
215		373
216	$STATUS_LINE = new CFClient::UI::Label	374	$STATUS_LINE = new CFClient::UI::Label
217	padding => 0,	375	padding => 0,
218	y => $HEIGHT * 49 / 50 - $FONTSIZE;	376	y => $HEIGHT * 44 / 45 - $FONTSIZE;
219	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	377	$CFClient::UI::ROOT->add ($STATUS_LINE);
220		378
221	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	379	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
222	padding => 0,	380	padding => 0,
223	y => $HEIGHT * 49 / 50,	381	y => $HEIGHT * 44 / 45,
224	height => $HEIGHT / 50,	382	height => $HEIGHT / 45,
225	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	383	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
226	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	384	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
227		385
228	$MAPWIDGET = new CFClient::UI::MapWidget;	386	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
229	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
230	$MAPWIDGET->focus_in;	387	$MAPWIDGET->focus_in;
		388	$MAPWIDGET->connect (activate_console => sub {
		389	my ($mapwidget, $preset) = @_;
231		390
232	config_dialog;	391	if ($CONSOLE) {
		392	$CONSOLE->{input}->focus_in;
		393
		394	if ($preset && $CONSOLE->{input}->get_text eq '') {
		395	$CONSOLE->{input}->set_text ($preset);
		396	}
		397	}
		398	});
		399
		400	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		401
		402	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		403	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		404	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		405
		406	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		407	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		408	status "Configuration Saved";
		409	});
		410
		411	$BUTTONBAR->{children}[0]->emit ("activate");
233	}	412	}
234		413
235	sub destroy_screen {	414	sub destroy_screen {
236	$CFClient::UI::TOPLEVEL->{children} = [];	415	$CFClient::UI::ROOT->{children} = [];
237	undef $SDL_ACTIVE;	416	undef $SDL_ACTIVE;
238	undef $SDL_EV;	417	undef $SDL_EV;
239	SDL::Quit;	418	SDL::Quit;
240	}	419	}
241		420
…		…
252	debug sprintf "%3.2f", $fps;	431	debug sprintf "%3.2f", $fps;
253		432
254	$want_refresh = 0;	433	$want_refresh = 0;
255	$can_refresh = 0;	434	$can_refresh = 0;
256		435
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;	436	$CFClient::UI::ROOT->draw;
269		437
270	SDL::GLSwapBuffers;	438	SDL::GLSwapBuffers;
271		439
272	$LAST_REFRESH = $NOW;	440	$LAST_REFRESH = $NOW;
273	}	441	}
…		…
311		479
312	$self->send ($command);	480	$self->send ($command);
313	status $command;	481	status $command;
314	}	482	}
315		483
316	sub conn::map_update {	484	sub conn::feed_map1a {
317	my ($self, $dirty) = @_;	485	my ($self, $data) = @_;
318		486
		487	# $self->Crossfire::Protocol::feed_map1a ($data);
		488
		489	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		490	$MAP->map1a_update ($data);
319	$MAPWIDGET->update;	491	$MAPWIDGET->update;
320	}	492	}
321		493
322	sub conn::map_scroll {	494	#sub conn::map_update {
323	my ($self, $dx, $dy) = @_;	495	# my ($self, $dirty) = @_;
324		496	#
325	# refresh;	497	# $MAPWIDGET->update;
326	}	498	#}
327		499
328	sub conn::map_clear {	500	sub conn::map_clear {
329	my ($self) = @_;	501	my ($self) = @_;
330		502
		503	$MAP->clear;
		504
331	# refresh;	505	# refresh;
332	}	506	}
333		507
334	sub conn::face_find {	508	sub conn::face_find {
335	my ($self, $face) = @_;	509	my ($self, $face) = @_;
336		510
337	$FACECACHE->{"$face->{chksum},$face->{name}"}	511	$FACECACHE->{"$face->{chksum},$face->{name}"}
338	}	512	}
339		513
340	sub conn::face_update {	514	sub conn::face_update {
341	my ($self, $face) = @_;	515	my ($self, $facenum, $face) = @_;
342		516
343	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	517	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
344		518
345	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};	519	my $tex = $face->{texture} =
		520	new_from_image CFClient::Texture
		521	delete $face->{image}, minify => 1;
		522
		523	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		524	$MAPWIDGET->update;
346	}	525	}
347		526
348	sub conn::query {	527	sub conn::query {
349	my ($self, $flags, $prompt) = @_;	528	my ($self, $flags, $prompt) = @_;
350		529
		530	#TODO
351	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	531	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		532	}
		533
		534	sub conn::drawinfo {
		535	my ($self, $color, $text) = @_;
		536
		537	my @color = (
		538	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		539	[1.00, 1.00, 1.00],
		540	[0.00, 0.00, 0.55],
		541	[1.00, 0.00, 0.00],
		542	[1.00, 0.54, 0.00],
		543	[0.11, 0.56, 1.00],
		544	[0.93, 0.46, 0.00],
		545	[0.18, 0.54, 0.34],
		546	[0.56, 0.73, 0.56],
		547	[0.80, 0.80, 0.80],
		548	[0.55, 0.41, 0.13],
		549	[0.99, 0.77, 0.26],
		550	[0.74, 0.65, 0.41],
		551	);
		552
		553	$LOGVIEW->add_paragraph ($color[$color], $text);
352	}	554	}
353		555
354	%SDL_CB = (	556	%SDL_CB = (
355	SDL_QUIT() => sub {	557	SDL_QUIT() => sub {
356	Event::unloop -1;	558	Event::unloop -1;
…		…
361	refresh;	563	refresh;
362	},	564	},
363	SDL_KEYDOWN() => sub {	565	SDL_KEYDOWN() => sub {
364	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	566	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
365	# alt-enter	567	# alt-enter
366	$FULLSCREEN = !$FULLSCREEN;
367	destroy_screen;	568	destroy_screen;
		569	$CFG->{fullscreen} = !$CFG->{fullscreen};
368	init_screen;	570	init_screen;
369	} else {	571	} else {
370	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	572	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
371	}	573	}
372	},	574	},
…		…
390	#############################################################################	592	#############################################################################
391		593
392	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	594	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
393		595
394	my %DEF_CFG = (	596	my %DEF_CFG = (
		597	sdl_mode => 0,
395	width => 640,	598	width => 640,
396	height => 480,	599	height => 480,
		600	fullscreen => 0,
397	fast => 0,	601	fast => 0,
		602	fow_enable => 1,
398	fow_intensity => 0.45,	603	fow_intensity => 0.45,
399	fullscreen => 0,	604	fow_smooth => 0,
400	sdl_mode => 0,	605	log_fontsize => 14,
401	mapsize => 100,	606	mapsize => 100,
402	host => "crossfire.schmorp.de",	607	host => "crossfire.schmorp.de",
403	port => 13327,	608	say_command => 'say',
404	);	609	);
405		610
406	while (my ($k, $v) = each %DEF_CFG) {	611	while (my ($k, $v) = each %DEF_CFG) {
407	$CFG->{$k} = $v unless exists $CFG->{$k};	612	$CFG->{$k} = $v unless exists $CFG->{$k};
408	}	613	}
409		614
410	sdl_init;	615	sdl_init;
411		616
412	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],	617	@SDL_MODES = reverse
		618	grep $_->[0] >= 640 && $_->[1] >= 480,
		619	map [SDL::RectW ($_), SDL::RectH ($_)],
413	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };	620	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
414		621
415	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	622	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
416		623
417	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	624	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
418		625

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.113 by root, Sat Apr 15 19:35:22 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.113 by root, Sat Apr 15 19:35:22 2006 UTC