ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/bin/cfplus
(Generate patch)

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.59 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.76 by root, Tue Jun 20 08:49:40 2006 UTC

… …
84our $CONSOLE; 84our $CONSOLE;
85our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY; 88our $HOST_ENTRY;
89our $SERVER_INFO;
89 90
90our $SETUP_DIALOG; 91our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 92our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 93our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 94our $SETUP_KEYBOARD;
94our $SETUP_SPELLS; 95our $SETUP_SPELLS;
95 96
97our $STATS_WINDOW;
98our $MESSAGE_WINDOW;
96our $FLOORBOX; 99our $FLOORBOX;
97our $GAUGES; 100our $GAUGES;
98our $STATWIDS; 101our $STATWIDS;
99 102
100our $SDL_ACTIVE; 103our $SDL_ACTIVE;
… …
123 126
124sub debug { 127sub debug {
125 $DEBUG_STATUS->set_text ($_[0]); 128 $DEBUG_STATUS->set_text ($_[0]);
126} 129}
127 130
131sub destroy_query_dialog {
132 (delete $_[0]{query_dialog})->destroy
133 if $_[0]{query_dialog};
134}
135
136# server query dialog
137sub server_query {
138 my ($conn, $flags, $prompt) = @_;
139
140 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
141 x => "center",
142 y => "center",
143 title => "Server Query",
144 child => my $vbox = new CFClient::UI::VBox,
145 ;
146
147 my @dialog = my $label = new CFClient::UI::Label
148 max_w => $::WIDTH * 0.4,
149 ellipsise => 0,
150 text => $prompt;
151
152 if ($flags & CS_QUERY_YESNO) {
153 push @dialog, my $hbox = new CFClient::UI::HBox;
154
155 $hbox->add (new CFClient::UI::Button
156 text => "No",
157 on_activate => sub {
158 $conn->send ("reply n");
159 $dialog->destroy;
160 0
161 }
162 );
163 $hbox->add (new CFClient::UI::Button
164 text => "Yes",
165 on_activate => sub {
166 $conn->send ("reply y");
167 destroy_query_dialog $conn;
168 0
169 },
170 );
171
172 $dialog->grab_focus;
173
174 } elsif ($flags & CS_QUERY_SINGLECHAR) {
175 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
176
177 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
178 $MESSAGE_WINDOW->show;
179
180 unshift @dialog, new CFClient::UI::Label
181 max_w => $::WIDTH * 0.4,
182 ellipsise => 0,
183 markup => "\nOr use your keyboard:\n";
184
185 unshift @dialog, my $table = new CFClient::UI::Table;
186
187 $table->add (0, 0, new CFClient::UI::Button
188 text => "Next Race",
189 on_activate => sub {
190 $conn->send ("reply n");
191 destroy_query_dialog $conn;
192 0
193 },
194 );
195 $table->add (2, 0, new CFClient::UI::Button
196 text => "Accept",
197 on_activate => sub {
198 $conn->send ("reply d");
199 destroy_query_dialog $conn;
200 0
201 },
202 );
203
204 unshift @dialog, new CFClient::UI::Label
205 max_w => $::WIDTH * 0.4,
206 ellipsise => 0,
207 markup =>
208 "<big><b>Character Creation: Race</b></big>\n\n"
209 . "Look at the <b>Messages</b> window to see a description of this race "
210 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
211 . "and the center of the screen to see how this race looks like "
212 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
213 . "You can look at another race, or accept this race (you will come back to this race eventually, "
214 . "so you can take your time making this important choice."
215 ;
216
217 } elsif ($prompt =~ /roll new stats/) {
218 if (my $stat = delete $conn->{stat_change_with}) {
219 $conn->send ("reply $stat");
220 destroy_query_dialog $conn;
221 return;
222 }
223
224 $STATS_WINDOW->show;
225 $MESSAGE_WINDOW->hide;
226
227 unshift @dialog, new CFClient::UI::Label
228 max_w => $::WIDTH * 0.4,
229 ellipsise => 0,
230 markup => "\nOr use your keyboard:\n";
231
232 unshift @dialog, my $table = new CFClient::UI::Table;
233
234 # left: re-roll
235 $table->add (0, 0, new CFClient::UI::Button
236 text => "Roll Again",
237 on_activate => sub {
238 $conn->send ("reply y");
239 destroy_query_dialog $conn;
240 0
241 },
242 );
243
244 # center: swap stats
245 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
246 value => $_,
247 options => [
248 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
249 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
250 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
251 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
252 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
253 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
254 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
255 ],
256 ), 1 .. 2;
257
258 $table->add (2, 0, new CFClient::UI::Button
259 text => "Swap Stats",
260 on_activate => sub {
261 $conn->{stat_change_with} = $sw2->{value};
262 $conn->send ("reply $sw1->{value}");
263 destroy_query_dialog $conn;
264 0
265 },
266 );
267 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
268
269 # right: accept
270 $table->add (4, 0, new CFClient::UI::Button
271 text => "Accept",
272 on_activate => sub {
273 $conn->send ("reply n");
274 $STATS_WINDOW->hide;
275 destroy_query_dialog $conn;
276 0
277 },
278 );
279
280 unshift @dialog, new CFClient::UI::Label
281 max_w => $::WIDTH * 0.4,
282 ellipsise => 0,
283 markup =>
284 "<big><b>Character Creation: Stats</b></big>\n\n"
285 . "Look at the <b>Stats</b> window to see your basic stats "
286 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
287 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
288 . "Race selection will influence those values later on."
289 ;
290 }
291
292 push @dialog, my $entry = new CFClient::UI::Entry
293 on_changed => sub {
294 $conn->send ("reply $_[1]");
295 destroy_query_dialog $conn;
296 0
297 },
298 ;
299
300 $entry->grab_focus;
301
302 } else {
303 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
304
305 push @dialog, my $entry = new CFClient::UI::Entry
306 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
307 on_activate => sub {
308 $conn->send ("reply $_[1]");
309 destroy_query_dialog $conn;
310 0
311 },
312 ;
313
314 $entry->grab_focus;
315 }
316
317 $vbox->add (@dialog);
318 $dialog->show;
319}
320
128sub start_game { 321sub start_game {
129 status "logging in..."; 322 status "logging in...";
130 323
131 $LOGIN_BUTTON->set_text ("Logout"); 324 $LOGIN_BUTTON->set_text ("Logout");
132 $SETUP_DIALOG->hide; 325 $SETUP_DIALOG->hide;
133 326
134 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 327 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
135 328
136 my ($host, $port) = split /:/, $CFG->{host}; 329 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
137 330
138 $MAP = new CFClient::Map $mapsize, $mapsize; 331 $MAP = new CFClient::Map $mapsize, $mapsize;
139 332
140 $CONN = eval { 333 $CONN = eval {
141 new CFClient::Protocol 334 new CFClient::Protocol
142 host => $host, 335 host => $host,
143 port => $port || 13327, 336 port => $port || 13327,
144 user => $CFG->{user}, 337 user => $CFG->{profile}{default}{user},
145 pass => $CFG->{password}, 338 pass => $CFG->{profile}{default}{password},
146 mapw => $mapsize, 339 mapw => $mapsize,
147 maph => $mapsize, 340 maph => $mapsize,
148 341
149 map_widget => $MAPWIDGET, 342 map_widget => $MAPWIDGET,
150 logview => $LOGVIEW, 343 logview => $LOGVIEW,
151 statusbox => $STATUSBOX, 344 statusbox => $STATUSBOX,
152 map => $MAP, 345 map => $MAP,
153 mapmap => $MAPMAP, 346 mapmap => $MAPMAP,
347 query => \&server_query,
154 348
155 sound_play => sub { 349 sound_play => sub {
156 my ($x, $y, $soundnum, $type) = @_; 350 my ($x, $y, $soundnum, $type) = @_;
157 351
158 $SDL_MIXER 352 $SDL_MIXER
… …
178sub stop_game { 372sub stop_game {
179 $LOGIN_BUTTON->set_text ("Login"); 373 $LOGIN_BUTTON->set_text ("Login");
180 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 374 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
181 $SETUP_DIALOG->show; 375 $SETUP_DIALOG->show;
182 $INV_WINDOW->hide; 376 $INV_WINDOW->hide;
377 $SETUP_SPELLS->clear_spells;
183 378
184 return unless $CONN; 379 return unless $CONN;
185 380
186 status "connection closed"; 381 status "connection closed";
187 382
383 destroy_query_dialog $CONN;
188 $CONN->destroy; 384 $CONN->destroy;
189 $CONN = 0; # false, does not autovivify 385 $CONN = 0; # false, does not autovivify
386
387 undef $MAP;
190} 388}
191 389
192sub graphics_setup { 390sub graphics_setup {
193 my $vbox = new CFClient::UI::VBox; 391 my $vbox = new CFClient::UI::VBox;
194 392
… …
212 410
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 411 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
214 $table->add (1, $row++, new CFClient::UI::CheckBox 412 $table->add (1, $row++, new CFClient::UI::CheckBox
215 state => $CFG->{fullscreen}, 413 state => $CFG->{fullscreen},
216 tooltip => "Bring the client into fullscreen mode.", 414 tooltip => "Bring the client into fullscreen mode.",
217 on_changed => sub { 415 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
218 my ($self, $value) = @_;
219 $CFG->{fullscreen} = $value;
220 }
221 ); 416 );
222 417
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 418 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
224 $table->add (1, $row++, new CFClient::UI::CheckBox 419 $table->add (1, $row++, new CFClient::UI::CheckBox
225 state => $CFG->{fast}, 420 state => $CFG->{fast},
226 tooltip => "Lower the visual quality considerably to speed up rendering.", 421 tooltip => "Lower the visual quality considerably to speed up rendering.",
227 on_changed => sub { 422 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{fast} = $value;
230 }
231 ); 423 );
232 424
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 425 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
234 $table->add (1, $row++, new CFClient::UI::Slider 426 $table->add (1, $row++, new CFClient::UI::Slider
235 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 427 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
236 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 428 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
237 on_changed => sub { 429 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{map_scale} = 2 ** $value;
240 }
241 ); 430 );
242 431
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 432 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
244 $table->add (1, $row++, new CFClient::UI::CheckBox 433 $table->add (1, $row++, new CFClient::UI::CheckBox
245 state => $CFG->{fow_enable}, 434 state => $CFG->{fow_enable},
246 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 435 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
247 on_changed => sub { 436 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
248 my ($self, $value) = @_;
249 $CFG->{fow_enable} = $value;
250 }
251 ); 437 );
252 438
253 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 439 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
254 $table->add (1, $row++, new CFClient::UI::Slider 440 $table->add (1, $row++, new CFClient::UI::Slider
255 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 441 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
256 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 442 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
257 on_changed => sub { 443 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
258 my ($self, $value) = @_;
259 $CFG->{fow_intensity} = $value;
260 }
261 ); 444 );
262 445
263 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 446 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
264 $table->add (1, $row++, new CFClient::UI::CheckBox 447 $table->add (1, $row++, new CFClient::UI::CheckBox
265 state => $CFG->{fow_smooth}, 448 state => $CFG->{fow_smooth},
266 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 449 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
267 on_changed => sub { 450 on_changed => sub {
268 my ($self, $value) = @_; 451 my ($self, $value) = @_;
269 $CFG->{fow_smooth} = $value; 452 $CFG->{fow_smooth} = $value;
270 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 453 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
454 0
271 } 455 }
272 ); 456 );
273 457
274 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 458 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
275 $table->add (1, $row++, new CFClient::UI::Slider 459 $table->add (1, $row++, new CFClient::UI::Slider
276 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 460 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
277 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 461 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
278 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 462 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
279 ); 463 );
280 464
281 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 465 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
282 $table->add (1, $row++, new CFClient::UI::Slider 466 $table->add (1, $row++, new CFClient::UI::Slider
283 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 467 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
284 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 468 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
285 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 469 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
286 ); 470 );
287 471
288 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 472 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
289 473
290 $table->add (1, $row++, new CFClient::UI::Slider 474 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 475 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
292 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 476 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
293 on_changed => sub { 477 on_changed => sub {
294 $CFG->{stat_fontsize} = $_[1]; 478 $CFG->{stat_fontsize} = $_[1];
295 &set_stats_window_fontsize; 479 &set_stats_window_fontsize;
480 0
296 } 481 }
297 ); 482 );
298 483
299 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 484 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
300 $table->add (1, $row++, new CFClient::UI::Slider 485 $table->add (1, $row++, new CFClient::UI::Slider
301 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 486 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
302 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 487 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
303 on_changed => sub { 488 on_changed => sub {
304 $CFG->{gauge_fontsize} = $_[1]; 489 $CFG->{gauge_fontsize} = $_[1];
305 &set_gauge_window_fontsize; 490 &set_gauge_window_fontsize;
491 0
306 } 492 }
307 ); 493 );
308 494
309 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 495 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
310 $table->add (1, $row++, new CFClient::UI::Slider 496 $table->add (1, $row++, new CFClient::UI::Slider
311 range => [$CFG->{gauge_size}, 0.2, 0.8], 497 range => [$CFG->{gauge_size}, 0.2, 0.8],
312 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 498 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
313 on_changed => sub { 499 on_changed => sub {
314 $CFG->{gauge_size} = $_[1]; 500 $CFG->{gauge_size} = $_[1];
315 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 501 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
502 0
316 } 503 }
317 ); 504 );
318 505
319 $table->add (1, $row++, new CFClient::UI::Button 506 $table->add (1, $row++, new CFClient::UI::Button
320 expand => 1, align => 0, text => "Apply", 507 expand => 1, align => 0, text => "Apply",
321 tooltip => "Apply the video settings", 508 tooltip => "Apply the video settings",
322 on_activate => sub { 509 on_activate => sub {
323 video_shutdown (); 510 video_shutdown ();
324 video_init (); 511 video_init ();
512 0
325 } 513 }
326 ); 514 );
327 515
328 $vbox 516 $vbox
329} 517}
… …
337 525
338 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 526 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
339 $table->add (1, $row++, new CFClient::UI::CheckBox 527 $table->add (1, $row++, new CFClient::UI::CheckBox
340 state => $CFG->{audio_enable}, 528 state => $CFG->{audio_enable},
341 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 529 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
342 on_changed => sub { 530 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
343 $CFG->{audio_enable} = $_[1];
344 }
345 ); 531 );
346# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 532# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
347# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 533# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
348# $CFG->{effects_volume} = $_[1]; 534# $CFG->{effects_volume} = $_[1];
349# }); 535# });
350 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 536 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
351 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 537 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
352 $hbox->add (new CFClient::UI::CheckBox 538 $hbox->add (new CFClient::UI::CheckBox
353 expand => 1, state => $CFG->{bgm_enable}, 539 expand => 1, state => $CFG->{bgm_enable},
354 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 540 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
355 on_changed => sub { 541 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
356 $CFG->{bgm_enable} = $_[1];
357 }
358 ); 542 );
359 $hbox->add (new CFClient::UI::Slider 543 $hbox->add (new CFClient::UI::Slider
360 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 544 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
361 tooltip => "The volume of the background music. Changes are instant.", 545 tooltip => "The volume of the background music. Changes are instant.",
362 on_changed => sub { 546 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
363 $CFG->{bgm_volume} = $_[1];
364 CFClient::MixMusic::volume $_[1] * 128;
365 }
366 ); 547 );
367 548
368 $table->add (1, $row++, new CFClient::UI::Button 549 $table->add (1, $row++, new CFClient::UI::Button
369 expand => 1, align => 0, text => "Apply", 550 expand => 1, align => 0, text => "Apply",
370 tooltip => "Apply the audio settings", 551 tooltip => "Apply the audio settings",
371 on_activate => sub { 552 on_activate => sub {
372 audio_shutdown (); 553 audio_shutdown ();
373 audio_init (); 554 audio_init ();
555 0
374 } 556 }
375 ); 557 );
376 558
377 $vbox 559 $vbox
378} 560}
… …
440 &set_gauge_window_fontsize; 622 &set_gauge_window_fontsize;
441 623
442 $win 624 $win
443} 625}
444 626
627sub debug_setup {
628 my $table = new CFClient::UI::Table;
445 629
630 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
631 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
632 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
633 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
634 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
635 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
636 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
637 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
638
639 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
640
641 for my $x (0..2) {
642 for my $y (0 .. 2) {
643 $table->add ($x + 3, $y,
644 new CFClient::UI::Entry
645 text => $default_smooth[$x * 3 + $y],
646 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
647 );
648 }
649 }
650
651
652 $table
653}
654
446sub make_stats_window { 655sub stats_window {
447 my $tgw = new CFClient::UI::FancyFrame 656 my $tgw = new CFClient::UI::FancyFrame
448 y => $HEIGHT * (2/8), 657 y => $HEIGHT * (2/8),
449 x => "max", 658 x => "max",
450 title => "Stats", 659 title => "Stats",
451 name => "stats_window"; 660 name => "stats_window",
661 has_close_button => 1;
452 662
453 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox); 663 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
454 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
455 can_hover => 1, can_events => 1, 665 can_hover => 1, can_events => 1,
456 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 666 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
… …
602 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
603 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 813 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
604 814
605 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 815 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
606 816
607 # TODO: replace by CS_STAT_RES_xxx constants
608 my %tbl = ( 817 my %tbl = (
609 phys => 100, 818 phys => CS_STAT_RES_PHYS,
610 magic => 101, 819 magic => CS_STAT_RES_MAG,
611 fire => 102, 820 fire => CS_STAT_RES_FIRE,
612 elec => 103, 821 elec => CS_STAT_RES_ELEC,
613 cold => 104, 822 cold => CS_STAT_RES_COLD,
614 conf => 105, 823 conf => CS_STAT_RES_CONF,
615 acid => 106, 824 acid => CS_STAT_RES_ACID,
616 drain => 107, 825 drain => CS_STAT_RES_DRAIN,
617 ghit => 108, 826 ghit => CS_STAT_RES_GHOSTHIT,
618 pois => 109, 827 pois => CS_STAT_RES_POISON,
619 slow => 110, 828 slow => CS_STAT_RES_SLOW,
620 para => 111, 829 para => CS_STAT_RES_PARA,
621 tund => 112, 830 tund => CS_STAT_TURN_UNDEAD,
622 fear => 113, 831 fear => CS_STAT_RES_FEAR,
623 depl => 113, 832 depl => CS_STAT_RES_DEPLETE,
624 deat => 115, 833 deat => CS_STAT_RES_DEATH,
625 holyw => 116, 834 holyw => CS_STAT_RES_HOLYWORD,
626 blind => 117, 835 blind => CS_STAT_RES_BLIND,
627 ); 836 );
628 837
629 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 838 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
630 for keys %tbl; 839 for keys %tbl;
631} 840}
… …
661 870
662 utf8::decode $buf if utf8::valid $buf; 871 utf8::decode $buf if utf8::valid $buf;
663 872
664 $table->clear; 873 $table->clear;
665 874
875 my @tip = (
876 "The current number of users logged in on the server.",
877 "The hostname of the server.",
878 "The time this server has been running without being restarted.",
879 "The server software version - a '+' indicates a Crossfire+ server.",
880 "Short information about this server provided by its admins.",
881 );
666 my @col = qw(Use #Users Host Uptime Version Description); 882 my @col = qw(#Users Host Uptime Version Description);
667 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 883 $table->add ($_, 0, new CFClient::UI::Label
884 can_hover => 1, can_events => 1,
885 align => 0, fg => [1, 1, 0],
886 text => $col[$_], tooltip => $tip[$_])
668 for 0 .. $#col; 887 for 0 .. $#col;
669 888
670 my @align = qw(1 0 1 1 -1); 889 my @align = qw(1 0 1 1 -1);
671 890
672 my $y = 0; 891 my $y = 0;
673 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 892 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
690 909
691 $m = [$users, $host, $uptime, $version, $desc]; 910 $m = [$users, $host, $uptime, $version, $desc];
692 911
693 $y++; 912 $y++;
694 913
695 $table->add (0, $y, new CFClient::UI::VBox children => [ 914 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
696 (new CFClient::UI::Button text => "Use", on_activate => sub { 915 (new CFClient::UI::Button
916 text => "Use",
917 tooltip => "Put this server into the <b>Host:Port</b> field",
918 on_activate => sub {
697 $HOST_ENTRY->set_text ($CFG->{host} = $host); 919 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
698 $METASERVER->toggle_visibility; 920 $METASERVER->hide;
921 0
922 },
699 }), 923 ),
700 (new CFClient::UI::Empty expand => 1), 924 (new CFClient::UI::Empty expand => 1),
701 ]); 925 ]);
702 926
703 $table->add ($_ + 1, $y, new CFClient::UI::Label 927 $table->add ($_, $y, new CFClient::UI::Label
704 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 928 ellipsise => 0,
929 align => $align[$_],
930 text => $m->[$_],
931 tooltip => $tip[$_],
932 can_hover => 1,
933 can_events => 1,
934 fontsize => 0.8)
705 for 0 .. $#$m; 935 for 0 .. $#$m;
706 } 936 }
707 } 937 }
708 }); 938 });
709} 939}
710 940
711sub metaserver_dialog { 941sub metaserver_dialog {
712 my $dialog = new CFClient::UI::FancyFrame 942 my $dialog = new CFClient::UI::FancyFrame
713 title => "Server List", 943 title => "Server List",
714 name => 'metaserver_dialog', 944 name => 'metaserver_dialog',
715 x => 'center', 945 x => 'center',
716 y => 'center', 946 y => 'center',
717 z => 3, 947 z => 3,
948 force_h => $::HEIGHT * 0.4,
718 child => (my $vbox = new CFClient::UI::VBox), 949 child => (my $vbox = new CFClient::UI::VBox),
719 on_visibility_change => sub { 950 on_visibility_change => sub {
720 update_metaserver if $_[1]; 951 update_metaserver if $_[1];
952 0
721 }, 953 },
722 ; 954 ;
723 955
724 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 956 $dialog->{table} = new CFClient::UI::Table;
957
958 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $dialog->{table});
725 959
726 $dialog 960 $dialog
727} 961}
728 962
729sub server_setup { 963sub server_setup {
… …
736 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 970 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
737 971
738 $vbox->add ( 972 $vbox->add (
739 $HOST_ENTRY = new CFClient::UI::Entry 973 $HOST_ENTRY = new CFClient::UI::Entry
740 expand => 1, 974 expand => 1,
741 text => $CFG->{host}, 975 text => $CFG->{profile}{default}{host},
742 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 976 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
743 on_changed => sub { 977 on_changed => sub {
744 my ($self, $value) = @_; 978 my ($self, $value) = @_;
745 $CFG->{host} = $value; 979 $CFG->{profile}{default}{host} = $value;
980 0
746 } 981 }
747 ); 982 );
748 983
749 $METASERVER = metaserver_dialog; 984 $METASERVER = metaserver_dialog;
750 985
751 $vbox->add (new CFClient::UI::Button 986 $vbox->add (new CFClient::UI::Button
752 expand => 1, 987 expand => 1,
753 text => "Server List", 988 text => "Server List",
754 other => $METASERVER, 989 other => $METASERVER,
755 tooltip => "Show a list of available crossfire servers", 990 tooltip => "Show a list of available crossfire servers",
756 on_activate => sub { $METASERVER->toggle_visibility }, 991 on_activate => sub { $METASERVER->toggle_visibility; 0 },
992 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
757 ); 993 );
758 } 994 }
759 995
760 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 996 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
761 $table->add (1, 4, new CFClient::UI::Entry 997 $table->add (1, 4, new CFClient::UI::Entry
762 text => $CFG->{user}, 998 text => $CFG->{profile}{default}{user},
763 tooltip => "The name of your character on the server", 999 tooltip => "The name of your character on the server",
764 on_changed => sub { 1000 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
765 my ($self, $value) = @_;
766 $CFG->{user} = $value;
767 }
768 ); 1001 );
769 1002
770 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1003 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
771 $table->add (1, 5, new CFClient::UI::Entry 1004 $table->add (1, 5, new CFClient::UI::Entry
772 text => $CFG->{password}, 1005 text => $CFG->{profile}{default}{password},
773 hidden => 1, 1006 hidden => 1,
774 tooltip => "The password for your character", 1007 tooltip => "The password for your character",
775 on_changed => sub { 1008 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
776 my ($self, $value) = @_;
777 $CFG->{password} = $value;
778 }
779 ); 1009 );
780 1010
781 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1011 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
782 $table->add (1, 7, new CFClient::UI::Slider 1012 $table->add (1, 7, new CFClient::UI::Slider
783 force_w => 100, 1013 force_w => 100,
784 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1014 range => [$CFG->{mapsize}, 10, 100, 0, 1],
785 tooltip => "This is the size of the portion of the map update the server sends you. " 1015 tooltip => "This is the size of the portion of the map update the server sends you. "
786 . "If you set this to a high value you will be able to see further, " 1016 . "If you set this to a high value you will be able to see further, "
787 . "but you also increase bandwidth requirements and latency. " 1017 . "but you also increase bandwidth requirements and latency. "
788 . "This option is only used once at log-in.", 1018 . "This option is only used once at log-in.",
789 on_changed => sub { 1019 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
790 my ($self, $value) = @_;
791
792 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
793 },
794 ); 1020 );
795 1021
796 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1022 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
797 $table->add (1, 8, new CFClient::UI::CheckBox 1023 $table->add (1, 8, new CFClient::UI::CheckBox
798 state => $CFG->{face_prefetch}, 1024 state => $CFG->{face_prefetch},
… …
801 . "This might increase or create lag, but increases the chances " 1027 . "This might increase or create lag, but increases the chances "
802 . "of faces being ready for display when you encounter them. " 1028 . "of faces being ready for display when you encounter them. "
803 . "It also uses up server bandwidth on every connect, " 1029 . "It also uses up server bandwidth on every connect, "
804 . "so only set it if you really need to prefetch images. " 1030 . "so only set it if you really need to prefetch images. "
805 . "This option can be set and unset any time.", 1031 . "This option can be set and unset any time.",
806 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1032 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
807 ); 1033 );
808 1034
809 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1035 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
810 $table->add (1, 9, new CFClient::UI::Entry 1036 $table->add (1, 9, new CFClient::UI::Entry
811 text => $CFG->{output_count}, 1037 text => $CFG->{output_count},
812 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1038 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
813 on_changed => sub { $CFG->{output_count} = $_[1] }, 1039 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
814 ); 1040 );
815 1041
816 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1042 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
817 $table->add (1, 10, new CFClient::UI::Entry 1043 $table->add (1, 10, new CFClient::UI::Entry
818 text => $CFG->{output_sync}, 1044 text => $CFG->{output_sync},
819 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1045 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
820 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1046 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
821 ); 1047 );
822 1048
823 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1049 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
824 expand => 1, 1050 expand => 1,
825 align => 0, 1051 align => 0,
826 text => "Login", 1052 text => "Login",
827 on_activate => sub { 1053 on_activate => sub {
828 $CONN ? stop_game 1054 $CONN ? stop_game
829 : start_game; 1055 : start_game;
1056 0
830 }, 1057 },
831 ); 1058 );
832 1059
833 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1060 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
834 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1061 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
837 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1064 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
838 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1065 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
839 on_changed => sub { 1066 on_changed => sub {
840 my ($self, $value) = @_; 1067 my ($self, $value) = @_;
841 $CFG->{say_command} = $value; 1068 $CFG->{say_command} = $value;
1069 0
842 } 1070 }
843 ); 1071 );
1072
1073 $vbox->add (new CFClient::UI::Label
1074 text => "Server Info",
1075 fontsize => 1.2,
1076 padding_y => 8,
1077 fg => [1, 1, 0, 1],
1078 );
1079
1080 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
844 1081
845 $vbox 1082 $vbox
846} 1083}
847 1084
848sub message_window { 1085sub message_window {
… …
851 title => "Messages", 1088 title => "Messages",
852 border_bg => [1, 1, 1, 1], 1089 border_bg => [1, 1, 1, 1],
853 bg => [0, 0, 0, 0.75], 1090 bg => [0, 0, 0, 0.75],
854 x => "max", 1091 x => "max",
855 y => 0, 1092 y => 0,
856 force_w => $::WIDTH / 3, 1093 force_w => $::WIDTH * 0.4,
857 force_h => $::HEIGHT / 5, 1094 force_h => $::HEIGHT * 0.5,
858 child => (my $vbox = new CFClient::UI::VBox); 1095 child => (my $vbox = new CFClient::UI::VBox),
1096 has_close_button => 1;
859 1097
860 $vbox->add ($LOGVIEW); 1098 $vbox->add ($LOGVIEW);
861 1099
862 $vbox->add (my $input = new CFClient::UI::Entry 1100 $vbox->add (my $input = new CFClient::UI::Entry
863 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1101 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
871 1109
872 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1110 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
873 $input->{refocus_map} = 1; 1111 $input->{refocus_map} = 1;
874 } 1112 }
875 delete $input->{auto_activated}; 1113 delete $input->{auto_activated};
1114
1115 0
876 }, 1116 },
877 on_activate => sub { 1117 on_activate => sub {
878 my ($input, $text) = @_; 1118 my ($input, $text) = @_;
879 $input->set_text (''); 1119 $input->set_text ('');
880 1120
… …
886 } 1126 }
887 if ($input->{refocus_map}) { 1127 if ($input->{refocus_map}) {
888 delete $input->{refocus_map}; 1128 delete $input->{refocus_map};
889 $MAPWIDGET->focus_in 1129 $MAPWIDGET->focus_in
890 } 1130 }
1131
1132 0
891 }, 1133 },
892 on_escape => sub { 1134 on_escape => sub {
893 $MAPWIDGET->focus_in 1135 $MAPWIDGET->grab_focus;
1136
1137 0
894 }, 1138 },
895 ); 1139 );
896 1140
897 $CONSOLE = { 1141 $CONSOLE = {
898 window => $window, 1142 window => $window,
… …
920 ); 1164 );
921 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1165 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
922 $hb->add (new CFClient::UI::Button 1166 $hb->add (new CFClient::UI::Button
923 text => "Ok", 1167 text => "Ok",
924 expand => 1, 1168 expand => 1,
925 on_activate => sub { $QUIT_DIALOG->hide }, 1169 on_activate => sub { $QUIT_DIALOG->hide; 0 },
926 ); 1170 );
927 $hb->add (new CFClient::UI::Button 1171 $hb->add (new CFClient::UI::Button
928 text => "Quit anyway", 1172 text => "Quit anyway",
929 expand => 1, 1173 expand => 1,
930 on_activate => sub { exit }, 1174 on_activate => sub { exit },
… …
973 ["Potions" => PICKUP_POTION], 1217 ["Potions" => PICKUP_POTION],
974 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1218 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
975 ["Ignore cursed" => PICKUP_NOT_CURSED], 1219 ["Ignore cursed" => PICKUP_NOT_CURSED],
976 ["Jewelery" => PICKUP_JEWELS], 1220 ["Jewelery" => PICKUP_JEWELS],
977 ], 1221 ],
1222 ["Weight/Value ratio", 2, 17]
978 ) 1223 )
979 { 1224 {
980 my ($title, $x, $y, @bits) = @$_; 1225 my ($title, $x, $y, @bits) = @$_;
981 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1226 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
982 1227
… …
987 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1232 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $table->add ($x+1, $y, new CFClient::UI::CheckBox 1233 $table->add ($x+1, $y, new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask, 1234 state => $CFG->{pickup} & $mask,
990 on_changed => sub { 1235 on_changed => sub {
991 my ($box, $value) = @_; 1236 my ($box, $value) = @_;
1237
992 if ($value) { 1238 if ($value) {
993 $::CFG->{pickup} |= $mask; 1239 $::CFG->{pickup} |= $mask;
994 } else { 1240 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1241 $::CFG->{pickup} &= ~$mask;
996 } 1242 }
1243
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1244 $::CONN->send_command ("pickup $::CFG->{pickup}")
998 if defined $::CONN; 1245 if defined $::CONN;
1246
1247 0
999 }); 1248 });
1000 } 1249 }
1001 } 1250 }
1002 1251
1252 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1],
1254 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub {
1256 my ($slider, $value) = @_;
1257
1258 $::CFG->{pickup} &= ~0x7;
1259 $::CFG->{pickup} |= int $value
1260 if $value;
1261 1;
1262 });
1263 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set",
1265 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN;
1268 0
1269 });
1270
1003 $table 1271 $table
1004} 1272}
1005 1273
1006sub make_inventory_window { 1274sub inventory_window {
1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1275 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center", 1276 x => "center",
1009 y => "center", 1277 y => "center",
1010 force_w => $WIDTH * 9/10, 1278 force_w => $WIDTH * 9/10,
1011 force_h => $HEIGHT * 9/10, 1279 force_h => $HEIGHT * 9/10,
1012 title => "Inventory", 1280 title => "Inventory",
1281 has_close_button => 1,
1013 ; 1282 ;
1014 1283
1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1284 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1);
1016 1285
1017 $hb->add (my $vb1 = new CFClient::UI::VBox); 1286 $hb->add (my $vb1 = new CFClient::UI::VBox);
… …
1039 1308
1040 my $refresh; 1309 my $refresh;
1041 $refresh = sub { 1310 $refresh = sub {
1042 $binding_list->clear (); 1311 $binding_list->clear ();
1043 1312
1044 for my $mod (keys %{$::CFG->{bindings}}) { 1313 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1314 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1315 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1316 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1048 1317
1049 my $lbl = join "; ", @$cmds; 1318 my $lbl = join "; ", @$cmds;
1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1319 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym);
1051 $binding_list->add (my $hb = new CFClient::UI::HBox); 1320 $binding_list->add (my $hb = new CFClient::UI::HBox);
1052 $hb->add (new CFClient::UI::Button 1321 $hb->add (new CFClient::UI::Button
1053 text => "delete", 1322 text => "delete",
1054 tooltip => "Deletes the binding", 1323 tooltip => "Deletes the binding",
1055 on_activate => sub { 1324 on_activate => sub {
1056 $binding_list->remove ($hb); 1325 $binding_list->remove ($hb);
1057 delete $::CFG->{bindings}->{$mod}->{$sym}; 1326 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1327 0
1058 }); 1328 });
1059 1329
1060 $hb->add (new CFClient::UI::Button 1330 $hb->add (new CFClient::UI::Button
1061 text => "edit", 1331 text => "edit",
1062 tooltip => "Edits the binding", 1332 tooltip => "Edits the binding",
1063 on_activate => sub { 1333 on_activate => sub {
1064 $::BIND_EDITOR->set_binding ( 1334 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1335 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1066 sub { 1336 sub {
1067 my ($nmod, $nsym, $ncmds) = @_; 1337 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym}; 1338 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1339 $::CFG->{profile}{default}{bindings}{$nmod}{$nsym} = $ncmds;
1070 $refresh->(); 1340 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1341 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $SETUP_DIALOG->show; 1342 $SETUP_DIALOG->show;
1073 }, 1343 },
1074 sub { 1344 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1345 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076 $SETUP_DIALOG->show; 1346 $SETUP_DIALOG->show;
1077 }); 1347 });
1078 $::BIND_EDITOR->show; 1348 $::BIND_EDITOR->show;
1079 $SETUP_DIALOG->hide; 1349 $SETUP_DIALOG->hide;
1350 0
1080 }); 1351 });
1081 1352
1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1353 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1354 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1084 } 1355 }
1085 } 1356 }
1086 }; 1357 };
1087 1358
1088 my $vb = new CFClient::UI::VBox; 1359 my $vb = new CFClient::UI::VBox;
1360 $vb->add (my $hb = new CFClient::UI::HBox);
1361 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1362 $hb->add (new CFClient::UI::CheckBox
1363 expand => 1,
1364 state => $CFG->{shift_fire_stop},
1365 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1366 on_changed => sub {
1367 my ($cbox, $value) = @_;
1368 $CFG->{shift_fire_stop} = $value;
1369 0
1370 });
1371
1089 $vb->add ($binding_list); 1372 $vb->add ($binding_list);
1090 $vb->add (my $hb = new CFClient::UI::HBox); 1373 $vb->add (my $hb = new CFClient::UI::HBox);
1091 1374
1092 $hb->add (new CFClient::UI::Button 1375 $hb->add (new CFClient::UI::Button
1093 text => "record new", 1376 text => "record new",
… …
1095 tooltip => "This button opens the binding editor with an empty binding.", 1378 tooltip => "This button opens the binding editor with an empty binding.",
1096 on_activate => sub { 1379 on_activate => sub {
1097 $::BIND_EDITOR->set_binding (undef, undef, [], 1380 $::BIND_EDITOR->set_binding (undef, undef, [],
1098 sub { 1381 sub {
1099 my ($mod, $sym, $cmds) = @_; 1382 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1383 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
1101 $refresh->(); 1384 $refresh->();
1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1385 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show; 1386 $SETUP_DIALOG->show;
1104 }, 1387 },
1105 sub { 1388 sub {
… …
1107 $SETUP_DIALOG->show; 1390 $SETUP_DIALOG->show;
1108 }, 1391 },
1109 ); 1392 );
1110 $SETUP_DIALOG->hide; 1393 $SETUP_DIALOG->hide;
1111 $::BIND_EDITOR->show; 1394 $::BIND_EDITOR->show;
1395 0
1112 }, 1396 },
1113 ); 1397 );
1114 1398
1115 $hb->add (new CFClient::UI::Button 1399 $hb->add (new CFClient::UI::Button
1116 text => "close", 1400 text => "close",
1117 tooltip => "Closes the binding window", 1401 tooltip => "Closes the binding window",
1118 expand => 1, 1402 expand => 1,
1119 on_activate => sub { 1403 on_activate => sub {
1120 $SETUP_DIALOG->hide; 1404 $SETUP_DIALOG->hide;
1405 0
1121 } 1406 }
1122 ); 1407 );
1123 1408
1124 $refresh->(); 1409 $refresh->();
1125 1410
1126 $vb 1411 $vb
1127} 1412}
1128 1413
1129sub make_help_window { 1414sub help_window {
1130 my $win = new CFClient::UI::FancyFrame 1415 my $win = new CFClient::UI::FancyFrame
1131 x => 'center', 1416 x => 'center',
1132 y => 'center', 1417 y => 'center',
1133 z => 2, 1418 z => 2,
1134 name => 'doc_browser', 1419 name => 'doc_browser',
… …
1137 title => "Documentation"; 1422 title => "Documentation";
1138 1423
1139 $win->add (my $vbox = new CFClient::UI::VBox); 1424 $win->add (my $vbox = new CFClient::UI::VBox);
1140 1425
1141 $vbox->add (my $buttons = new CFClient::UI::HBox); 1426 $vbox->add (my $buttons = new CFClient::UI::HBox);
1142 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1427 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1428 expand => 1, fontsize => 0.8, padding_x => 4);
1143 1429
1144 for ( 1430 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1431 $buttons->add (my $combo = new CFClient::UI::Combobox
1432 value => undef,
1433 options => [
1145 [intro => "Introduction"], 1434 [intro => "Introduction"],
1146 [manual => "Manual"], 1435 [manual => "Manual"],
1436 [skill_help => "Skills"],
1147 [command_help => "Commands"], 1437 [command_help => "Commands"],
1148 [skill_help => "Skills"], 1438 [dmcommand_help => "DM Commands"],
1149 ) { 1439 [COPYING => "License Terms"],
1150 my ($pod, $label) = @$_; 1440 ],
1441 on_changed => sub {
1442 my ($self, $pod) = @_;
1151 1443
1152 $buttons->add (new CFClient::UI::Button
1153 text => $label,
1154 on_activate => sub {
1155 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod", 1444 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1156 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] }; 1445 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1157 1446
1158 $viewer->clear; 1447 $viewer->clear;
1159 1448
1160 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1449 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1161 for @$pom; 1450 for @$pom;
1162 1451
1163 $viewer->set_offset (0); 1452 $viewer->set_offset (0);
1164 }, 1453 0
1454 },
1455 on_visibility_change => sub {
1456 my ($self, $visible) = @_;
1457 return unless $visible;
1458 return if $self->{value};
1459 $self->set_value ("intro");
1460 0
1461 },
1165 ); 1462 );
1166 }
1167
1168 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1169 1463
1170 $win 1464 $win
1171} 1465}
1172 1466
1173sub sdl_init { 1467sub sdl_init {
… …
1240 $MAPWIDGET->connect (activate_console => sub { 1534 $MAPWIDGET->connect (activate_console => sub {
1241 my ($mapwidget, $preset) = @_; 1535 my ($mapwidget, $preset) = @_;
1242 1536
1243 if ($CONSOLE) { 1537 if ($CONSOLE) {
1244 $CONSOLE->{input}->{auto_activated} = 1; 1538 $CONSOLE->{input}->{auto_activated} = 1;
1245 $CONSOLE->{input}->focus_in; 1539 $CONSOLE->{input}->grab_focus;
1246 1540
1247 if ($preset && $CONSOLE->{input}->get_text eq '') { 1541 if ($preset && $CONSOLE->{input}->get_text eq '') {
1248 $CONSOLE->{input}->set_text ($preset); 1542 $CONSOLE->{input}->set_text ($preset);
1249 } 1543 }
1250 } 1544 }
1251 }); 1545 });
1252 $MAPWIDGET->show; 1546 $MAPWIDGET->show;
1253 $MAPWIDGET->focus_in; 1547 $MAPWIDGET->grab_focus;
1254 1548
1255 $LOGVIEW = new CFClient::UI::TextView 1549 $LOGVIEW = new CFClient::UI::TextScroller
1256 expand => 1, 1550 expand => 1,
1257 font => $FONT_FIXED, 1551 font => $FONT_FIXED,
1258 fontsize => $::CFG->{log_fontsize}, 1552 fontsize => $::CFG->{log_fontsize},
1553 indent => -4,
1259 can_hover => 1, 1554 can_hover => 1,
1260 can_events => 1, 1555 can_events => 1,
1261 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1556 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1262 ; 1557 ;
1263 1558
… …
1267 x => 'center', 1562 x => 'center',
1268 y => 'center', 1563 y => 'center',
1269 z => 2, 1564 z => 2,
1270 force_w => $::WIDTH * 0.6, 1565 force_w => $::WIDTH * 0.6,
1271 force_h => $::HEIGHT * 0.6, 1566 force_h => $::HEIGHT * 0.6,
1567 has_close_button => 1,
1272 ; 1568 ;
1273 1569
1274 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1, 1570 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1275 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1571 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1276 1572
1277 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1573 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1278 "Configure the server to play on, your username, password and other server-related options."); 1574 "Configure the server to play on, your username, password and other server-related options.");
1279 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1575 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1280 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1576 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1281 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1577 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1282 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1578 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1283 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1579 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1284 "Configure the use of audio, sound effects and background music."); 1580 "Configure the use of audio, sound effects and background music.");
1285 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1581 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1286 "Lets you define, edit and delete bindings." 1582 "Lets you define, edit and delete key bindings."
1287 . "There is a shortcut for making bindings: <b>Left Control + Insert</b> opens the binding editor " 1583 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1288 . "with nothing set and the recording started. After doing the actions you " 1584 . "with nothing set and the recording started. After doing the actions you "
1289 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1585 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1290 . "After pressing the combo the binding will be saved automatically and the " 1586 . "After pressing the combo the binding will be saved automatically and the "
1291 . "binding editor closes"); 1587 . "binding editor closes");
1292 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1588 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup,
1293 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1589 "Displays all spells you have and lets you edit keyboard shortcuts for them.");
1590 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1591 "Some debuggin' options. Do not ask.");
1294 1592
1295 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1593 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1296 1594
1297 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1595 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1298 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1596 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1299 1597
1300 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1598 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1301 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1599 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1302 1600
1303 make_gauge_window->show; # 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 1601 make_gauge_window->show; # 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
1304 1602
1305 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window, 1603 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => $STATS_WINDOW = stats_window,
1306 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."); 1604 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1307 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1605 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => inventory_window,
1308 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). " 1606 tooltip => "Toggles the inventory window, where you can manage your loot (or treasures :). "
1309 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."); 1607 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory.");
1310 1608
1311 $BUTTONBAR->add (new CFClient::UI::Button 1609 $BUTTONBAR->add (new CFClient::UI::Button
1312 text => "Save Config", 1610 text => "Save Config",
1313 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1611 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1314 on_activate => sub { 1612 on_activate => sub {
1315 $::CFG->{layout} = CFClient::UI::get_layout; 1613 $::CFG->{layout} = CFClient::UI::get_layout;
1316 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1614 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1317 status "Configuration Saved"; 1615 status "Configuration Saved";
1616 0
1318 }, 1617 },
1319 ); 1618 );
1320 1619
1321 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1620 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1322 tooltip => "View Documentation"); 1621 tooltip => "View Documentation");
1323 1622
1324 $BUTTONBAR->add (new CFClient::UI::Button 1623 $BUTTONBAR->add (new CFClient::UI::Button
1325 text => "Quit", 1624 text => "Quit",
1326 tooltip => "Terminates the program", 1625 tooltip => "Terminates the program",
… …
1328 if ($CONN) { 1627 if ($CONN) {
1329 open_quit_dialog; 1628 open_quit_dialog;
1330 } else { 1629 } else {
1331 exit; 1630 exit;
1332 } 1631 }
1632 0
1333 }, 1633 },
1334 ); 1634 );
1335 1635
1336 $BUTTONBAR->show; 1636 $BUTTONBAR->show;
1337 $SETUP_DIALOG->show; 1637 $SETUP_DIALOG->show;
… …
1339 1639
1340 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1640 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1341} 1641}
1342 1642
1343sub video_shutdown { 1643sub video_shutdown {
1644 CFClient::OpenGL::shutdown;
1645
1344 undef $SDL_ACTIVE; 1646 undef $SDL_ACTIVE;
1345} 1647}
1346 1648
1347my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1649my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1348my $bgmusic;#TODO#hack#d# 1650my $bgmusic;#TODO#hack#d#
… …
1564 1866
1565 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1867 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1566 CFClient::UI::set_layout ($::CFG->{layout}); 1868 CFClient::UI::set_layout ($::CFG->{layout});
1567 1869
1568 my %DEF_CFG = ( 1870 my %DEF_CFG = (
1569 sdl_mode => 0, 1871 sdl_mode => 0,
1570 width => 640, 1872 width => 640,
1571 height => 480, 1873 height => 480,
1572 fullscreen => 0, 1874 fullscreen => 0,
1573 fast => 0, 1875 fast => 0,
1574 map_scale => 1, 1876 map_scale => 1,
1575 fow_enable => 1, 1877 fow_enable => 1,
1576 fow_intensity => 0.45, 1878 fow_intensity => 0.45,
1577 fow_smooth => 0, 1879 fow_smooth => 0,
1578 gui_fontsize => 1, 1880 gui_fontsize => 1,
1579 log_fontsize => 1, 1881 log_fontsize => 0.7,
1580 gauge_fontsize=> 1, 1882 gauge_fontsize => 1,
1581 gauge_size => 0.35, 1883 gauge_size => 0.35,
1582 stat_fontsize => 1, 1884 stat_fontsize => 0.7,
1583 mapsize => 100, 1885 mapsize => 100,
1584 host => "crossfire.schmorp.de",
1585 say_command => 'say', 1886 say_command => 'say',
1586 audio_enable => 1, 1887 audio_enable => 1,
1587 bgm_enable => 1, 1888 bgm_enable => 1,
1588 bgm_volume => 0.25, 1889 bgm_volume => 0.25,
1589 face_prefetch => 0, 1890 face_prefetch => 0,
1590 output_sync => 1, 1891 output_sync => 1,
1591 output_count => 1, 1892 output_count => 1,
1893 pickup => 0,
1894 default => "profile", # default profile
1895 );
1592 ); 1896
1593
1594 while (my ($k, $v) = each %DEF_CFG) { 1897 while (my ($k, $v) = each %DEF_CFG) {
1595 $CFG->{$k} = $v unless exists $CFG->{$k}; 1898 $CFG->{$k} = $v unless exists $CFG->{$k};
1596 } 1899 }
1900
1901 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1597 1902
1598 sdl_init; 1903 sdl_init;
1599 1904
1600 @SDL_MODES = reverse 1905 @SDL_MODES = reverse
1601 grep $_->[0] >= 640 && $_->[1] >= 480, 1906 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1643 video_init; 1948 video_init;
1644 audio_init; 1949 audio_init;
1645} 1950}
1646 1951
1647Event::loop; 1952Event::loop;
1953#CFClient::SDL_Quit;
1954#CFClient::_exit 0;
1648 1955
1649END { CFClient::SDL_Quit } 1956END { CFClient::SDL_Quit }
1650 1957
1651=head1 NAME 1958=head1 NAME
1652 1959

Diff Legend

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