[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.168 by root, Sun Apr 23 21:47:32 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
…		…
41	our @SDL_MODES;	36	our @SDL_MODES;
42	our $WIDTH;	37	our $WIDTH;
43	our $HEIGHT;	38	our $HEIGHT;
44	our $FULLSCREEN;	39	our $FULLSCREEN;
45	our $FONTSIZE;	40	our $FONTSIZE;
		41
		42	our $FONT_PROP;
		43	our $FONT_FIXED;
46		44
47	our $MAP;	45	our $MAP;
48	our $MAPWIDGET;	46	our $MAPWIDGET;
49	our $BUTTONBAR;	47	our $BUTTONBAR;
50	our $LOGVIEW;	48	our $LOGVIEW;
51	our $CONSOLE;	49	our $CONSOLE;
52	our $METASERVER;	50	our $METASERVER;
53		51
54	our $GAUGES;	52	our $GAUGES;
		53	our $STATWIDS;
55		54
56	our $SDL_ACTIVE;	55	our $SDL_ACTIVE;
57	our $SDL_EV;
58	our %SDL_CB;	56	our %SDL_CB;
		57
		58	our $SDL_MIXER;
		59	our @SOUNDS; # event => file mapping
		60	our %AUDIO_CHUNKS; # audio files
59		61
60	our $ALT_ENTER_MESSAGE;	62	our $ALT_ENTER_MESSAGE;
61	our $STATUS_LINE;	63	our $STATUS_LINE;
62	our $DEBUG_STATUS;	64	our $DEBUG_STATUS;
63		65
…		…
100	undef $CONN;	102	undef $CONN;
101	}	103	}
102		104
103	sub client_setup {	105	sub client_setup {
104	my $dialog = new CFClient::UI::FancyFrame	106	my $dialog = new CFClient::UI::FancyFrame
		107	title => "Client Setup",
105	child => (my $vbox = new CFClient::UI::VBox);	108	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]);	109	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
108		110
109	$table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");	111	$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);	112	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
111		113
112	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);	114	$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);	115	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
114		116
115	$mode_slider->connect (changed => sub {	117	$mode_slider->connect (changed => sub {
116	my ($self, $value) = @_;	118	my ($self, $value) = @_;
117		119
118	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	120	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
119	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});	121	$mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
120	});	122	});
121	$mode_slider->emit (changed => $mode_slider->{range}[0]);	123	$mode_slider->emit (changed => $mode_slider->{range}[0]);
122		124
		125	my $row = 1;
		126
123	$table->add (0, 1, new CFClient::UI::Label align => 1, text => "Fullscreen");	127	$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 {	128	$table->add (1, $row++, new CFClient::UI::CheckBox
		129	state => $CFG->{fullscreen},
		130	tooltip => "Bring the client into fullscreen mode",
		131	connect_changed => sub {
125	my ($self, $value) = @_;	132	my ($self, $value) = @_;
126	$CFG->{fullscreen} = $value;	133	$CFG->{fullscreen} = $value;
		134	}
127	});	135	);
128		136
129	$table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");	137	$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 {	138	$table->add (1, $row++, new CFClient::UI::CheckBox
		139	state => $CFG->{fast},
		140	tooltip => "Lower the visual quality considerably to speed up rendering.",
		141	connect_changed => sub {
131	my ($self, $value) = @_;	142	my ($self, $value) = @_;
132	$CFG->{fast} = $value;	143	$CFG->{fast} = $value;
		144	}
133	});	145	);
134		146
135	$table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");	147	$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 {	148	$table->add (1, $row++, new CFClient::UI::CheckBox
		149	state => $CFG->{fow_enable},
		150	tooltip => "Fog-of-War marks areas that cannot be seen by the player",
		151	connect_changed => sub {
137	my ($self, $value) = @_;	152	my ($self, $value) = @_;
138	$CFG->{fow_enable} = $value;	153	$CFG->{fow_enable} = $value;
		154	}
139	});	155	);
140		156
141	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");	157	$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 {	158	$table->add (1, $row++, new CFClient::UI::Slider
		159	range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
		160	tooltip => "The higher the intensity, the lighter the Fog-of-War color",
		161	connect_changed => sub {
143	my ($self, $value) = @_;	162	my ($self, $value) = @_;
144	$CFG->{fow_intensity} = $value;	163	$CFG->{fow_intensity} = $value;
		164	}
