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

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.132 by root, Tue Apr 18 02:07:37 2006 UTC vs. Revision 1.158 by elmex, Sat Apr 22 12:14:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.132 by root, Tue Apr 18 02:07:37 2006 UTC vs.
Revision 1.158 by elmex, Sat Apr 22 12:14:45 2006 UTC