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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.131 by root, Tue Apr 18 02:04:23 2006 UTC vs.
Revision 1.157 by elmex, Fri Apr 21 15:03:47 2006 UTC

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

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.131 by root, Tue Apr 18 02:04:23 2006 UTC vs. Revision 1.157 by elmex, Fri Apr 21 15:03:47 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.131 by root, Tue Apr 18 02:04:23 2006 UTC vs.
Revision 1.157 by elmex, Fri Apr 21 15:03:47 2006 UTC