145	});	165	);
146		166
147	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");	167	$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 {	168	$table->add (1, $row++, new CFClient::UI::CheckBox
		169	state => $CFG->{fow_smooth},
		170	tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
		171	connect_changed => sub {
149	my ($self, $value) = @_;	172	my ($self, $value) = @_;
150	$CFG->{fow_smooth} = $value;	173	$CFG->{fow_smooth} = $value;
151	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	174	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
		175	}
		176	);
		177
		178	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
		179	$table->add (1, $row++, new CFClient::UI::Slider
		180	range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
		181	tooltip => "The font size used by most GUI elements",
		182	connect_changed => sub {
		183	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
		184	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		185	}
		186	);
		187
		188	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
		189	$table->add (1, $row++, new CFClient::UI::Slider
		190	range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
		191	tooltip => "The font size used by the server log window only",
		192	connect_changed => sub {
		193	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
		194	}
		195	);
		196
		197	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
		198
		199	$table->add (1, $row++, new CFClient::UI::Slider
		200	range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
		201	tooltip => "The font size used by the statistics window only",
		202	connect_changed => sub {
		203	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
		204	&set_stats_window_fontsize;
		205	}
		206	);
		207
		208	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
		209	$table->add (1, $row++, new CFClient::UI::Slider
		210	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
		211	tooltip => "Adjust the size of the stats gauges at the bottom right",
		212	connect_changed => sub {
		213	$CFG->{gauge_size} = $_[1];
		214	my $h = int $HEIGHT * $CFG->{gauge_size};
		215	$GAUGES->{win}->set_size ($WIDTH, $h);
		216	$GAUGES->{win}->move (0, $HEIGHT - $h);
		217	}
		218	);
		219
		220	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
		221	$table->add (1, $row++, new CFClient::UI::Slider
		222	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
		223	tooltip => "Adjusts the fontsize of the gauges at the bottom right",
		224	connect_changed => sub {
		225	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
		226	&set_gauge_window_fontsize;
		227	#$GAUGES->{win}->check_size;
		228	#$GAUGES->{win}->update;
		229	}
		230	);
		231
		232	$table->add (1, $row++, new CFClient::UI::Button
		233	expand => 1, align => 0, text => "Apply",
		234	tooltip => "Apply the video settings",
		235	connect_activate => sub {
		236	video_shutdown ();
		237	video_init ();
		238	}
		239	);
		240
		241	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
		242	$table->add (1, $row++, new CFClient::UI::CheckBox
		243	state => $CFG->{audio_enable},
		244	tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
		245	connect_changed => sub {
		246	$CFG->{audio_enable} = $_[1];
		247	}
		248	);
		249	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
		250	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
		251	# $CFG->{effects_volume} = $_[1];
152	});	252	# });
153
154	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Log Fontsize");	253	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
155	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {	254	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
156	my ($self, $value) = @_;	255	$hbox->add (new CFClient::UI::CheckBox
157	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	256	expand => 1, state => $CFG->{bgm_enable},
		257	tooltip => "Enable background music playing",
		258	connect_changed => sub {
		259	$CFG->{bgm_enable} = $_[1];
		260	}
158	});	261	);
159		262	$hbox->add (new CFClient::UI::Slider
160	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	263	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
161	destroy_screen ();	264	tooltip => "The volume of the background music",
162	init_screen ();	265	connect_changed => sub {
		266	$CFG->{bgm_volume} = $_[1];
		267	CFClient::MixMusic::volume $_[1] * 128;
		268	}
163	});	269	);
		270
		271	$table->add (1, $row++, new CFClient::UI::Button
		272	expand => 1, align => 0, text => "Apply",
		273	tooltip => "Apply the audio settings",
		274	connect_activate => sub {
		275	audio_shutdown ();
		276	audio_init ();
		277	}
		278	);
