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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.158 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.168 by root, Sun Apr 23 21:47:32 2006 UTC

…		…
36	our @SDL_MODES;	36	our @SDL_MODES;
37	our $WIDTH;	37	our $WIDTH;
38	our $HEIGHT;	38	our $HEIGHT;
39	our $FULLSCREEN;	39	our $FULLSCREEN;
40	our $FONTSIZE;	40	our $FONTSIZE;
		41
		42	our $FONT_PROP;
		43	our $FONT_FIXED;
41		44
42	our $MAP;	45	our $MAP;
43	our $MAPWIDGET;	46	our $MAPWIDGET;
44	our $BUTTONBAR;	47	our $BUTTONBAR;
45	our $LOGVIEW;	48	our $LOGVIEW;
…		…
120	$mode_slider->emit (changed => $mode_slider->{range}[0]);	123	$mode_slider->emit (changed => $mode_slider->{range}[0]);
121		124
122	my $row = 1;	125	my $row = 1;
123		126
124	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");	127	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
125	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {	128	$table->add (1, $row++, new CFClient::UI::CheckBox
		129	state => $CFG->{fullscreen},
		130	tooltip => "Bring the client into fullscreen mode",
		131	connect_changed => sub {
126	my ($self, $value) = @_;	132	my ($self, $value) = @_;
127	$CFG->{fullscreen} = $value;	133	$CFG->{fullscreen} = $value;
		134	}
128	});	135	);
129		136
130	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");	137	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
131	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {	138	$table->add (1, $row++, new CFClient::UI::CheckBox
		139	state => $CFG->{fast},
		140	tooltip => "Lower the visual quality considerably to speed up rendering.",
		141	connect_changed => sub {
132	my ($self, $value) = @_;	142	my ($self, $value) = @_;
133	$CFG->{fast} = $value;	143	$CFG->{fast} = $value;
		144	}
134	});	145	);
135		146
136	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");	147	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
137	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {	148	$table->add (1, $row++, new CFClient::UI::CheckBox
		149	state => $CFG->{fow_enable},
		150	tooltip => "Fog-of-War marks areas that cannot be seen by the player",
		151	connect_changed => sub {
138	my ($self, $value) = @_;	152	my ($self, $value) = @_;
139	$CFG->{fow_enable} = $value;	153	$CFG->{fow_enable} = $value;
		154	}
140	});	155	);
141		156
142	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");	157	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
143	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {	158	$table->add (1, $row++, new CFClient::UI::Slider
		159	range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001],
		160	tooltip => "The higher the intensity, the lighter the Fog-of-War color",
		161	connect_changed => sub {
144	my ($self, $value) = @_;	162	my ($self, $value) = @_;
145	$CFG->{fow_intensity} = $value;	163	$CFG->{fow_intensity} = $value;
		164	}
146	});	165	);
147		166
148	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");	167	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
149	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {	168	$table->add (1, $row++, new CFClient::UI::CheckBox
		169	state => $CFG->{fow_smooth},
		170	tooltip => "Smooth the Fog-of-War a bit to make it more realistic",
		171	connect_changed => sub {
150	my ($self, $value) = @_;	172	my ($self, $value) = @_;
151	$CFG->{fow_smooth} = $value;	173	$CFG->{fow_smooth} = $value;
152	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;	174	status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2;
		175	}
153	});	176	);
154		177
155	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");	178	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
156	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gui_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	179	$table->add (1, $row++, new CFClient::UI::Slider
		180	range => [$CFG->{gui_fontsize}, 0.5, 2, 0.1],
		181	tooltip => "The font size used by most GUI elements",
		182	connect_changed => sub {
157	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;	183	$CFG->{gui_fontsize} = 0.1 * int $_[1] * 10;
158	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};	184	# $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
		185	}
