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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.124 by root, Mon Apr 17 19:50:23 2006 UTC vs.
Revision 1.163 by root, Sun Apr 23 00:57:40 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
…		…
49	our $BUTTONBAR;	44	our $BUTTONBAR;
50	our $LOGVIEW;	45	our $LOGVIEW;
51	our $CONSOLE;	46	our $CONSOLE;
52	our $METASERVER;	47	our $METASERVER;
53		48
		49	our $GAUGES;
		50	our $STATWIDS;
		51
54	our $SDL_ACTIVE;	52	our $SDL_ACTIVE;
55	our $SDL_EV;
56	our %SDL_CB;	53	our %SDL_CB;
		54
		55	our $SDL_MIXER;
		56	our @SOUNDS; # event => file mapping
		57	our %AUDIO_CHUNKS; # audio files
57		58
58	our $ALT_ENTER_MESSAGE;	59	our $ALT_ENTER_MESSAGE;
59	our $STATUS_LINE;	60	our $STATUS_LINE;
60	our $DEBUG_STATUS;	61	our $DEBUG_STATUS;
61		62
62	sub status {	63	sub status {
63	$STATUS_LINE->set_text ($_[0]);	64	$STATUS_LINE->set_text ($_[0]);
64	my ($w, $h) = $STATUS_LINE->size_request;
65	$STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);	65	$STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
66	}	66	}
67		67
68	sub debug {	68	sub debug {
69	$DEBUG_STATUS->set_text ($_[0]);	69	$DEBUG_STATUS->set_text ($_[0]);
70	my ($w, $h) = $DEBUG_STATUS->size_request;	70	$DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h});
71	$DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
72	}	71	}
73		72
74	sub start_game {	73	sub start_game {
75	status "logging in...";	74	status "logging in...";
76		75
…		…
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
		132	state => $CFG->{fast},
		133	tooltip => "Lower the visual quality considerably to speed up rendering.",
		134	connect_changed => sub {
131	my ($self, $value) = @_;	135	my ($self, $value) = @_;
132	$CFG->{fast} = $value;	136	$CFG->{fast} = $value;
		137	}
		138	);
		139
		140	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
		141	$table->add (1, $row++, new CFClient::UI::CheckBox
		142	state => $CFG->{fow_enable},
		143	tooltip => "Fog-of-War marks areas that cannot be seen by the player",
		144	connect_changed => sub {
		145	my ($self, $value) = @_;
		146	$CFG->{fow_enable} = $value;
		147	}
		148	);
		149
		150	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
		151	$table->add (1, $row++, new CFClient::UI::Slider
		152	range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
		153	tooltip => "The higher the intensity, the lighter the Fog-of-War color",
		154	connect_changed => sub {
		155	my ($self, $value) = @_;
		156	$CFG->{fow_intensity} = $value;
		157	}
		158	);
		159
		160	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
		161	$table->add (1, $row++, new CFClient::UI::CheckBox
		162	state => $CFG->{fow_smooth},
		163	tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
		164	connect_changed => sub {
		165	my ($self, $value) = @_;
		166	$CFG->{fow_smooth} = $value;
		167	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
		168	}
		169	);
		170
		171	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		172	$table->add (1, $row++, new CFClient::UI::Slider
		173	range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
		174	tooltip => "The font size used by most GUI elements",
		175	connect_changed => sub {
		176	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
		177	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		178	}
		179	);
		180
		181	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
		182	$table->add (1, $row++, new CFClient::UI::Slider
		183	range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
		184	tooltip => "The font size used by the server log window only",
		185	connect_changed => sub {
		186	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
		187	}
		188	);
		189
		190	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		191
		192	$table->add (1, $row++, new CFClient::UI::Slider
		193	range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
		194	tooltip => "The font size used by the statistics window only",
		195	connect_changed => sub {
		196	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
		197	&set_stats_window_fontsize;
		198	}
		199	);
		200
		201	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gaugesize");
		202	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], connect_changed => sub {
		203	$CFG->{gauge_size} = $_[1];
		204	my $h = int ($HEIGHT * $CFG->{gauge_size});
		205	$GAUGES->{win}->set_size ($WIDTH, $h);
		206	$GAUGES->{win}->{y} = $HEIGHT - $h;
		207	$GAUGES->{win}->{x} = 0;
		208	$GAUGES->{win}->update;
133	});	209	});
134		210
		211	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
		212	$table->add (1, $row++, new CFClient::UI::Slider
		213	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
		214	tooltip => "Adjust the size of the stats gauges at the bottom right",
		215	connect_changed => sub {
		216	$CFG->{gauge_size} = $_[1];
		217	my $h = int ($HEIGHT * $CFG->{gauge_size});
		218	$GAUGES->{win}->set_size ($WIDTH, $h);
		219	$GAUGES->{win}->{y} = $HEIGHT - $h;
		220	$GAUGES->{win}->{x} = 0;
		221	$GAUGES->{win}->update;
		222	}
		223	);
		224
		225	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
		226	$table->add (1, $row++, new CFClient::UI::Slider
		227	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
		228	connect_changed => sub {
		229	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
		230	&set_gauge_window_fontsize;
		231	$GAUGES->{win}->check_size;
		232	$GAUGES->{win}->update;
		233	}
		234	);
		235
		236	$table->add (1, $row++, new CFClient::UI::Button
		237	expand => 1, align => 0, text => "Apply",
		238	tooltip => "Apply the video settings (unless they are auto-apply)",
		239	connect_activate => sub {
		240	video_shutdown ();
		241	video_init ();
		242	}
		243	);
		244