164		279
165	$dialog	280	$dialog
		281	}
		282
		283	sub set_stats_window_fontsize {
		284	for (values %{$STATWIDS}) {
		285	$_->set_fontsize ($::CFG->{stat_fontsize});
		286	}
		287	}
		288
		289	sub set_gauge_window_fontsize {
		290	for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
		291	$_->set_fontsize ($::CFG->{gauge_fontsize});
		292	}
		293	}
		294
		295	sub make_gauge_window {
		296	my $gh = int ($HEIGHT * $CFG->{gauge_size});
		297	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
		298
		299	my $win = new CFClient::UI::Frame (
		300	y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
		301	);
		302	$win->add (my $vb = new CFClient::UI::VBox);
		303
		304	$vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
		305
		306
		307	$hbg->add (new CFClient::UI::Empty expand => 1);
		308	$hbg->add (my $hb = new CFClient::UI::HBox);
		309	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
		310	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
		311	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
		312	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
		313
		314	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
		315	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
		316
		317	$GAUGES = {
		318	exp => $exp, win => $win, range => $rng,
		319	food => $fg, mana => $mg, hp => $hg, grace => $gg
		320	};
		321	$win
		322	}
		323
		324	sub make_stats_window {
		325	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		326
		327	$tgw->add (my $vb = new CFClient::UI::VBox);
		328	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
		329	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
		330
		331	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		332
		333	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		334
		335	$tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		336	$tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		337	$tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		338	$tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		339	$tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		340	$tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		341	$tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		342
		343	$tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Str");
		344	$tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dex");
		345	$tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Con");
		346	$tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Int");
		347	$tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wis");
		348	$tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Pow");
		349	$tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Cha");
		350
		351	$tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
		352	$tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
		353	$tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
		354	$tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
		355	$tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
		356	$tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
		357
		358	$tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
		359	$tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
		360	$tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
		361	$tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
		362	$tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
		363	$tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
		364
		365	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
		366
		367	my $row = 0;
		368	my $col = 0;
		369
		370	my %resist_names = (
		371	slow => "Slow",
		372	holyw => "Holy Word",
		373	conf => "Confusion",
		374	fire => "Fire",
		375	depl => "Depletion",
		376	magic => "Magic",
		377	drain => "Draining",
		378	acid => "Acid",
		379	pois => "Poison",
		380	para => "Paralysation",
		381	deat => "Death",
		382	phys => "Physical",
		383	blind => "Blind",
		384	fear => "Fear",
		385	tund => "Turn undead",
		386	elec => "Electricity",
		387	cold => "Cold",
		388	ghit => "Ghost hit",
		389	);
		390	for (qw/slow holyw conf fire depl magic
		391	drain acid pois para deat phys
		392	blind fear tund elec cold ghit/)
		393	{
		394	$tbl2->add ($col, $row,
		395	$STATWIDS->{"res_$_"} =
		396	new CFClient::UI::Label
		397	template => "-100%",
		398	align => +1,
		399	valign => 0,
		400	tooltip => $resist_names{$_}
		401	);
		402	$tbl2->add ($col + 1, $row, new CFClient::UI::Image
		403	can_hover => 1,
		404	can_events => 1,
		405	image => "ui/resist/resist_$_.png",
		406	tooltip => $resist_names{$_}
		407	);
		408
		409	$row++;
		410	if ($row % 6 == 0) {
		411	$col += 2;
		412	$row = 0;
		413	}
		414	}
		415
		416	&set_stats_window_fontsize;
		417	update_stats_window ({});
		418
		419	$tgw
		420	}
		421
		422	sub update_stats_window {
		423	my ($stats) = @_;
		424
		425	# i love text protocols!!!
		426	my $hp = $stats->{1} * 1;
		427	my $hp_m = $stats->{2} * 1;
		428	my $sp = $stats->{3} * 1;
		429	my $sp_m = $stats->{4} * 1;
		430	my $fo = $stats->{18} * 1;
		431	my $fo_m = 999;
		432	my $gr = $stats->{23} * 1;
		433	my $gr_m = $stats->{24} * 1;
		434
		435	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		436	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		437	$GAUGES->{food} ->set_value ($fo, $fo_m);
		438	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		439	$GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} \|\| $stats->{28}) * 1
		440	." LVL: " . $stats->{12} * 1);
		441	my $rng = $stats->{20};
		442	$rng =~ s/^Range: //; # thank you so much dear server
		443	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		444	my $title = $stats->{21};
		445	$title =~ s/^Player: //;
		446	$STATWIDS->{title} ->set_text ("Title: " . $title);
		447
		448	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		449	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		450	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		451	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		452	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		453	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		454	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		455	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		456	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		457	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		458	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		459	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
		460	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
		461
		462	my %tbl = (
		463	phys => 100,
		464	magic => 101,
		465	fire => 102,
		466	elec => 103,
		467	cold => 104,
		468	conf => 105,
		469	acid => 106,
		470	drain => 107,
		471	ghit => 108,
		472	pois => 109,
		473	slow => 110,
		474	para => 111,
		475	tund => 112,
		476	fear => 113,
		477	depl => 113,
		478	deat => 115,
		479	holyw => 116,
		480	blind => 117
		481	);
		482
		483	for (keys %tbl) {
		484	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		485	}
		486
