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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.133 by root, Tue Apr 18 02:38:51 2006 UTC vs.
Revision 1.156 by elmex, Fri Apr 21 12:27:20 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;
151	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;
152	});	151	});
153		152
154	$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");
155	$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 {
156	my ($self, $value) = @_;
157	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);	161	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
158	});	162	});
159		163
160	$table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	164	$table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
161	destroy_screen ();	165	video_shutdown ();
162	init_screen ();	166	video_init ();
		167	});
		168
		169	$table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
		170	$table->add (1, 9, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {
		171	$CFG->{audio_enable} = $_[1];
		172	});
		173	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
		174	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
		175	# $CFG->{effects_volume} = $_[1];
		176	# });
		177	$table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
		178	$table->add (1, 10, my $hbox = new CFClient::UI::HBox);
		179	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {
		180	$CFG->{bgm_enable} = $_[1];
		181	});
		182	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {
		183	$CFG->{bgm_volume} = $_[1];
		184	CFClient::MixMusic::volume $_[1] * 128;
		185	});
		186
		187	$table->add (1, 11, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
		188	audio_shutdown ();
		189	audio_init ();
163	});	190	});
164		191
165	$dialog	192	$dialog
		193	}
		194
		195	sub make_stats_window {
		196	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
		197
		198	$tgw->add (my $vb = new CFClient::UI::VBox);
		199	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:");
		200	$vb->add (my $lhb = new CFClient::UI::HBox);
		201	$lhb->add ($STATWIDS->{exp} = new CFClient::UI::Label valign => 0, align => -1, text => "Exp:", expand => 1);
		202	$lhb->add ($STATWIDS->{lvl} = new CFClient::UI::Label valign => 0, align => -1, text => "Level:", expand => 1);
		203
		204	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
		205	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', expand => 1);
		206	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', expand => 1);
		207	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);
		208	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', expand => 1);
		209	$GAUGES = { food => $fg, mana => $mg, hp => $hg, grace => $gg };
		210
		211	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
		212
		213	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		214	$tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "S");
		215	$tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "D");
		216	$tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "Co");
		217	$tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "I");
		218	$tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "W");
		219	$tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "P");
		220	$tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "Ch");
		221
		222	$tbl->add (1, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
		223	$tbl->add (1, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
		224	$tbl->add (1, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
		225	$tbl->add (1, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
		226	$tbl->add (1, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
		227	$tbl->add (1, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
		228	} else {
		229	$tbl->add (0, 0, new CFClient::UI::Label valign => 0, align => +1, text => "S");
		230	$tbl->add (0, 1, new CFClient::UI::Label valign => 0, align => +1, text => "D");
		231	$tbl->add (0, 2, new CFClient::UI::Label valign => 0, align => +1, text => "Co");
		232	$tbl->add (0, 3, new CFClient::UI::Label valign => 0, align => +1, text => "I");
		233	$tbl->add (0, 4, new CFClient::UI::Label valign => 0, align => +1, text => "W");
		234	$tbl->add (0, 5, new CFClient::UI::Label valign => 0, align => +1, text => "P");
		235	$tbl->add (0, 6, new CFClient::UI::Label valign => 0, align => +1, text => "Ch");
		236
		237	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		238	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		239	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		240	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		241	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		242	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		243	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		244
		245	$tbl->add (2, 0, new CFClient::UI::Label valign => 0, align => +1, text => "Wc");
		246	$tbl->add (2, 1, new CFClient::UI::Label valign => 0, align => +1, text => "Ac");
		247	$tbl->add (2, 2, new CFClient::UI::Label valign => 0, align => +1, text => "Dam");
		248	$tbl->add (2, 3, new CFClient::UI::Label valign => 0, align => +1, text => "Arm");
		249	$tbl->add (2, 4, new CFClient::UI::Label valign => 0, align => +1, text => "Sp");
		250	$tbl->add (2, 5, new CFClient::UI::Label valign => 0, align => +1, text => "WSp");
		251
		252	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		253	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		254	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		255	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		256	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		257	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
		258	}
		259
		260	$hb->add (my $tbl2 = new CFClient::UI::Table);
		261
		262	my $row = 0;
		263	my $col = 0;
		264
		265	for (qw/slow holyw conf fire depl magic
		266	drain acid pois para deat phys
		267	blind fear tund elec cold ghit/)
		268	{
		269	$tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
		270	$tbl2->add ($col + 1, $row,
		271	$STATWIDS->{"res_$_"} =
		272	new CFClient::UI::Label text => "0", align => -1, valign => 0
		273	);
		274
		275	$row++;
		276	if ($row % 6 == 0) {
		277	$col += 2;
		278	$row = 0;
		279	}
		280	}
		281
		282	update_stats_window ({});
		283
		284	$tgw
		285	}
		286
		287	sub update_stats_window {
		288	my ($stats) = @_;
		289
		290	# i love text protocols!!!
		291	my $hp = $stats->{1};
		292	my $hp_m = $stats->{2};
		293	my $sp = $stats->{3};
		294	my $sp_m = $stats->{4};
		295	my $fo = $stats->{18};
		296	my $fo_m = 999;
		297	my $gr = $stats->{23};
		298	my $gr_m = $stats->{24};
		299
		300	$GAUGES->{hp} ->set_value ($hp, $hp_m);
		301	$GAUGES->{mana} ->set_value ($sp, $sp_m);
		302	$GAUGES->{food} ->set_value ($fo, $fo_m);
		303	$GAUGES->{grace} ->set_value ($gr, $gr_m);
		304	$STATWIDS->{title} ->set_text ("Title: " . $stats->{21});
		305	$STATWIDS->{exp} ->set_text ("Exp.: " . ($stats->{11} \|\| $stats->{28}));
		306	$STATWIDS->{lvl} ->set_text ("Level: " . $stats->{12});
		307
		308	if (0) { # this code can vanish, just wanted to preserver it for a checkin
		309	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
		310	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
		311	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
		312	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
		313	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
		314	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
		315	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
		316	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
		317	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
		318	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
		319	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
		320	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
		321	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
		322	} else {
		323	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
		324	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
		325	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
		326	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
		327	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
		328	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
		329	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
		330	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
		331	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
		332	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
		333	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
		334	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
		335	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
		336	}
		337
		338	my %tbl = (
		339	phys => 100,
		340	magic => 101,
		341	fire => 102,
		342	elec => 103,
		343	cold => 104,
		344	conf => 105,
		345	acid => 106,
		346	drain => 107,
		347	ghit => 108,
		348	pois => 109,
		349	slow => 110,
		350	para => 111,
		351	tund => 112,
		352	fear => 113,
		353	deat => 115,
		354	holyw => 116,
		355	blind => 117
		356	);
		357
		358	for (keys %tbl) {
		359	$STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}});
		360	}
		361
166	}	362	}
167		363
168	sub metaserver_dialog {	364	sub metaserver_dialog {
169	my $dialog = new CFClient::UI::FancyFrame	365	my $dialog = new CFClient::UI::FancyFrame
		366	title => "Metaserver",
170	child => (my $vbox = new CFClient::UI::VBox);	367	child => (my $vbox = new CFClient::UI::VBox);
171		368
172	$vbox->add ($dialog->{table} = new CFClient::UI::Table);	369	$vbox->add ($dialog->{table} = new CFClient::UI::Table);
173		370
174	$dialog	371	$dialog
…		…
231	$HOST->set_text ($CFG->{host} = $host);	428	$HOST->set_text ($CFG->{host} = $host);
232	}),	429	}),
233	(new CFClient::UI::Empty expand => 1),	430	(new CFClient::UI::Empty expand => 1),
234	]);	431	]);
235		432
236	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => $FONTSIZE * 0.8)	433	$table->add ($_ + 1, $y, new CFClient::UI::Label align => $align[$_], text => $m->[$_], fontsize => 0.8)
237	for 0 .. $#$m;	434	for 0 .. $#$m;
238	}	435	}
239	}	436	}
240	});	437	});
241	}	438	}
242		439
243	sub server_setup {	440	sub server_setup {
244	my $dialog = new CFClient::UI::FancyFrame	441	my $dialog = new CFClient::UI::FancyFrame
		442	title => "Server Setup",
245	child => (my $vbox = new CFClient::UI::VBox);	443	child => (my $vbox = new CFClient::UI::VBox);
246		444
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]);	445	$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");	446	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
250		447
251	{	448	{
252	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	449	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
253		450
254	$vbox->add (my $HOST = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {	451	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {
255	my ($self, $value) = @_;	452	my ($self, $value) = @_;
256	$CFG->{host} = $value;	453	$CFG->{host} = $value;
257	});	454	});
258		455
259	$METASERVER = metaserver_dialog;	456	$METASERVER = metaserver_dialog;
260		457
261	$vbox->add (new CFClient::UI::Flopper text => "Metaserver", other => $METASERVER, connect_open => sub {	458	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
262	update_metaserver $HOST;	459	update_metaserver $HOST;
263	});	460	});
264	}	461	}
265		462
266	$table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");	463	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
267	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {	464	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
268	my ($self, $value) = @_;	465	my ($self, $value) = @_;
269	$CFG->{user} = $value;	466	$CFG->{user} = $value;
270	});	467	});
271		468
272	$table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");	469	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
273	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	470	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
274	my ($self, $value) = @_;	471	my ($self, $value) = @_;
275	$CFG->{password} = $value;	472	$CFG->{password} = $value;
276	});	473	});
277		474
278	$table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");	475	$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 {	476	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
280	my ($self, $value) = @_;	477	my ($self, $value) = @_;
281	$CFG->{say_command} = $value;	478	$CFG->{say_command} = $value;
282	});	479	});
283		480
284	$table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");	481	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
285	$table->add (1, 7, new CFClient::UI::Slider	482	$table->add (1, 7, new CFClient::UI::Slider
286	req_w => 100,	483	req_w => 100,
287	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	484	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
288	connect_changed => sub {	485	connect_changed => sub {
289	my ($self, $value) = @_;	486	my ($self, $value) = @_;
…		…
299	$dialog	496	$dialog
300	}	497	}
301		498
302	sub message_window {	499	sub message_window {
303	my $window = new CFClient::UI::FancyFrame	500	my $window = new CFClient::UI::FancyFrame
		501	title => "Messages",
304	border_bg => [1, 1, 1, 0.5],	502	border_bg => [1, 1, 1, 0.5],
305	bg => [0.3, 0.3, 0.3, 0.8],	503	bg => [0.3, 0.3, 0.3, 0.8],
306	user_w => int $::WIDTH / 3,	504	user_w => int $::WIDTH / 3,
307	user_h => int $::HEIGHT / 5,	505	user_h => int $::HEIGHT / 5,
308	child => (my $vbox = new CFClient::UI::VBox);	506	child => (my $vbox = new CFClient::UI::VBox);
…		…
350		548
351	$window	549	$window
352	}	550	}
353		551
354	sub sdl_init {	552	sub sdl_init {
355	#SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO \| SDL_INIT_NOPARACHUTE	553	CFClient::SDL_Init
356	SDL::Init SDL_INIT_AUDIO \| SDL_INIT_VIDEO
357	and die "SDL::Init failed!\n";	554	and die "SDL::Init failed!\n";
358	}	555	}
359		556
360	sub init_screen {	557	sub video_init {
361	sdl_init;	558	sdl_init;
362		559
363	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };	560	($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
364	$FULLSCREEN = $CFG->{fullscreen};	561	$FULLSCREEN = $CFG->{fullscreen};
365	$FAST = $CFG->{fast};	562	$FAST = $CFG->{fast};
366		563
367	SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;	564	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";	565	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		566
391	$SDL_ACTIVE = 1;	567	$SDL_ACTIVE = 1;
392		568
393	$LAST_REFRESH = time - 0.01;	569	$LAST_REFRESH = time - 0.01;
394		570
395	CFClient::gl_init;	571	CFClient::gl_init;
396		572
397	$FONTSIZE = int $HEIGHT / 40;	573	$FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
398		574
399	#############################################################################	575	#############################################################################
400		576
401	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;	577	$DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
402	$CFClient::UI::ROOT->add ($DEBUG_STATUS);	578	$DEBUG_STATUS->show;
403		579
404	$STATUS_LINE = new CFClient::UI::Label	580	$STATUS_LINE = new CFClient::UI::Label
405	padding => 0,	581	padding => 0,
406	y => $HEIGHT * 44 / 45 - $FONTSIZE;	582	y => $HEIGHT - $FONTSIZE * 1.8;
407	$CFClient::UI::ROOT->add ($STATUS_LINE);	583	$STATUS_LINE->show;
408		584
409	$ALT_ENTER_MESSAGE = new CFClient::UI::Label	585	$ALT_ENTER_MESSAGE = new CFClient::UI::Label
410	padding => 0,	586	padding => 0,
411	y => $HEIGHT * 44 / 45,
412	fontsize => $HEIGHT / 45,	587	fontsize => 0.8,
413	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";	588	markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
414	$CFClient::UI::ROOT->add ($ALT_ENTER_MESSAGE);	589	$ALT_ENTER_MESSAGE->show;
		590	$ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
415		591
416	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::UI::MapWidget);	592	$CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget);
417	$MAPWIDGET->focus_in;	593	$MAPWIDGET->focus_in;
418	$MAPWIDGET->connect (activate_console => sub {	594	$MAPWIDGET->connect (activate_console => sub {
419	my ($mapwidget, $preset) = @_;	595	my ($mapwidget, $preset) = @_;
420		596
421	if ($CONSOLE) {	597	if ($CONSOLE) {
…		…
439	status "Configuration Saved";	615	status "Configuration Saved";
440	});	616	});
441		617
442	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	618	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
443		619
444	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH - 300, y => 0);
445	$tgw->add (my $hbox = new CFClient::UI::HBox ());
446		620
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);	621	$CFClient::UI::ROOT->add (make_stats_window);
454	}	622	}
455		623
456	sub destroy_screen {	624	sub video_shutdown {
457	$CFClient::UI::ROOT->{children} = [];	625	$CFClient::UI::ROOT->{children} = [];
458	undef $SDL_ACTIVE;	626	undef $SDL_ACTIVE;
		627	}
		628
		629	my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
		630	my $bgmusic;#TODO#hack#d#
		631
		632	sub audio_music_finished {
		633	return unless $CFG->{bgm_enable};
		634
		635	# TODO: hack, do play loop and mood music
		636	$bgmusic = new_from_file CFClient::MixMusic CFClient::find_rcfile "music/$bgmusic[0]";
		637	$bgmusic->play (0);
		638
		639	push @bgmusic, shift @bgmusic;
		640	}
		641
		642	sub audio_init {
		643	if ($CFG->{audio_enable}) {
		644	if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") {
		645	$SDL_MIXER = !CFClient::Mix_OpenAudio;
		646	CFClient::Mix_AllocateChannels 8;
		647	CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
		648
		649	audio_music_finished;
		650
		651	while (<$fh>) {
		652	next if /^\s*#/;
		653	next if /^\s*$/;
		654
		655	my ($file, $volume, $event) = split /\s+/, $_, 3;
		656
		657	push @SOUNDS, "$volume,$file";
		658
		659	$AUDIO_CHUNKS{"$volume,$file"} \|\|= do {
		660	my $chunk = new_from_file CFClient::MixChunk CFClient::find_rcfile "sounds/$file";
		661	$chunk->volume ($volume * 128 / 100);
		662	$chunk
		663	};
		664	}
		665	} else {
		666	status "unable to open sound config: $!";
		667	}
		668	}
		669	}
		670
		671	sub audio_shutdown {
		672	CFClient::Mix_CloseAudio if $SDL_MIXER;
459	undef $SDL_EV;	673	undef $SDL_MIXER;
460	SDL::Quit;	674	@SOUNDS = ();
		675	%AUDIO_CHUNKS = ();
461	}	676	}
462		677
463	my %animate_object;	678	my %animate_object;
464	my $animate_timer;	679	my $animate_timer;
465		680
…		…
475	$want_refresh = 0;	690	$want_refresh = 0;
476	$can_refresh = 0;	691	$can_refresh = 0;
477		692
478	$CFClient::UI::ROOT->draw;	693	$CFClient::UI::ROOT->draw;
479		694
480	SDL::GLSwapBuffers;	695	CFClient::SDL_GL_SwapBuffers;
481		696
482	$LAST_REFRESH = $NOW;	697	$LAST_REFRESH = $NOW;
483	}	698	}
484		699
485	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {	700	my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
486	$NOW = time;	701	$NOW = time;
487		702
488	($SDL_CB{$SDL_EV->type} \|\| sub { warn "unhandled event ", $SDL_EV->type })->()	703	($SDL_CB{$_->{type}} \|\| sub { warn "unhandled event $_->{type}" })->($_)
489	while $SDL_EV->poll;	704	for CFClient::SDL_PollEvent;
490		705
491	if (%animate_object) {	706	if (%animate_object) {
492	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;	707	$_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
493	$want_refresh++;	708	$want_refresh++;
494	}	709	}
…		…
517	@conn::ISA = Crossfire::Protocol::;	732	@conn::ISA = Crossfire::Protocol::;
518		733
519	sub conn::stats_update {	734	sub conn::stats_update {
520	my ($self, $stats) = @_;	735	my ($self, $stats) = @_;
521		736
522	# i love text protocols!!!	737	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	}	738	}
539		739
540	sub conn::user_send {	740	sub conn::user_send {
541	my ($self, $command) = @_;	741	my ($self, $command) = @_;
542		742
…		…
567		767
568	my ($hash, $x, $y, $w, $h) = @$map_info;	768	my ($hash, $x, $y, $w, $h) = @$map_info;
569		769
570	my $data = $MAP->get_rect ($x, $y, $w, $h);	770	my $data = $MAP->get_rect ($x, $y, $w, $h);
571	$MAPCACHE->put ($hash => Compress::LZF::compress $data);	771	$MAPCACHE->put ($hash => Compress::LZF::compress $data);
572
573	warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#	772	#warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
574
575	}	773	}
576		774
577	sub conn::map_clear {	775	sub conn::map_clear {
578	my ($self) = @_;	776	my ($self) = @_;
579		777
580	$self->flush_map;	778	$self->flush_map;
581	delete $self->{neigh};	779	delete $self->{neigh_map};
582		780
583	$MAP->clear;	781	$MAP->clear;
584	}	782	}
585		783
586		784
587	sub conn::load_map($$$) {	785	sub conn::load_map($$$) {
588	my ($self, $hash, $x, $y) = @_;	786	my ($self, $hash, $x, $y) = @_;
589		787
590	if (defined (my $data = $MAPCACHE->get ($hash))) {	788	if (defined (my $data = $MAPCACHE->get ($hash))) {
591	$data = Compress::LZF::decompress $data;	789	$data = Compress::LZF::decompress $data;
592	warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#	790	#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)) {	791	for my $id ($MAP->set_rect ($x, $y, $data)) {
594	my $data = $TILECACHE->get ($id)	792	my $data = $TILECACHE->get ($id)
595	or next;	793	or next;
596		794
597	$self->set_texture ($id => $data);	795	$self->set_texture ($id => $data);
598	}	796	}
599	}	797	}
600	}	798	}
601		799
		800	# this method does a "flood fill" into every tile direction
		801	# it assumes that tiles are arranged in a rectangular grid,
		802	# i.e. a map is the same as the left of the right map etc.
		803	# failure to comply are harmless and result in display errors
		804	# at worst.
602	sub conn::flood_fill {	805	sub conn::flood_fill {
603	my ($self, $path, $hash, $flags, $x0, $y0, $x1, $y1) = @_;	806	my ($self, $gx, $gy, $path, $hash, $flags) = @_;
604		807
605	# the server does not allow map paths > 6	808	# the server does not allow map paths > 6
606	return if 6 <= length $path;	809	return if 6 <= length $path;
607		810
608	for my $tile (1..4) {	811	my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
609	next if $self->{neigh}{$hash}[$tile];	812
		813	for (
		814	[1, 0, -1],
		815	[2, 1, 0],
		816	[3, 0, 1],
		817	[4, -1, 0],
		818	) {
		819	my ($tile, $dx, $dy) = @$_;
		820
		821	my $gx = $gx + $dx;
		822	my $gy = $gy + $dy;
		823
610	next unless $flags & (1 << ($tile - 1));	824	next unless $flags & (1 << ($tile - 1));
		825	next if $self->{neigh_grid}{$gx, $gy}++;
611		826
612	my $neigh = $self->{neigh}{$hash} \|\|= [];	827	my $neigh = $self->{neigh_map}{$hash} \|\|= [];
613		828	if (my $info = $neigh->[$tile]) {
614	$self->send_mapinfo ("spatial $path$tile", sub {
615	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;	829	my ($flags, $x, $y, $w, $h, $hash) = @$info;
616		830
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)	831	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
629	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;	832	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		833
		834	} else {
		835	$self->send_mapinfo ("spatial $path$tile", sub {
		836	my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
		837
		838	return if $mode ne "spatial";
		839
		840	$x += $MAP->ox;
		841	$y += $MAP->oy;
		842
		843	$self->load_map ($hash, $x, $y)
		844	unless $self->{neigh_map}{$hash}[5]++;#d#
		845
		846	$neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
		847
		848	$self->flood_fill ($gx, $gy, "$path$tile", $hash, $flags)
		849	if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
		850	});
630	});	851	}
631	}	852	}
632	}	853	}
633		854
634	sub conn::map_change {	855	sub conn::map_change {
635	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;	856	my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
…		…
638		859
639	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);	860	my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
640		861
641	my $mapmapw = 250;	862	my $mapmapw = 250;
642	my $mapmaph = 250;	863	my $mapmaph = 250;
		864
		865	$self->{neigh_rect} = [
		866	$ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
		867	$ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
		868	];
643		869
		870	delete $self->{neigh_grid};
644	$self->flood_fill ("", $hash, $flags,	871	$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		872
648	$x += $ox;	873	$x += $ox;
649	$y += $oy;	874	$y += $oy;
650		875
651	$self->{map_info} = [$hash, $x, $y, $w, $h];	876	$self->{map_info} = [$hash, $x, $y, $w, $h];
…		…
708		933
709	$tex	934	$tex
710	};	935	};
711	}	936	}
712		937
		938	sub conn::sound_play {
		939	my ($self, $x, $y, $soundnum, $type) = @_;
		940
		941	$SDL_MIXER
		942	or return;
		943
		944	my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
		945	or return;
		946
		947	$chunk->play;
		948	# warn "sound $x,$y,$soundnum,$type\n";#d#
		949	}
		950