135	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	245	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
		246	$table->add (1, $row++, new CFClient::UI::CheckBox
		247	state => $CFG->{audio_enable},
		248	tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
		249	connect_changed => sub {
		250	$CFG->{audio_enable} = $_[1];
		251	}
		252	);
		253	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
136	$table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {	254	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
137	my ($self, $value) = @_;	255	# $CFG->{effects_volume} = $_[1];
138	$CFG->{fow_enable} = $value;
139	});	256	# });
140
141	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");	257	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
142	$table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	258	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
143	my ($self, $value) = @_;	259	$hbox->add (new CFClient::UI::CheckBox
144	$CFG->{fow_intensity} = $value;	260	expand => 1, state => $CFG->{bgm_enable},
		261	tooltip => "Enable background music playing",
		262	connect_changed => sub {
		263	$CFG->{bgm_enable} = $_[1];
		264	}
145	});	265	);
146		266	$hbox->add (new CFClient::UI::Slider
147	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	267	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
148	$table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	268	tooltip => "The volume of the background music",
149	my ($self, $value) = @_;	269	connect_changed => sub {
150	$CFG->{fow_smooth} = $value;	270	$CFG->{bgm_volume} = $_[1];
		271	CFClient::MixMusic::volume $_[1] * 128;
		272	}
151	});	273	);
152		274
153	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");	275	$table->add (1, $row++, new CFClient::UI::Button
154	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {	276	expand => 1, align => 0, text => "Apply",
155	my ($self, $value) = @_;	277	tooltip => "Apply the audio settings that are not auto-apply",
156	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	278	connect_activate => sub {
		279	audio_shutdown ();
		280	audio_init ();
		281	}
157	});	282	);
158
159	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
160	destroy_screen ();
161	init_screen ();
162	});
163		283
164	$dialog	284	$dialog
		285	}
		286
		287	sub set_stats_window_fontsize {
		288	for (values %{$STATWIDS}) {
		289	$_->set_fontsize ($::CFG->{stat_fontsize});
		290	}
		291	}
		292
		293	sub set_gauge_window_fontsize {
		294	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
		295	$_->set_fontsize ($::CFG->{gauge_fontsize});
		296	}
		297	}
		298
		299	sub make_gauge_window {
		300	my $gh = int ($HEIGHT * $CFG->{gauge_size});
		301	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
		302
		303	my $win = new CFClient::UI::Frame (
		304	y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
		305	);
		306	$win->add (my $vb = new CFClient::UI::VBox);
		307
		308	$vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
		309
		310
		311	$hbg->add (new CFClient::UI::Empty expand => 1);
		312	$hbg->add (my $hb = new CFClient::UI::HBox);
		313	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp');
		314	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana');
		315	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace');
		316	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food');
		317
		318	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP:");
		319	# $vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => 1, text => "Lvl:");
		320	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
		321
		322
		323	$GAUGES = {
		324	exp => $exp,# lvl => $lvl,
		325	win => $win, range => $rng,
		326	food => $fg, mana => $mg, hp => $hg, grace => $gg
		327	};
		328	$win
		329	}
		330
		331	sub make_stats_window {
		332	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		333
		334	$tgw->add (my $vb = new CFClient::UI::VBox);
		335	$vb->add (my $uhb = new CFClient::UI::HBox);
		336	$uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
		337	$uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		338
		339	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		340
		341	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		342
		343	$tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Str");
		344	$tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dex");
		345	$tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Con");
		346	$tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Int");
		347	$tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wis");
		348	$tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Pow");
		349	$tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Cha");
		350
		351	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		352	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		353	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		354	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		355	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		356	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		357	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		358
		359	$tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
		360	$tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
		361	$tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
		362	$tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
		363	$tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
		364	$tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
		365
		366	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		367	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		368	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		369	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		370	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		371	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, text => "");
		372
		373	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
		374
		375	my $row = 0;
		376	my $col = 0;
		377
		378	for (qw/slow holyw conf fire depl magic
		379	drain acid pois para deat phys
		380	blind fear tund elec cold ghit/)
		381	{
		382	$tbl2->add ($col , $row,
		383	$STATWIDS->{"res_$_"} =
		384	new CFClient::UI::Label text => "0", align => +1, valign => 0
		385	);
		386	$tbl2->add ($col + 1, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
		387
		388	$row++;
		389	if ($row % 6 == 0) {
		390	$col += 2;
		391	$row = 0;
		392	}
		393	}
		394
		395	&set_stats_window_fontsize;
		396	update_stats_window ({});
		397
		398	$tgw
		399	}
		400
		401	sub update_stats_window {
		402	my ($stats) = @_;
		403
		404	# i love text protocols!!!
		405	my $hp = $stats->{1} * 1;
		406	my $hp_m = $stats->{2} * 1;
		407	my $sp = $stats->{3} * 1;
		408	my $sp_m = $stats->{4} * 1;
		409	my $fo = $stats->{18} * 1;
		410	my $fo_m = 999;
		411	my $gr = $stats->{23} * 1;
		412	my $gr_m = $stats->{24} * 1;
		413
		414	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		415	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		416	$GAUGES->{food} ->set_value ($fo, $fo_m);
		417	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		418	$GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} \|\| $stats->{28}) * 1
		419	." LVL: " . $stats->{12} * 1);
		420	my $rng = $stats->{20};
		421	$rng =~ s/^Range: //; # thank you so much dear server
		422	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		423	# $GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});
		424	$STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
		425
		426	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		427	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
		428	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
		429	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
		430	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
		431	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
		432	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
		433	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
		434	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
		435	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
		436	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
		437	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
		438	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
		439	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
		440	} else {
		441	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		442	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		443	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		444	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		445	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		446	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		447	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		448	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		449	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		450	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		451	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		452	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
		453	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
		454	}
		455
		456	my %tbl = (
		457	phys => 100,
		458	magic => 101,
		459	fire => 102,
		460	elec => 103,
		461	cold => 104,
		462	conf => 105,
		463	acid => 106,
		464	drain => 107,
		465	ghit => 108,
		466	pois => 109,
		467	slow => 110,
		468	para => 111,
		469	tund => 112,
		470	fear => 113,
		471	deat => 115,
		472	holyw => 116,
		473	blind => 117
		474	);
		475
		476	for (keys %tbl) {
		477	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		478	}
		479