166	}	487	}
167		488
168	sub metaserver_dialog {	489	sub metaserver_dialog {
169	my $dialog = new CFClient::UI::FancyFrame	490	my $dialog = new CFClient::UI::FancyFrame
		491	title => "Metaserver",
170	child => (my $vbox = new CFClient::UI::VBox);	492	child => (my $vbox = new CFClient::UI::VBox);
171		493
172	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	494	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
173		495
174	$dialog	496	$dialog
…		…
231	$HOST->set_text ($CFG->{host} = $host);	553	$HOST->set_text ($CFG->{host} = $host);
232	}),	554	}),
233	(new CFClient::UI::Empty expand => 1),	555	(new CFClient::UI::Empty expand => 1),
234	]);	556	]);
235		557
236	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)	558	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
237	for 0 .. $#$m;	559	for 0 .. $#$m;
238	}	560	}
239	}	561	}
240	});	562	});
241	}	563	}
242		564
243	sub server_setup {	565	sub server_setup {
244	my $dialog = new CFClient::UI::FancyFrame	566	my $dialog = new CFClient::UI::FancyFrame
		567	title => "Server Setup",
245	child => (my $vbox = new CFClient::UI::VBox);	568	child => (my $vbox = new CFClient::UI::VBox);
246		569
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]);	570	$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");	571	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
250		572
251	{	573	{
252	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	574	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
253		575
254	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	576	$vbox->add (
		577	my $HOST = new CFClient::UI::Entry
		578	expand => 1,
		579	text => $CFG->{host},
		580	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
		581	connect_changed => sub {
		582	my ($self, $value) = @_;
		583	$CFG->{host} = $value;
		584	}
		585	);
		586
		587	$METASERVER = metaserver_dialog;
		588
		589	$vbox->add (new CFClient::UI::Flopper
		590	expand => 1,
		591	text => "Metaserver",
		592	other => $METASERVER,
		593	tooltip => "Show a list of avaible crossfire servers",
		594	connect_open => sub {
		595	update_metaserver $HOST;
		596	}
		597	);
		598	}
		599
		600	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
		601	$table->add (1, 4, new CFClient::UI::Entry
		602	text => $CFG->{user},
		603	tooltip => "The name of your character on the server",
		604	connect_changed => sub {
255	my ($self, $value) = @_;	605	my ($self, $value) = @_;
256	$CFG->{host} = $value;	606	$CFG->{user} = $value;
257	});	607	}
		608	);
258		609
259	$METASERVER = metaserver_dialog;
260
261	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {
262	update_metaserver $HOST;
263	});
264	}
265
266	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	610	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
267	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	611	$table->add (1, 5, new CFClient::UI::Entry
		612	text => $CFG->{password},
		613	hidden => 1,
		614	tooltip => "The password for your character",
		615	connect_changed => sub {
268	my ($self, $value) = @_;	616	my ($self, $value) = @_;
269	$CFG->{user} = $value;
270	});
271
272	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
273	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
274	my ($self, $value) = @_;
275	$CFG->{password} = $value;	617	$CFG->{password} = $value;
		618	}
