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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.148 by root, Wed Apr 19 23:37:50 2006 UTC vs.
Revision 1.157 by elmex, Fri Apr 21 15:03:47 2006 UTC

…		…
45	our $LOGVIEW;	45	our $LOGVIEW;
46	our $CONSOLE;	46	our $CONSOLE;
47	our $METASERVER;	47	our $METASERVER;
48		48
49	our $GAUGES;	49	our $GAUGES;
		50	our $STATWIDS;
50		51
51	our $SDL_ACTIVE;	52	our $SDL_ACTIVE;
52	our %SDL_CB;	53	our %SDL_CB;
53		54
54	our $SDL_MIXER;	55	our $SDL_MIXER;
…		…
98	undef $CONN;	99	undef $CONN;
99	}	100	}
100		101
101	sub client_setup {	102	sub client_setup {
102	my $dialog = new CFClient::UI::FancyFrame	103	my $dialog = new CFClient::UI::FancyFrame
		104	title => "Client Setup",
103	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
104	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
105	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	106	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
106		107
107	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	108	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
108	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	109	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
109		110
110	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);	111	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
111	$hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8);	112	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
112		113
113	$mode_slider->connect (changed => sub {	114	$mode_slider->connect (changed => sub {
114	my ($self, $value) = @_;	115	my ($self, $value) = @_;
115		116
116	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	117	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
158	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");	159	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
159	$table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	160	$table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
160	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);	161	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
161	});	162	});
162		163
		164	$table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		165	$table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{stat_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
		166	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
		167	&set_stats_window_fontsize;
		168	});
		169
		170