165	}	480	}
166		481
167	sub metaserver_dialog {	482	sub metaserver_dialog {
168	my $dialog = new CFClient::UI::FancyFrame	483	my $dialog = new CFClient::UI::FancyFrame
		484	title => "Metaserver",
169	child => (my $vbox = new CFClient::UI::VBox);	485	child => (my $vbox = new CFClient::UI::VBox);
170		486
171	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	487	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
172		488
173	$dialog	489	$dialog
…		…
230	$HOST->set_text ($CFG->{host} = $host);	546	$HOST->set_text ($CFG->{host} = $host);
231	}),	547	}),
232	(new CFClient::UI::Empty expand => 1),	548	(new CFClient::UI::Empty expand => 1),
233	]);	549	]);
234		550
235	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)	551	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
236	for 0 .. $#$m;	552	for 0 .. $#$m;
237	}	553	}
238	}	554	}
239	});	555	});
240	}	556	}
241		557
242	sub server_setup {	558	sub server_setup {
243	my $dialog = new CFClient::UI::FancyFrame	559	my $dialog = new CFClient::UI::FancyFrame
		560	title => "Server Setup",
244	child => (my $vbox = new CFClient::UI::VBox);	561	child => (my $vbox = new CFClient::UI::VBox);
245		562
246	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
247	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	563	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
248	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host:Port");	564	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
249		565
250	{	566	{
251	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	567	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
252		568
253	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	569	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
254	my ($self, $value) = @_;	570	my ($self, $value) = @_;
255	$CFG->{host} = $value;	571	$CFG->{host} = $value;
256	});	572	});
257		573
258	$METASERVER = metaserver_dialog;	574	$METASERVER = metaserver_dialog;
259		575
260	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {	576	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
261	update_metaserver $HOST;	577	update_metaserver $HOST;
262	});	578	});
263	}	579	}
264		580
265	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	581	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
266	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	582	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
267	my ($self, $value) = @_;	583	my ($self, $value) = @_;
268	$CFG->{user} = $value;	584	$CFG->{user} = $value;
269	});	585	});
270		586
271	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	587	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
272	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	588	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
273	my ($self, $value) = @_;	589	my ($self, $value) = @_;
274	$CFG->{password} = $value;	590	$CFG->{password} = $value;
275	});	591	});
276		592
277	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	593	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
278	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {	594	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
279	my ($self, $value) = @_;	595	my ($self, $value) = @_;
280	$CFG->{say_command} = $value;	596	$CFG->{say_command} = $value;
281	});	597	});
282		598
283	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");	599	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
284	$table->add (1, 7, new CFClient::UI::Slider	600	$table->add (1, 7, new CFClient::UI::Slider
285	req_w => 100,	601	req_w => 100,
286	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	602	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
287	connect_changed => sub {	603	connect_changed => sub {
288	my ($self, $value) = @_;	604	my ($self, $value) = @_;
…		…
298	$dialog	614	$dialog
299	}	615	}
300		616
301	sub message_window {	617	sub message_window {
302	my $window = new CFClient::UI::FancyFrame	618	my $window = new CFClient::UI::FancyFrame
		619	title => "Messages",
303	border_bg => [1, 1, 1, 0.5],	620	border_bg => [1, 1, 1, 0.5],
304	bg => [0.3, 0.3, 0.3, 0.8],	621	bg => [0.3, 0.3, 0.3, 0.8],
305	user_w => int $::WIDTH / 3,	622	user_w => int $::WIDTH / 3,
306	user_h => int $::HEIGHT / 5,	623	user_h => int $::HEIGHT / 5,
307	child => (my $vbox = new CFClient::UI::VBox);	624	child => (my $vbox = new CFClient::UI::VBox);
…		…
349		666
350	$window	667	$window
351	}	668	}
352		669
353	sub sdl_init {	670	sub sdl_init {
354	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	671	CFClient::SDL_Init
355	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
356	and die "SDL::Init failed!\n";	672	and die "SDL::Init failed!\n";
357	}	673	}
358		674
359	sub init_screen {	675	sub video_init {
360	sdl_init;	676	sdl_init;
361		677
362	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	678	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
363	$FULLSCREEN = $CFG->{fullscreen};	679	$FULLSCREEN = $CFG->{fullscreen};
364	$FAST = $CFG->{fast};	680	$FAST = $CFG->{fast};
365		681
366	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	682	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
367	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
368	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
369	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
370
371	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
372	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
373	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
374	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
375
376	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
377	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
378	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
379
380	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
381	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
382	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
383	or die "SDL::SetVideoMode failed!\n";	683	or die "SDL_SetVideoMode failed!\n";
384
385	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
386
387	$SDL_EV = new SDL::Event;
388	$SDL_EV->set_unicode (1);
389		684
390	$SDL_ACTIVE = 1;	685	$SDL_ACTIVE = 1;
391		686
392	$LAST_REFRESH = time - 0.01;	687	$LAST_REFRESH = time - 0.01;
393		688
394	CFClient::gl_init;	689	CFClient::gl_init;
395		690
396	$FONTSIZE = int $HEIGHT / 40;	691	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
397		692
398	#############################################################################	693	#############################################################################
399		694
400	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	695	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
401	$CFClient::UI::ROOT->add ($DEBUG_STATUS);	696	$DEBUG_STATUS->show;
402		697
403	$STATUS_LINE = new CFClient::UI::Label	698	$STATUS_LINE = new CFClient::UI::Label
404	padding => 0,	699	padding => 0,
405	y => $HEIGHT * 44 / 45 - $FONTSIZE;	700	y => $HEIGHT - $FONTSIZE * 1.8;
406	$CFClient::UI::ROOT->add ($STATUS_LINE);	701	$STATUS_LINE->show;
407		702
408	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	703	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
409	padding => 0,	704	padding => 0,
410	y => $HEIGHT * 44 / 45,
411	fontsize => $HEIGHT / 45,	705	fontsize => 0.8,
412	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	706	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
413	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);	707	$ALT_ENTER_MESSAGE->show;
		708	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
414		709
415	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);	710	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
416	$MAPWIDGET->focus_in;	711	$MAPWIDGET->focus_in;
417	$MAPWIDGET->connect (activate_console => sub {	712	$MAPWIDGET->connect (activate_console => sub {
418	my ($mapwidget, $preset) = @_;	713	my ($mapwidget, $preset) = @_;
419		714
420	if ($CONSOLE) {	715	if ($CONSOLE) {
…		…
436	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	731	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
437	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	732	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
438	status "Configuration Saved";	733	status "Configuration Saved";
439	});	734	});
440		735
		736	$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
		737	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		738
441	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	739	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
442	}
443		740
444	sub destroy_screen {	741
		742	}
		743
		744	sub video_shutdown {
445	$CFClient::UI::ROOT->{children} = [];	745	$CFClient::UI::ROOT->{children} = [];
446	undef $SDL_ACTIVE;	746	undef $SDL_ACTIVE;
		747	}
		748
		749	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
		750	my $bgmusic;#TODO#hack#d#
		751
		752	sub audio_music_finished {
		753	return unless $CFG->{bgm_enable};
		754
		755	# TODO: hack, do play loop and mood music
		756	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		757	$bgmusic->play (0);
		758
		759	push @bgmusic, shift @bgmusic;
		760	}
		761
		762	sub audio_init {
		763	if ($CFG->{audio_enable}) {
		764	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
		765	$SDL_MIXER = !CFClient::Mix_OpenAudio;
		766	CFClient::Mix_AllocateChannels 8;
		767	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
		768
		769	audio_music_finished;
		770
		771	while (<$fh>) {
		772	next if /^\s*#/;
		773	next if /^\s*$/;
		774
		775	my ($file, $volume, $event) = split /\s+/, $_, 3;
		776
		777	push @SOUNDS, "$volume,$file";
		778
		779	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
		780	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
		781	$chunk->volume ($volume * 128 / 100);
		782	$chunk
		783	};
		784	}
		785	} else {
		786	status "unable to open sound config: $!";
		787	}
		788	}
		789	}
		790
		791	sub audio_shutdown {
		792	CFClient::Mix_CloseAudio if $SDL_MIXER;
447	undef $SDL_EV;	793	undef $SDL_MIXER;
448	SDL::Quit;	794	@SOUNDS = ();
		795	%AUDIO_CHUNKS = ();
449	}	796	}
450		797
451	my %animate_object;	798	my %animate_object;
452	my $animate_timer;	799	my $animate_timer;
453		800
…		…
463	$want_refresh = 0;	810	$want_refresh = 0;
464	$can_refresh = 0;	811	$can_refresh = 0;
465		812
466	$CFClient::UI::ROOT->draw;	813	$CFClient::UI::ROOT->draw;
467		814
468	SDL::GLSwapBuffers;	815	CFClient::SDL_GL_SwapBuffers;
469		816
470	$LAST_REFRESH = $NOW;	817	$LAST_REFRESH = $NOW;
471	}	818	}
472		819
473	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	820	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
474	$NOW = time;	821	$NOW = time;
475		822
476	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	823	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
477	while $SDL_EV->poll;	824	for CFClient::SDL_PollEvent;
478		825
479	if (%animate_object) {	826	if (%animate_object) {
480	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	827	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
481	$want_refresh++;	828	$want_refresh++;
482	}	829	}
…		…
502	delete $animate_object{$widget};	849	delete $animate_object{$widget};
503	}	850	}
504		851
505	@conn::ISA = Crossfire::Protocol::;	852	@conn::ISA = Crossfire::Protocol::;
506		853
		854	sub conn::stats_update {
		855	my ($self, $stats) = @_;
		856
		857	update_stats_window ($stats);
		858	}
		859