276	});	619	);
277		620
278	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	621	$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 {	622	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry
		623	text => $CFG->{say_command},
		624	tooltip => "This is the command that will be used if you write a line in the message window entry. "
		625	."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		626	."But you could also set it to 'tell <playername>' to only chat with that user.",
		627	connect_changed => sub {
280	my ($self, $value) = @_;	628	my ($self, $value) = @_;
281	$CFG->{say_command} = $value;	629	$CFG->{say_command} = $value;
		630	}
282	});	631	);
283		632
284	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");	633	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
285	$table->add (1, 7, new CFClient::UI::Slider	634	$table->add (1, 7, new CFClient::UI::Slider
286	req_w => 100,	635	req_w => 100,
287	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	636	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		637	tooltip => "This is the size of the portion of the map update the server sends you. "
		638	."If you set this to a high value you will be able to see further for example.",
288	connect_changed => sub {	639	connect_changed => sub {
289	my ($self, $value) = @_;	640	my ($self, $value) = @_;
290		641
291	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	642	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
292	},	643	},
…		…
299	$dialog	650	$dialog
300	}	651	}
301		652
302	sub message_window {	653	sub message_window {
303	my $window = new CFClient::UI::FancyFrame	654	my $window = new CFClient::UI::FancyFrame
		655	title => "Messages",
304	border_bg => [1, 1, 1, 0.5],	656	border_bg => [1, 1, 1, 0.5],
305	bg => [0.3, 0.3, 0.3, 0.8],	657	bg => [0.3, 0.3, 0.3, 0.8],
306	user_w => int $::WIDTH / 3,	658	user_w => int $::WIDTH / 3,
307	user_h => int $::HEIGHT / 5,	659	user_h => int $::HEIGHT / 5,
308	child => (my $vbox = new CFClient::UI::VBox);	660	child => (my $vbox = new CFClient::UI::VBox);
309		661
310	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	662	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
311	expand => 1,	663	expand => 1,
		664	font => $FONT_FIXED,
312	fontsize => $::CFG->{log_fontsize},	665	fontsize => $::CFG->{log_fontsize},
313	);	666	);
314		667
315	$vbox->add (my $input = new CFClient::UI::Entry	668	$vbox->add (my $input = new CFClient::UI::Entry
316	connect_focus_in => sub {	669	connect_focus_in => sub {
…		…
350		703
351	$window	704	$window
352	}	705	}
353		706
354	sub sdl_init {	707	sub sdl_init {
355	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	708	CFClient::SDL_Init
356	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
357	and die "SDL::Init failed!\n";	709	and die "SDL::Init failed!\n";
358	}	710	}
359		711
360	sub init_screen {	712	sub video_init {
361	sdl_init;	713	sdl_init;
362		714
363	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	715	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
364	$FULLSCREEN = $CFG->{fullscreen};	716	$FULLSCREEN = $CFG->{fullscreen};
365	$FAST = $CFG->{fast};	717	$FAST = $CFG->{fast};
366		718
367	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	719	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";	720	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		721
391	$SDL_ACTIVE = 1;	722	$SDL_ACTIVE = 1;
392		723
393	$LAST_REFRESH = time - 0.01;	724	$LAST_REFRESH = time - 0.01;
394		725
395	CFClient::gl_init;	726	CFClient::gl_init;
396		727
397	$FONTSIZE = int $HEIGHT / 40;	728	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
398		729
399	#############################################################################	730	#############################################################################
400		731
401	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	732	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
402	$CFClient::UI::ROOT->add ($DEBUG_STATUS);	733	$DEBUG_STATUS->show;
403		734
404	$STATUS_LINE = new CFClient::UI::Label	735	$STATUS_LINE = new CFClient::UI::Label
405	padding => 0,	736	padding => 0,
406	y => $HEIGHT * 44 / 45 - $FONTSIZE;	737	y => $HEIGHT - $FONTSIZE * 1.8;
407	$CFClient::UI::ROOT->add ($STATUS_LINE);	738	$STATUS_LINE->show;
408		739
409	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	740	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
410	padding => 0,	741	padding => 0,
411	y => $HEIGHT * 44 / 45,
412	fontsize => $HEIGHT / 45,	742	fontsize => 0.8,
413	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	743	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
414	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);	744	$ALT_ENTER_MESSAGE->show;
		745	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
415		746
416	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);	747	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
417	$MAPWIDGET->focus_in;	748	$MAPWIDGET->focus_in;
418	$MAPWIDGET->connect (activate_console => sub {	749	$MAPWIDGET->connect (activate_console => sub {
419	my ($mapwidget, $preset) = @_;	750	my ($mapwidget, $preset) = @_;
420		751
421	if ($CONSOLE) {	752	if ($CONSOLE) {
…		…
431	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);	762	$CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox);
432		763
433	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);	764	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
434	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);	765	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
435	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);	766	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
		767
		768	$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
		769	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
436		770
437	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	771	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
438	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	772	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
439	status "Configuration Saved";	773	status "Configuration Saved";
440	});	774	});
441		775
442	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	776	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
443
444	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
445	$tgw->add (my $hbox = new CFClient::UI::HBox ());
446
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	}	777	}
455		778
456	sub destroy_screen {	779	sub video_shutdown {
457	$CFClient::UI::ROOT->{children} = [];	780	$CFClient::UI::ROOT->{children} = [];
458	undef $SDL_ACTIVE;	781	undef $SDL_ACTIVE;
		782	}
		783
		784	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
		785	my $bgmusic;#TODO#hack#d#
		786
		787	sub audio_music_finished {
		788	return unless $CFG->{bgm_enable};
		789
		790	# TODO: hack, do play loop and mood music
		791	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		792	$bgmusic->play (0);
		793
		794	push @bgmusic, shift @bgmusic;
		795	}
		796
		797	sub audio_init {
		798	if ($CFG->{audio_enable}) {
		799	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
		800	$SDL_MIXER = !CFClient::Mix_OpenAudio;
		801	CFClient::Mix_AllocateChannels 8;
		802	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
		803
		804	audio_music_finished;
		805
		806	while (<$fh>) {
		807	next if /^\s*#/;
		808	next if /^\s*$/;
		809
		810	my ($file, $volume, $event) = split /\s+/, $_, 3;
		811
		812	push @SOUNDS, "$volume,$file";
		813
		814	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
		815	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
		816	$chunk->volume ($volume * 128 / 100);
		817	$chunk
		818	};
		819	}
		820	} else {
		821	status "unable to open sound config: $!";
		822	}
		823	}
		824	}
		825
		826	sub audio_shutdown {
		827	CFClient::Mix_CloseAudio if $SDL_MIXER;
459	undef $SDL_EV;	828	undef $SDL_MIXER;
460	SDL::Quit;	829	@SOUNDS = ();
		830	%AUDIO_CHUNKS = ();
461	}	831	}
462		832
463	my %animate_object;	833	my %animate_object;
464	my $animate_timer;	834	my $animate_timer;
465		835
…		…
475	$want_refresh = 0;	845	$want_refresh = 0;
476	$can_refresh = 0;	846	$can_refresh = 0;
477		847
478	$CFClient::UI::ROOT->draw;	848	$CFClient::UI::ROOT->draw;
479		849
480	SDL::GLSwapBuffers;	850	CFClient::SDL_GL_SwapBuffers;
481		851
482	$LAST_REFRESH = $NOW;	852	$LAST_REFRESH = $NOW;
483	}	853	}
484		854
485	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	855	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
486	$NOW = time;	856	$NOW = time;
487		857
488	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	858	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
489	while $SDL_EV->poll;	859	for CFClient::SDL_PollEvent;
490		860
491	if (%animate_object) {	861	if (%animate_object) {
492	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	862	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
493	$want_refresh++;	863	$want_refresh++;
494	}	864	}
…		…
517	@conn::ISA = Crossfire::Protocol::;	887	@conn::ISA = Crossfire::Protocol::;
518		888
519	sub conn::stats_update {	889	sub conn::stats_update {
520	my ($self, $stats) = @_;	890	my ($self, $stats) = @_;
521		891
522	# i love text protocols!!!	892	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	}	893	}
539		894
540	sub conn::user_send {	895	sub conn::user_send {
541	my ($self, $command) = @_;	896	my ($self, $command) = @_;
542		897
…		…
567		922
568	my ($hash, $x, $y, $w, $h) = @$map_info;	923	my ($hash, $x, $y, $w, $h) = @$map_info;
569		924
570	my $data = $MAP->get_rect ($x, $y, $w, $h);	925	my $data = $MAP->get_rect ($x, $y, $w, $h);
571	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	926	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
572
573	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	927	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
574
575	}	928	}
576		929
577	sub conn::map_clear {	930	sub conn::map_clear {
578	my ($self) = @_;	931	my ($self) = @_;
579		932
580	$self->flush_map;	933	$self->flush_map;
581	delete $self->{neigh};	934	delete $self->{neigh_map};
582		935
583	$MAP->clear;	936	$MAP->clear;
584	}	937	}
585		938
586		939
587	sub conn::load_map($$$) {	940	sub conn::load_map($$$) {
588	my ($self, $hash, $x, $y) = @_;	941	my ($self, $hash, $x, $y) = @_;
589		942
590	if (defined (my $data = $MAPCACHE->get ($hash))) {	943	if (defined (my $data = $MAPCACHE->get ($hash))) {
591	$data = Compress::LZF::decompress $data;	944	$data = Compress::LZF::decompress $data;
592	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	945	#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)) {	946	for my $id ($MAP->set_rect ($x, $y, $data)) {
594	my $data = $TILECACHE->get ($id)	947	my $data = $TILECACHE->get ($id)
595	or next;	948	or next;
596		949
597	$self->set_texture ($id => $data);	950	$self->set_texture ($id => $data);
598	}	951	}
599	}	952	}
600	}	953	}
601		954
		955	# this method does a "flood fill" into every tile direction
		956	# it assumes that tiles are arranged in a rectangular grid,
		957	# i.e. a map is the same as the left of the right map etc.
		958	# failure to comply are harmless and result in display errors
		959	# at worst.
