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.49 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.89 by elmex, Sun Jul 9 21:11:48 2006 UTC

… …
25# need to do it again because that pile of garbage called PAR nukes it before main 25# need to do it again because that pile of garbage called PAR nukes it before main
26unshift @INC, $ENV{PAR_TEMP} 26unshift @INC, $ENV{PAR_TEMP}
27 if %PAR::LibCache; 27 if %PAR::LibCache;
28 28
29use Time::HiRes 'time'; 29use Time::HiRes 'time';
30use Pod::POM;
31use Event; 30use Event;
32 31
33use Crossfire; 32use Crossfire;
34use Crossfire::Protocol::Constants; 33use Crossfire::Protocol::Constants;
35 34
… …
37 36
38use CFClient; 37use CFClient;
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
40use CFClient::Protocol; 39use CFClient::Protocol;
41use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
42use CFClient::MapWidget; 42use CFClient::MapWidget;
43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
43 45
44$Event::DIED = sub { 46$Event::DIED = sub {
45 # TODO: display dialog box or so 47 # TODO: display dialog box or so
46 Carp::confess $_[1];#d#TODO: remove when stable 48 Carp::confess $_[1];#d#TODO: remove when stable
47 CFClient::error $_[1]; 49 CFClient::error $_[1];
… …
83our $CONSOLE; 85our $CONSOLE;
84our $METASERVER; 86our $METASERVER;
85our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
86our $QUIT_DIALOG; 88our $QUIT_DIALOG;
87our $HOST_ENTRY; 89our $HOST_ENTRY;
90our $PICKUP_ENABLE;
91our $SERVER_INFO;
88 92
89our $SETUP_DIALOG; 93our $SETUP_DIALOG;
90our $SETUP_NOTEBOOK; 94our $SETUP_NOTEBOOK;
91our $SETUP_SERVER; 95our $SETUP_SERVER;
92our $SETUP_KEYBOARD; 96our $SETUP_KEYBOARD;
93our $SETUP_SPELLS;
94 97
98our $PL_NOTEBOOK;
99our $PL_WINDOW;
100
101our $INVENTORY_PAGE;
102our $STATS_PAGE;
103our $SPELL_PAGE;
104
105our $HELP_WINDOW;
106our $MESSAGE_WINDOW;
95our $FLOORBOX; 107our $FLOORBOX;
96our $GAUGES; 108our $GAUGES;
97our $STATWIDS; 109our $STATWIDS;
98 110
99our $SDL_ACTIVE; 111our $SDL_ACTIVE;
… …
105 117
106our $ALT_ENTER_MESSAGE; 118our $ALT_ENTER_MESSAGE;
107our $STATUSBOX; 119our $STATUSBOX;
108our $DEBUG_STATUS; 120our $DEBUG_STATUS;
109 121
110our $INV_WINDOW;
111our $INV; 122our $INV;
112our $INVR; 123our $INVR;
113our $INV_RIGHT_HB; 124our $INV_RIGHT_HB;
114 125
115our $BIND_EDITOR; 126our $BIND_EDITOR;
127our $BIND_UPD_CB;
116 128
117our $PICKUP_CFG; 129our $PICKUP_CFG;
118 130
119sub status { 131sub status {
120 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 132 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
… …
122 134
123sub debug { 135sub debug {
124 $DEBUG_STATUS->set_text ($_[0]); 136 $DEBUG_STATUS->set_text ($_[0]);
125} 137}
126 138
139sub destroy_query_dialog {
140 (delete $_[0]{query_dialog})->destroy
141 if $_[0]{query_dialog};
142}
143
144# server query dialog
145sub server_query {
146 my ($conn, $flags, $prompt) = @_;
147
148 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
149 x => "center",
150 y => "center",
151 title => "Server Query",
152 child => my $vbox = new CFClient::UI::VBox,
153 ;
154
155 my @dialog = my $label = new CFClient::UI::Label
156 max_w => $::WIDTH * 0.4,
157 ellipsise => 0,
158 text => $prompt;
159
160 if ($flags & CS_QUERY_YESNO) {
161 push @dialog, my $hbox = new CFClient::UI::HBox;
162
163 $hbox->add (new CFClient::UI::Button
164 text => "No",
165 on_activate => sub {
166 $conn->send ("reply n");
167 $dialog->destroy;
168 0
169 }
170 );
171 $hbox->add (new CFClient::UI::Button
172 text => "Yes",
173 on_activate => sub {
174 $conn->send ("reply y");
175 destroy_query_dialog $conn;
176 0
177 },
178 );
179
180 $dialog->grab_focus;
181
182 } elsif ($flags & CS_QUERY_SINGLECHAR) {
183 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
184
185 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
186 $MESSAGE_WINDOW->show;
187
188 unshift @dialog, new CFClient::UI::Label
189 max_w => $::WIDTH * 0.4,
190 ellipsise => 0,
191 markup => "\nOr use your keyboard:\n";
192
193 unshift @dialog, my $table = new CFClient::UI::Table;
194
195 $table->add (0, 0, new CFClient::UI::Button
196 text => "Next Race",
197 on_activate => sub {
198 $conn->send ("reply n");
199 destroy_query_dialog $conn;
200 0
201 },
202 );
203 $table->add (2, 0, new CFClient::UI::Button
204 text => "Accept",
205 on_activate => sub {
206 $conn->send ("reply d");
207 destroy_query_dialog $conn;
208 0
209 },
210 );
211
212 unshift @dialog, new CFClient::UI::Label
213 max_w => $::WIDTH * 0.4,
214 ellipsise => 0,
215 markup =>
216 "<big><b>Character Creation: Race</b></big>\n\n"
217 . "Look at the <b>Messages</b> window to see a description of this race "
218 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
219 . "and the center of the screen to see how this race looks like "
220 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
221 . "You can look at another race, or accept this race (you will come back to this race eventually, "
222 . "so you can take your time making this important choice."
223 ;
224
225 } elsif ($prompt =~ /roll new stats/) {
226 if (my $stat = delete $conn->{stat_change_with}) {
227 $conn->send ("reply $stat");
228 destroy_query_dialog $conn;
229 return;
230 }
231
232 $STATS_PAGE->show;
233 $MESSAGE_WINDOW->hide;
234
235 unshift @dialog, new CFClient::UI::Label
236 max_w => $::WIDTH * 0.4,
237 ellipsise => 0,
238 markup => "\nOr use your keyboard:\n";
239
240 unshift @dialog, my $table = new CFClient::UI::Table;
241
242 # left: re-roll
243 $table->add (0, 0, new CFClient::UI::Button
244 text => "Roll Again",
245 on_activate => sub {
246 $conn->send ("reply y");
247 destroy_query_dialog $conn;
248 0
249 },
250 );
251
252 # center: swap stats
253 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
254 value => $_,
255 options => [
256 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
257 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
258 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
259 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
260 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
261 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
262 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
263 ],
264 ), 1 .. 2;
265
266 $table->add (2, 0, new CFClient::UI::Button
267 text => "Swap Stats",
268 on_activate => sub {
269 $conn->{stat_change_with} = $sw2->{value};
270 $conn->send ("reply $sw1->{value}");
271 destroy_query_dialog $conn;
272 0
273 },
274 );
275 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
276
277 # right: accept
278 $table->add (4, 0, new CFClient::UI::Button
279 text => "Accept",
280 on_activate => sub {
281 $conn->send ("reply n");
282 $STATS_PAGE->hide;
283 destroy_query_dialog $conn;
284 0
285 },
286 );
287
288 unshift @dialog, new CFClient::UI::Label
289 max_w => $::WIDTH * 0.4,
290 ellipsise => 0,
291 markup =>
292 "<big><b>Character Creation: Stats</b></big>\n\n"
293 . "Look at the <b>Stats</b> window to see your basic stats "
294 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
295 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
296 . "Race selection will influence those values later on."
297 ;
298 }
299
300 push @dialog, my $entry = new CFClient::UI::Entry
301 on_changed => sub {
302 $conn->send ("reply $_[1]");
303 destroy_query_dialog $conn;
304 0
305 },
306 ;
307
308 $entry->grab_focus;
309
310 } else {
311 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
312
313 push @dialog, my $entry = new CFClient::UI::Entry
314 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
315 on_activate => sub {
316 $conn->send ("reply $_[1]");
317 destroy_query_dialog $conn;
318 0
319 },
320 ;
321
322 $entry->grab_focus;
323 }
324
325 $vbox->add (@dialog);
326 $dialog->show;
327}
328
127sub start_game { 329sub start_game {
128 status "logging in..."; 330 status "logging in...";
129 331
130 $LOGIN_BUTTON->set_text ("Logout"); 332 $LOGIN_BUTTON->set_text ("Logout");
131 $SETUP_DIALOG->hide; 333 $SETUP_DIALOG->hide;
132 334
133 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 335 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
134 336
135 my ($host, $port) = split /:/, $CFG->{host}; 337 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
136 338
137 $MAP = new CFClient::Map $mapsize, $mapsize; 339 $MAP = new CFClient::Map $mapsize, $mapsize;
138 340
139 $CONN = eval { 341 $CONN = eval {
140 new CFClient::Protocol 342 new CFClient::Protocol
141 host => $host, 343 host => $host,
142 port => $port || 13327, 344 port => $port || 13327,
143 user => $CFG->{user}, 345 user => $CFG->{profile}{default}{user},
144 pass => $CFG->{password}, 346 pass => $CFG->{profile}{default}{password},
145 mapw => $mapsize, 347 mapw => $mapsize,
146 maph => $mapsize, 348 maph => $mapsize,
147 349
148 map_widget => $MAPWIDGET, 350 map_widget => $MAPWIDGET,
149 logview => $LOGVIEW, 351 logview => $LOGVIEW,
150 statusbox => $STATUSBOX, 352 statusbox => $STATUSBOX,
151 map => $MAP, 353 map => $MAP,
152 mapmap => $MAPMAP, 354 mapmap => $MAPMAP,
355 query => \&server_query,
153 356
154 sound_play => sub { 357 sound_play => sub {
155 my ($x, $y, $soundnum, $type) = @_; 358 my ($x, $y, $soundnum, $type) = @_;
156 359
157 $SDL_MIXER 360 $SDL_MIXER
… …
174 } 377 }
175} 378}
176 379
177sub stop_game { 380sub stop_game {
178 $LOGIN_BUTTON->set_text ("Login"); 381 $LOGIN_BUTTON->set_text ("Login");
382 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
179 $SETUP_DIALOG->show; 383 $SETUP_DIALOG->show;
180 $INV_WINDOW->hide; 384 $PL_WINDOW->hide;
181 $LOGVIEW->hide; 385 $SPELL_PAGE->clear_spells;
182 386
183 return unless $CONN; 387 return unless $CONN;
184 388
185 status "connection closed"; 389 status "connection closed";
186 390
391 destroy_query_dialog $CONN;
187 $CONN->destroy; 392 $CONN->destroy;
188 $CONN = 0; # false, does not autovivify 393 $CONN = 0; # false, does not autovivify
394
395 undef $MAP;
189} 396}
190 397
191sub graphics_setup { 398sub graphics_setup {
192 my $vbox = new CFClient::UI::VBox; 399 my $vbox = new CFClient::UI::VBox;
193 400
… …
211 418
212 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 419 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
213 $table->add (1, $row++, new CFClient::UI::CheckBox 420 $table->add (1, $row++, new CFClient::UI::CheckBox
214 state => $CFG->{fullscreen}, 421 state => $CFG->{fullscreen},
215 tooltip => "Bring the client into fullscreen mode.", 422 tooltip => "Bring the client into fullscreen mode.",
216 on_changed => sub { 423 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
217 my ($self, $value) = @_;
218 $CFG->{fullscreen} = $value;
219 }
220 ); 424 );
221 425
222 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 426 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
223 $table->add (1, $row++, new CFClient::UI::CheckBox 427 $table->add (1, $row++, new CFClient::UI::CheckBox
224 state => $CFG->{fast}, 428 state => $CFG->{fast},
225 tooltip => "Lower the visual quality considerably to speed up rendering.", 429 tooltip => "Lower the visual quality considerably to speed up rendering.",
226 on_changed => sub { 430 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
227 my ($self, $value) = @_;
228 $CFG->{fast} = $value;
229 }
230 ); 431 );
231 432
232 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 433 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
233 $table->add (1, $row++, new CFClient::UI::Slider 434 $table->add (1, $row++, new CFClient::UI::Slider
234 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 435 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
235 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 436 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
236 on_changed => sub { 437 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
237 my ($self, $value) = @_;
238 $CFG->{map_scale} = 2 ** $value;
239 }
240 ); 438 );
241 439
242 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 440 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
243 $table->add (1, $row++, new CFClient::UI::CheckBox 441 $table->add (1, $row++, new CFClient::UI::CheckBox
244 state => $CFG->{fow_enable}, 442 state => $CFG->{fow_enable},
245 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 443 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
246 on_changed => sub { 444 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
247 my ($self, $value) = @_;
248 $CFG->{fow_enable} = $value;
249 }
250 ); 445 );
251 446
252 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 447 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
253 $table->add (1, $row++, new CFClient::UI::Slider 448 $table->add (1, $row++, new CFClient::UI::Slider
254 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 449 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
255 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 450 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
256 on_changed => sub { 451 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
257 my ($self, $value) = @_;
258 $CFG->{fow_intensity} = $value;
259 }
260 ); 452 );
261 453
262 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 454 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
263 $table->add (1, $row++, new CFClient::UI::CheckBox 455 $table->add (1, $row++, new CFClient::UI::CheckBox
264 state => $CFG->{fow_smooth}, 456 state => $CFG->{fow_smooth},
265 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 457 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
266 on_changed => sub { 458 on_changed => sub {
267 my ($self, $value) = @_; 459 my ($self, $value) = @_;
268 $CFG->{fow_smooth} = $value; 460 $CFG->{fow_smooth} = $value;
269 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2; 461 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
462 0
270 } 463 }
271 ); 464 );
272 465
273 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 466 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
274 $table->add (1, $row++, new CFClient::UI::Slider 467 $table->add (1, $row++, new CFClient::UI::Slider
275 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 468 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
276 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 469 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
277 on_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 470 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
278 ); 471 );
279 472
280 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 473 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
281 $table->add (1, $row++, new CFClient::UI::Slider 474 $table->add (1, $row++, new CFClient::UI::Slider
282 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 475 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
283 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 476 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
284 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 477 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
285 );
286
287 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
288
289 $table->add (1, $row++, new CFClient::UI::Slider
290 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
291 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
292 on_changed => sub {
293 $CFG->{stat_fontsize} = $_[1];
294 &set_stats_window_fontsize;
295 }
296 ); 478 );
297 479
298 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 480 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
299 $table->add (1, $row++, new CFClient::UI::Slider 481 $table->add (1, $row++, new CFClient::UI::Slider
300 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 482 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
301 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 483 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
302 on_changed => sub { 484 on_changed => sub {
303 $CFG->{gauge_fontsize} = $_[1]; 485 $CFG->{gauge_fontsize} = $_[1];
304 &set_gauge_window_fontsize; 486 &set_gauge_window_fontsize;
487 0
305 } 488 }
306 ); 489 );
307 490
308 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 491 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
309 $table->add (1, $row++, new CFClient::UI::Slider 492 $table->add (1, $row++, new CFClient::UI::Slider
310 range => [$CFG->{gauge_size}, 0.2, 0.8], 493 range => [$CFG->{gauge_size}, 0.2, 0.8],
311 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 494 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
312 on_changed => sub { 495 on_changed => sub {
313 $CFG->{gauge_size} = $_[1]; 496 $CFG->{gauge_size} = $_[1];
314 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 497 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
498 0
315 } 499 }
316 ); 500 );
317 501
318 $table->add (1, $row++, new CFClient::UI::Button 502 $table->add (1, $row++, new CFClient::UI::Button
319 expand => 1, align => 0, text => "Apply", 503 expand => 1, align => 0, text => "Apply",
320 tooltip => "Apply the video settings", 504 tooltip => "Apply the video settings",
321 on_activate => sub { 505 on_activate => sub {
322 video_shutdown (); 506 video_shutdown ();
323 video_init (); 507 video_init ();
508 0
324 } 509 }
325 ); 510 );
326 511
327 $vbox 512 $vbox
328} 513}
… …
336 521
337 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 522 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
338 $table->add (1, $row++, new CFClient::UI::CheckBox 523 $table->add (1, $row++, new CFClient::UI::CheckBox
339 state => $CFG->{audio_enable}, 524 state => $CFG->{audio_enable},
340 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.", 525 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.",
341 on_changed => sub { 526 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
342 $CFG->{audio_enable} = $_[1];
343 }
344 ); 527 );
345# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 528# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
346# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 529# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
347# $CFG->{effects_volume} = $_[1]; 530# $CFG->{effects_volume} = $_[1];
348# }); 531# });
349 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 532 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
350 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 533 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
351 $hbox->add (new CFClient::UI::CheckBox 534 $hbox->add (new CFClient::UI::CheckBox
352 expand => 1, state => $CFG->{bgm_enable}, 535 expand => 1, state => $CFG->{bgm_enable},
353 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 536 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
354 on_changed => sub { 537 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
355 $CFG->{bgm_enable} = $_[1];
356 }
357 ); 538 );
358 $hbox->add (new CFClient::UI::Slider 539 $hbox->add (new CFClient::UI::Slider
359 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 540 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
360 tooltip => "The volume of the background music. Changes are instant.", 541 tooltip => "The volume of the background music. Changes are instant.",
361 on_changed => sub { 542 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
362 $CFG->{bgm_volume} = $_[1];
363 CFClient::MixMusic::volume $_[1] * 128;
364 }
365 ); 543 );
366 544
367 $table->add (1, $row++, new CFClient::UI::Button 545 $table->add (1, $row++, new CFClient::UI::Button
368 expand => 1, align => 0, text => "Apply", 546 expand => 1, align => 0, text => "Apply",
369 tooltip => "Apply the audio settings", 547 tooltip => "Apply the audio settings",
370 on_activate => sub { 548 on_activate => sub {
371 audio_shutdown (); 549 audio_shutdown ();
372 audio_init (); 550 audio_init ();
551 0
373 } 552 }
374 ); 553 );
375 554
376 $vbox 555 $vbox
377}
378
379sub set_stats_window_fontsize {
380 for (values %{$STATWIDS}) {
381 $_->set_fontsize ($::CFG->{stat_fontsize});
382 }
383} 556}
384 557
385sub set_gauge_window_fontsize { 558sub set_gauge_window_fontsize {
386 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) { 559 for (map { $GAUGES->{$_} } grep { $_ ne 'win' } keys %{$GAUGES}) {
387 $_->set_fontsize ($::CFG->{gauge_fontsize}); 560 $_->set_fontsize ($::CFG->{gauge_fontsize});
… …
439 &set_gauge_window_fontsize; 612 &set_gauge_window_fontsize;
440 613
441 $win 614 $win
442} 615}
443 616
617sub debug_setup {
618 my $table = new CFClient::UI::Table;
444 619
620 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
621 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
622 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
623 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
624 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
625 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
626 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
627 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
628
629 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
630
631 for my $x (0..2) {
632 for my $y (0 .. 2) {
633 $table->add ($x + 3, $y,
634 new CFClient::UI::Entry
635 text => $default_smooth[$x * 3 + $y],
636 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
637 );
638 }
639 }
640
641
642 $table
643}
644
445sub make_stats_window { 645sub stats_window {
446 my $tgw = new CFClient::UI::FancyFrame 646 my $vb = new CFClient::UI::VBox;
447 y => $HEIGHT * (2/8),
448 x => "max",
449 title => "Stats",
450 name => "stats_window";
451 647
452 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
453 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 648 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
454 can_hover => 1, can_events => 1, 649 can_hover => 1, can_events => 1,
455 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 650 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
456 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 651 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
457 can_hover => 1, can_events => 1, 652 can_hover => 1, can_events => 1,
… …
481 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 676 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
482 677
483 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."], 678 [2, 0, st_wc => "Wc", -120, "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72."],
484 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."], 679 [2, 1, st_ac => "Ac", -120, "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases."],
485 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."], 680 [2, 2, st_dam => "Dam", 120, "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
486 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value."], 681 [2, 3, st_arm => "Arm", 120, "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance."],
487 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."], 682 [2, 4, st_spd => "Spd", 10.54, "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed."],
488 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."], 683 [2, 5, st_wspd => "WSp", 10.54, "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed."],
489 ) { 684 ) {
490 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 685 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
491 686
… …
510 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 705 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
511 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 706 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
512 pois => "<b>Poison</b> (resistance to getting poisoned)", 707 pois => "<b>Poison</b> (resistance to getting poisoned)",
513 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 708 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
514 deat => "<b>Death</b> (resistance against death spells)", 709 deat => "<b>Death</b> (resistance against death spells)",
515 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 710 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat. The value displayed here is also displayed in the 'Arm' field on the left.)",
516 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 711 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
517 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)", 712 fear => "<b>Fear</b> (this attack will drive you away from monsters who cast this and hit you successfully, being resistant to this helps a lot when fighting those monsters)",
518 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 713 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
519 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 714 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
520 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 715 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
537 ); 732 );
538 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 733 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
539 font => $FONT_FIXED, 734 font => $FONT_FIXED,
540 can_hover => 1, 735 can_hover => 1,
541 can_events => 1, 736 can_events => 1,
542 image => "ui/resist/resist_$_.png", 737 path => "ui/resist/resist_$_.png",
543 tooltip => $resist_names{$_}, 738 tooltip => $resist_names{$_},
544 ); 739 );
545 740
546 $row++; 741 $row++;
547 if ($row % 6 == 0) { 742 if ($row % 6 == 0) {
548 $col += 2; 743 $col += 2;
549 $row = 0; 744 $row = 0;
550 } 745 }
551 } 746 }
552 747
553 &set_stats_window_fontsize; 748 $vb->add (my $tbl3 = new CFClient::UI::Table expand => 1);
749 $STATWIDS->{"_skill_tbl"} = $tbl3;
750
554 update_stats_window ({}); 751 update_stats_window ({});
555 752
556 $tgw 753 $vb
557} 754}
558 755
559sub formsep($) { 756sub formsep($) {
560 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1 757 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
561} 758}
… …
595 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW}); 792 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
596 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA}); 793 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
597 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC}); 794 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
598 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC}); 795 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
599 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM}); 796 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
600 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_ARMOUR}); 797 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
601 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 798 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
602 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 799 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
603 800
604 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 801 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
605 802
606 # TODO: replace by CS_STAT_RES_xxx constants
607 my %tbl = ( 803 my %tbl = (
608 phys => 100, 804 phys => CS_STAT_RES_PHYS,
609 magic => 101, 805 magic => CS_STAT_RES_MAG,
610 fire => 102, 806 fire => CS_STAT_RES_FIRE,
611 elec => 103, 807 elec => CS_STAT_RES_ELEC,
612 cold => 104, 808 cold => CS_STAT_RES_COLD,
613 conf => 105, 809 conf => CS_STAT_RES_CONF,
614 acid => 106, 810 acid => CS_STAT_RES_ACID,
615 drain => 107, 811 drain => CS_STAT_RES_DRAIN,
616 ghit => 108, 812 ghit => CS_STAT_RES_GHOSTHIT,
617 pois => 109, 813 pois => CS_STAT_RES_POISON,
618 slow => 110, 814 slow => CS_STAT_RES_SLOW,
619 para => 111, 815 para => CS_STAT_RES_PARA,
620 tund => 112, 816 tund => CS_STAT_TURN_UNDEAD,
621 fear => 113, 817 fear => CS_STAT_RES_FEAR,
622 depl => 113, 818 depl => CS_STAT_RES_DEPLETE,
623 deat => 115, 819 deat => CS_STAT_RES_DEATH,
624 holyw => 116, 820 holyw => CS_STAT_RES_HOLYWORD,
625 blind => 117, 821 blind => CS_STAT_RES_BLIND,
626 ); 822 );
823
824 if ($::CONN && !$STATWIDS->{_skill_tbl_init}) {
825 my $sktbl = $STATWIDS->{_skill_tbl};
826 $sktbl->clear;
827
828 $sktbl->add (0, 0, new CFClient::UI::Label text => "Exp.", align => 1);
829 $sktbl->add (1, 0, new CFClient::UI::Label text => "Level", align => 1);
830 $sktbl->add (2, 0, new CFClient::UI::Label text => "Skillname");
831
832 my @skills;
833
834 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
835 push @skills, [$i, $::CONN->{skill_info}{$i}];
836 }
837
838 my $y = 1;
839 for (sort { $a->[1] cmp $b->[1] } @skills) {
840 my ($idx, $name) = @$_;
841
842 unless (defined $STATWIDS->{"sk_xp_$idx"} || !$::CONN->{skill_info}{$idx}) {
843 $sktbl->add (0, $y, $STATWIDS->{"sk_xp_$idx"} = new CFClient::UI::Label text => "0", align => 1);
844 $sktbl->add (1, $y, $STATWIDS->{"sk_lvl_$idx"} = new CFClient::UI::Label text => "0", align => 1);
845 $sktbl->add (2, $y++, new CFClient::UI::Label text => $name);
846 }
847 }
848
849 $STATWIDS->{_skill_tbl_init} = 1;
850 }
851
852 for (my $i = CS_STAT_SKILLINFO; $i < CS_STAT_SKILLINFO+CS_NUM_SKILLS; $i++) {
853 if (exists $stats->{$i}) {
854 $STATWIDS->{"sk_xp_$i"}->set_text (formsep $stats->{$i}->[1])
855 if $STATWIDS->{"sk_xp_$i"};
856 $STATWIDS->{"sk_lvl_$i"}->set_text (sprintf "%d", $stats->{$i}->[0])
857 if $STATWIDS->{"sk_lvl_$i"};
858 }
859 }
627 860
628 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 861 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
629 for keys %tbl; 862 for keys %tbl;
630} 863}
631 864
632my $METASERVER_ATIME; 865my $METASERVER_ATIME;
633 866
634sub update_metaserver { 867sub update_metaserver {
868 my ($metaserver_dialog) = @_;
869
870 $METASERVER = $metaserver_dialog
871 if defined $metaserver_dialog;
872
635 return if $METASERVER_ATIME > time; 873 return if $METASERVER_ATIME > time;
636 $METASERVER_ATIME = time + 60; 874 $METASERVER_ATIME = time + 60;
637 875
638 my $table = $METASERVER->{table}; 876 my $table = $METASERVER->{table};
639 $table->clear; 877 $table->clear;
… …
660 898
661 utf8::decode $buf if utf8::valid $buf; 899 utf8::decode $buf if utf8::valid $buf;
662 900
663 $table->clear; 901 $table->clear;
664 902
903 my @tip = (
904 "The current number of users logged in on the server.",
905 "The hostname of the server.",
906 "The time this server has been running without being restarted.",
907 "The server software version - a '+' indicates a Crossfire+ server.",
908 "Short information about this server provided by its admins.",
909 );
665 my @col = qw(Use #Users Host Uptime Version Description); 910 my @col = qw(#Users Host Uptime Version Description);
666 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 911 $table->add ($_, 0, new CFClient::UI::Label
912 can_hover => 1, can_events => 1,
913 align => 0, fg => [1, 1, 0],
914 text => $col[$_], tooltip => $tip[$_])
667 for 0 .. $#col; 915 for 0 .. $#col;
668 916
669 my @align = qw(1 0 1 1 -1); 917 my @align = qw(1 0 1 1 -1);
670 918
671 my $y = 0; 919 my $y = 0;
672 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 920 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
689 937
690 $m = [$users, $host, $uptime, $version, $desc]; 938 $m = [$users, $host, $uptime, $version, $desc];
691 939
692 $y++; 940 $y++;
693 941
694 $table->add (0, $y, new CFClient::UI::VBox children => [ 942 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
695 (new CFClient::UI::Button text => "Use", on_activate => sub { 943 (new CFClient::UI::Button
944 text => "Use",
945 tooltip => "Put this server into the <b>Host:Port</b> field",
946 on_activate => sub {
696 $HOST_ENTRY->set_text ($CFG->{host} = $host); 947 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
697 $METASERVER->toggle_visibility; 948 $METASERVER->hide;
949 0
950 },
698 }), 951 ),
699 (new CFClient::UI::Empty expand => 1), 952 (new CFClient::UI::Empty expand => 1),
700 ]); 953 ]);
701 954
702 $table->add ($_ + 1, $y, new CFClient::UI::Label 955 $table->add ($_, $y, new CFClient::UI::Label
703 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 956 ellipsise => 0,
957 align => $align[$_],
958 text => $m->[$_],
959 tooltip => $tip[$_],
960 can_hover => 1,
961 can_events => 1,
962 fontsize => 0.8)
704 for 0 .. $#$m; 963 for 0 .. $#$m;
705 } 964 }
706 } 965 }
707 }); 966 });
708} 967}
709 968
710sub metaserver_dialog { 969sub metaserver_dialog {
970 my $vbox = new CFClient::UI::VBox;
971 my $table = new CFClient::UI::Table;
972 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
973
711 my $dialog = new CFClient::UI::FancyFrame 974 my $dialog = new CFClient::UI::FancyFrame
712 title => "Server List", 975 title => "Server List",
713 name => 'metaserver_dialog', 976 name => 'metaserver_dialog',
714 x => 'center', 977 x => 'center',
715 y => 'center', 978 y => 'center',
716 child => (my $vbox = new CFClient::UI::VBox), 979 z => 3,
980 force_h => $::HEIGHT * 0.4,
981 child => $vbox,
982 has_close_button => 1,
983 table => $table,
717 on_visibility_change => sub { 984 on_visibility_change => sub {
718 update_metaserver if $_[1]; 985 update_metaserver ($_[0]) if $_[1];
986 0
719 }, 987 },
720 ; 988 ;
721
722 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
723 989
724 $dialog 990 $dialog
725} 991}
726 992
727sub server_setup { 993sub server_setup {
… …
734 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 1000 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
735 1001
736 $vbox->add ( 1002 $vbox->add (
737 $HOST_ENTRY = new CFClient::UI::Entry 1003 $HOST_ENTRY = new CFClient::UI::Entry
738 expand => 1, 1004 expand => 1,
739 text => $CFG->{host}, 1005 text => $CFG->{profile}{default}{host},
740 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1006 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
741 on_changed => sub { 1007 on_changed => sub {
742 my ($self, $value) = @_; 1008 my ($self, $value) = @_;
743 $CFG->{host} = $value; 1009 $CFG->{profile}{default}{host} = $value;
1010 0
744 } 1011 }
745 ); 1012 );
746
747 $METASERVER = metaserver_dialog;
748 1013
749 $vbox->add (new CFClient::UI::Button 1014 $vbox->add (new CFClient::UI::Button
750 expand => 1, 1015 expand => 1,
751 text => "Server List", 1016 text => "Server List",
752 other => $METASERVER, 1017 other => $METASERVER,
753 tooltip => "Show a list of available crossfire servers", 1018 tooltip => "Show a list of available crossfire servers",
754 on_activate => sub { $METASERVER->toggle_visibility }, 1019 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1020 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
755 ); 1021 );
756 } 1022 }
757 1023
758 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1024 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
759 $table->add (1, 4, new CFClient::UI::Entry 1025 $table->add (1, 4, new CFClient::UI::Entry
760 text => $CFG->{user}, 1026 text => $CFG->{profile}{default}{user},
761 tooltip => "The name of your character on the server", 1027 tooltip => "The name of your character on the server",
762 on_changed => sub { 1028 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
763 my ($self, $value) = @_;
764 $CFG->{user} = $value;
765 }
766 ); 1029 );
767 1030
768 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1031 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
769 $table->add (1, 5, new CFClient::UI::Entry 1032 $table->add (1, 5, new CFClient::UI::Entry
770 text => $CFG->{password}, 1033 text => $CFG->{profile}{default}{password},
771 hidden => 1, 1034 hidden => 1,
772 tooltip => "The password for your character", 1035 tooltip => "The password for your character",
773 on_changed => sub { 1036 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
774 my ($self, $value) = @_;
775 $CFG->{password} = $value;
776 }
777 ); 1037 );
778 1038
779 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1039 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
780 $table->add (1, 7, new CFClient::UI::Slider 1040 $table->add (1, 7, new CFClient::UI::Slider
781 force_w => 100, 1041 force_w => 100,
782 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1042 range => [$CFG->{mapsize}, 10, 100, 0, 1],
783 tooltip => "This is the size of the portion of the map update the server sends you. " 1043 tooltip => "This is the size of the portion of the map update the server sends you. "
784 . "If you set this to a high value you will be able to see further, " 1044 . "If you set this to a high value you will be able to see further, "
785 . "but you also increase bandwidth requirements and latency. " 1045 . "but you also increase bandwidth requirements and latency. "
786 . "This option is only used once at log-in.", 1046 . "This option is only used once at log-in.",
787 on_changed => sub { 1047 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
788 my ($self, $value) = @_;
789
790 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
791 },
792 ); 1048 );
793 1049
794 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1050 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
795 $table->add (1, 8, new CFClient::UI::CheckBox 1051 $table->add (1, 8, new CFClient::UI::CheckBox
796 state => $CFG->{face_prefetch}, 1052 state => $CFG->{face_prefetch},
… …
799 . "This might increase or create lag, but increases the chances " 1055 . "This might increase or create lag, but increases the chances "
800 . "of faces being ready for display when you encounter them. " 1056 . "of faces being ready for display when you encounter them. "
801 . "It also uses up server bandwidth on every connect, " 1057 . "It also uses up server bandwidth on every connect, "
802 . "so only set it if you really need to prefetch images. " 1058 . "so only set it if you really need to prefetch images. "
803 . "This option can be set and unset any time.", 1059 . "This option can be set and unset any time.",
804 on_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1060 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
805 ); 1061 );
806 1062
807 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1063 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
808 $table->add (1, 9, new CFClient::UI::Entry 1064 $table->add (1, 9, new CFClient::UI::Entry
809 text => $CFG->{output_count}, 1065 text => $CFG->{output_count},
810 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1066 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
811 on_changed => sub { $CFG->{output_count} = $_[1] }, 1067 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
812 ); 1068 );
813 1069
814 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1070 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
815 $table->add (1, 10, new CFClient::UI::Entry 1071 $table->add (1, 10, new CFClient::UI::Entry
816 text => $CFG->{output_sync}, 1072 text => $CFG->{output_sync},
817 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1073 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
818 on_changed => sub { $CFG->{output_sync} = $_[1] }, 1074 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
819 ); 1075 );
820 1076
821 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1077 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
822 expand => 1, 1078 expand => 1,
823 align => 0, 1079 align => 0,
824 text => "Login", 1080 text => "Login",
825 on_activate => sub { 1081 on_activate => sub {
826 $CONN ? stop_game 1082 $CONN ? stop_game
827 : start_game; 1083 : start_game;
1084 0
828 }, 1085 },
829 ); 1086 );
830 1087
831 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 1088 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
832 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry 1089 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
… …
835 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1092 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
836 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1093 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
837 on_changed => sub { 1094 on_changed => sub {
838 my ($self, $value) = @_; 1095 my ($self, $value) = @_;
839 $CFG->{say_command} = $value; 1096 $CFG->{say_command} = $value;
1097 0
840 } 1098 }
841 ); 1099 );
1100
1101 $vbox->add (new CFClient::UI::Label
1102 text => "Server Info",
1103 fontsize => 1.2,
1104 padding_y => 8,
1105 fg => [1, 1, 0, 1],
1106 );
1107
1108 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
842 1109
843 $vbox 1110 $vbox
844} 1111}
845 1112
846sub message_window { 1113sub message_window {
… …
849 title => "Messages", 1116 title => "Messages",
850 border_bg => [1, 1, 1, 1], 1117 border_bg => [1, 1, 1, 1],
851 bg => [0, 0, 0, 0.75], 1118 bg => [0, 0, 0, 0.75],
852 x => "max", 1119 x => "max",
853 y => 0, 1120 y => 0,
854 force_w => $::WIDTH / 3, 1121 force_w => $::WIDTH * 0.4,
855 force_h => $::HEIGHT / 5, 1122 force_h => $::HEIGHT * 0.5,
856 child => (my $vbox = new CFClient::UI::VBox); 1123 child => (my $vbox = new CFClient::UI::VBox),
1124 has_close_button => 1;
857 1125
858 $vbox->add ($LOGVIEW); 1126 $vbox->add ($LOGVIEW);
859 1127
860 $vbox->add (my $input = new CFClient::UI::Entry 1128 $vbox->add (my $input = new CFClient::UI::Entry
861 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1129 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
… …
869 1137
870 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1138 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
871 $input->{refocus_map} = 1; 1139 $input->{refocus_map} = 1;
872 } 1140 }
873 delete $input->{auto_activated}; 1141 delete $input->{auto_activated};
1142
1143 0
874 }, 1144 },
875 on_activate => sub { 1145 on_activate => sub {
876 my ($input, $text) = @_; 1146 my ($input, $text) = @_;
877 $input->set_text (''); 1147 $input->set_text ('');
878 1148
… …
884 } 1154 }
885 if ($input->{refocus_map}) { 1155 if ($input->{refocus_map}) {
886 delete $input->{refocus_map}; 1156 delete $input->{refocus_map};
887 $MAPWIDGET->focus_in 1157 $MAPWIDGET->focus_in
888 } 1158 }
1159
1160 0
889 }, 1161 },
890 on_escape => sub { 1162 on_escape => sub {
891 $MAPWIDGET->focus_in 1163 $MAPWIDGET->grab_focus;
1164
1165 0
892 }, 1166 },
893 ); 1167 );
894 1168
895 $CONSOLE = { 1169 $CONSOLE = {
896 window => $window, 1170 window => $window,
… …
903sub open_quit_dialog { 1177sub open_quit_dialog {
904 unless ($QUIT_DIALOG) { 1178 unless ($QUIT_DIALOG) {
905 $QUIT_DIALOG = new CFClient::UI::FancyFrame 1179 $QUIT_DIALOG = new CFClient::UI::FancyFrame
906 x => "center", 1180 x => "center",
907 y => "center", 1181 y => "center",
1182 z => 50,
908 title => "Really Quit?", 1183 title => "Really Quit?",
909 ; 1184 ;
910 1185
911 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1186 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
912 1187
… …
917 ); 1192 );
918 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1193 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
919 $hb->add (new CFClient::UI::Button 1194 $hb->add (new CFClient::UI::Button
920 text => "Ok", 1195 text => "Ok",
921 expand => 1, 1196 expand => 1,
922 on_activate => sub { $QUIT_DIALOG->hide }, 1197 on_activate => sub { $QUIT_DIALOG->hide; 0 },
923 ); 1198 );
924 $hb->add (new CFClient::UI::Button 1199 $hb->add (new CFClient::UI::Button
925 text => "Quit anyway", 1200 text => "Quit anyway",
926 expand => 1, 1201 expand => 1,
927 on_activate => sub { exit }, 1202 on_activate => sub { exit },
… …
930 1205
931 $QUIT_DIALOG->show; 1206 $QUIT_DIALOG->show;
932} 1207}
933 1208
934sub autopickup_setup { 1209sub autopickup_setup {
935 my $vb = new CFClient::UI::VBox; 1210 my $table = new CFClient::UI::Table;
936
937 $vb->add (my $gen_tbl = new CFClient::UI::Table expand => 1);
938 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
939 $hb->add (my $ltbl = new CFClient::UI::Table expand => 1);
940 $hb->add (my $rtbl = new CFClient::UI::Table expand => 1);
941
942 my $tbl = 0;
943 my $tblrow = 0;
944 1211
945 for ( 1212 for (
946 ["General", $gen_tbl], 1213 ["General", 0, 0,
947 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 1214 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
948 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 1215 ["Inhibit autopickup" => PICKUP_INHIBIT],
949 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 1216 ["Stop before pickup" => PICKUP_STOP],
950 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 1217 ["Debug autopickup" => PICKUP_DEBUG],
1218 ],
951 ["Weapons", $ltbl], 1219 ["Weapons", 0, 6,
952 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 1220 ["All weapons" => PICKUP_ALLWEAPON],
953 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 1221 ["Missile weapons" => PICKUP_MISSILEWEAPON],
954 ["Bows" => CFClient::Pickup::PU_BOW], 1222 ["Bows" => PICKUP_BOW],
955 ["Arrows" => CFClient::Pickup::PU_ARROW], 1223 ["Arrows" => PICKUP_ARROW],
1224 ],
956 ["Armour"], 1225 ["Armour", 0, 12,
957 ["Helmets" => CFClient::Pickup::PU_HELMET], 1226 ["Helmets" => PICKUP_HELMET],
958 ["Shields" => CFClient::Pickup::PU_SHIELD], 1227 ["Shields" => PICKUP_SHIELD],
959 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 1228 ["Body Armour" => PICKUP_ARMOUR],
960 ["Boots" => CFClient::Pickup::PU_BOOTS], 1229 ["Boots" => PICKUP_BOOTS],
961 ["Gloves" => CFClient::Pickup::PU_GLOVES], 1230 ["Gloves" => PICKUP_GLOVES],
962 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 1231 ["Cloaks" => PICKUP_CLOAK],
1232 ],
1233
963 ["Readables", $rtbl], 1234 ["Readables", 2, 2,
964 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 1235 ["Spellbooks" => PICKUP_SPELLBOOK],
965 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 1236 ["Skillscrolls" => PICKUP_SKILLSCROLL],
966 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 1237 ["Normal Books/Scrolls" => PICKUP_READABLES],
1238 ],
967 ["Misc"], 1239 ["Misc", 2, 7,
968 ["Food" => CFClient::Pickup::PU_FOOD], 1240 ["Food" => PICKUP_FOOD],
969 ["Drinks" => CFClient::Pickup::PU_DRINK], 1241 ["Drinks" => PICKUP_DRINK],
970 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 1242 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
971 ["Keys" => CFClient::Pickup::PU_KEY], 1243 ["Keys" => PICKUP_KEY],
972 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 1244 ["Magical Items" => PICKUP_MAGICAL],
973 ["Potions" => CFClient::Pickup::PU_POTION], 1245 ["Potions" => PICKUP_POTION],
974 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 1246 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
975 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 1247 ["Ignore cursed" => PICKUP_NOT_CURSED],
976 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 1248 ["Jewelery" => PICKUP_JEWELS],
1249 ],
1250 ["Weight/Value ratio", 2, 17]
977 ) 1251 )
978 { 1252 {
979 if (ref $_->[1]) { 1253 my ($title, $x, $y, @bits) = @$_;
980 $tbl = $_->[1];
981 $tblrow = 0;
982 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1254 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
983 } elsif (not defined $_->[1]) { 1255
984 $tbl->add (0, $tblrow++, new CFClient::UI::Label text => $_->[0], align => -1); 1256 for (@bits) {
985 } else { 1257 ++$y;
1258
986 my $mask = $_->[1]; 1259 my $mask = $_->[1];
987 $tbl->add (0, $tblrow, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1); 1260 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
988 $tbl->add (1, $tblrow++, new CFClient::UI::CheckBox 1261 $table->add ($x+1, $y, my $checkbox = new CFClient::UI::CheckBox
989 state => $CFG->{pickup} & $mask, 1262 state => $::CFG->{pickup} & $mask,
990 on_changed => sub { 1263 on_changed => sub {
991 my ($box, $value) = @_; 1264 my ($box, $value) = @_;
1265
992 if ($value) { 1266 if ($value) {
993 $::CFG->{pickup} |= $mask; 1267 $::CFG->{pickup} |= $mask;
994 } else { 1268 } else {
995 $::CFG->{pickup} = $::CFG->{pickup} & ~$mask; 1269 $::CFG->{pickup} &= ~$mask;
996 } 1270 }
1271
997 $::CONN->send (sprintf "command pickup %u", $::CFG->{pickup}) 1272 $::CONN->send_command ("pickup $::CFG->{pickup}")
998 if defined $::CONN; 1273 if defined $::CONN;
1274
1275 0
999 }); 1276 });
1277
1278 ${$_->[2]} = $checkbox if $_->[2];
1000 } 1279 }
1001 } 1280 }
1002 1281
1282 $table->add (2, 18, new CFClient::UI::ValSlider
1283 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1284 template => ">= 99",
1285 to_value => sub { ">= " . 5 * $_[0] },
1286 on_changed => sub {
1287 my ($slider, $value) = @_;
1288
1289 $::CFG->{pickup} &= ~0xF;
1290 $::CFG->{pickup} |= int $value
1291 if $value;
1292 1;
1293 });
1294
1295 $table->add (3, 18, new CFClient::UI::Button
1296 text => "set",
1297 on_activate => sub {
1298 $::CONN->send_command ("pickup $::CFG->{pickup}")
1299 if defined $::CONN;
1300 0
1301 });
1302
1303 $table
1304}
1305
1306sub inventory_widget {
1307 my $hb = new CFClient::UI::HBox homogeneous => 1;
1308
1309 $hb->add (my $vb1 = new CFClient::UI::VBox);
1310 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1311 $vb1->add ($INV = new CFClient::UI::Inventory);
1312
1313 $hb->add (my $vb2 = new CFClient::UI::VBox);
1314
1315 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1316
1317 $vb2->add ($INVR = new CFClient::UI::Inventory);
1318
1319 # XXX: Call after $INVR = ... because set_opencont sets the items
1320 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1321
1003 $vb 1322 $hb
1004} 1323}
1005 1324
1006sub make_inventory_window { 1325sub toggle_player_page {
1326 my ($widget) = @_;
1327
1328 if ($PL_WINDOW->{visible} && $PL_NOTEBOOK->get_current_page == $widget) {
1329 $PL_WINDOW->hide;
1330 } else {
1331 $PL_NOTEBOOK->set_current_page ($widget);
1332 $PL_WINDOW->show;
1333 }
1334}
1335
1336sub player_window {
1007 my $invwin = $INV_WINDOW = new CFClient::UI::FancyFrame 1337 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1008 x => "center", 1338 x => "center",
1009 y => "center", 1339 y => "center",
1010 force_w => $WIDTH * 9/10, 1340 force_w => $WIDTH * 9/10,
1011 force_h => $HEIGHT * 9/10, 1341 force_h => $HEIGHT * 9/10,
1012 title => "Inventory", 1342 title => "Player",
1343 has_close_button => 1
1013 ; 1344 ;
1014 1345
1015 $invwin->add (my $hb = new CFClient::UI::HBox homogeneous => 1); 1346 my $ntb =
1347 $PL_NOTEBOOK =
1348 new CFClient::UI::Notebook
1349 expand => 1,
1350 debug => 1,
1351 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1352 ;
1016 1353
1017 $hb->add (my $vb1 = new CFClient::UI::VBox); 1354 $ntb->add (
1018 $vb1->add (new CFClient::UI::Label align => 0, text => "Player"); 1355 "Stats &amp; Skills" => $STATS_PAGE = stats_window,
1019 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1); 1356 "Shows statistics and skill window, where all your Stats, Resistances and Skills are shown."
1357 );
1358 $ntb->add (
1359 Spellbook => $SPELL_PAGE = new CFClient::UI::SpellList,
1360 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1361 );
1362 $ntb->add (
1363 Inventory => $INVENTORY_PAGE = inventory_widget,
1364 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1365 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1366 );
1020 1367
1021 $hb->add (my $vb2 = new CFClient::UI::VBox); 1368 $ntb->set_current_page ($INVENTORY_PAGE);
1022 1369
1023 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox); 1370 $plwin->add ($ntb);
1024 1371 $plwin
1025 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
1026
1027 # XXX: Call after $INVR = ... because set_opencont sets the items
1028 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1029
1030 $invwin
1031} 1372}
1032 1373
1033sub spell_setup { 1374sub update_bindings {
1034 new CFClient::UI::SpellList 1375 $BIND_UPD_CB->() if $BIND_UPD_CB;
1035} 1376}
1036 1377
1037sub keyboard_setup { 1378sub keyboard_setup {
1038 my $binding_list = new CFClient::UI::VBox; 1379 my $binding_list = new CFClient::UI::VBox;
1039 1380
1040 my $refresh; 1381 my $refresh;
1041 $refresh = sub { 1382 $refresh = $BIND_UPD_CB = sub {
1042 $binding_list->clear (); 1383 $binding_list->clear ();
1043 1384
1044 for my $mod (keys %{$::CFG->{bindings}}) { 1385 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1045 for my $sym (keys %{$::CFG->{bindings}->{$mod}}) { 1386 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1046 my $cmds = $::CFG->{bindings}->{$mod}->{$sym}; 1387 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1047 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1388 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1048 1389
1049 my $lbl = join "; ", @$cmds; 1390 my $lbl = join "; ", @$cmds;
1050 my $nam = CFClient::Binder::keycombo_to_name ($mod, $sym); 1391 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1051 $binding_list->add (my $hb = new CFClient::UI::HBox); 1392 $binding_list->add (my $hb = new CFClient::UI::HBox);
1052 $hb->add (new CFClient::UI::Button 1393 $hb->add (new CFClient::UI::Button
1053 text => "delete", 1394 text => "delete",
1054 tooltip => "Deletes the binding", 1395 tooltip => "Deletes the binding",
1055 on_activate => sub { 1396 on_activate => sub {
1056 $binding_list->remove ($hb); 1397 $binding_list->remove ($hb);
1057 delete $::CFG->{bindings}->{$mod}->{$sym}; 1398 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1399 0
1058 }); 1400 });
1059 1401
1060 $hb->add (new CFClient::UI::Button 1402 $hb->add (new CFClient::UI::Button
1061 text => "edit", 1403 text => "edit",
1062 tooltip => "Edits the binding", 1404 tooltip => "Edits the binding",
1063 on_activate => sub { 1405 on_activate => sub {
1064 $::BIND_EDITOR->set_binding ( 1406 $::BIND_EDITOR->set_binding (
1065 $mod, $sym, $::CFG->{bindings}->{$mod}->{$sym}, 1407 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1066 sub { 1408 sub {
1067 my ($nmod, $nsym, $ncmds) = @_; 1409 my ($nmod, $nsym, $ncmds) = @_;
1068 delete $::CFG->{bindings}->{$mod}->{$sym}; 1410 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1069 $::CFG->{bindings}->{$nmod}->{$nsym} = $ncmds; 1411 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1070 $refresh->(); 1412 $refresh->();
1071 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1413 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1072 $SETUP_DIALOG->show; 1414 $SETUP_DIALOG->show;
1073 }, 1415 },
1074 sub { 1416 sub {
1075 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1417 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1076 $SETUP_DIALOG->show; 1418 $SETUP_DIALOG->show;
1077 }); 1419 });
1078 $::BIND_EDITOR->show; 1420 $::BIND_EDITOR->show;
1079 $SETUP_DIALOG->hide; 1421 $SETUP_DIALOG->hide;
1422 0
1080 }); 1423 });
1081 1424
1082 $hb->add (new CFClient::UI::Label text => "(Key: $nam)"); 1425 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1083 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1); 1426 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1084 } 1427 }
1085 } 1428 }
1086 }; 1429 };
1087 1430
1088 my $vb = new CFClient::UI::VBox; 1431 my $vb = new CFClient::UI::VBox;
1432 $vb->add (my $hb = new CFClient::UI::HBox);
1433 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1434 $hb->add (new CFClient::UI::CheckBox
1435 expand => 1,
1436 state => $CFG->{shift_fire_stop},
1437 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1438 on_changed => sub {
1439 my ($cbox, $value) = @_;
1440 $CFG->{shift_fire_stop} = $value;
1441 0
1442 });
1443
1089 $vb->add ($binding_list); 1444 $vb->add ($binding_list);
1090 $vb->add (my $hb = new CFClient::UI::HBox); 1445 $vb->add (my $hb = new CFClient::UI::HBox);
1091 1446
1092 $hb->add (new CFClient::UI::Button 1447 $hb->add (new CFClient::UI::Button
1093 text => "record new", 1448 text => "record new",
… …
1095 tooltip => "This button opens the binding editor with an empty binding.", 1450 tooltip => "This button opens the binding editor with an empty binding.",
1096 on_activate => sub { 1451 on_activate => sub {
1097 $::BIND_EDITOR->set_binding (undef, undef, [], 1452 $::BIND_EDITOR->set_binding (undef, undef, [],
1098 sub { 1453 sub {
1099 my ($mod, $sym, $cmds) = @_; 1454 my ($mod, $sym, $cmds) = @_;
1100 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 1455 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1101 $refresh->(); 1456 $refresh->();
1102 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1457 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1103 $SETUP_DIALOG->show; 1458 $SETUP_DIALOG->show;
1104 }, 1459 },
1105 sub { 1460 sub {
1106 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD); 1461 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1107 $SETUP_DIALOG->show; 1462 $SETUP_DIALOG->show;
1108 }); 1463 },
1464 );
1109 $SETUP_DIALOG->hide; 1465 $SETUP_DIALOG->hide;
1110 $::BIND_EDITOR->show; 1466 $::BIND_EDITOR->show;
1467 0
1111 }, 1468 },
1112 ); 1469 );
1113 1470
1114 $hb->add (new CFClient::UI::Button 1471 $hb->add (new CFClient::UI::Button
1115 text => "close", 1472 text => "close",
1116 tooltip => "Closes the binding window", 1473 tooltip => "Closes the binding window",
1117 expand => 1, 1474 expand => 1,
1118 on_activate => sub { 1475 on_activate => sub {
1119 $SETUP_DIALOG->hide; 1476 $SETUP_DIALOG->hide;
1477 0
1120 } 1478 }
1121 ); 1479 );
1122 1480
1123 $refresh->(); 1481 $refresh->();
1124 1482
1125 $vb 1483 $vb
1126} 1484}
1127 1485
1128sub make_help_window { 1486sub help_window {
1129 my $win = new CFClient::UI::FancyFrame 1487 my $win = new CFClient::UI::FancyFrame
1130 x => 'center', 1488 x => 'center',
1131 y => 'center', 1489 y => 'center',
1490 z => 2,
1132 name => 'doc_browser', 1491 name => 'doc_browser',
1133 force_w => int $WIDTH * 7/8, 1492 force_w => int $WIDTH * 7/8,
1134 force_h => int $HEIGHT * 7/8, 1493 force_h => int $HEIGHT * 7/8,
1135 title => "Documentation"; 1494 title => "Help Browser",
1495 has_close_button => 1;
1136 1496
1137 $win->add (my $vbox = new CFClient::UI::VBox); 1497 $win->add (my $vbox = new CFClient::UI::VBox);
1138 1498
1139 $vbox->add (my $buttons = new CFClient::UI::HBox); 1499 $vbox->add (my $buttons = new CFClient::UI::HBox);
1140 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8); 1500 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1501 expand => 1, fontsize => 0.8, padding_x => 4);
1141 1502
1142 for ( 1503 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1504 $buttons->add (my $combo = new CFClient::UI::Combobox
1505 value => undef,
1506 options => [
1143 [intro => "Introduction"], 1507 [intro => "Introduction"],
1144 [manual => "Manual"], 1508 [manual => "Main Manual"],
1509 [skill_help => "Skill Reference"],
1510 [command_help => "Command Reference"],
1145 [command_help => "Commands"], 1511 [dmcommand_help => "DM Commands"],
1146 [skill_help => "Skills"], 1512 [COPYING => "License Terms"],
1147 ) { 1513 ],
1148 my ($pod, $label) = @$_; 1514 on_changed => sub {
1515 my ($self, $pod) = @_;
1149 1516
1150 $buttons->add (new CFClient::UI::Button 1517 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1151 text => $label, 1518 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1152 on_activate => sub {
1153 my $parser = new Pod::POM;
1154 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
1155 1519
1156 $viewer->clear; 1520 $viewer->clear;
1521
1522# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1523# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1524# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1525# ]);#d#
1157 1526
1158 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0]) 1527 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1159 for @{ CFClient::pod_to_pango_list $pom }; 1528 for @$pom;
1160 1529
1161 $viewer->set_offset (0); 1530 $viewer->set_offset (0);
1531
1162 }, 1532 0
1533 },
1534 on_visibility_change => sub {
1535 my ($self, $visible) = @_;
1536 return unless $visible;
1537 return if $self->{value};
1538 $self->set_value ("intro");
1539 0
1540 },
1163 ); 1541 );
1164 }
1165
1166 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>");
1167 1542
1168 $win 1543 $win
1169} 1544}
1170 1545
1171sub sdl_init { 1546sub sdl_init {
… …
1208 z => 100, 1583 z => 100,
1209 force_x => "max", 1584 force_x => "max",
1210 force_y => 0; 1585 force_y => 0;
1211 $DEBUG_STATUS->show; 1586 $DEBUG_STATUS->show;
1212 1587
1213 $BIND_EDITOR = new CFClient::UI::BindEditor (x => "max", y => 0); 1588 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1214 1589
1215 $STATUSBOX = new CFClient::UI::Statusbox; 1590 $STATUSBOX = new CFClient::UI::Statusbox;
1216 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1591 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
1217 1592
1218 (new CFClient::UI::Frame 1593 (new CFClient::UI::Frame
1219 bg => [0, 0, 0, 0.4], 1594 bg => [0, 0, 0, 0.4],
1220 force_x => 0, 1595 force_x => 0,
1221 force_y => "max", 1596 force_y => "max",
… …
1238 $MAPWIDGET->connect (activate_console => sub { 1613 $MAPWIDGET->connect (activate_console => sub {
1239 my ($mapwidget, $preset) = @_; 1614 my ($mapwidget, $preset) = @_;
1240 1615
1241 if ($CONSOLE) { 1616 if ($CONSOLE) {
1242 $CONSOLE->{input}->{auto_activated} = 1; 1617 $CONSOLE->{input}->{auto_activated} = 1;
1243 $CONSOLE->{input}->focus_in; 1618 $CONSOLE->{input}->grab_focus;
1244 1619
1245 if ($preset && $CONSOLE->{input}->get_text eq '') { 1620 if ($preset && $CONSOLE->{input}->get_text eq '') {
1246 $CONSOLE->{input}->set_text ($preset); 1621 $CONSOLE->{input}->set_text ($preset);
1247 } 1622 }
1248 } 1623 }
1249 }); 1624 });
1250 $MAPWIDGET->show; 1625 $MAPWIDGET->show;
1251 $MAPWIDGET->focus_in; 1626 $MAPWIDGET->grab_focus;
1252 1627
1253 $LOGVIEW = new CFClient::UI::TextView 1628 $LOGVIEW = new CFClient::UI::TextScroller
1254 expand => 1, 1629 expand => 1,
1255 font => $FONT_FIXED, 1630 font => $FONT_FIXED,
1256 fontsize => $::CFG->{log_fontsize}, 1631 fontsize => $::CFG->{log_fontsize},
1632 indent => -4,
1257 can_hover => 1, 1633 can_hover => 1,
1258 can_events => 1, 1634 can_events => 1,
1259 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1635 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1260 ; 1636 ;
1261 1637
1262 $SETUP_DIALOG = new CFClient::UI::FancyFrame 1638 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1263 title => "Setup", 1639 title => "Setup",
1264 name => "setup_dialog", 1640 name => "setup_dialog",
1265 x => 'center', 1641 x => 'center',
1266 y => 'center', 1642 y => 'center',
1643 z => 2,
1267 force_w => $::WIDTH * 0.6, 1644 force_w => $::WIDTH * 0.6,
1268 force_h => $::HEIGHT * 0.6, 1645 force_h => $::HEIGHT * 0.6,
1646 has_close_button => 1,
1269 ; 1647 ;
1270 1648
1649 $METASERVER = metaserver_dialog;
1650
1271 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook); 1651 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1652 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1272 1653
1273 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1654 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1274 "Configure the server to play on, your username, password and other server-related options."); 1655 "Configure the server to play on, your username, password and other server-related options.");
1275 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1656 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1276 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1657 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1277 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1658 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1278 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1659 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1279 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1660 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1280 "Configure the use of audio, sound effects and background music."); 1661 "Configure the use of audio, sound effects and background music.");
1281 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1662 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1282 "Lets you define, edit and delete bindings." 1663 "Lets you define, edit and delete key bindings."
1283 . "There is a shortcut for making bindings: Left Control + Insert opens the binding editor " 1664 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1284 . "with nothing set and the recording started. After doing the actions you " 1665 . "with nothing set and the recording started. After doing the actions you "
1285 . "want to record press Insert and you will be asked to press a key-combo." 1666 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1286 . "After pressing the combo the binding will be saved automatically and the " 1667 . "After pressing the combo the binding will be saved automatically and the "
1287 . "binding editor closes"); 1668 . "binding editor closes");
1288 $SETUP_NOTEBOOK->add (Spells => $SETUP_SPELLS = spell_setup, 1669 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1289 "Displays all spells you have and lets you edit keyboard shortcuts for them."); 1670 "Some debuggin' options. Do not ask.");
1290 1671
1291 $BUTTONBAR = new CFClient::UI::HBox x => 0, y => 0; 1672 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1292 1673
1293 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1674 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1294 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1675 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1295 1676
1296 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1677 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1297 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1678 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1298 1679
1299 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 1680 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
1300 1681
1301 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1302 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1303 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1682 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Playerbook", other => player_window,
1304 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)." 1683 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1305 ."You can also hit the Tab-key to show/hide the Inventory.");
1306 1684
1307 $BUTTONBAR->add (new CFClient::UI::Button 1685 $BUTTONBAR->add (new CFClient::UI::Button
1308 text => "Save Config", 1686 text => "Save Config",
1309 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1687 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1310 on_activate => sub { 1688 on_activate => sub {
1311 $::CFG->{layout} = CFClient::UI::get_layout; 1689 $::CFG->{layout} = CFClient::UI::get_layout;
1312 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc"; 1690 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1313 status "Configuration Saved"; 1691 status "Configuration Saved";
1692 0
1314 }, 1693 },
1315 ); 1694 );
1316 1695
1317 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1696 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1318 tooltip => "View Documentation"); 1697 tooltip => "View Documentation");
1319 1698
1320 $BUTTONBAR->add (new CFClient::UI::Button 1699 $BUTTONBAR->add (new CFClient::UI::Button
1321 text => "Quit", 1700 text => "Quit",
1322 tooltip => "Terminates the program", 1701 tooltip => "Terminates the program",
… …
1324 if ($CONN) { 1703 if ($CONN) {
1325 open_quit_dialog; 1704 open_quit_dialog;
1326 } else { 1705 } else {
1327 exit; 1706 exit;
1328 } 1707 }
1708 0
1329 }, 1709 },
1330 ); 1710 );
1331 1711
1332 $BUTTONBAR->show; 1712 $BUTTONBAR->show;
1333 $SETUP_DIALOG->show; 1713 $SETUP_DIALOG->show;
… …
1335 1715
1336 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1716 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1337} 1717}
1338 1718
1339sub video_shutdown { 1719sub video_shutdown {
1720 CFClient::OpenGL::shutdown;
1721
1340 undef $SDL_ACTIVE; 1722 undef $SDL_ACTIVE;
1341} 1723}
1342 1724
1343my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1725my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1344my $bgmusic;#TODO#hack#d# 1726my $bgmusic;#TODO#hack#d#
… …
1560 1942
1561 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc"; 1943 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1562 CFClient::UI::set_layout ($::CFG->{layout}); 1944 CFClient::UI::set_layout ($::CFG->{layout});
1563 1945
1564 my %DEF_CFG = ( 1946 my %DEF_CFG = (
1565 sdl_mode => 0, 1947 sdl_mode => 0,
1566 width => 640, 1948 width => 640,
1567 height => 480, 1949 height => 480,
1568 fullscreen => 0, 1950 fullscreen => 0,
1569 fast => 0, 1951 fast => 0,
1570 map_scale => 1, 1952 map_scale => 1,
1571 fow_enable => 1, 1953 fow_enable => 1,
1572 fow_intensity => 0.45, 1954 fow_intensity => 0.45,
1573 fow_smooth => 0, 1955 fow_smooth => 0,
1574 gui_fontsize => 1, 1956 gui_fontsize => 1,
1575 log_fontsize => 1, 1957 log_fontsize => 0.7,
1576 gauge_fontsize=> 1, 1958 gauge_fontsize => 1,
1577 gauge_size => 0.35, 1959 gauge_size => 0.35,
1578 stat_fontsize => 1, 1960 stat_fontsize => 0.7,
1579 mapsize => 100, 1961 mapsize => 100,
1580 host => "crossfire.schmorp.de",
1581 say_command => 'say', 1962 say_command => 'say',
1582 audio_enable => 1, 1963 audio_enable => 1,
1583 bgm_enable => 1, 1964 bgm_enable => 1,
1584 bgm_volume => 0.25, 1965 bgm_volume => 0.25,
1585 face_prefetch => 0, 1966 face_prefetch => 0,
1586 output_sync => 1, 1967 output_sync => 1,
1587 output_count => 1, 1968 output_count => 1,
1969 pickup => 0,
1970 default => "profile", # default profile
1971 );
1588 ); 1972
1589
1590 while (my ($k, $v) = each %DEF_CFG) { 1973 while (my ($k, $v) = each %DEF_CFG) {
1591 $CFG->{$k} = $v unless exists $CFG->{$k}; 1974 $CFG->{$k} = $v unless exists $CFG->{$k};
1592 } 1975 }
1976
1977 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1593 1978
1594 sdl_init; 1979 sdl_init;
1595 1980
1596 @SDL_MODES = reverse 1981 @SDL_MODES = reverse
1597 grep $_->[0] >= 640 && $_->[1] >= 480, 1982 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1639 video_init; 2024 video_init;
1640 audio_init; 2025 audio_init;
1641} 2026}
1642 2027
1643Event::loop; 2028Event::loop;
2029#CFClient::SDL_Quit;
2030#CFClient::_exit 0;
1644 2031
1645END { CFClient::SDL_Quit } 2032END { CFClient::SDL_Quit }
1646 2033
1647=head1 NAME 2034=head1 NAME
1648 2035

Diff Legend

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