159	});	186	);
160		187
161	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");	188	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Server Log Fontsize");
162	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	189	$table->add (1, $row++, new CFClient::UI::Slider
		190	range => [$CFG->{log_fontsize}, 0.5, 2, 0.1],
		191	tooltip => "The font size used by the server log window only",
		192	connect_changed => sub {
163	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);	193	$LOGVIEW->set_fontsize ($CFG->{log_fontsize} = 0.1 * int $_[1] * 10);
		194	}
164	});	195	);
165		196
166	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");	197	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
167	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{stat_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	198
		199	$table->add (1, $row++, new CFClient::UI::Slider
		200	range => [$CFG->{stat_fontsize}, 0.5, 2, 0.1],
		201	tooltip => "The font size used by the statistics window only",
		202	connect_changed => sub {
168	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;	203	$CFG->{stat_fontsize} = 0.1 * int $_[1] * 10;
169	&set_stats_window_fontsize;	204	&set_stats_window_fontsize;
		205	}
170	});	206	);
171		207
172	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge width");	208	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
173	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_w_size}, 0.1, 0.5, 0.02], connect_changed => sub {	209	$table->add (1, $row++, new CFClient::UI::Slider
174	$CFG->{gauge_w_size} = $_[1];	210	range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02],
175	my $h = int ($HEIGHT * $CFG->{gauge_size});	211	tooltip => "Adjust the size of the stats gauges at the bottom right",
176	my $w = int ($WIDTH * $CFG->{gauge_w_size});	212	connect_changed => sub {
177	$GAUGES->{win}->set_size ($w, $h);
178	$GAUGES->{win}->{y} = $HEIGHT - $h;
179	$GAUGES->{win}->{x} = $WIDTH - $w;
180	$GAUGES->{win}->update;
181	});
182
183	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge height");
184	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_size}, 0.2, 0.8, 0.02], connect_changed => sub {
185	$CFG->{gauge_size} = $_[1];	213	$CFG->{gauge_size} = $_[1];
186	my $h = int ($HEIGHT * $CFG->{gauge_size});	214	my $h = int $HEIGHT * $CFG->{gauge_size};
187	my $w = int ($WIDTH * $CFG->{gauge_w_size});
188	$GAUGES->{win}->set_size ($w, $h);	215	$GAUGES->{win}->set_size ($WIDTH, $h);
189	$GAUGES->{win}->{y} = $HEIGHT - $h;	216	$GAUGES->{win}->move (0, $HEIGHT - $h);
190	$GAUGES->{win}->{x} = $WIDTH - $w;	217	}
191	$GAUGES->{win}->update;
192	});	218	);
193
194		219
195	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");	220	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
196	$table->add (1, $row++, new CFClient::UI::Slider range => [$CFG->{gauge_fontsize}, 0.7, 1.7, 0.1], connect_changed => sub {	221	$table->add (1, $row++, new CFClient::UI::Slider
		222	range => [$CFG->{gauge_fontsize}, 0.5, 2.0, 0.1],
		223	tooltip => "Adjusts the fontsize of the gauges at the bottom right",
		224	connect_changed => sub {
197	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;	225	$CFG->{gauge_fontsize} = 0.1 * int $_[1] * 10;
198	&set_gauge_window_fontsize;	226	&set_gauge_window_fontsize;
199	$GAUGES->{win}->check_size;	227	#$GAUGES->{win}->check_size;
200	$GAUGES->{win}->update;	228	#$GAUGES->{win}->update;
		229	}
201	});	230	);
202		231
203		232	$table->add (1, $row++, new CFClient::UI::Button
204		233	expand => 1, align => 0, text => "Apply",
205	$table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	234	tooltip => "Apply the video settings",
		235	connect_activate => sub {
206	video_shutdown ();	236	video_shutdown ();
207	video_init ();	237	video_init ();
		238	}
208	});	239	);
209		240
210	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");	241	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
211	$table->add (1, $row++, new CFClient::UI::CheckBox state => $CFG->{audio_enable}, connect_changed => sub {	242	$table->add (1, $row++, new CFClient::UI::CheckBox
		243	state => $CFG->{audio_enable},
		244	tooltip => "If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
		245	connect_changed => sub {
212	$CFG->{audio_enable} = $_[1];	246	$CFG->{audio_enable} = $_[1];
		247	}
213	});	248	);
214	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");	249	# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
215	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {	250	# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub {
216	# $CFG->{effects_volume} = $_[1];	251	# $CFG->{effects_volume} = $_[1];
217	# });	252	# });
218	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");	253	$table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
219	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);	254	$table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
220	$hbox->add (new CFClient::UI::CheckBox expand => 1, state => $CFG->{bgm_enable}, connect_changed => sub {	255	$hbox->add (new CFClient::UI::CheckBox
		256	expand => 1, state => $CFG->{bgm_enable},
		257	tooltip => "Enable background music playing",
		258	connect_changed => sub {
221	$CFG->{bgm_enable} = $_[1];	259	$CFG->{bgm_enable} = $_[1];
		260	}
222	});	261	);
223	$hbox->add (new CFClient::UI::Slider expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1], connect_changed => sub {	262	$hbox->add (new CFClient::UI::Slider
		263	expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0.1],
		264	tooltip => "The volume of the background music",
		265	connect_changed => sub {
224	$CFG->{bgm_volume} = $_[1];	266	$CFG->{bgm_volume} = $_[1];
225	CFClient::MixMusic::volume $_[1] * 128;	267	CFClient::MixMusic::volume $_[1] * 128;
		268	}
226	});	269	);
227		270
228	$table->add (1, $row++, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {	271	$table->add (1, $row++, new CFClient::UI::Button
		272	expand => 1, align => 0, text => "Apply",
		273	tooltip => "Apply the audio settings",
		274	connect_activate => sub {
229	audio_shutdown ();	275	audio_shutdown ();
230	audio_init ();	276	audio_init ();
		277	}
231	});	278	);
232		279
233	$dialog	280	$dialog
234	}	281	}
235		282
236	sub set_stats_window_fontsize {	283	sub set_stats_window_fontsize {
…		…
245	}	292	}
246	}	293	}
247		294
248	sub make_gauge_window {	295	sub make_gauge_window {
249	my $gh = int ($HEIGHT * $CFG->{gauge_size});	296	my $gh = int ($HEIGHT * $CFG->{gauge_size});
250	my $gw = int ($WIDTH * $CFG->{gauge_w_size});	297	# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
251		298
252	my $win = new CFClient::UI::Frame (	299	my $win = new CFClient::UI::Frame (
253	y => $HEIGHT - $gh, x => $WIDTH - $gw, req_w => $gw, req_h => $gh	300	y => $HEIGHT - $gh, x => 0, req_w => $WIDTH, req_h => $gh
254	);	301	);
255	$win->add (my $vb = new CFClient::UI::VBox);	302	$win->add (my $vb = new CFClient::UI::VBox);
256		303
257	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	304	$vb->add (my $hbg = new CFClient::UI::HBox expand => 1);
		305
		306
		307	$hbg->add (new CFClient::UI::Empty expand => 1);
		308	$hbg->add (my $hb = new CFClient::UI::HBox);
258	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', expand => 1);	309	$hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', tooltip => "Health points");
259	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', expand => 1);	310	$hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', tooltip => "Spellpoints");
260	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', expand => 1);	311	$hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', tooltip => "Grace");
261	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', expand => 1);	312	$hb->add (my $fg = new CFClient::UI::Gauge type => 'food', tooltip => "Food");
		313