602	sub conn::flood_fill {	960	sub conn::flood_fill {
603	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	961	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
604		962
605	# the server does not allow map paths > 6	963	# the server does not allow map paths > 6
606	return if 6 <= length $path;	964	return if 6 <= length $path;
607		965
608	for my $tile (1..4) {	966	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
609	next if $self->{neigh}{$hash}[$tile];	967
		968	for (
		969	[1, 0, -1],
		970	[2, 1, 0],
		971	[3, 0, 1],
		972	[4, -1, 0],
		973	) {
		974	my ($tile, $dx, $dy) = @$_;
		975
		976	my $gx = $gx + $dx;
		977	my $gy = $gy + $dy;
		978
610	next unless $flags & (1 << ($tile - 1));	979	next unless $flags & (1 << ($tile - 1));
		980	next if $self->{neigh_grid}{$gx, $gy}++;
611		981
612	my $neigh = $self->{neigh}{$hash} \|\|= [];	982	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
613		983	if (my $info = $neigh->[$tile]) {
614	$self->send_mapinfo ("spatial $path$tile", sub {
615	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	984	my ($flags, $x, $y, $w, $h, $hash) = @$info;
616		985
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)	986	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
629	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	987	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		988
		989	} else {
		990	$self->send_mapinfo ("spatial $path$tile", sub {
		991	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		992
		993	return if $mode ne "spatial";
		994
		995	$x += $MAP->ox;
		996	$y += $MAP->oy;
		997
		998	$self->load_map ($hash, $x, $y)
		999	unless $self->{neigh_map}{$hash}[5]++;#d#
		1000
		1001	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		1002
		1003	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		1004	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		1005	});
630	});	1006	}
631	}	1007	}
632	}	1008	}
633		1009
634	sub conn::map_change {	1010	sub conn::map_change {
635	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	1011	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
638		1014
639	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	1015	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
640		1016
641	my $mapmapw = 250;	1017	my $mapmapw = 250;
642	my $mapmaph = 250;	1018	my $mapmaph = 250;
		1019
		1020	$self->{neigh_rect} = [
		1021	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		1022	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		1023	];
643		1024
		1025	delete $self->{neigh_grid};
644	$self->flood_fill ("", $hash, $flags,	1026	$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		1027
648	$x += $ox;	1028	$x += $ox;
649	$y += $oy;	1029	$y += $oy;
650		1030
651	$self->{map_info} = [$hash, $x, $y, $w, $h];	1031	$self->{map_info} = [$hash, $x, $y, $w, $h];
		1032
		1033	my $map = $self->{map_info}[0];
		1034	$map =~ s/^.*?\/([^\/]+)$/\1/;
		1035	$STATWIDS->{map}->set_text ("Map: " . $map);
652		1036
653	$self->load_map ($hash, $x, $y);	1037	$self->load_map ($hash, $x, $y);
654	}	1038	}
655		1039
656	sub conn::face_find {	1040	sub conn::face_find {
…		…
708		1092
709	$tex	1093	$tex
710	};	1094	};
711	}	1095	}
712		1096
		1097	sub conn::sound_play {
		1098	my ($self, $x, $y, $soundnum, $type) = @_;
		1099
		1100	$SDL_MIXER
		1101	or return;
		1102
		1103	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
		1104	or return;
		1105
		1106	$chunk->play;
		1107	# warn "sound $x,$y,$soundnum,$type\n";#d#
		1108	}
		1109