507	sub conn::user_send {	860	sub conn::user_send {
508	my ($self, $command) = @_;	861	my ($self, $command) = @_;
509		862
510	$self->send_command ($command);	863	$self->send_command ($command);
511	status $command;	864	status $command;
…		…
534		887
535	my ($hash, $x, $y, $w, $h) = @$map_info;	888	my ($hash, $x, $y, $w, $h) = @$map_info;
536		889
537	my $data = $MAP->get_rect ($x, $y, $w, $h);	890	my $data = $MAP->get_rect ($x, $y, $w, $h);
538	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	891	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
539
540	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	892	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
541
542	}	893	}
543		894
544	sub conn::map_clear {	895	sub conn::map_clear {
545	my ($self) = @_;	896	my ($self) = @_;
546		897
547	$self->flush_map;	898	$self->flush_map;
548	delete $self->{neigh};	899	delete $self->{neigh_map};
549		900
550	$MAP->clear;	901	$MAP->clear;
551	}	902	}
552		903
553		904
554	sub conn::load_map($$$) {	905	sub conn::load_map($$$) {
555	my ($self, $hash, $x, $y) = @_;	906	my ($self, $hash, $x, $y) = @_;
556		907
557	if (defined (my $data = $MAPCACHE->get ($hash))) {	908	if (defined (my $data = $MAPCACHE->get ($hash))) {
558	$data = Compress::LZF::decompress $data;	909	$data = Compress::LZF::decompress $data;
559	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	910	#warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
560	for my $id ($MAP->set_rect ($x, $y, $data)) {	911	for my $id ($MAP->set_rect ($x, $y, $data)) {
561	my $data = $TILECACHE->get ($id)	912	my $data = $TILECACHE->get ($id)
562	or next;	913	or next;
563		914
564	$self->set_texture ($id => $data);	915	$self->set_texture ($id => $data);
565	}	916	}
566	}	917	}
567	}	918	}
568		919
		920	# this method does a "flood fill" into every tile direction
		921	# it assumes that tiles are arranged in a rectangular grid,
		922	# i.e. a map is the same as the left of the right map etc.
		923	# failure to comply are harmless and result in display errors
		924	# at worst.