713	sub conn::query {	951	sub conn::query {
714	my ($self, $flags, $prompt) = @_;	952	my ($self, $flags, $prompt) = @_;
715		953
716	#TODO	954	#TODO, display dialog with relevant information
717	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#	955	warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
718	}	956	}
719		957
720	sub conn::drawinfo {	958	sub conn::drawinfo {
721	my ($self, $color, $text) = @_;	959	my ($self, $color, $text) = @_;
…		…
737	);	975	);
738		976
739	$LOGVIEW->add_paragraph ($color[$color], $text);	977	$LOGVIEW->add_paragraph ($color[$color], $text);
740	}	978	}
741		979
		980	sub conn::spell_add {
		981	my ($self, $spell) = @_;
		982
		983	$MAPWIDGET->add_command ("invoke $spell->{name}", $spell->{message}, sub {
		984	});
		985	$MAPWIDGET->add_command ("cast $spell->{name}", $spell->{message}, sub {
		986	});
		987	}
		988
		989	sub conn::spell_delete {
		990	my ($self, $spell) = @_;
		991	}
		992
		993	sub conn::addme_success {
		994	my ($self) = @_;
		995
		996	for my $skill (values %{$self->{skill_info}}) {
		997	$MAPWIDGET->add_command ("ready_skill $skill", "", sub {
		998	});
		999	$MAPWIDGET->add_command ("use_skill $skill", "", sub {
		1000	});
		1001	}
		1002	}
		1003
