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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.136 by root, Tue Apr 18 06:34:30 2006 UTC vs.
Revision 1.162 by elmex, Sun Apr 23 00:50:51 2006 UTC

…		…
4	use utf8;	4	use utf8;
5		5
6	use Time::HiRes 'time';	6	use Time::HiRes 'time';
7	use Event;	7	use Event;
8		8
9	use SDL;
10	use SDL::App;
11	use SDL::Event;
12	use SDL::Surface;
13
14	use SDL::Mixer;
15	use SDL::Sound;
16	use SDL::Music;
17
18	use SDL::OpenGL;
19
20	use Crossfire;	9	use Crossfire;
21	use Crossfire::Protocol;	10	use Crossfire::Protocol;
22		11
23	use Compress::LZF;	12	use Compress::LZF;
24		13
25	use CFClient;	14	use CFClient;
26	use CFClient::UI;	15	use CFClient::UI;
		16	use CFClient::MapWidget;
27		17
28	our $VERSION = '0.1';	18	our $VERSION = '0.1';
29		19
30	my $MAX_FPS = 60;	20	my $MAX_FPS = 60;
31	my $MIN_FPS = 5; # unused as of yet	21	my $MIN_FPS = 5; # unused as of yet
…		…
55	our $LOGVIEW;	45	our $LOGVIEW;
56	our $CONSOLE;	46	our $CONSOLE;
57	our $METASERVER;	47	our $METASERVER;
58		48
59	our $GAUGES;	49	our $GAUGES;
		50	our $STATWIDS;
60		51
61	our $SDL_ACTIVE;	52	our $SDL_ACTIVE;
62	our $SDL_EV;
63	our %SDL_CB;	53	our %SDL_CB;
64		54
65	our $SDL_MIXER;	55	our $SDL_MIXER;
66	our @SOUNDS; # event => file mapping	56	our @SOUNDS; # event => file mapping
67	our %AUDIO_CHUNKS; # audio files	57	our %AUDIO_CHUNKS; # audio files
…		…
109	undef $CONN;	99	undef $CONN;
110	}	100	}
111		101
112	sub client_setup {	102	sub client_setup {
113	my $dialog = new CFClient::UI::FancyFrame	103	my $dialog = new CFClient::UI::FancyFrame
		104	title => "Client Setup",
114	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
115	$vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
116	$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]);
117		107
118	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	108	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
119	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	109	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
120		110
121	$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]);
122	$hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);	112	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
123		113
124	$mode_slider->connect (changed => sub {	114	$mode_slider->connect (changed => sub {
125	my ($self, $value) = @_;	115	my ($self, $value) = @_;
126		116
127	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	117	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
128	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	118	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
129	});	119	});
130	$mode_slider->emit (changed => $mode_slider->{range}[0]);	120	$mode_slider->emit (changed => $mode_slider->{range}[0]);
131		121
		122	my $row = 1;
		123
132	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");	124	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
133	$table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	125	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
134	my ($self, $value) = @_;	126	my ($self, $value) = @_;
135	$CFG->{fullscreen} = $value;	127	$CFG->{fullscreen} = $value;
136	});	128	});
137		129
138	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");	130	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
139	$table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	131	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
140	my ($self, $value) = @_;	132	my ($self, $value) = @_;
141	$CFG->{fast} = $value;	133	$CFG->{fast} = $value;
142	});	134	});
143		135
144	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	136	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
145	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {	137	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
146	my ($self, $value) = @_;	138	my ($self, $value) = @_;
147	$CFG->{fow_enable} = $value;	139	$CFG->{fow_enable} = $value;
148	});	140	});
149		141
150	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");	142	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
151	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	143	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
152	my ($self, $value) = @_;	144	my ($self, $value) = @_;
153	$CFG->{fow_intensity} = $value;	145	$CFG->{fow_intensity} = $value;
154	});	146	});
155		147
156	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	148	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
157	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	149	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
158	my ($self, $value) = @_;	150	my ($self, $value) = @_;
159	$CFG->{fow_smooth} = $value;	151	$CFG->{fow_smooth} = $value;
160	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	152	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
161	});	153	});
162		154
163	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");	155	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		156	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
		157	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
		158	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		159	});
		160
		161	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