262	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => -1, text => "XP:");	314	$vb->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, text => "XP: 0 LVL: 0");
263	$vb->add (my $lvl = new CFClient::UI::Label valign => 0, align => -1, text => "Lvl:");	315	$vb->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, text => "Rng:");
264
265		316
266	$GAUGES = {	317	$GAUGES = {
267	exp => $exp, lvl => $lvl, win => $win,	318	exp => $exp, win => $win, range => $rng,
268	food => $fg, mana => $mg, hp => $hg, grace => $gg	319	food => $fg, mana => $mg, hp => $hg, grace => $gg
269	};	320	};
270	$win	321	$win
271	}	322	}
272		323
273	sub make_stats_window {	324	sub make_stats_window {
274	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");	325	my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats");
275		326
276	$tgw->add (my $vb = new CFClient::UI::VBox);	327	$tgw->add (my $vb = new CFClient::UI::VBox);
277	$vb->add (my $uhb = new CFClient::UI::HBox);
278	$uhb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);	328	$vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
279	$uhb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);	329	$vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
280		330
281	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);	331	$vb->add (my $hb = new CFClient::UI::HBox expand => 1);
282		332
283	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);	333	$hb->add (my $tbl = new CFClient::UI::Table expand => 1);
284		334
		335	$tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		336	$tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		337	$tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		338	$tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		339	$tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		340	$tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		341	$tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30");
		342