163	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	171	$table->add (1, 9, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
164	video_shutdown ();	172	video_shutdown ();
165	video_init ();	173	video_init ();
166	});	174	});
167		175
168	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	176	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
169	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {	177	$table->add (1, 10, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
170	$CFG->{audio_enable} = $_[1];	178	$CFG->{audio_enable} = $_[1];
171	});	179	});
172	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	180	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
173	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	181	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
174	# $CFG->{effects_volume} = $_[1];	182	# $CFG->{effects_volume} = $_[1];
175	# });	183	# });
176	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	184	$table->add (0, 11, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
177	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);	185	$table->add (1, 11, my $hbox = new CFClient::UI::HBox);
178	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {	186	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
179	$CFG->{bgm_enable} = $_[1];	187	$CFG->{bgm_enable} = $_[1];
180	});	188	});
181	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {	189	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
182	$CFG->{bgm_volume} = $_[1];	190	$CFG->{bgm_volume} = $_[1];
183	CFClient::Mix_VolumeMusic ($_[1]);	191	CFClient::MixMusic::volume $_[1] * 128;
184	});	192	});
185		193
186	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	194	$table->add (1, 12, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
187	audio_shutdown ();	195	audio_shutdown ();
188	audio_init ();	196	audio_init ();
189	});	197	});
190		198
191	$dialog	199	$dialog
192	}	200	}
193		201
		202	sub set_stats_window_fontsize {
		203	for (values %{$STATWIDS}, values %{$GAUGES}) {
		204	$_->set_fontsize ($::CFG->{stat_fontsize});
		205	}
		206	}
		207
		208	sub make_stats_window {
		209	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		210
		211	$tgw->add (my $vb = new CFClient::UI::VBox);
		212	$vb->add (my $uhb = new CFClient::UI::HBox);
		213	$uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
		214	$uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		215	$vb->add (my $dhb = new CFClient::UI::HBox);
		216	$dhb->add ($STATWIDS->{exp} = new CFClient::UI::Label valign => 0, align => -1, text => "Exp:", expand => 1);
		217	$dhb->add ($STATWIDS->{lvl} = new CFClient::UI::Label valign => 0, align => -1, text => "Level:", expand => 1);
		218
		219	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		220	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', expand => 1);
		221	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', expand => 1);
		222	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);
		223	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', expand => 1);
		224	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
		225
		226	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		227
		228	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		229	$tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "S");
		230	$tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "D");
		231	$tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "Co");
		232	$tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "I");
		233	$tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "W");
		234	$tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "P");
		235	$tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "Ch");
		236
		237	$tbl->add (1, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
		238	$tbl->add (1, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
		239	$tbl->add (1, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
		240	$tbl->add (1, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
		241	$tbl->add (1, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
		242	$tbl->add (1, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
		243	} else {
		244	$tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "S");
		245	$tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "D");
		246	$tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Co");
		247	$tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "I");
		248	$tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "W");
		249	$tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "P");
		250	$tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
		251
		252	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		253	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		254	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		255	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		256	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		257	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		258	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		259
		260	$tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
		261	$tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
		262	$tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
		263	$tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
		264	$tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
		265	$tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
		266
		267	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		268	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		269	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		270	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		271	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		272	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		273	}
		274
		275	$hb->add (my $tbl2 = new CFClient::UI::Table);
		276
		277	my $row = 0;
		278	my $col = 0;
		279
		280	for (qw/slow holyw conf fire depl magic
		281	drain acid pois para deat phys
		282	blind fear tund elec cold ghit/)
		283	{
		284	$tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
		285	$tbl2->add ($col + 1, $row,
		286	$STATWIDS->{"res_$_"} =
		287	new CFClient::UI::Label text => "0", align => -1, valign => 0
		288	);
		289
		290	$row++;
		291	if ($row % 6 == 0) {
		292	$col += 2;
		293	$row = 0;
		294	}
		295	}
		296
		297	&set_stats_window_fontsize;
		298	update_stats_window ({});
		299
		300	$tgw
		301	}
		302
		303	sub update_stats_window {
		304	my ($stats) = @_;
		305
		306	# i love text protocols!!!
		307	my $hp = $stats->{1} * 1;
		308	my $hp_m = $stats->{2} * 1;
		309	my $sp = $stats->{3} * 1;
		310	my $sp_m = $stats->{4} * 1;
		311	my $fo = $stats->{18} * 1;
		312	my $fo_m = 999;
		313	my $gr = $stats->{23} * 1;
		314	my $gr_m = $stats->{24} * 1;
		315
		316	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		317	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		318	$GAUGES->{food} ->set_value ($fo, $fo_m);
		319	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		320	$STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
		321	$STATWIDS->{exp} ->set_text ("Exp.: " . ($stats->{11} \|\| $stats->{28}));
		322	$STATWIDS->{lvl} ->set_text ("Level: " . $stats->{12});
		323
		324	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		325	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
		326	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
		327	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
		328	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
		329	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
		330	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
		331	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
		332	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
		333	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
		334	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
		335	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
		336	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
		337	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
		338	} else {
		339	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		340	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		341	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		342	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		343	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		344	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		345	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		346	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		347	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		348	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		349	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		350	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
		351	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
		352	}
		353
		354	my %tbl = (
		355	phys => 100,
		356	magic => 101,
		357	fire => 102,
		358	elec => 103,
		359	cold => 104,
		360	conf => 105,
		361	acid => 106,
		362	drain => 107,
		363	ghit => 108,
		364	pois => 109,
		365	slow => 110,
		366	para => 111,
		367	tund => 112,
		368	fear => 113,
		369	deat => 115,
		370	holyw => 116,
		371	blind => 117
		372	);
		373
		374	for (keys %tbl) {
		375	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		376	}
		377
		378	}
		379
