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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.140 by root, Wed Apr 19 06:06:46 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
14	use SDL::Mixer;
15	use SDL::Sound;
16	use SDL::Music;
17
18	use SDL::OpenGL;
19
20	use Crossfire;	9	use Crossfire;
21	use Crossfire::Protocol;	10	use Crossfire::Protocol;
22		11
23	use Compress::LZF;	12	use Compress::LZF;
24		13
25	use CFClient;	14	use CFClient;
26	use CFClient::UI;	15	use CFClient::UI;
		16	use CFClient::MapWidget;
27		17
28	our $VERSION = '0.1';	18	our $VERSION = '0.1';
29		19
30	my $MAX_FPS = 60;	20	my $MAX_FPS = 60;
31	my $MIN_FPS = 5; # unused as of yet	21	my $MIN_FPS = 5; # unused as of yet
…		…
55	our $LOGVIEW;	45	our $LOGVIEW;
56	our $CONSOLE;	46	our $CONSOLE;
57	our $METASERVER;	47	our $METASERVER;
58		48
59	our $GAUGES;	49	our $GAUGES;
		50	our $STATWIDS;
60		51
61	our $SDL_ACTIVE;	52	our $SDL_ACTIVE;
62	our $SDL_EV;
63	our %SDL_CB;	53	our %SDL_CB;
64		54
65	our $SDL_MIXER;	55	our $SDL_MIXER;
66	our @SOUNDS; # event => file mapping	56	our @SOUNDS; # event => file mapping
67	our %AUDIO_CHUNKS; # audio files	57	our %AUDIO_CHUNKS; # audio files
…		…
109	undef $CONN;	99	undef $CONN;
110	}	100	}
111		101
112	sub client_setup {	102	sub client_setup {
113	my $dialog = new CFClient::UI::FancyFrame	103	my $dialog = new CFClient::UI::FancyFrame
		104	title => "Client Setup",
114	child => (my $vbox = new CFClient::UI::VBox);	105	child => (my $vbox = new CFClient::UI::VBox);
115	$vbox->add (new CFClient::UI::Label valign => 0, align => 0, text => "Client Setup");
116	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);	106	$vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
117		107
118	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");	108	$table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
119	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);	109	$table->add (1, 0, my $hbox = new CFClient::UI::HBox);
120		110
121	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);	111	$hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
122	$hbox->add (my $mode_label = new CFClient::UI::Label valign => 0, height => 0.8);	112	$hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
123		113
124	$mode_slider->connect (changed => sub {	114	$mode_slider->connect (changed => sub {
125	my ($self, $value) = @_;	115	my ($self, $value) = @_;
126		116
127	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;	117	$CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
…		…
158	my ($self, $value) = @_;	148	my ($self, $value) = @_;
159	$CFG->{fow_smooth} = $value;	149	$CFG->{fow_smooth} = $value;
160	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	150	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
161	});	151	});
162		152
163	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Log Fontsize");	153	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
164	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.5, 1.5, 0.1], connect_changed => sub {	154	$table->add (1, 6, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {
165	$CFG->{gui_fontsize} = 0.1 * int $_[0] * 10;	155	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
166	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	156	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
167	});	157	});
168		158
169	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Log Fontsize");	159	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
170	$table->add (1, 7, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.5, 0.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 {
171	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[0] * 10);	161	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
172	});	162	});
173		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
174	$table->add (1, 8, 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 {
175	video_shutdown ();	172	video_shutdown ();
176	video_init ();	173	video_init ();
177	});	174	});
178		175
179	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	176	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
180	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {	177	$table->add (1, 10, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
181	$CFG->{audio_enable} = $_[1];	178	$CFG->{audio_enable} = $_[1];
182	});	179	});
183	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	180	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
184	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	181	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
185	# $CFG->{effects_volume} = $_[1];	182	# $CFG->{effects_volume} = $_[1];
186	# });	183	# });
187	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Bg. Music");	184	$table->add (0, 11, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
188	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);	185	$table->add (1, 11, my $hbox = new CFClient::UI::HBox);
189	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {	186	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
190	$CFG->{bgm_enable} = $_[1];	187	$CFG->{bgm_enable} = $_[1];
191	});	188	});
192	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 128, 1], connect_changed => sub {	189	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
193	$CFG->{bgm_volume} = $_[1];	190	$CFG->{bgm_volume} = $_[1];
194	$SDL_MIXER->music_volume ($_[1]);	191	CFClient::MixMusic::volume $_[1] * 128;
195	});	192	});
196		193
197	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	194	$table->add (1, 12, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
198	audio_shutdown ();	195	audio_shutdown ();
199	audio_init ();	196	audio_init ();
200	});	197	});
201		198
202	$dialog	199	$dialog
203	}	200	}
204		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
		378	}
		379