285	$tbl->add (0, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "S");	343	$tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Str");
286	$tbl->add (0, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "D");	344	$tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dex");
287	$tbl->add (0, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Co");	345	$tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Con");
288	$tbl->add (0, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "I");	346	$tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Int");
289	$tbl->add (0, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "W");	347	$tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wis");
290	$tbl->add (0, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "P");	348	$tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Pow");
291	$tbl->add (0, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ch");	349	$tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Cha");
292		350
293	$tbl->add (1, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => -1, text => "");	351	$tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
		352	$tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120");
294	$tbl->add (1, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => -1, text => "");	353	$tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
295	$tbl->add (1, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => -1, text => "");
296	$tbl->add (1, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => -1, text => "");	354	$tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120");
		355	$tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54");
297	$tbl->add (1, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => -1, text => "");	356	$tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
298	$tbl->add (1, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => -1, text => "");
299	$tbl->add (1, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => -1, text => "");
300		357
301	$tbl->add (2, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Wc");	358	$tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Wc");
302	$tbl->add (2, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Ac");	359	$tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Ac");
303	$tbl->add (2, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Dam");	360	$tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Dam");
304	$tbl->add (2, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Arm");	361	$tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Arm");
305	$tbl->add (2, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "Sp");	362	$tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "Sp");
306	$tbl->add (2, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => +1, text => "WSp");	363	$tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label valign => 0, align => -1, text => "WSp");
307
308	$tbl->add (3, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => -1, text => "");
309	$tbl->add (3, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => -1, text => "");
310	$tbl->add (3, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => -1, text => "");
311	$tbl->add (3, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => -1, text => "");
312	$tbl->add (3, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
313	$tbl->add (3, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => -1, text => "");
314		364
315	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);	365	$hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
316		366
317	my $row = 0;	367	my $row = 0;
318	my $col = 0;	368	my $col = 0;
319		369
		370	my %resist_names = (
		371	slow => "Slow",
		372	holyw => "Holy Word",
		373	conf => "Confusion",
		374	fire => "Fire",
		375	depl => "Depletion",
		376	magic => "Magic",
		377	drain => "Draining",
		378	acid => "Acid",
		379	pois => "Poison",
		380	para => "Paralysation",
		381	deat => "Death",
		382	phys => "Physical",
		383	blind => "Blind",
		384	fear => "Fear",
		385	tund => "Turn undead",
		386	elec => "Electricity",
		387	cold => "Cold",
		388	ghit => "Ghost hit",
		389	);