713	sub conn::query {	1110	sub conn::query {
714	my ($self, $flags, $prompt) = @_;	1111	my ($self, $flags, $prompt) = @_;
715		1112
716	#TODO	1113	#TODO, display dialog with relevant information
717	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	1114	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
718	}	1115	}
719		1116
720	sub conn::drawinfo {	1117	sub conn::drawinfo {
721	my ($self, $color, $text) = @_;	1118	my ($self, $color, $text) = @_;
…		…
737	);	1134	);
738		1135
739	$LOGVIEW->add_paragraph ($color[$color], $text);	1136	$LOGVIEW->add_paragraph ($color[$color], $text);
740	}	1137	}
741		1138
		1139	sub conn::spell_add {
		1140	my ($self, $spell) = @_;
		1141
		1142	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
		1143	});
		1144	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
		1145	});
		1146	}
		1147
		1148	sub conn::spell_delete {
		1149	my ($self, $spell) = @_;
		1150	}
		1151
		1152	sub conn::addme_success {
		1153	my ($self) = @_;
		1154
		1155	for my $skill (values %{$self->{skill_info}}) {
		1156	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {
		1157	});
		1158	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
		1159	});
		1160	}
		1161	}
		1162
742	%SDL_CB = (	1163	%SDL_CB = (
743	SDL_QUIT() => sub {	1164	CFClient::SDL_QUIT => sub {
744	Event::unloop -1;	1165	Event::unloop -1;
745	},	1166	},
746	SDL_VIDEORESIZE() => sub {	1167	CFClient::SDL_VIDEORESIZE => sub {
747	},	1168	},
748	SDL_VIDEOEXPOSE() => sub {	1169	CFClient::SDL_VIDEOEXPOSE => \&refresh,
749	refresh;
750	},
751	SDL_KEYDOWN() => sub {
752	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
753	# alt-enter
754	destroy_screen;
755	$CFG->{fullscreen} = !$CFG->{fullscreen};
756	init_screen;
757	} else {
758	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
759	}
760	},
761	SDL_KEYUP() => sub {
762	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
763	},
764	SDL_MOUSEMOTION() => sub {
765	CFClient::UI::feed_sdl_motion_event ($SDL_EV);
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 {	1170	CFClient::SDL_ACTIVEEVENT => sub {
774	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#	1171	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
775	},	1172	},
		1173	CFClient::SDL_KEYDOWN => sub {
		1174	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
		1175	# alt-enter
		1176	video_shutdown;
		1177	$CFG->{fullscreen} = !$CFG->{fullscreen};
		1178	video_init;
		1179	} else {
		1180	CFClient::UI::feed_sdl_key_down_event ($_[0]);
		1181	}
		1182	},
		1183	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
		1184	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
		1185	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
		1186	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
		1187	CFClient::SDL_USEREVENT => \&audio_music_finished,
776	);	1188	);
777		1189
778	#############################################################################	1190	#############################################################################
779		1191
780	$SIG{INT} = $SIG{TERM} = sub { exit };	1192	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
791	fullscreen => 0,	1203	fullscreen => 0,
792	fast => 0,	1204	fast => 0,
793	fow_enable => 1,	1205	fow_enable => 1,
794	fow_intensity => 0.45,	1206	fow_intensity => 0.45,
795	fow_smooth => 0,	1207	fow_smooth => 0,
		1208	gui_fontsize => 1,