205	sub metaserver_dialog {	380	sub metaserver_dialog {
206	my $dialog = new CFClient::UI::FancyFrame	381	my $dialog = new CFClient::UI::FancyFrame
		382	title => "Metaserver",
207	child => (my $vbox = new CFClient::UI::VBox);	383	child => (my $vbox = new CFClient::UI::VBox);
208		384
209	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	385	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
210		386
211	$dialog	387	$dialog
…		…
277	});	453	});
278	}	454	}
279		455
280	sub server_setup {	456	sub server_setup {
281	my $dialog = new CFClient::UI::FancyFrame	457	my $dialog = new CFClient::UI::FancyFrame
		458	title => "Server Setup",
282	child => (my $vbox = new CFClient::UI::VBox);	459	child => (my $vbox = new CFClient::UI::VBox);
283		460
284	$vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
285	$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]);
286	$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");
287		463
288	{	464	{
289	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	465	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
290		466
291	$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 {
292	my ($self, $value) = @_;	468	my ($self, $value) = @_;
293	$CFG->{host} = $value;	469	$CFG->{host} = $value;
294	});	470	});
295		471
296	$METASERVER = metaserver_dialog;	472	$METASERVER = metaserver_dialog;
297		473
298	$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 {
299	update_metaserver $HOST;	475	update_metaserver $HOST;
300	});	476	});
301	}	477	}
302		478
303	$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");
304	$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 {
305	my ($self, $value) = @_;	481	my ($self, $value) = @_;
306	$CFG->{user} = $value;	482	$CFG->{user} = $value;
307	});	483	});
308		484
309	$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");
310	$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 {
311	my ($self, $value) = @_;	487	my ($self, $value) = @_;
312	$CFG->{password} = $value;	488	$CFG->{password} = $value;
313	});	489	});
314		490
315	$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");
316	$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 {
317	my ($self, $value) = @_;	493	my ($self, $value) = @_;
318	$CFG->{say_command} = $value;	494	$CFG->{say_command} = $value;
319	});	495	});
320		496
321	$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");
322	$table->add (1, 7, new CFClient::UI::Slider	498	$table->add (1, 7, new CFClient::UI::Slider
323	req_w => 100,	499	req_w => 100,
324	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	500	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
325	connect_changed => sub {	501	connect_changed => sub {
326	my ($self, $value) = @_;	502	my ($self, $value) = @_;
…		…
336	$dialog	512	$dialog
337	}	513	}
338		514
339	sub message_window {	515	sub message_window {
340	my $window = new CFClient::UI::FancyFrame	516	my $window = new CFClient::UI::FancyFrame
		517	title => "Messages",
341	border_bg => [1, 1, 1, 0.5],	518	border_bg => [1, 1, 1, 0.5],
342	bg => [0.3, 0.3, 0.3, 0.8],	519	bg => [0.3, 0.3, 0.3, 0.8],
343	user_w => int $::WIDTH / 3,	520	user_w => int $::WIDTH / 3,
344	user_h => int $::HEIGHT / 5,	521	user_h => int $::HEIGHT / 5,
345	child => (my $vbox = new CFClient::UI::VBox);	522	child => (my $vbox = new CFClient::UI::VBox);
…		…
387		564
388	$window	565	$window
389	}	566	}
390		567
391	sub sdl_init {	568	sub sdl_init {
392	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	569	CFClient::SDL_Init
393	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
394	and die "SDL::Init failed!\n";	570	and die "SDL::Init failed!\n";
395	}	571	}
396		572
397	sub video_init {	573	sub video_init {
398	sdl_init;	574	sdl_init;
399		575
400	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	576	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
401	$FULLSCREEN = $CFG->{fullscreen};	577	$FULLSCREEN = $CFG->{fullscreen};
402	$FAST = $CFG->{fast};	578	$FAST = $CFG->{fast};
403		579
404	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	580	CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
405	SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
406	SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
407	SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 1;
408
409	SDL::GLSetAttribute SDL_GL_ACCUM_RED_SIZE, 0;
410	SDL::GLSetAttribute SDL_GL_ACCUM_GREEN_SIZE, 0;
411	SDL::GLSetAttribute SDL_GL_ACCUM_BLUE_SIZE, 0;
412	SDL::GLSetAttribute SDL_GL_ACCUM_ALPHA_SIZE, 0;
413
414	SDL::GLSetAttribute SDL_GL_DOUBLEBUFFER, 1;
415	SDL::GLSetAttribute SDL_GL_BUFFER_SIZE, 15;
416	SDL::GLSetAttribute SDL_GL_DEPTH_SIZE, 0;
417
418	SDL::SetVideoMode $WIDTH, $HEIGHT, 0,
419	SDL_HWSURFACE \| SDL_ANYFORMAT \| SDL_OPENGL \| SDL_DOUBLEBUF
420	\| ($FULLSCREEN ? SDL_FULLSCREEN : 0)
421	or die "SDL::SetVideoMode failed!\n";	581	or die "SDL_SetVideoMode failed!\n";
422
423	SDL::WMSetCaption "Crossfire+ Client", "Crossfire+";
424
425	$SDL_EV = new SDL::Event;
426	$SDL_EV->set_unicode (1);
427		582
428	$SDL_ACTIVE = 1;	583	$SDL_ACTIVE = 1;
429		584
430	$LAST_REFRESH = time - 0.01;	585	$LAST_REFRESH = time - 0.01;
431		586
…		…
448	fontsize => 0.8,	603	fontsize => 0.8,
449	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	604	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
450	$ALT_ENTER_MESSAGE->show;	605	$ALT_ENTER_MESSAGE->show;
451	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});	606	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
452		607
453	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);	608	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
454	$MAPWIDGET->focus_in;	609	$MAPWIDGET->focus_in;
455	$MAPWIDGET->connect (activate_console => sub {	610	$MAPWIDGET->connect (activate_console => sub {
456	my ($mapwidget, $preset) = @_;	611	my ($mapwidget, $preset) = @_;
457		612
458	if ($CONSOLE) {	613	if ($CONSOLE) {
…		…
476	status "Configuration Saved";	631	status "Configuration Saved";
477	});	632	});
478		633
479	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	634	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
480		635
481	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
482	$tgw->add (my $hbox = new CFClient::UI::HBox ());
483		636
484	$hbox->add (my $hg = new CFClient::UI::VGauge (gauge => 'hp'));
485	$hbox->add (my $mg = new CFClient::UI::VGauge (gauge => 'mana'));
486	$hbox->add (my $gg = new CFClient::UI::VGauge (gauge => 'grace'));
487	$hbox->add (my $fg = new CFClient::UI::VGauge (gauge => 'food'));
488
489	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
490	$CFClient::UI::ROOT->add ($tgw);	637	$CFClient::UI::ROOT->add (make_stats_window);
491	}	638	}
492		639
493	sub video_shutdown {	640	sub video_shutdown {
494	$CFClient::UI::ROOT->{children} = [];	641	$CFClient::UI::ROOT->{children} = [];
495	undef $SDL_ACTIVE;	642	undef $SDL_ACTIVE;
496	undef $SDL_EV;
497	}	643	}
498		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#
499	my $bgmusic;#TODO#hack#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	}
500		657
501	sub audio_init {	658	sub audio_init {
502	if ($CFG->{audio_enable}) {	659	if ($CFG->{audio_enable}) {
503	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {	660	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
504	$SDL_MIXER = new SDL::Mixer;	661	$SDL_MIXER = !CFClient::Mix_OpenAudio;
505	$SDL_MIXER->allocate_channels (8);	662	CFClient::Mix_AllocateChannels 8;
		663	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
506		664
507	# TODO: hack, do play loop and mood music	665	audio_music_finished;
508	if ($CFG->{bgm_enable}) {
509	$bgmusic = new SDL::Music CFClient::find_rcfile "music/game3.ogg";
510	$SDL_MIXER->play_music ($bgmusic, -1);
511	$SDL_MIXER->music_volume ($CFG->{bgm_volume});
512	}
513		666
514	while (<$fh>) {	667	while (<$fh>) {
515	next if /^\s*#/;	668	next if /^\s*#/;
516	next if /^\s*$/;	669	next if /^\s*$/;
517		670
518	my ($file, $volume, $event) = split /\s+/, $_, 3;	671	my ($file, $volume, $event) = split /\s+/, $_, 3;
519		672
520	push @SOUNDS, "$volume,$file";	673	push @SOUNDS, "$volume,$file";
521		674
522	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {	675	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
523	my $chunk = new SDL::Sound CFClient::find_rcfile "sounds/$file";	676	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
524	$chunk->volume ($volume * 128 / 100);	677	$chunk->volume ($volume * 128 / 100);
525	$chunk	678	$chunk
526	};	679	};
527	}	680	}
528	} else {	681	} else {
…		…
530	}	683	}
531	}	684	}
532	}	685	}
533		686
534	sub audio_shutdown {	687	sub audio_shutdown {
		688	CFClient::Mix_CloseAudio if $SDL_MIXER;
535	undef $SDL_MIXER;	689	undef $SDL_MIXER;
536	@SOUNDS = ();	690	@SOUNDS = ();
537	%AUDIO_CHUNKS = ();	691	%AUDIO_CHUNKS = ();
538	}	692	}
539		693
…		…
552	$want_refresh = 0;	706	$want_refresh = 0;
553	$can_refresh = 0;	707	$can_refresh = 0;
554		708
555	$CFClient::UI::ROOT->draw;	709	$CFClient::UI::ROOT->draw;
556		710
557	SDL::GLSwapBuffers;	711	CFClient::SDL_GL_SwapBuffers;
558		712
559	$LAST_REFRESH = $NOW;	713	$LAST_REFRESH = $NOW;
560	}	714	}
561		715
562	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 {
563	$NOW = time;	717	$NOW = time;
564		718
565	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	719	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
566	while $SDL_EV->poll;	720	for CFClient::SDL_PollEvent;
567		721
568	if (%animate_object) {	722	if (%animate_object) {
569	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	723	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
570	$want_refresh++;	724	$want_refresh++;
571	}	725	}
…		…
594	@conn::ISA = Crossfire::Protocol::;	748	@conn::ISA = Crossfire::Protocol::;
595		749
596	sub conn::stats_update {	750	sub conn::stats_update {
597	my ($self, $stats) = @_;	751	my ($self, $stats) = @_;
598		752
599	# i love text protocols!!!	753	update_stats_window ($stats);
600	# FIXME: the stats are somehow weird
601	my $hp = $stats->{1};
602	my $hp_m = $stats->{2};
603	my $sp = $stats->{3};
604	my $sp_m = $stats->{4};
605	my $fo = $stats->{18};
606	my $fo_m = 1000;
607	my $gr = $stats->{23};
608	my $gr_m = $stats->{24};
609
610	#d# warn "DATA $hp $hp_m $sp $sp_m $fo $fo_m $gr $gr_m\n";
611	$GAUGES->{hp}->set_value ($hp, $hp_m);
612	$GAUGES->{mana}->set_value ($sp, $sp_m);
613	$GAUGES->{food}->set_value ($fo, $fo_m);
614	$GAUGES->{grace}->set_value ($gr, $gr_m);
615	}	754	}
616		755
617	sub conn::user_send {	756	sub conn::user_send {
618	my ($self, $command) = @_;	757	my ($self, $command) = @_;
619		758
…		…
644		783
645	my ($hash, $x, $y, $w, $h) = @$map_info;	784	my ($hash, $x, $y, $w, $h) = @$map_info;
646		785
647	my $data = $MAP->get_rect ($x, $y, $w, $h);	786	my $data = $MAP->get_rect ($x, $y, $w, $h);
648	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	787	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
649
650	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	788	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
651
652	}	789	}
653		790
654	sub conn::map_clear {	791	sub conn::map_clear {
655	my ($self) = @_;	792	my ($self) = @_;
656		793
657	$self->flush_map;	794	$self->flush_map;
658	delete $self->{neigh};	795	delete $self->{neigh_map};
659		796
660	$MAP->clear;	797	$MAP->clear;
661	}	798	}
662		799
663		800
664	sub conn::load_map($$$) {	801	sub conn::load_map($$$) {
665	my ($self, $hash, $x, $y) = @_;	802	my ($self, $hash, $x, $y) = @_;
666		803
667	if (defined (my $data = $MAPCACHE->get ($hash))) {	804	if (defined (my $data = $MAPCACHE->get ($hash))) {
668	$data = Compress::LZF::decompress $data;	805	$data = Compress::LZF::decompress $data;
669	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#
670	for my $id ($MAP->set_rect ($x, $y, $data)) {	807	for my $id ($MAP->set_rect ($x, $y, $data)) {
671	my $data = $TILECACHE->get ($id)	808	my $data = $TILECACHE->get ($id)
672	or next;	809	or next;
673		810
674	$self->set_texture ($id => $data);	811	$self->set_texture ($id => $data);
675	}	812	}
676	}	813	}
677	}	814	}
678		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.
679	sub conn::flood_fill {	821	sub conn::flood_fill {
680	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	822	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
681		823
682	# the server does not allow map paths > 6	824	# the server does not allow map paths > 6
683	return if 6 <= length $path;	825	return if 6 <= length $path;
684		826
685	for my $tile (1..4) {	827	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
686	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
687	next unless $flags & (1 << ($tile - 1));	840	next unless $flags & (1 << ($tile - 1));
		841	next if $self->{neigh_grid}{$gx, $gy}++;
688		842
689	my $neigh = $self->{neigh}{$hash} \|\|= [];	843	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
690		844	if (my $info = $neigh->[$tile]) {
691	$self->send_mapinfo ("spatial $path$tile", sub {
692	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	845	my ($flags, $x, $y, $w, $h, $hash) = @$info;
693		846
694	#warn "map<$path>_$tile=<$mode,$x,$y,$w,$h,$hash>\n";#d#
695	return if $mode ne "spatial";
696
697	$x += $MAP->ox;
698	$y += $MAP->oy;
699
700	$self->load_map ($hash, $x, $y)
701	unless $self->{neigh}{$hash}[5]++;#d#
702
703	$neigh->[$tile] = [$x, $y, $w, $h];
704
705	$self->flood_fill ("$path$tile", $hash, $flags, $x0, $y0, $x1, $y1)	847	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
706	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	});
707	});	867	}
708	}	868	}
709	}	869	}
710		870
711	sub conn::map_change {	871	sub conn::map_change {
712	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	872	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
715		875
716	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	876	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
717		877
718	my $mapmapw = 250;	878	my $mapmapw = 250;
719	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	];
720		885
		886	delete $self->{neigh_grid};
721	$self->flood_fill ("", $hash, $flags,	887	$self->flood_fill (0, 0, "", $hash, $flags);
722	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
723	$ox + $mapmapw * 0.5, $oy + $mapmapw * 0.5);
724		888
725	$x += $ox;	889	$x += $ox;
726	$y += $oy;	890	$y += $oy;
727		891
728	$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]);
729		895
730	$self->load_map ($hash, $x, $y);	896	$self->load_map ($hash, $x, $y);
731	}	897	}
732		898
733	sub conn::face_find {	899	sub conn::face_find {
…		…
794	or return;	960	or return;
795		961
796	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}	962	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
797	or return;	963	or return;
798		964
799	$SDL_MIXER->play_channel (-1, $chunk);	965	$chunk->play;
800	warn "sound $x,$y,$soundnum,$type\n";#d#	966	# warn "sound $x,$y,$soundnum,$type\n";#d#
801	}	967	}
802		968
803	sub conn::query {	969	sub conn::query {
804	my ($self, $flags, $prompt) = @_;	970	my ($self, $flags, $prompt) = @_;
805		971
806	#TODO	972	#TODO, display dialog with relevant information
807	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	973	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
808	}	974	}
809		975
810	sub conn::drawinfo {	976	sub conn::drawinfo {
811	my ($self, $color, $text) = @_;	977	my ($self, $color, $text) = @_;
…		…
827	);	993	);
828		994
829	$LOGVIEW->add_paragraph ($color[$color], $text);	995	$LOGVIEW->add_paragraph ($color[$color], $text);
830	}	996	}
831		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
832	%SDL_CB = (	1022	%SDL_CB = (
833	SDL_QUIT() => sub {	1023	CFClient::SDL_QUIT => sub {
834	Event::unloop -1;	1024	Event::unloop -1;
835	},	1025	},
836	SDL_VIDEORESIZE() => sub {	1026	CFClient::SDL_VIDEORESIZE => sub {
837	},	1027	},
838	SDL_VIDEOEXPOSE() => sub {	1028	CFClient::SDL_VIDEOEXPOSE => \&refresh,
839	refresh;	1029	CFClient::SDL_ACTIVEEVENT => sub {
		1030	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
840	},	1031	},
841	SDL_KEYDOWN() => sub {	1032	CFClient::SDL_KEYDOWN => sub {
842	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	1033	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
843	# alt-enter	1034	# alt-enter
844	video_shutdown;	1035	video_shutdown;
845	$CFG->{fullscreen} = !$CFG->{fullscreen};	1036	$CFG->{fullscreen} = !$CFG->{fullscreen};
846	video_init;	1037	video_init;
847	} else {	1038	} else {
848	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	1039	CFClient::UI::feed_sdl_key_down_event ($_[0]);
849	}	1040	}
850	},	1041	},
851	SDL_KEYUP() => sub {	1042	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
852	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);	1043	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
853	},	1044	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
854	SDL_MOUSEMOTION() => sub {	1045	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
855	CFClient::UI::feed_sdl_motion_event ($SDL_EV);	1046	CFClient::SDL_USEREVENT => \&audio_music_finished,
856	},
857	SDL_MOUSEBUTTONDOWN() => sub {
858	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
859	},
860	SDL_MOUSEBUTTONUP() => sub {
861	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
862	},
863	SDL_ACTIVEEVENT() => sub {
864	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
865	},
866	);	1047	);
867		1048
868	#############################################################################	1049	#############################################################################
869		1050
870	$SIG{INT} = $SIG{TERM} = sub { exit };	1051	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
882	fast => 0,	1063	fast => 0,
883	fow_enable => 1,	1064	fow_enable => 1,
884	fow_intensity => 0.45,	1065	fow_intensity => 0.45,
885	fow_smooth => 0,	1066	fow_smooth => 0,
886	gui_fontsize => 1,	1067	gui_fontsize => 1,
887	log_fontsize => 14,	1068	log_fontsize => 1,
		1069	stat_fontsize => 1,