164	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {	162	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
165	my ($self, $value) = @_;
166	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	163	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
167	});	164	});
168		165
		166	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		167	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{stat_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
		168	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
		169	&set_stats_window_fontsize;
		170	});
		171
		172	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gaugesize");
		173	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], connect_changed => sub {
		174	$CFG->{gauge_size} = $_[1];
		175	my $h = int ($HEIGHT * $CFG->{gauge_size});
		176	$GAUGES->{win}->set_size ($WIDTH, $h);
		177	$GAUGES->{win}->{y} = $HEIGHT - $h;
		178	$GAUGES->{win}->{x} = 0;
		179	$GAUGES->{win}->update;
		180	});
		181
		182
		183	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
		184	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
		185	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
		186	&set_gauge_window_fontsize;
		187	$GAUGES->{win}->check_size;
		188	$GAUGES->{win}->update;
		189	});
		190
		191
		192
169	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	193	$table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
170	video_shutdown ();	194	video_shutdown ();
171	video_init ();	195	video_init ();
172	});	196	});
173		197
		198	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
		199	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
		200	$CFG->{audio_enable} = $_[1];
		201	});
		202	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
		203	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
		204	# $CFG->{effects_volume} = $_[1];
		205	# });
		206	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
		207	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
		208	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
		209	$CFG->{bgm_enable} = $_[1];
		210	});
		211	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
		212	$CFG->{bgm_volume} = $_[1];
		213	CFClient::MixMusic::volume $_[1] * 128;
		214	});
		215
		216	$table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		217	audio_shutdown ();
		218	audio_init ();
		219	});
		220
