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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.88 by root, Wed Apr 12 21:01:47 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC

…		…
19	use CFClient::UI;	19	use CFClient::UI;
20		20
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	24	my $MIN_FPS = 5; # unused as of yet
		25
		26	our $META_SERVER = "crossfire.real-time.com:13326";
25		27
26	our $FACECACHE;	28	our $FACECACHE;
27		29
28	our $LAST_REFRESH;	30	our $LAST_REFRESH;
29	our $NOW;	31	our $NOW;
…		…
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");
…		…
107	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	118	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
108	my ($self, $value) = @_;	119	my ($self, $value) = @_;
109	$CFG->{fullscreen} = $value;	120	$CFG->{fullscreen} = $value;
110	});	121	});
111		122
		123	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
		124	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
		125	my ($self, $value) = @_;
		126	$CFG->{fast} = $value;
		127	});
		128
		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");
		136	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
		137	my ($self, $value) = @_;
		138	$CFG->{fow_intensity} = $value;
		139	});
		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
112	$table->add (1, 2, 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 {
113	destroy_screen ();	154	destroy_screen ();
114	init_screen ();	155	init_screen ();
115	});	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	warn $buf;
		187	}
		188	});
		189	}
		190
		191	sub server_setup {
		192	my $dialog = new CFClient::UI::FancyFrame
		193	child => (my $vbox = new CFClient::UI::VBox);
116		194
117	$vbox->add (new CFClient::UI::Label align => 0, text => "Server");	195	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
118	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	196	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
119	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");	197	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");
120	$table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host});	198
121		199	{
122	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");	200	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
123	$table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port});	201
		202	$vbox->add (new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
		203	my ($self, $value) = @_;
		204	$CFG->{host} = $value;
		205	});
		206
		207	$METASERVER = metaserver_dialog;
		208
		209	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
		210	update_metaserver;
		211	});
		212	}
124		213
125	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	214	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
126	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user});	215	$table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
		216	my ($self, $value) = @_;
		217	$CFG->{user} = $value;
		218	});
127		219
128	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	220	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
129	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);	221	$table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
		222	my ($self, $value) = @_;
		223	$CFG->{password} = $value;
		224	});
130		225
		226	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
		227	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
		228	my ($self, $value) = @_;
		229	$CFG->{say_command} = $value;
		230	});
		231
131	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size");	232	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
132	$table->add (1, 6, new CFClient::UI::Slider	233	$table->add (1, 7, new CFClient::UI::Slider
133	req_w => 100,	234	req_w => 100,
134	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	235	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
135	connect_changed => sub {	236	connect_changed => sub {
136	my ($self, $value) = @_;	237	my ($self, $value) = @_;
137		238
138	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	239	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
139	},	240	},
140	);	241	);
141		242
142	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {	243	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
143	start_game;	244	start_game;
144	});	245	});
145		246
146	$vbox->add (my $hbox = new CFClient::UI::HBox);	247	$dialog
		248	}