194	sub metaserver_dialog {	380	sub metaserver_dialog {
195	my $dialog = new CFClient::UI::FancyFrame	381	my $dialog = new CFClient::UI::FancyFrame
		382	title => "Metaserver",
196	child => (my $vbox = new CFClient::UI::VBox);	383	child => (my $vbox = new CFClient::UI::VBox);
197		384
198	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	385	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
199		386
200	$dialog	387	$dialog
…		…
266	});	453	});
267	}	454	}
268		455
269	sub server_setup {	456	sub server_setup {
270	my $dialog = new CFClient::UI::FancyFrame	457	my $dialog = new CFClient::UI::FancyFrame
		458	title => "Server Setup",
271	child => (my $vbox = new CFClient::UI::VBox);	459	child => (my $vbox = new CFClient::UI::VBox);
272		460
273	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Server Setup");
274	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	461	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
275	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	462	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
276		463
277	{	464	{
278	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	465	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
…		…
325	$dialog	512	$dialog
326	}	513	}
327		514
328	sub message_window {	515	sub message_window {
329	my $window = new CFClient::UI::FancyFrame	516	my $window = new CFClient::UI::FancyFrame
		517	title => "Messages",
330	border_bg => [1, 1, 1, 0.5],	518	border_bg => [1, 1, 1, 0.5],
331	bg => [0.3, 0.3, 0.3, 0.8],	519	bg => [0.3, 0.3, 0.3, 0.8],
332	user_w => int $::WIDTH / 3,	520	user_w => int $::WIDTH / 3,
333	user_h => int $::HEIGHT / 5,	521	user_h => int $::HEIGHT / 5,
334	child => (my $vbox = new CFClient::UI::VBox);	522	child => (my $vbox = new CFClient::UI::VBox);
…		…
443	status "Configuration Saved";	631	status "Configuration Saved";
444	});	632	});
445		633
446	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	634	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
447		635
448	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
449	$tgw->add (my $hbox = new CFClient::UI::HBox ());
450		636
451	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
452	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
453	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
454	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
455
456	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
457	$CFClient::UI::ROOT->add ($tgw);	637	$CFClient::UI::ROOT->add (make_stats_window);
458	}	638	}
459		639
460	sub video_shutdown {	640	sub video_shutdown {
461	$CFClient::UI::ROOT->{children} = [];	641	$CFClient::UI::ROOT->{children} = [];
462	undef $SDL_ACTIVE;	642	undef $SDL_ACTIVE;
463	}	643	}
464		644
		645	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
465	my $bgmusic;#TODO#hack#d#	646	my $bgmusic;#TODO#hack#d#
		647
		648	sub audio_music_finished {
		649	return unless $CFG->{bgm_enable};
		650
		651	# TODO: hack, do play loop and mood music
		652	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		653	$bgmusic->play (0);
		654
		655	push @bgmusic, shift @bgmusic;
		656	}