174	$dialog	221	$dialog
		222	}
		223
		224	sub set_stats_window_fontsize {
		225	for (values %{$STATWIDS}) {
		226	$_->set_fontsize ($::CFG->{stat_fontsize});
		227	}
		228	}
		229
		230	sub set_gauge_window_fontsize {
		231	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
		232	$_->set_fontsize ($::CFG->{gauge_fontsize});
		233	}
		234	}
		235
		236	sub make_gauge_window {
		237	my $gh = int ($HEIGHT * $CFG->{gauge_size});
		238	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
		239
		240	my $win = new CFClient::UI::Frame (
		241	y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
		242	);
		243	$win->add (my $vb = new CFClient::UI::VBox);
		244
		245	$vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
		246
		247
		248	$hbg->add (new CFClient::UI::Empty expand => 1);
		249	$hbg->add (my $hb = new CFClient::UI::HBox);
		250	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp');
		251	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana');
		252	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace');
		253	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food');
		254
		255	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP:");
		256	# $vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => 1, text => "Lvl:");
		257	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
		258
		259
		260	$GAUGES = {
		261	exp => $exp,# lvl => $lvl,
		262	win => $win, range => $rng,
		263	food => $fg, mana => $mg, hp => $hg, grace => $gg
		264	};
		265	$win
		266	}
		267
		268	sub make_stats_window {
		269	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		270
		271	$tgw->add (my $vb = new CFClient::UI::VBox);
		272	$vb->add (my $uhb = new CFClient::UI::HBox);
		273	$uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
		274	$uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		275
		276	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		277
		278	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		279
		280	$tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str");
		281	$tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");
		282	$tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");
		283	$tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");
		284	$tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");
		285	$tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");
		286	$tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");
		287
		288	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		289	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		290	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		291	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		292	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		293	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		294	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		295
		296	$tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
		297	$tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
		298	$tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
		299	$tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
		300	$tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
		301	$tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
		302
		303	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		304	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		305	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		306	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		307	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		308	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		309
		310	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
		311
		312	my $row = 0;
		313	my $col = 0;
		314
		315	for (qw/slow holyw conf fire depl magic
		316	drain acid pois para deat phys
		317	blind fear tund elec cold ghit/)
		318	{
		319	$tbl2->add ($col , $row,
		320	$STATWIDS->{"res_$_"} =
		321	new CFClient::UI::Label text => "0", align => +1, valign => 0
		322	);
		323	$tbl2->add ($col + 1, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
		324
		325	$row++;
		326	if ($row % 6 == 0) {
		327	$col += 2;
		328	$row = 0;
		329	}
		330	}
		331
		332	&set_stats_window_fontsize;
		333	update_stats_window ({});
		334
		335	$tgw
		336	}
		337
		338	sub update_stats_window {
		339	my ($stats) = @_;
		340
		341	# i love text protocols!!!
		342	my $hp = $stats->{1} * 1;
		343	my $hp_m = $stats->{2} * 1;
		344	my $sp = $stats->{3} * 1;
		345	my $sp_m = $stats->{4} * 1;
		346	my $fo = $stats->{18} * 1;
		347	my $fo_m = 999;
		348	my $gr = $stats->{23} * 1;
		349	my $gr_m = $stats->{24} * 1;
		350
		351	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		352	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		353	$GAUGES->{food} ->set_value ($fo, $fo_m);
		354	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		355	$GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} \|\| $stats->{28}) * 1
		356	." LVL: " . $stats->{12} * 1);
		357	my $rng = $stats->{20};
		358	$rng =~ s/^Range: //; # thank you so much dear server
		359	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		360	# $GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});
		361	$STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
		362
		363	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		364	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
		365	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
		366	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
		367	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
		368	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
		369	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
		370	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
		371	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
		372	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
		373	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
		374	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
		375	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
		376	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
		377	} else {
		378	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		379	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		380	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		381	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		382	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		383	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		384	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		385	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		386	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		387	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		388	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		389	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
		390	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
		391	}
		392
		393	my %tbl = (
		394	phys => 100,
		395	magic => 101,
		396	fire => 102,
		397	elec => 103,
		398	cold => 104,
		399	conf => 105,
		400	acid => 106,
		401	drain => 107,
		402	ghit => 108,
		403	pois => 109,
		404	slow => 110,
		405	para => 111,
		406	tund => 112,
		407	fear => 113,
		408	deat => 115,
		409	holyw => 116,
		410	blind => 117
		411	);
		412
		413	for (keys %tbl) {
		414	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		415	}
		416