796	log_fontsize => 14,	1209	log_fontsize => 1,
		1210	gauge_fontsize => 1,
		1211	gauge_size => 0.35,
		1212	stat_fontsize => 1,
797	mapsize => 100,	1213	mapsize => 100,
798	host => "crossfire.schmorp.de",	1214	host => "crossfire.schmorp.de",
799	say_command => 'say',	1215	say_command => 'say',
		1216	audio_enable => 1,
		1217	bgm_enable => 1,
		1218	bgm_volume => 0.25,
800	);	1219	);
801		1220
802	while (my ($k, $v) = each %DEF_CFG) {	1221	while (my ($k, $v) = each %DEF_CFG) {
803	$CFG->{$k} = $v unless exists $CFG->{$k};	1222	$CFG->{$k} = $v unless exists $CFG->{$k};
804	}	1223	}
805		1224
806	sdl_init;	1225	sdl_init;
807		1226
808	@SDL_MODES = reverse	1227	@SDL_MODES = reverse
809	grep $_->[0] >= 640 && $_->[1] >= 480,	1228	grep $_->[0] >= 640 && $_->[1] >= 480,
810	map [SDL::RectW ($_), SDL::RectH ($_)],	1229	CFClient::SDL_ListModes;
811	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
812		1230
813	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1231	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
814		1232
815	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1233	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
816		1234
817	{	1235	{
818	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	1236	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
		1237	DejaVuSans.ttf
		1238	DejaVuSansMono.ttf
		1239	DejaVuSans-Bold.ttf
		1240	DejaVuSansMono-Bold.ttf
		1241	DejaVuSans-Oblique.ttf
		1242	DejaVuSansMono-Oblique.ttf
		1243	DejaVuSans-BoldOblique.ttf
		1244	DejaVuSansMono-BoldOblique.ttf
		1245	);
819		1246
820	CFClient::add_font $_ for @fonts;	1247	CFClient::add_font $_ for @fonts;
821	CFClient::set_font $fonts[0];	1248
822	}	1249	$FONT_PROP = new_from_file CFClient::Font $fonts[0];
		1250	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];
823		1251
824	init_screen;	1252	$FONT_PROP->make_default;
		1253	}
		1254
		1255	video_init;
		1256	audio_init;
825		1257
826	Event::loop;	1258	Event::loop;
827		1259
828	END { SDL::Quit }	1260	END { CFClient::SDL_Quit }
829		1261
830		1262

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.168 by root, Sun Apr 23 21:47:32 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.168 by root, Sun Apr 23 21:47:32 2006 UTC