569	sub conn::flood_fill {	925	sub conn::flood_fill {
570	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	926	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
571		927
572	# the server does not allow map paths > 6	928	# the server does not allow map paths > 6
573	return if 6 <= length $path;	929	return if 6 <= length $path;
574		930
575	for my $tile (1..4) {	931	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
576	next if $self->{neigh}{$hash}[$tile];	932
		933	for (
		934	[1, 0, -1],
		935	[2, 1, 0],
		936	[3, 0, 1],
		937	[4, -1, 0],
		938	) {
		939	my ($tile, $dx, $dy) = @$_;
		940
		941	my $gx = $gx + $dx;
		942	my $gy = $gy + $dy;
		943
577	next unless $flags & (1 << ($tile - 1));	944	next unless $flags & (1 << ($tile - 1));
		945	next if $self->{neigh_grid}{$gx, $gy}++;
578		946
579	my $neigh = $self->{neigh}{$hash} \|\|= [];	947	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
580		948	if (my $info = $neigh->[$tile]) {
581	$self->send_mapinfo ("spatial $path$tile", sub {
582	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	949	my ($flags, $x, $y, $w, $h, $hash) = @$info;
583		950
584	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
585	return if $mode ne "spatial";
586
587	$x += $MAP->ox;
588	$y += $MAP->oy;
589
590	$self->load_map ($hash, $x, $y)
591	unless $self->{neigh}{$hash}[5]++;#d#
592
593	$neigh->[$tile] = [$x, $y, $w, $h];
594
595	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)	951	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
596	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	952	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		953
		954	} else {
		955	$self->send_mapinfo ("spatial $path$tile", sub {
		956	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		957
		958	return if $mode ne "spatial";
		959
		960	$x += $MAP->ox;
		961	$y += $MAP->oy;
		962
		963	$self->load_map ($hash, $x, $y)
		964	unless $self->{neigh_map}{$hash}[5]++;#d#
		965
		966	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		967
		968	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		969	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		970	});
597	});	971	}
598	}	972	}
599	}	973	}
600		974
601	sub conn::map_change {	975	sub conn::map_change {
602	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	976	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
603		977
604	$self->flush_map;	978	$self->flush_map;
605		979
606	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	980	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
607		981
608	warn "$ox $oy map_info<$flags, $x, $y, $w, $h, $hash>\n";#d#
609
610	my $mapmapw = 250;	982	my $mapmapw = 250;
611	my $mapmaph = 250;	983	my $mapmaph = 250;
		984
		985	$self->{neigh_rect} = [
		986	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		987	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		988	];
612		989
		990	delete $self->{neigh_grid};
613	$self->flood_fill ("", $hash, $flags,	991	$self->flood_fill (0, 0, "", $hash, $flags);
614	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
615	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
616		992
617	$x += $ox;	993	$x += $ox;
618	$y += $oy;	994	$y += $oy;
619		995
620	$self->{map_info} = [$hash, $x, $y, $w, $h];	996	$self->{map_info} = [$hash, $x, $y, $w, $h];
		997
		998	my $map = $self->{map_info}[0];
		999	$map =~ s/^.*?\/([^\/]+)$/\1/;
		1000	$STATWIDS->{map}->set_text ("Map: " . $map);
621		1001
622	$self->load_map ($hash, $x, $y);	1002	$self->load_map ($hash, $x, $y);
623	}	1003	}
624		1004
625	sub conn::face_find {	1005	sub conn::face_find {
…		…
677		1057
678	$tex	1058	$tex
679	};	1059	};
680	}	1060	}
681		1061
		1062	sub conn::sound_play {
		1063	my ($self, $x, $y, $soundnum, $type) = @_;
		1064
		1065	$SDL_MIXER
		1066	or return;
		1067
		1068	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
		1069	or return;
		1070
		1071	$chunk->play;
		1072	# warn "sound $x,$y,$soundnum,$type\n";#d#
		1073	}
		1074