175	}	417	}
176		418
177	sub metaserver_dialog {	419	sub metaserver_dialog {
178	my $dialog = new CFClient::UI::FancyFrame	420	my $dialog = new CFClient::UI::FancyFrame
		421	title => "Metaserver",
179	child => (my $vbox = new CFClient::UI::VBox);	422	child => (my $vbox = new CFClient::UI::VBox);
180		423
181	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	424	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
182		425
183	$dialog	426	$dialog
…		…
240	$HOST->set_text ($CFG->{host} = $host);	483	$HOST->set_text ($CFG->{host} = $host);
241	}),	484	}),
242	(new CFClient::UI::Empty expand => 1),	485	(new CFClient::UI::Empty expand => 1),
243	]);	486	]);
244		487
245	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)	488	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
246	for 0 .. $#$m;	489	for 0 .. $#$m;
247	}	490	}
248	}	491	}
249	});	492	});
250	}	493	}
251		494
252	sub server_setup {	495	sub server_setup {
253	my $dialog = new CFClient::UI::FancyFrame	496	my $dialog = new CFClient::UI::FancyFrame
		497	title => "Server Setup",
254	child => (my $vbox = new CFClient::UI::VBox);	498	child => (my $vbox = new CFClient::UI::VBox);
255		499
256	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
257	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	500	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
258	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");	501	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
259		502
260	{	503	{
261	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	504	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
262		505
263	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	506	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
264	my ($self, $value) = @_;	507	my ($self, $value) = @_;
265	$CFG->{host} = $value;	508	$CFG->{host} = $value;
266	});	509	});
267		510
268	$METASERVER = metaserver_dialog;	511	$METASERVER = metaserver_dialog;
269		512
270	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {	513	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
271	update_metaserver $HOST;	514	update_metaserver $HOST;
272	});	515	});
273	}	516	}
274		517
275	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	518	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
276	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	519	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
277	my ($self, $value) = @_;	520	my ($self, $value) = @_;
278	$CFG->{user} = $value;	521	$CFG->{user} = $value;
279	});	522	});
280		523
281	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	524	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
282	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	525	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
283	my ($self, $value) = @_;	526	my ($self, $value) = @_;
284	$CFG->{password} = $value;	527	$CFG->{password} = $value;
285	});	528	});
286		529
287	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	530	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
288	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {	531	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
289	my ($self, $value) = @_;	532	my ($self, $value) = @_;
290	$CFG->{say_command} = $value;	533	$CFG->{say_command} = $value;
291	});	534	});
292		535
293	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");	536	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
294	$table->add (1, 7, new CFClient::UI::Slider	537	$table->add (1, 7, new CFClient::UI::Slider
295	req_w => 100,	538	req_w => 100,
296	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	539	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
297	connect_changed => sub {	540	connect_changed => sub {
298	my ($self, $value) = @_;	541	my ($self, $value) = @_;
…		…
308	$dialog	551	$dialog
309	}	552	}
310		553
311	sub message_window {	554	sub message_window {
312	my $window = new CFClient::UI::FancyFrame	555	my $window = new CFClient::UI::FancyFrame
		556	title => "Messages",
313	border_bg => [1, 1, 1, 0.5],	557	border_bg => [1, 1, 1, 0.5],
314	bg => [0.3, 0.3, 0.3, 0.8],	558	bg => [0.3, 0.3, 0.3, 0.8],
315	user_w => int $::WIDTH / 3,	559	user_w => int $::WIDTH / 3,
316	user_h => int $::HEIGHT / 5,	560	user_h => int $::HEIGHT / 5,
317	child => (my $vbox = new CFClient::UI::VBox);	561	child => (my $vbox = new CFClient::UI::VBox);
…		…
359		603
360	$window	604	$window
361	}	605	}
362		606
363	sub sdl_init {	607	sub sdl_init {
364	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	608	CFClient::SDL_Init
365	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
366	and die "SDL::Init failed!\n";	609	and die "SDL::Init failed!\n";
367	}	610	}
368		611
369	sub video_init {	612	sub video_init {
370	sdl_init;	613	sdl_init;
371		614
372	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	615	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
373	$FULLSCREEN = $CFG->{fullscreen};	616	$FULLSCREEN = $CFG->{fullscreen};
374	$FAST = $CFG->{fast};	617	$FAST = $CFG->{fast};
375		618
376	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	619	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
377	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
378	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
379	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
380
381	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
382	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
383	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
384	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
385
386	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
387	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
388	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
389
390	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
391	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
392	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
393	or die "SDL::SetVideoMode failed!\n";	620	or die "SDL_SetVideoMode failed!\n";
394
395	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
396
397	$SDL_EV = new SDL::Event;
398	$SDL_EV->set_unicode (1);
399		621
400	$SDL_ACTIVE = 1;	622	$SDL_ACTIVE = 1;
401		623
402	$LAST_REFRESH = time - 0.01;	624	$LAST_REFRESH = time - 0.01;
403		625
404	CFClient::gl_init;	626	CFClient::gl_init;
405		627
406	$FONTSIZE = int $HEIGHT / 40;	628	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
407		629
408	#############################################################################	630	#############################################################################
409		631
410	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	632	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
411	$CFClient::UI::ROOT->add ($DEBUG_STATUS);	633	$DEBUG_STATUS->show;
412		634
413	$STATUS_LINE = new CFClient::UI::Label	635	$STATUS_LINE = new CFClient::UI::Label
414	padding => 0,	636	padding => 0,
415	y => $HEIGHT * 44 / 45 - $FONTSIZE;	637	y => $HEIGHT - $FONTSIZE * 1.8;
416	$CFClient::UI::ROOT->add ($STATUS_LINE);	638	$STATUS_LINE->show;
417		639
418	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	640	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
419	padding => 0,	641	padding => 0,
420	y => $HEIGHT * 44 / 45,
421	fontsize => $HEIGHT / 45,	642	fontsize => 0.8,
422	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	643	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
423	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);	644	$ALT_ENTER_MESSAGE->show;
		645	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
424		646
425	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);	647	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
426	$MAPWIDGET->focus_in;	648	$MAPWIDGET->focus_in;
427	$MAPWIDGET->connect (activate_console => sub {	649	$MAPWIDGET->connect (activate_console => sub {
428	my ($mapwidget, $preset) = @_;	650	my ($mapwidget, $preset) = @_;
429		651
430	if ($CONSOLE) {	652	if ($CONSOLE) {
…		…
446	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	668	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
447	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	669	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
448	status "Configuration Saved";	670	status "Configuration Saved";
449	});	671	});
450		672
		673	$CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
		674	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		675
451	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	676	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
452		677
453	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
454	$tgw->add (my $hbox = new CFClient::UI::HBox ());
455		678
456	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
457	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
458	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
459	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
460
461	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
462	$CFClient::UI::ROOT->add ($tgw);
463	}	679	}
464		680
465	sub video_shutdown {	681	sub video_shutdown {
466	$CFClient::UI::ROOT->{children} = [];	682	$CFClient::UI::ROOT->{children} = [];
467	undef $SDL_ACTIVE;	683	undef $SDL_ACTIVE;
468	undef $SDL_EV;
469	}	684	}
470		685
		686	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
471	my $bgmusic;#TODO#hack#d#	687	my $bgmusic;#TODO#hack#d#
472		688
		689	sub audio_music_finished {
		690	return unless $CFG->{bgm_enable};
		691
		692	# TODO: hack, do play loop and mood music
		693	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		694	$bgmusic->play (0);
		695
		696	push @bgmusic, shift @bgmusic;
		697	}
		698
473	sub audio_init {	699	sub audio_init {
474	if ($CFG->{sound} \|\| 1) {	700	if ($CFG->{audio_enable}) {
475	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	701	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
476	$SDL_MIXER = new SDL::Mixer;	702	$SDL_MIXER = !CFClient::Mix_OpenAudio;
477	$SDL_MIXER->allocate_channels (8);	703	CFClient::Mix_AllocateChannels 8;
		704	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
478		705
479	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";	706	audio_music_finished;
480	$SDL_MIXER->play_music ($bgmusic, -1);
481		707
482	while (<$fh>) {	708	while (<$fh>) {
483	next if /^\s*#/;	709	next if /^\s*#/;
484	next if /^\s*$/;	710	next if /^\s*$/;
485		711
486	my ($file, $volume, $event) = split /\s+/, $_, 3;	712	my ($file, $volume, $event) = split /\s+/, $_, 3;
487		713
488	push @SOUNDS, "$volume,$file";	714	push @SOUNDS, "$volume,$file";
489		715
490	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {	716	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
491	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";	717	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
492	$chunk->volume ($volume * 128 / 100);	718	$chunk->volume ($volume * 128 / 100);
493	$chunk	719	$chunk
494	};	720	};
495	}	721	}
496	} else {	722	} else {
…		…
498	}	724	}
499	}	725	}
500	}	726	}
501		727
502	sub audio_shutdown {	728	sub audio_shutdown {
		729	CFClient::Mix_CloseAudio if $SDL_MIXER;
503	undef $SDL_MIXER;	730	undef $SDL_MIXER;
504	@SOUNDS = ();	731	@SOUNDS = ();
505	%AUDIO_CHUNKS = ();	732	%AUDIO_CHUNKS = ();
506	}	733	}
507		734
…		…
520	$want_refresh = 0;	747	$want_refresh = 0;
521	$can_refresh = 0;	748	$can_refresh = 0;
522		749
523	$CFClient::UI::ROOT->draw;	750	$CFClient::UI::ROOT->draw;
524		751
525	SDL::GLSwapBuffers;	752	CFClient::SDL_GL_SwapBuffers;
526		753
527	$LAST_REFRESH = $NOW;	754	$LAST_REFRESH = $NOW;
528	}	755	}
529		756
530	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	757	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
531	$NOW = time;	758	$NOW = time;
532		759
533	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	760	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
534	while $SDL_EV->poll;	761	for CFClient::SDL_PollEvent;
535		762
536	if (%animate_object) {	763	if (%animate_object) {
537	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	764	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
538	$want_refresh++;	765	$want_refresh++;
539	}	766	}
…		…
562	@conn::ISA = Crossfire::Protocol::;	789	@conn::ISA = Crossfire::Protocol::;
563		790
564	sub conn::stats_update {	791	sub conn::stats_update {
565	my ($self, $stats) = @_;	792	my ($self, $stats) = @_;
566		793
567	# i love text protocols!!!	794	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	}	795	}
584		796
585	sub conn::user_send {	797	sub conn::user_send {
586	my ($self, $command) = @_;	798	my ($self, $command) = @_;
587		799
…		…
612		824
613	my ($hash, $x, $y, $w, $h) = @$map_info;	825	my ($hash, $x, $y, $w, $h) = @$map_info;
614		826
615	my $data = $MAP->get_rect ($x, $y, $w, $h);	827	my $data = $MAP->get_rect ($x, $y, $w, $h);
616	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	828	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
617
618	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	829	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
619
620	}	830	}
621		831
622	sub conn::map_clear {	832	sub conn::map_clear {
623	my ($self) = @_;	833	my ($self) = @_;
624		834
625	$self->flush_map;	835	$self->flush_map;
626	delete $self->{neigh};	836	delete $self->{neigh_map};
627		837
628	$MAP->clear;	838	$MAP->clear;
629	}	839	}
630		840
631		841
632	sub conn::load_map($$$) {	842	sub conn::load_map($$$) {
633	my ($self, $hash, $x, $y) = @_;	843	my ($self, $hash, $x, $y) = @_;
634		844
635	if (defined (my $data = $MAPCACHE->get ($hash))) {	845	if (defined (my $data = $MAPCACHE->get ($hash))) {
636	$data = Compress::LZF::decompress $data;	846	$data = Compress::LZF::decompress $data;
637	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	847	#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)) {	848	for my $id ($MAP->set_rect ($x, $y, $data)) {
639	my $data = $TILECACHE->get ($id)	849	my $data = $TILECACHE->get ($id)
640	or next;	850	or next;
641		851
642	$self->set_texture ($id => $data);	852	$self->set_texture ($id => $data);
643	}	853	}
644	}	854	}
645	}	855	}
646		856
		857	# this method does a "flood fill" into every tile direction
		858	# it assumes that tiles are arranged in a rectangular grid,
		859	# i.e. a map is the same as the left of the right map etc.
		860	# failure to comply are harmless and result in display errors
		861	# at worst.