742	%SDL_CB = (	1004	%SDL_CB = (
743	SDL_QUIT() => sub {	1005	CFClient::SDL_QUIT => sub {
744	Event::unloop -1;	1006	Event::unloop -1;
745	},	1007	},
746	SDL_VIDEORESIZE() => sub {	1008	CFClient::SDL_VIDEORESIZE => sub {
747	},	1009	},
748	SDL_VIDEOEXPOSE() => sub {	1010	CFClient::SDL_VIDEOEXPOSE => \&refresh,
749	refresh;	1011	CFClient::SDL_ACTIVEEVENT => sub {
		1012	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
750	},	1013	},
751	SDL_KEYDOWN() => sub {	1014	CFClient::SDL_KEYDOWN => sub {
752	if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {	1015	if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
753	# alt-enter	1016	# alt-enter
754	destroy_screen;	1017	video_shutdown;
755	$CFG->{fullscreen} = !$CFG->{fullscreen};	1018	$CFG->{fullscreen} = !$CFG->{fullscreen};
756	init_screen;	1019	video_init;
757	} else {	1020	} else {
758	CFClient::UI::feed_sdl_key_down_event ($SDL_EV);	1021	CFClient::UI::feed_sdl_key_down_event ($_[0]);
759	}	1022	}
760	},	1023	},
761	SDL_KEYUP() => sub {	1024	CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
762	CFClient::UI::feed_sdl_key_up_event ($SDL_EV);	1025	CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
763	},	1026	CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
764	SDL_MOUSEMOTION() => sub {	1027	CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
765	CFClient::UI::feed_sdl_motion_event ($SDL_EV);	1028	CFClient::SDL_USEREVENT => \&audio_music_finished,
766	},
767	SDL_MOUSEBUTTONDOWN() => sub {
768	CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
769	},
770	SDL_MOUSEBUTTONUP() => sub {
771	CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
772	},
773	SDL_ACTIVEEVENT() => sub {
774	# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
775	},
776	);	1029	);
777		1030
778	#############################################################################	1031	#############################################################################
779		1032
780	$SIG{INT} = $SIG{TERM} = sub { exit };	1033	$SIG{INT} = $SIG{TERM} = sub { exit };
…		…
791	fullscreen => 0,	1044	fullscreen => 0,
792	fast => 0,	1045	fast => 0,
793	fow_enable => 1,	1046	fow_enable => 1,
794	fow_intensity => 0.45,	1047	fow_intensity => 0.45,
795	fow_smooth => 0,	1048	fow_smooth => 0,
		1049	gui_fontsize => 1,