682	sub conn::query {	1075	sub conn::query {
683	my ($self, $flags, $prompt) = @_;	1076	my ($self, $flags, $prompt) = @_;
684		1077
685	#TODO	1078	#TODO, display dialog with relevant information
686	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1079	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
687	}	1080	}
688		1081
689	sub conn::drawinfo {	1082	sub conn::drawinfo {
690	my ($self, $color, $text) = @_;	1083	my ($self, $color, $text) = @_;
…		…
706	);	1099	);
707		1100
708	$LOGVIEW->add_paragraph ($color[$color], $text);	1101	$LOGVIEW->add_paragraph ($color[$color], $text);
709	}	1102	}
710		1103
		1104	sub conn::spell_add {
		1105	my ($self, $spell) = @_;
		1106
		1107	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
		1108	});
		1109	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
		1110	});
		1111	}
		1112
		1113	sub conn::spell_delete {
		1114	my ($self, $spell) = @_;
		1115	}
		1116
		1117	sub conn::addme_success {
		1118	my ($self) = @_;
		1119
		1120	for my $skill (values %{$self->{skill_info}}) {
		1121	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {
		1122	});
		1123	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
		1124	});
		1125	}
		1126	}
		1127
711	%SDL_CB = (	1128	%SDL_CB = (
712	SDL_QUIT() => sub {	1129	CFClient::SDL_QUIT => sub {
713	Event::unloop -1;	1130	Event::unloop -1;
714	},	1131	},
715	SDL_VIDEORESIZE() => sub {	1132	CFClient::SDL_VIDEORESIZE => sub {
716	},	1133	},
717	SDL_VIDEOEXPOSE() => sub {	1134	CFClient::SDL_VIDEOEXPOSE => \&refresh,
718	refresh;
719	},
720	SDL_KEYDOWN() => sub {
721	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
722	# alt-enter
723	destroy_screen;
724	$CFG->{fullscreen} = !$CFG->{fullscreen};
725	init_screen;
726	} else {
727	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
728	}
729	},
730	SDL_KEYUP() => sub {
731	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
732	},
733	SDL_MOUSEMOTION() => sub {
734	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
735	},
736	SDL_MOUSEBUTTONDOWN() => sub {
737	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
738	},
739	SDL_MOUSEBUTTONUP() => sub {
740	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
741	},
742	SDL_ACTIVEEVENT() => sub {	1135	CFClient::SDL_ACTIVEEVENT => sub {
743	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	1136	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
744	},	1137	},
		1138	CFClient::SDL_KEYDOWN => sub {
		1139	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
		1140	# alt-enter
		1141	video_shutdown;
		1142	$CFG->{fullscreen} = !$CFG->{fullscreen};
		1143	video_init;
		1144	} else {
		1145	CFClient::UI::feed_sdl_key_down_event ($_[0]);
		1146	}
		1147	},
		1148	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
		1149	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
		1150	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
		1151	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
		1152	CFClient::SDL_USEREVENT => \&audio_music_finished,