147		249
148	$hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {	250	sub message_window {
149	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	251	my $window = new CFClient::UI::FancyFrame
150	status "Configuration Saved";	252	border_bg => [1, 1, 1, 0.5],
		253	bg => [0.3, 0.3, 0.3, 0.8],
		254	user_w => $::WIDTH/4,
		255	user_h => $::HEIGHT,
		256	child => (my $vbox = new CFClient::UI::VBox);
		257
		258	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
		259	expand => 1,
		260	fontsize => $::CFG->{log_fontsize},
151	});	261	);
152	$CFClient::UI::TOPLEVEL->add ($dialog);	262
		263	$vbox->add (my $input = new CFClient::UI::LineEntry);
		264	$input->connect (activate => sub {
		265	my ($input, $text) = @_;
		266	$input->set_text ('');
		267
		268	if ($text =~ /^\/(.*)/) {
		269	$::CONN->user_send ("command $1");
		270	} else {
		271	my $say_cmd = $::CFG->{say_command} \|\| 'say';
		272	$::CONN->user_send ("command $say_cmd $text");
		273	}
		274	1
		275	});
		276	$input->connect (escape => sub {
		277	$MAPWIDGET->focus_in
		278	});
		279	$input->focus_in;
		280
		281	$CONSOLE = {
		282	window => $window,
		283	input => $input
		284	};
		285
		286	$window
		287	}
		288
		289	sub sdl_init {
		290	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE
		291	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
		292	and die "SDL::Init failed!\n";
153	}	293	}
154		294
155	sub init_screen {	295	sub init_screen {
		296	sdl_init;
		297
156	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	298	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
157	$FULLSCREEN = $CFG->{fullscreen};	299	$FULLSCREEN = $CFG->{fullscreen};
		300	$FAST = $CFG->{fast};
158		301
159	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	302	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
160	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;	303	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
161	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;	304	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
162	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;	305	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
…		…
188		331
189	$FONTSIZE = int $HEIGHT / 40;	332	$FONTSIZE = int $HEIGHT / 40;
190		333
191	#############################################################################	334	#############################################################################
192		335
193	$DEBUG_STATUS = new CFClient::UI::Label padding => 0;	336	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
194	$CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);	337	$CFClient::UI::ROOT->add ($DEBUG_STATUS);
195		338
196	$STATUS_LINE = new CFClient::UI::Label	339	$STATUS_LINE = new CFClient::UI::Label
197	padding => 0,	340	padding => 0,
198	y => $HEIGHT * 49 / 50 - $FONTSIZE;	341	y => $HEIGHT * 44 / 45 - $FONTSIZE;
199	$CFClient::UI::TOPLEVEL->add ($STATUS_LINE);	342	$CFClient::UI::ROOT->add ($STATUS_LINE);
200		343
201	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	344	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
202	padding => 0,	345	padding => 0,
203	y => $HEIGHT * 49 / 50,	346	y => $HEIGHT * 44 / 45,
204	height => $HEIGHT / 50,	347	height => $HEIGHT / 45,
205	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	348	text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
206	$CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);	349	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);
207		350
208	$MAPWIDGET = new CFClient::UI::MapWidget;	351	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);
209	$CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
210	$MAPWIDGET->focus_in;	352	$MAPWIDGET->focus_in;
		353	$MAPWIDGET->connect (activate_console => sub {
		354	my ($mapwidget, $preset) = @_;
211		355
212	config_dialog;	356	if ($CONSOLE) {
		357	$CONSOLE->{input}->focus_in;
		358
		359	if ($preset && $CONSOLE->{input}->get_text eq '') {
		360	$CONSOLE->{input}->set_text ($preset);
		361	}
		362	}
		363	});
		364
		365	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
		366
		367	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
		368	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
		369	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		370
		371	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
		372	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
		373	status "Configuration Saved";
		374	});
		375
		376	$BUTTONBAR->{children}[0]->emit ("activate");