647	sub conn::flood_fill {	862	sub conn::flood_fill {
648	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	863	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
649		864
650	# the server does not allow map paths > 6	865	# the server does not allow map paths > 6
651	return if 6 <= length $path;	866	return if 6 <= length $path;
652		867
653	for my $tile (1..4) {	868	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
654	next if $self->{neigh}{$hash}[$tile];	869
		870	for (
		871	[1, 0, -1],
		872	[2, 1, 0],
		873	[3, 0, 1],
		874	[4, -1, 0],
		875	) {
		876	my ($tile, $dx, $dy) = @$_;
		877
		878	my $gx = $gx + $dx;
		879	my $gy = $gy + $dy;
		880
655	next unless $flags & (1 << ($tile - 1));	881	next unless $flags & (1 << ($tile - 1));
		882	next if $self->{neigh_grid}{$gx, $gy}++;
656		883
657	my $neigh = $self->{neigh}{$hash} \|\|= [];	884	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
658		885	if (my $info = $neigh->[$tile]) {
659	$self->send_mapinfo ("spatial $path$tile", sub {
660	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	886	my ($flags, $x, $y, $w, $h, $hash) = @$info;
661		887
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)	888	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
674	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	889	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		890
		891	} else {
		892	$self->send_mapinfo ("spatial $path$tile", sub {
		893	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		894
		895	return if $mode ne "spatial";
		896
		897	$x += $MAP->ox;
		898	$y += $MAP->oy;
		899
		900	$self->load_map ($hash, $x, $y)
		901	unless $self->{neigh_map}{$hash}[5]++;#d#
		902
		903	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		904
		905	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		906	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		907	});
675	});	908	}
676	}	909	}
677	}	910	}
678		911
679	sub conn::map_change {	912	sub conn::map_change {
680	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	913	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
683		916
684	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	917	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
685		918
686	my $mapmapw = 250;	919	my $mapmapw = 250;
687	my $mapmaph = 250;	920	my $mapmaph = 250;
		921
		922	$self->{neigh_rect} = [
		923	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		924	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		925	];
688		926
		927	delete $self->{neigh_grid};
689	$self->flood_fill ("", $hash, $flags,	928	$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		929
693	$x += $ox;	930	$x += $ox;
694	$y += $oy;	931	$y += $oy;
695		932
696	$self->{map_info} = [$hash, $x, $y, $w, $h];	933	$self->{map_info} = [$hash, $x, $y, $w, $h];
		934
		935	my $map = $self->{map_info}[0];
		936	$map =~ s/^.*?\/([^\/]+)$/\1/;
		937	$STATWIDS->{map}->set_text ("Map: " . $map);
697		938
698	$self->load_map ($hash, $x, $y);	939	$self->load_map ($hash, $x, $y);
699	}	940	}
700		941
701	sub conn::face_find {	942	sub conn::face_find {
…		…
756	}	997	}
757		998
758	sub conn::sound_play {	999	sub conn::sound_play {
759	my ($self, $x, $y, $soundnum, $type) = @_;	1000	my ($self, $x, $y, $soundnum, $type) = @_;
760		1001
		1002	$SDL_MIXER
		1003	or return;
		1004
761	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}	1005	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
762	or return;	1006	or return;
763		1007
764	$SDL_MIXER->play_channel (-1, $chunk);	1008	$chunk->play;
765	warn "sound $x,$y,$soundnum,$type\n";#d#	1009	# warn "sound $x,$y,$soundnum,$type\n";#d#
766	}	1010	}
767		1011
768	sub conn::query {	1012	sub conn::query {
769	my ($self, $flags, $prompt) = @_;	1013	my ($self, $flags, $prompt) = @_;
770		1014
771	#TODO	1015	#TODO, display dialog with relevant information
772	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1016	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
773	}	1017	}
774		1018
775	sub conn::drawinfo {	1019	sub conn::drawinfo {
776	my ($self, $color, $text) = @_;	1020	my ($self, $color, $text) = @_;
…		…
792	);	1036	);
793		1037
794	$LOGVIEW->add_paragraph ($color[$color], $text);	1038	$LOGVIEW->add_paragraph ($color[$color], $text);
795	}	1039	}
796		1040
		1041	sub conn::spell_add {
		1042	my ($self, $spell) = @_;
		1043
		1044	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
		1045	});
		1046	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
		1047	});
		1048	}
		1049
		1050	sub conn::spell_delete {
		1051	my ($self, $spell) = @_;
		1052	}
		1053
		1054	sub conn::addme_success {
		1055	my ($self) = @_;
		1056
		1057	for my $skill (values %{$self->{skill_info}}) {
		1058	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {
		1059	});
		1060	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
		1061	});
		1062	}
		1063	}
		1064