745	);	1153	);
746		1154
747	#############################################################################	1155	#############################################################################
		1156
		1157	$SIG{INT} = $SIG{TERM} = sub { exit };
748		1158
749	$TILECACHE = CFClient::db_table "tilecache";	1159	$TILECACHE = CFClient::db_table "tilecache";
750	$FACEMAP = CFClient::db_table "facemap";	1160	$FACEMAP = CFClient::db_table "facemap";
751		1161
752	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";	1162	CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
…		…
758	fullscreen => 0,	1168	fullscreen => 0,
759	fast => 0,	1169	fast => 0,
760	fow_enable => 1,	1170	fow_enable => 1,
761	fow_intensity => 0.45,	1171	fow_intensity => 0.45,
762	fow_smooth => 0,	1172	fow_smooth => 0,
		1173	gui_fontsize => 1,
763	log_fontsize => 14,	1174	log_fontsize => 1,
		1175	gauge_fontsize => 1,
		1176	gauge_size => 0.35,
		1177	stat_fontsize => 1,
764	mapsize => 100,	1178	mapsize => 100,
765	host => "crossfire.schmorp.de",	1179	host => "crossfire.schmorp.de",
766	say_command => 'say',	1180	say_command => 'say',
		1181	audio_enable => 1,
		1182	bgm_enable => 1,
		1183	bgm_volume => 0.25,
