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

Diff Legend

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