213	}	377	}
214		378
215	sub destroy_screen {	379	sub destroy_screen {
216	$CFClient::UI::TOPLEVEL->{children} = [];	380	$CFClient::UI::ROOT->{children} = [];
217	undef $SDL_ACTIVE;	381	undef $SDL_ACTIVE;
218	undef $SDL_EV;	382	undef $SDL_EV;
219	SDL::Quit;	383	SDL::Quit;
220	}	384	}
221		385
…		…
232	debug sprintf "%3.2f", $fps;	396	debug sprintf "%3.2f", $fps;
233		397
234	$want_refresh = 0;	398	$want_refresh = 0;
235	$can_refresh = 0;	399	$can_refresh = 0;
236		400
237	glViewport 0, 0, $WIDTH, $HEIGHT;
238
239	glMatrixMode GL_PROJECTION;
240	glLoadIdentity;
241	glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
242	glMatrixMode GL_MODELVIEW;
243	glLoadIdentity;
244
245	glClear GL_COLOR_BUFFER_BIT;
246
247	$CFClient::UI::TOPLEVEL->draw;	401	$CFClient::UI::ROOT->draw;
248		402
249	SDL::GLSwapBuffers;	403	SDL::GLSwapBuffers;
250		404
251	$LAST_REFRESH = $NOW;	405	$LAST_REFRESH = $NOW;
252	}	406	}
…		…
283	delete $animate_object{$widget};	437	delete $animate_object{$widget};
284	}	438	}
285		439
286	@conn::ISA = Crossfire::Protocol::;	440	@conn::ISA = Crossfire::Protocol::;
287		441
288	sub conn::send {	442	sub conn::user_send {
289	my ($self, $command) = @_;	443	my ($self, $command) = @_;
290		444
291	$self->Crossfire::Protocol::send ($command);	445	$self->send ($command);
292	status $command;	446	status $command;
293	}	447	}
294		448
295	sub conn::map_update {	449	sub conn::feed_map1a {
296	my ($self, $dirty) = @_;	450	my ($self, $data) = @_;
297		451
		452	# $self->Crossfire::Protocol::feed_map1a ($data);
		453
		454	$MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
		455	$MAP->map1a_update ($data);
298	$MAPWIDGET->update;	456	$MAPWIDGET->update;
299	}	457	}
300		458
301	sub conn::map_scroll {	459	#sub conn::map_update {
302	my ($self, $dx, $dy) = @_;	460	# my ($self, $dirty) = @_;
303		461	#
304	# refresh;	462	# $MAPWIDGET->update;
305	}	463	#}
306		464
307	sub conn::map_clear {	465	sub conn::map_clear {
308	my ($self) = @_;	466	my ($self) = @_;
309		467
		468	$MAP->clear;
		469
310	# refresh;	470	# refresh;
311	}	471	}
312		472
313	sub conn::face_find {	473	sub conn::face_find {
314	my ($self, $face) = @_;	474	my ($self, $face) = @_;
315		475
316	$FACECACHE->{"$face->{chksum},$face->{name}"}	476	$FACECACHE->{"$face->{chksum},$face->{name}"}
317	}	477	}
318		478
319	sub conn::face_update {	479	sub conn::face_update {
320	my ($self, $face) = @_;	480	my ($self, $facenum, $face) = @_;
321		481
322	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};	482	$FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
323		483
324	$face->{texture} = new_from_image CFClient::Texture delete $face->{image};	484	my $tex = $face->{texture} =
		485	new_from_image CFClient::Texture
		486	delete $face->{image}, minify => 1;
		487
		488	$MAP->set_texture ($facenum, @$tex{qw(name w h s t)}, @{$tex->{minified}});
		489	$MAPWIDGET->update;
325	}	490	}
326		491
327	sub conn::query {	492	sub conn::query {
328	my ($self, $flags, $prompt) = @_;	493	my ($self, $flags, $prompt) = @_;
329		494
		495	#TODO
330	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	496	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
		497	}
		498
		499	sub conn::drawinfo {
		500	my ($self, $color, $text) = @_;
		501
		502	my @color = (
		503	[1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
		504	[1.00, 1.00, 1.00],
		505	[0.00, 0.00, 0.55],
		506	[1.00, 0.00, 0.00],
		507	[1.00, 0.54, 0.00],
		508	[0.11, 0.56, 1.00],
		509	[0.93, 0.46, 0.00],
		510	[0.18, 0.54, 0.34],
		511	[0.56, 0.73, 0.56],
		512	[0.80, 0.80, 0.80],
		513	[0.55, 0.41, 0.13],
		514	[0.99, 0.77, 0.26],
		515	[0.74, 0.65, 0.41],
		516	);
		517
		518	$LOGVIEW->add_paragraph ($color[$color], $text);
331	}	519	}
332		520
333	%SDL_CB = (	521	%SDL_CB = (
334	SDL_QUIT() => sub {	522	SDL_QUIT() => sub {
335	Event::unloop -1;	523	Event::unloop -1;
…		…
340	refresh;	528	refresh;
341	},	529	},
342	SDL_KEYDOWN() => sub {	530	SDL_KEYDOWN() => sub {
343	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	531	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
344	# alt-enter	532	# alt-enter
345	$FULLSCREEN = !$FULLSCREEN;
346	destroy_screen;	533	destroy_screen;
		534	$CFG->{fullscreen} = !$CFG->{fullscreen};
347	init_screen;	535	init_screen;
348	} else {	536	} else {
349	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	537	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
350	}	538	}
351	},	539	},
…		…
368		556
369	#############################################################################	557	#############################################################################
370		558
371	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	559	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
372		560
373	$CFG \|\|= {	561	my %DEF_CFG = (
		562	sdl_mode => 0,
374	width => 640,	563	width => 640,
375	height => 480,	564	height => 480,
376	fullscreen => 0,	565	fullscreen => 0,
377	sdl_mode => 0,	566	fast => 0,
		567	fow_enable => 1,
		568	fow_intensity => 0.45,
		569	fow_smooth => 0,
		570	log_fontsize => 14,
378	mapsize => 100,	571	mapsize => 100,
379	host => "crossfire.schmorp.de",	572	host => "crossfire.schmorp.de",
380	port => 13327,	573	say_command => 'say',
381	};	574	);
382		575
383	SDL::Init SDL_INIT_TIMER \| SDL_INIT_AUDIO \| SDL_INIT_VIDEO	576	while (my ($k, $v) = each %DEF_CFG) {
384	and die "SDL::Init failed!\n";	577	$CFG->{$k} = $v unless exists $CFG->{$k};
		578	}
385		579
386	@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],	580	sdl_init;
		581
		582	@SDL_MODES = reverse
		583	grep $_->[0] >= 640 && $_->[1] >= 480,
		584	map [SDL::RectW ($_), SDL::RectH ($_)],
387	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };	585	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
		586
		587	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
		588
		589	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
388		590
389	init_screen;	591	init_screen;
390		592
391	{	593	{
392	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	594	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.88 by root, Wed Apr 12 21:01:47 2006 UTC vs. Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.88 by root, Wed Apr 12 21:01:47 2006 UTC vs.
Revision 1.112 by root, Sat Apr 15 13:56:26 2006 UTC