767	);	1184	);
768		1185
769	while (my ($k, $v) = each %DEF_CFG) {	1186	while (my ($k, $v) = each %DEF_CFG) {
770	$CFG->{$k} = $v unless exists $CFG->{$k};	1187	$CFG->{$k} = $v unless exists $CFG->{$k};
771	}	1188	}
772		1189
773	sdl_init;	1190	sdl_init;
774		1191
775	@SDL_MODES = reverse	1192	@SDL_MODES = reverse
776	grep $_->[0] >= 640 && $_->[1] >= 480,	1193	grep $_->[0] >= 640 && $_->[1] >= 480,
777	map [SDL::RectW ($_), SDL::RectH ($_)],	1194	CFClient::SDL_ListModes;
778	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
779		1195
780	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1196	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
781		1197
782	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1198	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
783		1199
…		…
786		1202
787	CFClient::add_font $_ for @fonts;	1203	CFClient::add_font $_ for @fonts;
788	CFClient::set_font $fonts[0];	1204	CFClient::set_font $fonts[0];
789	}	1205	}
790		1206
791	init_screen;	1207	video_init;
		1208	audio_init;
792		1209
793	Event::loop;	1210	Event::loop;
794		1211
		1212	END { CFClient::SDL_Quit }
795		1213
		1214

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.124 by root, Mon Apr 17 19:50:23 2006 UTC vs. Revision 1.163 by root, Sun Apr 23 00:57:40 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.124 by root, Mon Apr 17 19:50:23 2006 UTC vs.
Revision 1.163 by root, Sun Apr 23 00:57:40 2006 UTC