320	for (qw/slow holyw conf fire depl magic	390	for (qw/slow holyw conf fire depl magic
321	drain acid pois para deat phys	391	drain acid pois para deat phys
322	blind fear tund elec cold ghit/)	392	blind fear tund elec cold ghit/)
323	{	393	{
324	$tbl2->add ($col, $row, new CFClient::UI::Image image => "ui/resist/resist_$_.png");
325	$tbl2->add ($col + 1, $row,	394	$tbl2->add ($col, $row,
326	$STATWIDS->{"res_$_"} =	395	$STATWIDS->{"res_$_"} =
327	new CFClient::UI::Label text => "0", align => -1, valign => 0	396	new CFClient::UI::Label
		397	template => "-100%",
		398	align => +1,
		399	valign => 0,
		400	tooltip => $resist_names{$_}
		401	);
		402	$tbl2->add ($col + 1, $row, new CFClient::UI::Image
		403	can_hover => 1,
		404	can_events => 1,
		405	image => "ui/resist/resist_$_.png",
		406	tooltip => $resist_names{$_}
328	);	407	);
329		408
330	$row++;	409	$row++;
331	if ($row % 6 == 0) {	410	if ($row % 6 == 0) {
332	$col += 2;	411	$col += 2;
…		…
355		434
356	$GAUGES->{hp} ->set_value ($hp, $hp_m);	435	$GAUGES->{hp} ->set_value ($hp, $hp_m);
357	$GAUGES->{mana} ->set_value ($sp, $sp_m);	436	$GAUGES->{mana} ->set_value ($sp, $sp_m);
358	$GAUGES->{food} ->set_value ($fo, $fo_m);	437	$GAUGES->{food} ->set_value ($fo, $fo_m);
359	$GAUGES->{grace} ->set_value ($gr, $gr_m);	438	$GAUGES->{grace} ->set_value ($gr, $gr_m);
360	$GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} \|\| $stats->{28}));	439	$GAUGES->{exp} ->set_text ("XP: " . ($stats->{11} \|\| $stats->{28}) * 1
361	$GAUGES->{lvl} ->set_text ("LVL: " . $stats->{12});	440	." LVL: " . $stats->{12} * 1);
		441	my $rng = $stats->{20};
		442	$rng =~ s/^Range: //; # thank you so much dear server
		443	$GAUGES->{range} ->set_text ("Rng: " . $rng);
		444	my $title = $stats->{21};
		445	$title =~ s/^Player: //;
362	$STATWIDS->{title} ->set_text ("Title: " . $stats->{21});	446	$STATWIDS->{title} ->set_text ("Title: " . $title);
363		447
364	if (0) { # this code can vanish, just wanted to preserver it for a checkin
365	$STATWIDS->{st_str} ->set_text (sprintf "S%d", $stats->{5});
366	$STATWIDS->{st_dex} ->set_text (sprintf "D%d", $stats->{8});
367	$STATWIDS->{st_con} ->set_text (sprintf "Co%d", $stats->{9});
368	$STATWIDS->{st_int} ->set_text (sprintf "I%d", $stats->{6});
369	$STATWIDS->{st_wis} ->set_text (sprintf "W%d", $stats->{7});
370	$STATWIDS->{st_pow} ->set_text (sprintf "P%d", $stats->{22});
371	$STATWIDS->{st_cha} ->set_text (sprintf "Ch%d", $stats->{10});
372	$STATWIDS->{st_wc} ->set_text (sprintf "Wc%d", $stats->{13});
373	$STATWIDS->{st_ac} ->set_text (sprintf "Ac%d", $stats->{14});
374	$STATWIDS->{st_dam} ->set_text (sprintf "Dam%d", $stats->{15});
375	$STATWIDS->{st_arm} ->set_text (sprintf "Arm%d", $stats->{16});
376	$STATWIDS->{st_spd} ->set_text (sprintf "Sp%.1f", $stats->{17});
377	$STATWIDS->{st_wspd}->set_text (sprintf "WSp%.1f", $stats->{19});
378	} else {
379	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});	448	$STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5});
380	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});	449	$STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8});
381	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});	450	$STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9});
382	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});	451	$STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6});
383	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});	452	$STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7});
384	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});	453	$STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22});
385	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});	454	$STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10});
386	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});	455	$STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13});
387	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});	456	$STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14});
388	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});	457	$STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15});
389	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});	458	$STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16});
390	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});	459	$STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{17});
391	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});	460	$STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{19});
392	}
393		461
394	my %tbl = (	462	my %tbl = (
395	phys => 100,	463	phys => 100,
396	magic => 101,	464	magic => 101,
397	fire => 102,	465	fire => 102,
…		…
404	pois => 109,	472	pois => 109,
405	slow => 110,	473	slow => 110,
406	para => 111,	474	para => 111,
407	tund => 112,	475	tund => 112,
408	fear => 113,	476	fear => 113,
		477	depl => 113,
409	deat => 115,	478	deat => 115,
410	holyw => 116,	479	holyw => 116,
411	blind => 117	480	blind => 117
412	);	481	);
413		482
…		…
502	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");	571	$table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
503		572
504	{	573	{
505	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);	574	$table->add (1, 2, my $vbox = new CFClient::UI::VBox);
506		575
507	$vbox->add (my $HOST = new CFClient::UI::Entry expand => 1, text => $CFG->{host}, connect_changed => sub {	576	$vbox->add (
		577	my $HOST = new CFClient::UI::Entry
		578	expand => 1,
		579	text => $CFG->{host},
		580	tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
		581	connect_changed => sub {
		582	my ($self, $value) = @_;
		583	$CFG->{host} = $value;
		584	}
		585	);
		586
		587	$METASERVER = metaserver_dialog;
		588
		589	$vbox->add (new CFClient::UI::Flopper
		590	expand => 1,
		591	text => "Metaserver",
		592	other => $METASERVER,
		593	tooltip => "Show a list of avaible crossfire servers",
		594	connect_open => sub {
		595	update_metaserver $HOST;
		596	}
		597	);
		598	}
		599
		600	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
		601	$table->add (1, 4, new CFClient::UI::Entry
		602	text => $CFG->{user},
		603	tooltip => "The name of your character on the server",
		604	connect_changed => sub {
508	my ($self, $value) = @_;	605	my ($self, $value) = @_;
509	$CFG->{host} = $value;
510	});
511
512	$METASERVER = metaserver_dialog;
513
514	$vbox->add (new CFClient::UI::Flopper expand => 1, text => "Metaserver", other => $METASERVER, connect_open => sub {
515	update_metaserver $HOST;
516	});
517	}
518
519	$table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
520	$table->add (1, 4, new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
521	my ($self, $value) = @_;
522	$CFG->{user} = $value;	606	$CFG->{user} = $value;
		607	}
523	});	608	);
524		609
525	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");	610	$table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
526	$table->add (1, 5, new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {	611	$table->add (1, 5, new CFClient::UI::Entry
		612	text => $CFG->{password},
		613	hidden => 1,
		614	tooltip => "The password for your character",
		615	connect_changed => sub {
527	my ($self, $value) = @_;	616	my ($self, $value) = @_;
528	$CFG->{password} = $value;	617	$CFG->{password} = $value;
		618	}
529	});	619	);
530		620
531	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");	621	$table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
532	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {	622	$table->add (1, 6, my $saycmd = new CFClient::UI::Entry
		623	text => $CFG->{say_command},
		624	tooltip => "This is the command that will be used if you write a line in the message window entry. "
		625	."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
		626	."But you could also set it to 'tell <playername>' to only chat with that user.",
		627	connect_changed => sub {
533	my ($self, $value) = @_;	628	my ($self, $value) = @_;
534	$CFG->{say_command} = $value;	629	$CFG->{say_command} = $value;
		630	}
535	});	631	);
536		632
537	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");	633	$table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
538	$table->add (1, 7, new CFClient::UI::Slider	634	$table->add (1, 7, new CFClient::UI::Slider
539	req_w => 100,	635	req_w => 100,
540	range => [$CFG->{mapsize}, 10, 100 + 1, 1],	636	range => [$CFG->{mapsize}, 10, 100 + 1, 1],
		637	tooltip => "This is the size of the portion of the map update the server sends you. "
		638	."If you set this to a high value you will be able to see further for example.",
541	connect_changed => sub {	639	connect_changed => sub {
542	my ($self, $value) = @_;	640	my ($self, $value) = @_;
543		641
544	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;	642	$CFG->{mapsize} = $self->{range}[0] = $value = int $value;
545	},	643	},
…		…
561	user_h => int $::HEIGHT / 5,	659	user_h => int $::HEIGHT / 5,
562	child => (my $vbox = new CFClient::UI::VBox);	660	child => (my $vbox = new CFClient::UI::VBox);
563		661
564	$vbox->add ($LOGVIEW = new CFClient::UI::TextView	662	$vbox->add ($LOGVIEW = new CFClient::UI::TextView
565	expand => 1,	663	expand => 1,
		664	font => $FONT_FIXED,
566	fontsize => $::CFG->{log_fontsize},	665	fontsize => $::CFG->{log_fontsize},
567	);	666	);
568		667
569	$vbox->add (my $input = new CFClient::UI::Entry	668	$vbox->add (my $input = new CFClient::UI::Entry
570	connect_focus_in => sub {	669	connect_focus_in => sub {
…		…
664		763
665	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);	764	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
666	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);	765	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
667	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);	766	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
668		767
		768	$CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
		769	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
		770
669	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {	771	$BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
670	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";	772	CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
671	status "Configuration Saved";	773	status "Configuration Saved";
672	});	774	});
673		775
674	$CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
675	$BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
676
677	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup	776	$BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
678
679
680	}	777	}
681		778
682	sub video_shutdown {	779	sub video_shutdown {
683	$CFClient::UI::ROOT->{children} = [];	780	$CFClient::UI::ROOT->{children} = [];
684	undef $SDL_ACTIVE;	781	undef $SDL_ACTIVE;
…		…
1110	fow_smooth => 0,	1207	fow_smooth => 0,
1111	gui_fontsize => 1,	1208	gui_fontsize => 1,
1112	log_fontsize => 1,	1209	log_fontsize => 1,
1113	gauge_fontsize => 1,	1210	gauge_fontsize => 1,
1114	gauge_size => 0.35,	1211	gauge_size => 0.35,
1115	gauge_w_size => 0.14,
1116	stat_fontsize => 1,	1212	stat_fontsize => 1,
1117	mapsize => 100,	1213	mapsize => 100,
1118	host => "crossfire.schmorp.de",	1214	host => "crossfire.schmorp.de",
1119	say_command => 'say',	1215	say_command => 'say',
1120	audio_enable => 1,	1216	audio_enable => 1,
…		…
1135	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";	1231	@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1136		1232
1137	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;	1233	$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1138		1234
1139	{	1235	{
1140	my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);	1236	my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
		1237	DejaVuSans.ttf
		1238	DejaVuSansMono.ttf
		1239	DejaVuSans-Bold.ttf
		1240	DejaVuSansMono-Bold.ttf
		1241	DejaVuSans-Oblique.ttf
		1242	DejaVuSansMono-Oblique.ttf
		1243	DejaVuSans-BoldOblique.ttf
		1244	DejaVuSansMono-BoldOblique.ttf
		1245	);
1141		1246
1142	CFClient::add_font $_ for @fonts;	1247	CFClient::add_font $_ for @fonts;
1143	CFClient::set_font $fonts[0];	1248
		1249	$FONT_PROP = new_from_file CFClient::Font $fonts[0];
		1250	$FONT_FIXED = new_from_file CFClient::Font $fonts[1];
		1251
		1252	$FONT_PROP->make_default;
1144	}	1253	}
1145		1254
1146	video_init;	1255	video_init;
1147	audio_init;	1256	audio_init;
1148		1257

Diff Legend

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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents): Revision 1.158 by elmex, Sat Apr 22 12:14:45 2006 UTC vs. Revision 1.168 by root, Sun Apr 23 21:47:32 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.158 by elmex, Sat Apr 22 12:14:45 2006 UTC vs.
Revision 1.168 by root, Sun Apr 23 21:47:32 2006 UTC