466		657
467	sub audio_init {	658	sub audio_init {
468	if ($CFG->{audio_enable}) {	659	if ($CFG->{audio_enable}) {
469	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	660	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
470
471	$SDL_MIXER = !CFClient::Mix_OpenAudio;	661	$SDL_MIXER = !CFClient::Mix_OpenAudio;
472	CFClient::Mix_AllocateChannels 8;	662	CFClient::Mix_AllocateChannels 8;
473	CFClient::MixMusic::volume $CFG->{bgm_volume};	663	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
474		664
475	# TODO: hack, do play loop and mood music	665	audio_music_finished;
476	if ($CFG->{bgm_enable}) {
477	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/game3.ogg";
478	$bgmusic->play;
479	}
480		666
481	while (<$fh>) {	667	while (<$fh>) {
482	next if /^\s*#/;	668	next if /^\s*#/;
483	next if /^\s*$/;	669	next if /^\s*$/;
484		670
…		…
562	@conn::ISA = Crossfire::Protocol::;	748	@conn::ISA = Crossfire::Protocol::;
563		749
564	sub conn::stats_update {	750	sub conn::stats_update {
565	my ($self, $stats) = @_;	751	my ($self, $stats) = @_;
566		752
567	# i love text protocols!!!	753	update_stats_window ($stats);
568	# FIXME: the stats are somehow weird
569	my $hp = $stats->{1};
570	my $hp_m = $stats->{2};
571	my $sp = $stats->{3};
572	my $sp_m = $stats->{4};
573	my $fo = $stats->{18};
574	my $fo_m = 1000;
575	my $gr = $stats->{23};
576	my $gr_m = $stats->{24};
577
578	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
579	$GAUGES->{hp}->set_value ($hp, $hp_m);
580	$GAUGES->{mana}->set_value ($sp, $sp_m);
581	$GAUGES->{food}->set_value ($fo, $fo_m);
582	$GAUGES->{grace}->set_value ($gr, $gr_m);
583	}	754	}
584		755
585	sub conn::user_send {	756	sub conn::user_send {
586	my ($self, $command) = @_;	757	my ($self, $command) = @_;
587		758
…		…
612		783
613	my ($hash, $x, $y, $w, $h) = @$map_info;	784	my ($hash, $x, $y, $w, $h) = @$map_info;
614		785
615	my $data = $MAP->get_rect ($x, $y, $w, $h);	786	my $data = $MAP->get_rect ($x, $y, $w, $h);
616	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	787	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
617
618	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	788	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
619
620	}	789	}
621		790
622	sub conn::map_clear {	791	sub conn::map_clear {
623	my ($self) = @_;	792	my ($self) = @_;
624		793
625	$self->flush_map;	794	$self->flush_map;
626	delete $self->{neigh};	795	delete $self->{neigh_map};
627		796
628	$MAP->clear;	797	$MAP->clear;
629	}	798	}
630		799
631		800
632	sub conn::load_map($$$) {	801	sub conn::load_map($$$) {
633	my ($self, $hash, $x, $y) = @_;	802	my ($self, $hash, $x, $y) = @_;
634		803
635	if (defined (my $data = $MAPCACHE->get ($hash))) {	804	if (defined (my $data = $MAPCACHE->get ($hash))) {
636	$data = Compress::LZF::decompress $data;	805	$data = Compress::LZF::decompress $data;
637	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	806	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
638	for my $id ($MAP->set_rect ($x, $y, $data)) {	807	for my $id ($MAP->set_rect ($x, $y, $data)) {
639	my $data = $TILECACHE->get ($id)	808	my $data = $TILECACHE->get ($id)
640	or next;	809	or next;
641		810
642	$self->set_texture ($id => $data);	811	$self->set_texture ($id => $data);
643	}	812	}
644	}	813	}
645	}	814	}
646		815
		816	# this method does a "flood fill" into every tile direction
		817	# it assumes that tiles are arranged in a rectangular grid,
		818	# i.e. a map is the same as the left of the right map etc.
		819	# failure to comply are harmless and result in display errors
		820	# at worst.
647	sub conn::flood_fill {	821	sub conn::flood_fill {
648	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	822	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
649		823
650	# the server does not allow map paths > 6	824	# the server does not allow map paths > 6
651	return if 6 <= length $path;	825	return if 6 <= length $path;
652		826
653	for my $tile (1..4) {	827	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
654	next if $self->{neigh}{$hash}[$tile];	828
		829	for (
		830	[1, 0, -1],
		831	[2, 1, 0],
		832	[3, 0, 1],
		833	[4, -1, 0],
		834	) {
		835	my ($tile, $dx, $dy) = @$_;
		836
		837	my $gx = $gx + $dx;
		838	my $gy = $gy + $dy;
		839
655	next unless $flags & (1 << ($tile - 1));	840	next unless $flags & (1 << ($tile - 1));
		841	next if $self->{neigh_grid}{$gx, $gy}++;
656		842
657	my $neigh = $self->{neigh}{$hash} \|\|= [];	843	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
658		844	if (my $info = $neigh->[$tile]) {
659	$self->send_mapinfo ("spatial $path$tile", sub {
660	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	845	my ($flags, $x, $y, $w, $h, $hash) = @$info;
661		846
662	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
663	return if $mode ne "spatial";
664
665	$x += $MAP->ox;
666	$y += $MAP->oy;
667
668	$self->load_map ($hash, $x, $y)
669	unless $self->{neigh}{$hash}[5]++;#d#
670
671	$neigh->[$tile] = [$x, $y, $w, $h];
672
673	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)	847	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
674	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	848	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		849
		850	} else {
		851	$self->send_mapinfo ("spatial $path$tile", sub {
		852	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		853
		854	return if $mode ne "spatial";
		855
		856	$x += $MAP->ox;
		857	$y += $MAP->oy;
		858
		859	$self->load_map ($hash, $x, $y)
		860	unless $self->{neigh_map}{$hash}[5]++;#d#
		861
		862	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		863
		864	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		865	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		866	});
675	});	867	}
676	}	868	}
677	}	869	}
678		870
679	sub conn::map_change {	871	sub conn::map_change {
680	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	872	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
683		875
684	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	876	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
685		877
686	my $mapmapw = 250;	878	my $mapmapw = 250;
687	my $mapmaph = 250;	879	my $mapmaph = 250;
		880
		881	$self->{neigh_rect} = [
		882	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		883	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		884	];
688		885
		886	delete $self->{neigh_grid};
689	$self->flood_fill ("", $hash, $flags,	887	$self->flood_fill (0, 0, "", $hash, $flags);
690	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
691	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
692		888
693	$x += $ox;	889	$x += $ox;
694	$y += $oy;	890	$y += $oy;
695		891
696	$self->{map_info} = [$hash, $x, $y, $w, $h];	892	$self->{map_info} = [$hash, $x, $y, $w, $h];
		893
		894	$STATWIDS->{map}->set_text ("Map: " . $self->{map_info}[0]);
697		895
698	$self->load_map ($hash, $x, $y);	896	$self->load_map ($hash, $x, $y);
699	}	897	}
700		898
701	sub conn::face_find {	899	sub conn::face_find {
…		…
825	CFClient::SDL_QUIT => sub {	1023	CFClient::SDL_QUIT => sub {
826	Event::unloop -1;	1024	Event::unloop -1;
827	},	1025	},
828	CFClient::SDL_VIDEORESIZE => sub {	1026	CFClient::SDL_VIDEORESIZE => sub {
829	},	1027	},
830	CFClient::SDL_VIDEOEXPOSE => sub {	1028	CFClient::SDL_VIDEOEXPOSE => \&refresh,
831	refresh;	1029	CFClient::SDL_ACTIVEEVENT => sub {
		1030	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
832	},	1031	},
833	CFClient::SDL_KEYDOWN => sub {	1032	CFClient::SDL_KEYDOWN => sub {
834	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {	1033	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
835	# alt-enter	1034	# alt-enter
836	video_shutdown;	1035	video_shutdown;
…		…
838	video_init;	1037	video_init;
839	} else {	1038	} else {
840	CFClient::UI::feed_sdl_key_down_event ($_[0]);	1039	CFClient::UI::feed_sdl_key_down_event ($_[0]);
841	}	1040	}
842	},	1041	},
843	CFClient::SDL_KEYUP => sub {	1042	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
844	CFClient::UI::feed_sdl_key_up_event ($_[0]);	1043	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
845	},	1044	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
846	CFClient::SDL_MOUSEMOTION => sub {	1045	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
847	CFClient::UI::feed_sdl_motion_event ($_[0]);	1046	CFClient::SDL_USEREVENT => \&audio_music_finished,
848	},
849	CFClient::SDL_MOUSEBUTTONDOWN => sub {
850	CFClient::UI::feed_sdl_button_down_event ($_[0]);
851	},
852	CFClient::SDL_MOUSEBUTTONUP => sub {
853	CFClient::UI::feed_sdl_button_up_event ($_[0]);
854	},
855	CFClient::SDL_ACTIVEEVENT => sub {
856	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
857	},
858	);	1047	);
859		1048
860	#############################################################################	1049	#############################################################################
861		1050
862	$SIG{INT} = $SIG{TERM} = sub { exit };	1051	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
874	fast => 0,	1063	fast => 0,
875	fow_enable => 1,	1064	fow_enable => 1,
876	fow_intensity => 0.45,	1065	fow_intensity => 0.45,
877	fow_smooth => 0,	1066	fow_smooth => 0,
878	gui_fontsize => 1,	1067	gui_fontsize => 1,
879	log_fontsize => 14,	1068	log_fontsize => 1,
		1069	stat_fontsize => 1,
880	mapsize => 100,	1070	mapsize => 100,
881	host => "crossfire.schmorp.de",	1071	host => "crossfire.schmorp.de",
882	say_command => 'say',	1072	say_command => 'say',
883	audio_enable => 1,	1073	audio_enable => 1,
884	bgm_enable => 1,	1074	bgm_enable => 1,
885	bgm_volume => 64,	1075	bgm_volume => 0.25,
886	);	1076	);
887		1077
888	while (my ($k, $v) = each %DEF_CFG) {	1078	while (my ($k, $v) = each %DEF_CFG) {
889	$CFG->{$k} = $v unless exists $CFG->{$k};	1079	$CFG->{$k} = $v unless exists $CFG->{$k};
890	}	1080	}

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.148 by root, Wed Apr 19 23:37:50 2006 UTC vs. Revision 1.157 by elmex, Fri Apr 21 15:03:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.148 by root, Wed Apr 19 23:37:50 2006 UTC vs.
Revision 1.157 by elmex, Fri Apr 21 15:03:47 2006 UTC