797	%SDL_CB = (	1065	%SDL_CB = (
798	SDL_QUIT() => sub {	1066	CFClient::SDL_QUIT => sub {
799	Event::unloop -1;	1067	Event::unloop -1;
800	},	1068	},
801	SDL_VIDEORESIZE() => sub {	1069	CFClient::SDL_VIDEORESIZE => sub {
802	},	1070	},
803	SDL_VIDEOEXPOSE() => sub {	1071	CFClient::SDL_VIDEOEXPOSE => \&refresh,
804	refresh;	1072	CFClient::SDL_ACTIVEEVENT => sub {
		1073	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
805	},	1074	},
806	SDL_KEYDOWN() => sub {	1075	CFClient::SDL_KEYDOWN => sub {
807	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	1076	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
808	# alt-enter	1077	# alt-enter
809	video_shutdown;	1078	video_shutdown;
810	$CFG->{fullscreen} = !$CFG->{fullscreen};	1079	$CFG->{fullscreen} = !$CFG->{fullscreen};
811	video_init;	1080	video_init;
812	} else {	1081	} else {
813	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	1082	CFClient::UI::feed_sdl_key_down_event ($_[0]);
814	}	1083	}
815	},	1084	},
816	SDL_KEYUP() => sub {	1085	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
817	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);	1086	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
818	},	1087	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
819	SDL_MOUSEMOTION() => sub {	1088	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
820	CFClient::UI::feed_sdl_motion_event ($SDL_EV);	1089	CFClient::SDL_USEREVENT => \&audio_music_finished,
821	},
822	SDL_MOUSEBUTTONDOWN() => sub {
823	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
824	},
825	SDL_MOUSEBUTTONUP() => sub {
826	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
827	},
828	SDL_ACTIVEEVENT() => sub {
829	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
830	},
831	);	1090	);
832		1091
833	#############################################################################	1092	#############################################################################
834		1093
835	$SIG{INT} = $SIG{TERM} = sub { exit };	1094	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
846	fullscreen => 0,	1105	fullscreen => 0,
847	fast => 0,	1106	fast => 0,
848	fow_enable => 1,	1107	fow_enable => 1,
849	fow_intensity => 0.45,	1108	fow_intensity => 0.45,
850	fow_smooth => 0,	1109	fow_smooth => 0,
		1110	gui_fontsize => 1,