796	log_fontsize => 14,	1050	log_fontsize => 14,
797	mapsize => 100,	1051	mapsize => 100,
798	host => "crossfire.schmorp.de",	1052	host => "crossfire.schmorp.de",
799	say_command => 'say',	1053	say_command => 'say',
		1054	audio_enable => 1,
		1055	bgm_enable => 1,
		1056	bgm_volume => 0.25,
800	);	1057	);
801		1058
802	while (my ($k, $v) = each %DEF_CFG) {	1059	while (my ($k, $v) = each %DEF_CFG) {
803	$CFG->{$k} = $v unless exists $CFG->{$k};	1060	$CFG->{$k} = $v unless exists $CFG->{$k};
804	}	1061	}
805		1062
806	sdl_init;	1063	sdl_init;
807		1064
808	@SDL_MODES = reverse	1065	@SDL_MODES = reverse
809	grep $_->[0] >= 640 && $_->[1] >= 480,	1066	grep $_->[0] >= 640 && $_->[1] >= 480,
810	map [SDL::RectW ($_), SDL::RectH ($_)],	1067	CFClient::SDL_ListModes;
811	@{ SDL::ListModes 0, SDL_FULLSCREEN \| SDL_HWSURFACE \| SDL_OPENGL };
812		1068
813	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1069	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
814		1070
815	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1071	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
816		1072
…		…
819		1075
820	CFClient::add_font $_ for @fonts;	1076	CFClient::add_font $_ for @fonts;
821	CFClient::set_font $fonts[0];	1077	CFClient::set_font $fonts[0];
822	}	1078	}
823		1079
824	init_screen;	1080	video_init;
		1081	audio_init;
825		1082
826	Event::loop;	1083	Event::loop;
827		1084
828	END { SDL::Quit }	1085	END { CFClient::SDL_Quit }
829		1086
830		1087

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.133 by root, Tue Apr 18 02:38:51 2006 UTC vs. Revision 1.156 by elmex, Fri Apr 21 12:27:20 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.133 by root, Tue Apr 18 02:38:51 2006 UTC vs.
Revision 1.156 by elmex, Fri Apr 21 12:27:20 2006 UTC