888	mapsize => 100,	1070	mapsize => 100,
889	host => "crossfire.schmorp.de",	1071	host => "crossfire.schmorp.de",
890	say_command => 'say',	1072	say_command => 'say',
891	audio_enable => 1,	1073	audio_enable => 1,
892	bgm_enable => 1,	1074	bgm_enable => 1,
893	bgm_volume => 64,	1075	bgm_volume => 0.25,
894	);	1076	);
895		1077
896	while (my ($k, $v) = each %DEF_CFG) {	1078	while (my ($k, $v) = each %DEF_CFG) {
897	$CFG->{$k} = $v unless exists $CFG->{$k};	1079	$CFG->{$k} = $v unless exists $CFG->{$k};
898	}	1080	}
899		1081
900	sdl_init;	1082	sdl_init;
901		1083
902	@SDL_MODES = reverse	1084	@SDL_MODES = reverse
903	grep $_->[0] >= 640 && $_->[1] >= 480,	1085	grep $_->[0] >= 640 && $_->[1] >= 480,
904	map [SDL::RectW ($_), SDL::RectH ($_)],	1086	CFClient::SDL_ListModes;
905	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
906		1087
907	@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)";
908		1089
909	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1090	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
910		1091
…		…
918	video_init;	1099	video_init;
919	audio_init;	1100	audio_init;
920		1101
921	Event::loop;	1102	Event::loop;
922		1103
923	END { SDL::Quit }	1104	END { CFClient::SDL_Quit }
924		1105
925		1106

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.140 by root, Wed Apr 19 06:06:46 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.140 by root, Wed Apr 19 06:06:46 2006 UTC vs.
Revision 1.157 by elmex, Fri Apr 21 15:03:47 2006 UTC