851	log_fontsize => 14,	1111	log_fontsize => 1,
		1112	gauge_fontsize => 1,
		1113	gauge_size => 0.35,
		1114	stat_fontsize => 1,
852	mapsize => 100,	1115	mapsize => 100,
853	host => "crossfire.schmorp.de",	1116	host => "crossfire.schmorp.de",
854	say_command => 'say',	1117	say_command => 'say',
		1118	audio_enable => 1,
		1119	bgm_enable => 1,
		1120	bgm_volume => 0.25,
855	);	1121	);
856		1122
857	while (my ($k, $v) = each %DEF_CFG) {	1123	while (my ($k, $v) = each %DEF_CFG) {
858	$CFG->{$k} = $v unless exists $CFG->{$k};	1124	$CFG->{$k} = $v unless exists $CFG->{$k};
859	}	1125	}
860		1126
861	sdl_init;	1127	sdl_init;
862		1128
863	@SDL_MODES = reverse	1129	@SDL_MODES = reverse
864	grep $_->[0] >= 640 && $_->[1] >= 480,	1130	grep $_->[0] >= 640 && $_->[1] >= 480,
865	map [SDL::RectW ($_), SDL::RectH ($_)],	1131	CFClient::SDL_ListModes;
866	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
867		1132
868	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1133	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
869		1134
870	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1135	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
871		1136
…		…
879	video_init;	1144	video_init;
880	audio_init;	1145	audio_init;
881		1146
882	Event::loop;	1147	Event::loop;
883		1148
884	END { SDL::Quit }	1149	END { CFClient::SDL_Quit }
885		1150
886		1151

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.136 by root, Tue Apr 18 06:34:30 2006 UTC vs. Revision 1.162 by elmex, Sun Apr 23 00:50:51 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.136 by root, Tue Apr 18 06:34:30 2006 UTC vs.
Revision 1.162 by elmex, Sun Apr 23 00:50:51 2006 UTC