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.10 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.85 by elmex, Sun Jul 2 19:32:56 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; 33use Crossfire::Protocol::Constants;
35 34
36use Compress::LZF; 35use Compress::LZF;
37 36
38use CFClient; 37use CFClient;
39use CFClient::OpenGL (); 38use CFClient::OpenGL ();
39use CFClient::Protocol;
40use CFClient::UI; 40use CFClient::UI;
41use CFClient::BindingEditor;
41use CFClient::MapWidget; 42use CFClient::MapWidget;
43
44$SIG{QUIT} = sub { Carp::cluck "QUIT" };
42 45
43$Event::DIED = sub { 46$Event::DIED = sub {
44 # TODO: display dialog box or so 47 # TODO: display dialog box or so
48 Carp::confess $_[1];#d#TODO: remove when stable
45 CFClient::error $_[1]; 49 CFClient::error $_[1];
46}; 50};
47 51
48#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 52#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
49 53
… …
51 55
52my $MAX_FPS = 60; 56my $MAX_FPS = 60;
53my $MIN_FPS = 5; # unused as of yet 57my $MIN_FPS = 5; # unused as of yet
54 58
55our $META_SERVER = "crossfire.real-time.com:13326"; 59our $META_SERVER = "crossfire.real-time.com:13326";
56
57our $FACEMAP;
58our $TILECACHE;
59our $MAPCACHE;
60 60
61our $LAST_REFRESH; 61our $LAST_REFRESH;
62our $NOW; 62our $NOW;
63 63
64our $CFG; 64our $CFG;
… …
84our $LOGVIEW; 84our $LOGVIEW;
85our $CONSOLE; 85our $CONSOLE;
86our $METASERVER; 86our $METASERVER;
87our $LOGIN_BUTTON; 87our $LOGIN_BUTTON;
88our $QUIT_DIALOG; 88our $QUIT_DIALOG;
89our $HOST_ENTRY;
90our $SERVER_INFO;
89 91
92our $SETUP_DIALOG;
93our $SETUP_NOTEBOOK;
94our $SETUP_SERVER;
95our $SETUP_KEYBOARD;
96our $SETUP_SPELLS;
97
98our $STATS_WINDOW;
99our $MESSAGE_WINDOW;
90our $FLOORBOX; 100our $FLOORBOX;
91our $GAUGES; 101our $GAUGES;
92our $STATWIDS; 102our $STATWIDS;
93 103
94our $SDL_ACTIVE; 104our $SDL_ACTIVE;
… …
100 110
101our $ALT_ENTER_MESSAGE; 111our $ALT_ENTER_MESSAGE;
102our $STATUSBOX; 112our $STATUSBOX;
103our $DEBUG_STATUS; 113our $DEBUG_STATUS;
104 114
105our $INVWIN;
106our $INV; 115our $INV;
107our $INVR; 116our $INVR;
108our $INVR_LBL; 117our $INV_RIGHT_HB;
118
119our $PL_NOTEBOOK;
120our $PL_WINDOW;
121
122our $BIND_EDITOR;
123our $BIND_UPD_CB;
124
125our $PICKUP_CFG;
109 126
110sub status { 127sub status {
111 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 128 $STATUSBOX->add (CFClient::UI::Label::escape $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
112} 129}
113 130
114sub debug { 131sub debug {
115 $DEBUG_STATUS->set_text ($_[0]); 132 $DEBUG_STATUS->set_text ($_[0]);
116 my ($w, $h) = $DEBUG_STATUS->size_request; 133}
117 $DEBUG_STATUS->move ($WIDTH - $w, 0); 134
135sub destroy_query_dialog {
136 (delete $_[0]{query_dialog})->destroy
137 if $_[0]{query_dialog};
138}
139
140# server query dialog
141sub server_query {
142 my ($conn, $flags, $prompt) = @_;
143
144 $conn->{query_dialog} = my $dialog = new CFClient::UI::FancyFrame
145 x => "center",
146 y => "center",
147 title => "Server Query",
148 child => my $vbox = new CFClient::UI::VBox,
149 ;
150
151 my @dialog = my $label = new CFClient::UI::Label
152 max_w => $::WIDTH * 0.4,
153 ellipsise => 0,
154 text => $prompt;
155
156 if ($flags & CS_QUERY_YESNO) {
157 push @dialog, my $hbox = new CFClient::UI::HBox;
158
159 $hbox->add (new CFClient::UI::Button
160 text => "No",
161 on_activate => sub {
162 $conn->send ("reply n");
163 $dialog->destroy;
164 0
165 }
166 );
167 $hbox->add (new CFClient::UI::Button
168 text => "Yes",
169 on_activate => sub {
170 $conn->send ("reply y");
171 destroy_query_dialog $conn;
172 0
173 },
174 );
175
176 $dialog->grab_focus;
177
178 } elsif ($flags & CS_QUERY_SINGLECHAR) {
179 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
180
181 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
182 $MESSAGE_WINDOW->show;
183
184 unshift @dialog, new CFClient::UI::Label
185 max_w => $::WIDTH * 0.4,
186 ellipsise => 0,
187 markup => "\nOr use your keyboard:\n";
188
189 unshift @dialog, my $table = new CFClient::UI::Table;
190
191 $table->add (0, 0, new CFClient::UI::Button
192 text => "Next Race",
193 on_activate => sub {
194 $conn->send ("reply n");
195 destroy_query_dialog $conn;
196 0
197 },
198 );
199 $table->add (2, 0, new CFClient::UI::Button
200 text => "Accept",
201 on_activate => sub {
202 $conn->send ("reply d");
203 destroy_query_dialog $conn;
204 0
205 },
206 );
207
208 unshift @dialog, new CFClient::UI::Label
209 max_w => $::WIDTH * 0.4,
210 ellipsise => 0,
211 markup =>
212 "<big><b>Character Creation: Race</b></big>\n\n"
213 . "Look at the <b>Messages</b> window to see a description of this race "
214 . "(<small>or hover with your mouse over the bottommost entry in the status area in the lower left area of the screen</small>) "
215 . "and the center of the screen to see how this race looks like "
216 . "(<small>this is below this dialog window, you may need to click on the display area to make it visible</small>).\n\n"
217 . "You can look at another race, or accept this race (you will come back to this race eventually, "
218 . "so you can take your time making this important choice."
219 ;
220
221 } elsif ($prompt =~ /roll new stats/) {
222 if (my $stat = delete $conn->{stat_change_with}) {
223 $conn->send ("reply $stat");
224 destroy_query_dialog $conn;
225 return;
226 }
227
228 $STATS_WINDOW->show;
229 $MESSAGE_WINDOW->hide;
230
231 unshift @dialog, new CFClient::UI::Label
232 max_w => $::WIDTH * 0.4,
233 ellipsise => 0,
234 markup => "\nOr use your keyboard:\n";
235
236 unshift @dialog, my $table = new CFClient::UI::Table;
237
238 # left: re-roll
239 $table->add (0, 0, new CFClient::UI::Button
240 text => "Roll Again",
241 on_activate => sub {
242 $conn->send ("reply y");
243 destroy_query_dialog $conn;
244 0
245 },
246 );
247
248 # center: swap stats
249 my ($sw1, $sw2) = map +(new CFClient::UI::Combobox
250 value => $_,
251 options => [
252 [1 => "Str", "Strength ($conn->{stat}{+CS_STAT_STR})"],
253 [2 => "Dex", "Dexterity ($conn->{stat}{+CS_STAT_DEX})"],
254 [3 => "Con", "Constitution ($conn->{stat}{+CS_STAT_CON})"],
255 [4 => "Int", "Intelligence ($conn->{stat}{+CS_STAT_INT})"],
256 [5 => "Wis", "Wisdom ($conn->{stat}{+CS_STAT_WIS})"],
257 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
258 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
259 ],
260 ), 1 .. 2;
261
262 $table->add (2, 0, new CFClient::UI::Button
263 text => "Swap Stats",
264 on_activate => sub {
265 $conn->{stat_change_with} = $sw2->{value};
266 $conn->send ("reply $sw1->{value}");
267 destroy_query_dialog $conn;
268 0
269 },
270 );
271 $table->add (2, 1, new CFClient::UI::HBox children => [$sw1, $sw2]);
272
273 # right: accept
274 $table->add (4, 0, new CFClient::UI::Button
275 text => "Accept",
276 on_activate => sub {
277 $conn->send ("reply n");
278 $STATS_WINDOW->hide;
279 destroy_query_dialog $conn;
280 0
281 },
282 );
283
284 unshift @dialog, new CFClient::UI::Label
285 max_w => $::WIDTH * 0.4,
286 ellipsise => 0,
287 markup =>
288 "<big><b>Character Creation: Stats</b></big>\n\n"
289 . "Look at the <b>Stats</b> window to see your basic stats "
290 . "(first column: 1 strength, 2 dexterity, 3 constitution, 4 intelligence, 5 wisdom, 6 power and 7 charisma).\n\n"
291 . "You can create another set of stats, swap two stat values with each other or accept the stats as they are now and continue. "
292 . "Race selection will influence those values later on."
293 ;
294 }
295
296 push @dialog, my $entry = new CFClient::UI::Entry
297 on_changed => sub {
298 $conn->send ("reply $_[1]");
299 destroy_query_dialog $conn;
300 0
301 },
302 ;
303
304 $entry->grab_focus;
305
306 } else {
307 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
308
309 push @dialog, my $entry = new CFClient::UI::Entry
310 $flags & CS_QUERY_HIDEINPUT ? (hidden => "*") : (),
311 on_activate => sub {
312 $conn->send ("reply $_[1]");
313 destroy_query_dialog $conn;
314 0
315 },
316 ;
317
318 $entry->grab_focus;
319 }
320
321 $vbox->add (@dialog);
322 $dialog->show;
118} 323}
119 324
120sub start_game { 325sub start_game {
121 status "logging in..."; 326 status "logging in...";
122 327
328 $LOGIN_BUTTON->set_text ("Logout");
329 $SETUP_DIALOG->hide;
330
123 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 331 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
124 332
125 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 333 my ($host, $port) = split /:/, $CFG->{profile}{default}{host};
334
126 $MAP = new CFClient::Map $mapsize, $mapsize; 335 $MAP = new CFClient::Map $mapsize, $mapsize;
127
128 my ($host, $port) = split /:/, $CFG->{host};
129 336
130 $CONN = eval { 337 $CONN = eval {
131 new conn 338 new CFClient::Protocol
132 host => $host, 339 host => $host,
133 port => $port || 13327, 340 port => $port || 13327,
134 user => $CFG->{user}, 341 user => $CFG->{profile}{default}{user},
135 pass => $CFG->{password}, 342 pass => $CFG->{profile}{default}{password},
136 mapw => $mapsize, 343 mapw => $mapsize,
137 maph => $mapsize, 344 maph => $mapsize,
138 ; 345
346 map_widget => $MAPWIDGET,
347 logview => $LOGVIEW,
348 statusbox => $STATUSBOX,
349 map => $MAP,
350 mapmap => $MAPMAP,
351 query => \&server_query,
352
353 sound_play => sub {
354 my ($x, $y, $soundnum, $type) = @_;
355
356 $SDL_MIXER
357 or return;
358
359 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
360 or return;
361
362 $chunk->play;
363 },
139 }; 364 };
140 365
141 if ($CONN) { 366 if ($CONN) {
142 CFClient::lowdelay fileno $CONN->{fh}; 367 CFClient::lowdelay fileno $CONN->{fh};
143 368
144 $LOGIN_BUTTON->set_text ("Logout");
145 status "login successful"; 369 status "login successful";
146
147 $BUTTONBAR->{children}[1]->emit ("activate")
148 if $BUTTONBAR->{children}[1]->{state};
149
150 } else { 370 } else {
151 status "unable to connect"; 371 status "unable to connect";
152 stop_game(); 372 stop_game();
153 } 373 }
154} 374}
155 375
156sub stop_game { 376sub stop_game {
377 $LOGIN_BUTTON->set_text ("Login");
378 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
379 $SETUP_DIALOG->show;
380 $PL_WINDOW->hide;
381 $SETUP_SPELLS->clear_spells;
382
157 return unless $CONN; 383 return unless $CONN;
158 384
159 status "connection closed"; 385 status "connection closed";
160 $LOGIN_BUTTON->set_text ("Login"); 386
387 destroy_query_dialog $CONN;
161 $CONN->destroy; 388 $CONN->destroy;
162 $CONN = 0; # false, does not autovivify 389 $CONN = 0; # false, does not autovivify
163 390
164 $BUTTONBAR->{children}[1]->emit ("activate")
165 unless $BUTTONBAR->{children}[1]->{state};
166
167 undef $MAPCACHE;
168 undef $MAP; 391 undef $MAP;
169} 392}
170 393
171sub client_setup { 394sub graphics_setup {
172 my $dialog = new CFClient::UI::FancyFrame
173 title => "Client Setup",
174 child => (my $vbox = new CFClient::UI::VBox); 395 my $vbox = new CFClient::UI::VBox;
396
175 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 397 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
176 398
177 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode"); 399 $table->add (0, 0, new CFClient::UI::Label valign => 0, align => 1, text => "Video Mode");
178 $table->add (1, 0, my $hbox = new CFClient::UI::HBox); 400 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
179 401
180 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 402 $hbox->add (my $mode_slider = new CFClient::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]);
181 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 403 $hbox->add (my $mode_label = new CFClient::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
182 404
183 $mode_slider->connect (changed => sub { 405 $mode_slider->connect (changed => sub {
184 my ($self, $value) = @_; 406 my ($self, $value) = @_;
185 407
… …
192 414
193 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen"); 415 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fullscreen");
194 $table->add (1, $row++, new CFClient::UI::CheckBox 416 $table->add (1, $row++, new CFClient::UI::CheckBox
195 state => $CFG->{fullscreen}, 417 state => $CFG->{fullscreen},
196 tooltip => "Bring the client into fullscreen mode.", 418 tooltip => "Bring the client into fullscreen mode.",
197 connect_changed => sub { 419 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
198 my ($self, $value) = @_;
199 $CFG->{fullscreen} = $value;
200 }
201 ); 420 );
202 421
203 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 422 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
204 $table->add (1, $row++, new CFClient::UI::CheckBox 423 $table->add (1, $row++, new CFClient::UI::CheckBox
205 state => $CFG->{fast}, 424 state => $CFG->{fast},
206 tooltip => "Lower the visual quality considerably to speed up rendering.", 425 tooltip => "Lower the visual quality considerably to speed up rendering.",
207 connect_changed => sub { 426 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
208 my ($self, $value) = @_;
209 $CFG->{fast} = $value;
210 }
211 ); 427 );
212 428
213 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale"); 429 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Map Scale");
214 $table->add (1, $row++, new CFClient::UI::Slider 430 $table->add (1, $row++, new CFClient::UI::Slider
215 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 431 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
216 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 432 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
217 connect_changed => sub { 433 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
218 my ($self, $value) = @_;
219 $CFG->{map_scale} = 2 ** $value;
220 }
221 ); 434 );
222 435
223 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War"); 436 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Fog of War");
224 $table->add (1, $row++, new CFClient::UI::CheckBox 437 $table->add (1, $row++, new CFClient::UI::CheckBox
225 state => $CFG->{fow_enable}, 438 state => $CFG->{fow_enable},
226 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 439 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
227 connect_changed => sub { 440 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
228 my ($self, $value) = @_;
229 $CFG->{fow_enable} = $value;
230 }
231 ); 441 );
232 442
233 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 443 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Intensity");
234 $table->add (1, $row++, new CFClient::UI::Slider 444 $table->add (1, $row++, new CFClient::UI::Slider
235 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 445 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
236 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 446 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
237 connect_changed => sub { 447 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
238 my ($self, $value) = @_;
239 $CFG->{fow_intensity} = $value;
240 }
241 ); 448 );
242 449
243 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth"); 450 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "FoW Smooth");
244 $table->add (1, $row++, new CFClient::UI::CheckBox 451 $table->add (1, $row++, new CFClient::UI::CheckBox
245 state => $CFG->{fow_smooth}, 452 state => $CFG->{fow_smooth},
246 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.", 453 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
247 connect_changed => sub { 454 on_changed => sub {
248 my ($self, $value) = @_; 455 my ($self, $value) = @_;
249 $CFG->{fow_smooth} = $value; 456 $CFG->{fow_smooth} = $value;
250 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::GL_VERSION < 1.2; 457 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFClient::OpenGL::GL_VERSION < 1.2;
458 0
251 } 459 }
252 ); 460 );
253 461
254 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 462 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
255 $table->add (1, $row++, new CFClient::UI::Slider 463 $table->add (1, $row++, new CFClient::UI::Slider
256 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 464 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
257 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 465 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
258 connect_changed => sub { $CFG->{gui_fontsize} = $_[1] }, 466 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
259 ); 467 );
260 468
261 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 469 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Message Fontsize");
262 $table->add (1, $row++, new CFClient::UI::Slider 470 $table->add (1, $row++, new CFClient::UI::Slider
263 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 471 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
264 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 472 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
265 connect_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]) }, 473 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
266 ); 474 );
267 475
268 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize"); 476 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Stats Fontsize");
269 477
270 $table->add (1, $row++, new CFClient::UI::Slider 478 $table->add (1, $row++, new CFClient::UI::Slider
271 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1], 479 range => [$CFG->{stat_fontsize}, 0.5, 2, 0, 0.1],
272 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.", 480 tooltip => "The font size used by the <b>statistics window</b> only. Changes are instant.",
273 connect_changed => sub { 481 on_changed => sub {
274 $CFG->{stat_fontsize} = $_[1]; 482 $CFG->{stat_fontsize} = $_[1];
275 &set_stats_window_fontsize; 483 &set_stats_window_fontsize;
484 0
276 } 485 }
277 ); 486 );
278 487
279 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 488 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
280 $table->add (1, $row++, new CFClient::UI::Slider 489 $table->add (1, $row++, new CFClient::UI::Slider
281 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 490 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
282 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 491 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
283 connect_changed => sub { 492 on_changed => sub {
284 $CFG->{gauge_fontsize} = $_[1]; 493 $CFG->{gauge_fontsize} = $_[1];
285 &set_gauge_window_fontsize; 494 &set_gauge_window_fontsize;
495 0
286 } 496 }
287 ); 497 );
288 498
289 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size"); 499 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Gauge size");
290 $table->add (1, $row++, new CFClient::UI::Slider 500 $table->add (1, $row++, new CFClient::UI::Slider
291 range => [$CFG->{gauge_size}, 0.2, 0.8], 501 range => [$CFG->{gauge_size}, 0.2, 0.8],
292 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 502 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
293 connect_changed => sub { 503 on_changed => sub {
294 $CFG->{gauge_size} = $_[1]; 504 $CFG->{gauge_size} = $_[1];
295 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 505 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
506 0
296 } 507 }
297 ); 508 );
298 509
299 $table->add (1, $row++, new CFClient::UI::Button 510 $table->add (1, $row++, new CFClient::UI::Button
300 expand => 1, align => 0, text => "Apply", 511 expand => 1, align => 0, text => "Apply",
301 tooltip => "Apply the video settings", 512 tooltip => "Apply the video settings",
302 connect_activate => sub { 513 on_activate => sub {
303 video_shutdown (); 514 video_shutdown ();
304 video_init (); 515 video_init ();
516 0
305 } 517 }
306 ); 518 );
519
520 $vbox
521}
522
523sub audio_setup {
524 my $vbox = new CFClient::UI::VBox;
525
526 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
527
528 my $row = 0;
307 529
308 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable"); 530 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Audio Enable");
309 $table->add (1, $row++, new CFClient::UI::CheckBox 531 $table->add (1, $row++, new CFClient::UI::CheckBox
310 state => $CFG->{audio_enable}, 532 state => $CFG->{audio_enable},
311 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.", 533 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.",
312 connect_changed => sub { 534 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
313 $CFG->{audio_enable} = $_[1];
314 }
315 ); 535 );
316# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume"); 536# $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Effects Volume");
317# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], connect_changed => sub { 537# $table->add (1, 8, new CFClient::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
318# $CFG->{effects_volume} = $_[1]; 538# $CFG->{effects_volume} = $_[1];
319# }); 539# });
320 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music"); 540 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Background Music");
321 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox); 541 $table->add (1, $row++, my $hbox = new CFClient::UI::HBox);
322 $hbox->add (new CFClient::UI::CheckBox 542 $hbox->add (new CFClient::UI::CheckBox
323 expand => 1, state => $CFG->{bgm_enable}, 543 expand => 1, state => $CFG->{bgm_enable},
324 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 544 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
325 connect_changed => sub { 545 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
326 $CFG->{bgm_enable} = $_[1];
327 }
328 ); 546 );
329 $hbox->add (new CFClient::UI::Slider 547 $hbox->add (new CFClient::UI::Slider
330 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 548 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
331 tooltip => "The volume of the background music. Changes are instant.", 549 tooltip => "The volume of the background music. Changes are instant.",
332 connect_changed => sub { 550 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFClient::MixMusic::volume $_[1] * 128; 0 }
333 $CFG->{bgm_volume} = $_[1];
334 CFClient::MixMusic::volume $_[1] * 128;
335 }
336 ); 551 );
337 552
338 $table->add (1, $row++, new CFClient::UI::Button 553 $table->add (1, $row++, new CFClient::UI::Button
339 expand => 1, align => 0, text => "Apply", 554 expand => 1, align => 0, text => "Apply",
340 tooltip => "Apply the audio settings", 555 tooltip => "Apply the audio settings",
341 connect_activate => sub { 556 on_activate => sub {
342 audio_shutdown (); 557 audio_shutdown ();
343 audio_init (); 558 audio_init ();
559 0
344 } 560 }
345 ); 561 );
346 562
347 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command"); 563 $vbox
348 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
349 text => $CFG->{say_command},
350 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
351 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
352 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
353 connect_changed => sub {
354 my ($self, $value) = @_;
355 $CFG->{say_command} = $value;
356 }
357 );
358
359 $dialog
360} 564}
361 565
362sub set_stats_window_fontsize { 566sub set_stats_window_fontsize {
363 for (values %{$STATWIDS}) { 567 for (values %{$STATWIDS}) {
364 $_->set_fontsize ($::CFG->{stat_fontsize}); 568 $_->set_fontsize ($::CFG->{stat_fontsize});
… …
373 577
374sub make_gauge_window { 578sub make_gauge_window {
375 my $gh = int $HEIGHT * $CFG->{gauge_size}; 579 my $gh = int $HEIGHT * $CFG->{gauge_size};
376 580
377 my $win = new CFClient::UI::Frame ( 581 my $win = new CFClient::UI::Frame (
378 req_y => -1, 582 force_x => 0,
583 force_y => "max",
379 user_w => $WIDTH, 584 force_w => $WIDTH,
380 user_h => $gh, 585 force_h => $gh,
381 ); 586 );
382 587
383 $win->add (my $hbox = new CFClient::UI::HBox 588 $win->add (my $hbox = new CFClient::UI::HBox
384 children => [ 589 children => [
385 (new CFClient::UI::HBox expand => 1), 590 (new CFClient::UI::HBox expand => 1),
… …
421 &set_gauge_window_fontsize; 626 &set_gauge_window_fontsize;
422 627
423 $win 628 $win
424} 629}
425 630
631sub debug_setup {
632 my $table = new CFClient::UI::Table;
633
634 $table->add (0, 0, new CFClient::UI::Label text => "Widget Borders");
635 $table->add (1, 0, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
636 $table->add (0, 1, new CFClient::UI::Label text => "Tooltip Widget Info");
637 $table->add (1, 1, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
638 $table->add (0, 2, new CFClient::UI::Label text => "Show FPS");
639 $table->add (1, 2, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
640 $table->add (0, 3, new CFClient::UI::Label text => "Suppress Tooltips");
641 $table->add (1, 3, new CFClient::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
642
643 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
644
645 for my $x (0..2) {
646 for my $y (0 .. 2) {
647 $table->add ($x + 3, $y,
648 new CFClient::UI::Entry
649 text => $default_smooth[$x * 3 + $y],
650 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
651 );
652 }
653 }
654
655
656 $table
657}
658
426sub make_stats_window { 659sub stats_window {
427 my $tgw = new CFClient::UI::FancyFrame title => "Stats"; 660 my $tgw =
661 new CFClient::UI::Window
662 child => my $vb = new CFClient::UI::VBox;
428 663
429 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
430 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1, 664 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1,
431 can_hover => 1, can_events => 1, 665 can_hover => 1, can_events => 1,
432 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server."); 666 tooltip => "Your name and title. You can change your title by using the <b>title</b> command, if supported by the server.");
433 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1, 667 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1,
434 can_hover => 1, can_events => 1, 668 can_hover => 1, can_events => 1,
435 tooltip => "The map you are currently on (if supported by the server)."); 669 tooltip => "The map you are currently on (if supported by the server).");
436 670
437 $vb->add (my $hb0 = new CFClient::UI::HBox); 671 $vb->add (my $hb0 = new CFClient::UI::HBox);
438 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1, 672 $hb0->add ($STATWIDS->{weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Weight:", expand => 1,
439 can_hover => 1, can_events => 1, 673 can_hover => 1, can_events => 1,
440 tooltip => "This is the amount the Player weights."); 674 tooltip => "The weight of the player including all inventory items.");
441 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1, 675 $hb0->add ($STATWIDS->{m_weight} = new CFClient::UI::Label valign => 0, align => -1, text => "Max weight:", expand => 1,
442 can_hover => 1, can_events => 1, 676 can_hover => 1, can_events => 1,
443 tooltip => "The weight limit, you can't carry more than this."); 677 tooltip => "The weight limit: you cannot carry more than this.");
444 678
445 679
446 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 680 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
447 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 681 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
448 682
… …
458 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."], 692 [0, 6, st_cha => "Cha", 30, "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops."],
459 693
460 [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."], 694 [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."],
461 [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."], 695 [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."],
462 [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."], 696 [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."],
463 [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."], 697 [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."],
464 [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."], 698 [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."],
465 [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."], 699 [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."],
466 ) { 700 ) {
467 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 701 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
468 702
… …
487 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)", 721 drain => "<b>Draining</b> (some monsters (e.g. vampires) and other effects can steal experience)",
488 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)", 722 acid => "<b>Acid</b> (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
489 pois => "<b>Poison</b> (resistance to getting poisoned)", 723 pois => "<b>Poison</b> (resistance to getting poisoned)",
490 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)", 724 para => "<b>Paralysation</b> (this resistance affects the chance you get paralysed)",
491 deat => "<b>Death</b> (resistance against death spells)", 725 deat => "<b>Death</b> (resistance against death spells)",
492 phys => "<b>Physical</b> (this is the resistance against physical attacks, like when a monster hit you in melee combat)", 726 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.)",
493 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)", 727 blind => "<b>Blind</b> (blind resistance affects the chance of a successful blinding attack)",
494 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)", 728 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)",
495 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...", 729 tund => "<b>Turn undead</b> (affects your resistancy to various forms of 'turn undead' spells. Only relevant when you are, in fact, undead...",
496 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)", 730 elec => "<b>Electricity</b> (resistance against electricity, spells like large lightning, small lightning, ...)",
497 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)", 731 cold => "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)",
… …
514 ); 748 );
515 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 749 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
516 font => $FONT_FIXED, 750 font => $FONT_FIXED,
517 can_hover => 1, 751 can_hover => 1,
518 can_events => 1, 752 can_events => 1,
519 image => "ui/resist/resist_$_.png", 753 path => "ui/resist/resist_$_.png",
520 tooltip => $resist_names{$_}, 754 tooltip => $resist_names{$_},
521 ); 755 );
522 756
523 $row++; 757 $row++;
524 if ($row % 6 == 0) { 758 if ($row % 6 == 0) {
… …
531 update_stats_window ({}); 765 update_stats_window ({});
532 766
533 $tgw 767 $tgw
534} 768}
535 769
536sub formsep { 770sub formsep($) {
537 reverse join ",", grep length, split /(...)/, reverse $_[0] * 1 771 scalar reverse join ",", unpack "(A3)*", reverse $_[0] * 1
538} 772}
539 773
540sub update_stats_window { 774sub update_stats_window {
541 my ($stats) = @_; 775 my ($stats) = @_;
542 776
543 # i love text protocols!!! 777 # I love text protocols...
778
544 my $hp = $stats->{Crossfire::Protocol::CS_STAT_HP} * 1; 779 my $hp = $stats->{+CS_STAT_HP} * 1;
545 my $hp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXHP} * 1; 780 my $hp_m = $stats->{+CS_STAT_MAXHP} * 1;
546 my $sp = $stats->{Crossfire::Protocol::CS_STAT_SP} * 1; 781 my $sp = $stats->{+CS_STAT_SP} * 1;
547 my $sp_m = $stats->{Crossfire::Protocol::CS_STAT_MAXSP} * 1; 782 my $sp_m = $stats->{+CS_STAT_MAXSP} * 1;
548 my $fo = $stats->{Crossfire::Protocol::CS_STAT_FOOD} * 1; 783 my $fo = $stats->{+CS_STAT_FOOD} * 1;
549 my $fo_m = 999; 784 my $fo_m = 999;
550 my $gr = $stats->{Crossfire::Protocol::CS_STAT_GRACE} * 1; 785 my $gr = $stats->{+CS_STAT_GRACE} * 1;
551 my $gr_m = $stats->{Crossfire::Protocol::CS_STAT_MAXGRACE} * 1; 786 my $gr_m = $stats->{+CS_STAT_MAXGRACE} * 1;
552 787
553 $GAUGES->{hp} ->set_value ($hp, $hp_m); 788 $GAUGES->{hp} ->set_value ($hp, $hp_m);
554 $GAUGES->{mana} ->set_value ($sp, $sp_m); 789 $GAUGES->{mana} ->set_value ($sp, $sp_m);
555 $GAUGES->{food} ->set_value ($fo, $fo_m); 790 $GAUGES->{food} ->set_value ($fo, $fo_m);
556 $GAUGES->{grace} ->set_value ($gr, $gr_m); 791 $GAUGES->{grace} ->set_value ($gr, $gr_m);
557 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{Crossfire::Protocol::CS_STAT_EXP64}) 792 $GAUGES->{exp} ->set_text ("Exp: " . (formsep $stats->{+CS_STAT_EXP64})
558 . " (lvl " . ($stats->{Crossfire::Protocol::CS_STAT_LEVEL} * 1) . ")"); 793 . " (lvl " . ($stats->{+CS_STAT_LEVEL} * 1) . ")");
559 my $rng = $stats->{Crossfire::Protocol::CS_STAT_RANGE}; 794 my $rng = $stats->{+CS_STAT_RANGE};
560 $rng =~ s/^Range: //; # thank you so much dear server 795 $rng =~ s/^Range: //; # thank you so much dear server
561 $GAUGES->{range} ->set_text ("Rng: " . $rng); 796 $GAUGES->{range} ->set_text ("Rng: " . $rng);
562 my $title = $stats->{Crossfire::Protocol::CS_STAT_TITLE}; 797 my $title = $stats->{+CS_STAT_TITLE};
563 $title =~ s/^Player: //; 798 $title =~ s/^Player: //;
564 $STATWIDS->{title} ->set_text ("Title: " . $title); 799 $STATWIDS->{title} ->set_text ("Title: " . $title);
565 800
566 $STATWIDS->{st_str} ->set_text (sprintf "%d", $stats->{5}); 801 $STATWIDS->{st_str} ->set_text (sprintf "%d" , $stats->{+CS_STAT_STR});
567 $STATWIDS->{st_dex} ->set_text (sprintf "%d", $stats->{8}); 802 $STATWIDS->{st_dex} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DEX});
568 $STATWIDS->{st_con} ->set_text (sprintf "%d", $stats->{9}); 803 $STATWIDS->{st_con} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CON});
569 $STATWIDS->{st_int} ->set_text (sprintf "%d", $stats->{6}); 804 $STATWIDS->{st_int} ->set_text (sprintf "%d" , $stats->{+CS_STAT_INT});
570 $STATWIDS->{st_wis} ->set_text (sprintf "%d", $stats->{7}); 805 $STATWIDS->{st_wis} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WIS});
571 $STATWIDS->{st_pow} ->set_text (sprintf "%d", $stats->{22}); 806 $STATWIDS->{st_pow} ->set_text (sprintf "%d" , $stats->{+CS_STAT_POW});
572 $STATWIDS->{st_cha} ->set_text (sprintf "%d", $stats->{10}); 807 $STATWIDS->{st_cha} ->set_text (sprintf "%d" , $stats->{+CS_STAT_CHA});
573 $STATWIDS->{st_wc} ->set_text (sprintf "%d", $stats->{13}); 808 $STATWIDS->{st_wc} ->set_text (sprintf "%d" , $stats->{+CS_STAT_WC});
574 $STATWIDS->{st_ac} ->set_text (sprintf "%d", $stats->{14}); 809 $STATWIDS->{st_ac} ->set_text (sprintf "%d" , $stats->{+CS_STAT_AC});
575 $STATWIDS->{st_dam} ->set_text (sprintf "%d", $stats->{15}); 810 $STATWIDS->{st_dam} ->set_text (sprintf "%d" , $stats->{+CS_STAT_DAM});
576 $STATWIDS->{st_arm} ->set_text (sprintf "%d", $stats->{16}); 811 $STATWIDS->{st_arm} ->set_text (sprintf "%d" , $stats->{+CS_STAT_RES_PHYS});
577 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_SPEED}); 812 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
578 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{Crossfire::Protocol::CS_STAT_WEAP_SP}); 813 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
579 814
580 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{Crossfire::Protocol::CS_STAT_WEIGHT_LIM} / 1000); 815 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
581 816
582 my %tbl = ( 817 my %tbl = (
583 phys => 100, 818 phys => CS_STAT_RES_PHYS,
584 magic => 101, 819 magic => CS_STAT_RES_MAG,
585 fire => 102, 820 fire => CS_STAT_RES_FIRE,
586 elec => 103, 821 elec => CS_STAT_RES_ELEC,
587 cold => 104, 822 cold => CS_STAT_RES_COLD,
588 conf => 105, 823 conf => CS_STAT_RES_CONF,
589 acid => 106, 824 acid => CS_STAT_RES_ACID,
590 drain => 107, 825 drain => CS_STAT_RES_DRAIN,
591 ghit => 108, 826 ghit => CS_STAT_RES_GHOSTHIT,
592 pois => 109, 827 pois => CS_STAT_RES_POISON,
593 slow => 110, 828 slow => CS_STAT_RES_SLOW,
594 para => 111, 829 para => CS_STAT_RES_PARA,
595 tund => 112, 830 tund => CS_STAT_TURN_UNDEAD,
596 fear => 113, 831 fear => CS_STAT_RES_FEAR,
597 depl => 113, 832 depl => CS_STAT_RES_DEPLETE,
598 deat => 115, 833 deat => CS_STAT_RES_DEATH,
599 holyw => 116, 834 holyw => CS_STAT_RES_HOLYWORD,
600 blind => 117 835 blind => CS_STAT_RES_BLIND,
601 ); 836 );
602 837
603 for (keys %tbl) {
604 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}); 838 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
605 } 839 for keys %tbl;
606
607}
608
609sub metaserver_dialog {
610 my $dialog = new CFClient::UI::FancyFrame
611 title => "Server List",
612 child => (my $vbox = new CFClient::UI::VBox);
613
614 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
615
616 $dialog
617} 840}
618 841
619my $METASERVER_ATIME; 842my $METASERVER_ATIME;
620 843
621sub update_metaserver { 844sub update_metaserver {
622 my ($HOST) = @_; 845 my ($metaserver_dialog) = @_;
846
847 $METASERVER = $metaserver_dialog
848 if defined $metaserver_dialog;
623 849
624 return if $METASERVER_ATIME > time; 850 return if $METASERVER_ATIME > time;
625 $METASERVER_ATIME = time + 60; 851 $METASERVER_ATIME = time + 60;
626 852
627 my $table = $METASERVER->{table}; 853 my $table = $METASERVER->{table};
… …
649 875
650 utf8::decode $buf if utf8::valid $buf; 876 utf8::decode $buf if utf8::valid $buf;
651 877
652 $table->clear; 878 $table->clear;
653 879
880 my @tip = (
881 "The current number of users logged in on the server.",
882 "The hostname of the server.",
883 "The time this server has been running without being restarted.",
884 "The server software version - a '+' indicates a Crossfire+ server.",
885 "Short information about this server provided by its admins.",
886 );
654 my @col = qw(Use #Users Host Uptime Version Description); 887 my @col = qw(#Users Host Uptime Version Description);
655 $table->add ($_, 0, new CFClient::UI::Label align => 0, fg => [1, 1, 0], text => $col[$_]) 888 $table->add ($_, 0, new CFClient::UI::Label
889 can_hover => 1, can_events => 1,
890 align => 0, fg => [1, 1, 0],
891 text => $col[$_], tooltip => $tip[$_])
656 for 0 .. $#col; 892 for 0 .. $#col;
657 893
658 my @align = qw(1 0 1 1 -1); 894 my @align = qw(1 0 1 1 -1);
659 895
660 my $y = 0; 896 my $y = 0;
661 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 897 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) {
… …
678 914
679 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
680 916
681 $y++; 917 $y++;
682 918
683 $table->add (0, $y, new CFClient::UI::VBox children => [ 919 $table->add (scalar @$m, $y, new CFClient::UI::VBox children => [
684 (new CFClient::UI::Button text => "Use", connect_activate => sub { 920 (new CFClient::UI::Button
921 text => "Use",
922 tooltip => "Put this server into the <b>Host:Port</b> field",
923 on_activate => sub {
685 $HOST->set_text ($CFG->{host} = $host); 924 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
925 $METASERVER->hide;
926 0
927 },
686 }), 928 ),
687 (new CFClient::UI::Empty expand => 1), 929 (new CFClient::UI::Empty expand => 1),
688 ]); 930 ]);
689 931
690 $table->add ($_ + 1, $y, new CFClient::UI::Label 932 $table->add ($_, $y, new CFClient::UI::Label
691 ellipsise => 0, align => $align[$_], text => $m->[$_], fontsize => 0.8) 933 ellipsise => 0,
934 align => $align[$_],
935 text => $m->[$_],
936 tooltip => $tip[$_],
937 can_hover => 1,
938 can_events => 1,
939 fontsize => 0.8)
692 for 0 .. $#$m; 940 for 0 .. $#$m;
693 } 941 }
694 } 942 }
695 }); 943 });
696} 944}
697 945
946sub metaserver_dialog {
947 my $vbox = new CFClient::UI::VBox;
948 my $table = new CFClient::UI::Table;
949 $vbox->add (new CFClient::UI::ScrolledWindow expand => 1, child => $table);
950
951 my $dialog = new CFClient::UI::FancyFrame
952 title => "Server List",
953 name => 'metaserver_dialog',
954 x => 'center',
955 y => 'center',
956 z => 3,
957 force_h => $::HEIGHT * 0.4,
958 child => $vbox,
959 has_close_button => 1,
960 table => $table,
961 on_visibility_change => sub {
962 update_metaserver ($_[0]) if $_[1];
963 0
964 },
965 ;
966
967 $dialog
968}
969
698sub server_setup { 970sub server_setup {
699 my $dialog = new CFClient::UI::FancyFrame
700 title => "Server Setup",
701 child => (my $vbox = new CFClient::UI::VBox); 971 my $vbox = new CFClient::UI::VBox;
702 972
703 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 973 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
704 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port"); 974 $table->add (0, 2, new CFClient::UI::Label valign => 0, align => 1, text => "Host:Port");
705 975
706 { 976 {
707 $table->add (1, 2, my $vbox = new CFClient::UI::VBox); 977 $table->add (1, 2, my $vbox = new CFClient::UI::VBox);
708 978
709 $vbox->add ( 979 $vbox->add (
710 my $HOST = new CFClient::UI::Entry 980 $HOST_ENTRY = new CFClient::UI::Entry
711 expand => 1, 981 expand => 1,
712 text => $CFG->{host}, 982 text => $CFG->{profile}{default}{host},
713 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 983 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
714 connect_changed => sub { 984 on_changed => sub {
715 my ($self, $value) = @_; 985 my ($self, $value) = @_;
716 $CFG->{host} = $value; 986 $CFG->{profile}{default}{host} = $value;
987 0
717 } 988 }
718 ); 989 );
719 990
720 $METASERVER = metaserver_dialog;
721
722 $vbox->add (new CFClient::UI::Flopper 991 $vbox->add (new CFClient::UI::Button
723 expand => 1, 992 expand => 1,
724 text => "Server List", 993 text => "Server List",
725 other => $METASERVER, 994 other => $METASERVER,
726 tooltip => "Show a list of available crossfire servers", 995 tooltip => "Show a list of available crossfire servers",
727 connect_open => sub { 996 on_activate => sub { $METASERVER->toggle_visibility; 0 },
728 update_metaserver $HOST; 997 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
729 }
730 ); 998 );
731 } 999 }
732 1000
733 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username"); 1001 $table->add (0, 4, new CFClient::UI::Label valign => 0, align => 1, text => "Username");
734 $table->add (1, 4, new CFClient::UI::Entry 1002 $table->add (1, 4, new CFClient::UI::Entry
735 text => $CFG->{user}, 1003 text => $CFG->{profile}{default}{user},
736 tooltip => "The name of your character on the server", 1004 tooltip => "The name of your character on the server",
737 connect_changed => sub { 1005 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
738 my ($self, $value) = @_;
739 $CFG->{user} = $value;
740 }
741 ); 1006 );
742 1007
743 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password"); 1008 $table->add (0, 5, new CFClient::UI::Label valign => 0, align => 1, text => "Password");
744 $table->add (1, 5, new CFClient::UI::Entry 1009 $table->add (1, 5, new CFClient::UI::Entry
745 text => $CFG->{password}, 1010 text => $CFG->{profile}{default}{password},
746 hidden => 1, 1011 hidden => 1,
747 tooltip => "The password for your character", 1012 tooltip => "The password for your character",
748 connect_changed => sub { 1013 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
749 my ($self, $value) = @_;
750 $CFG->{password} = $value;
751 }
752 ); 1014 );
753 1015
754 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 1016 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
755 $table->add (1, 7, new CFClient::UI::Slider 1017 $table->add (1, 7, new CFClient::UI::Slider
756 req_w => 100, 1018 force_w => 100,
757 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1019 range => [$CFG->{mapsize}, 10, 100, 0, 1],
758 tooltip => "This is the size of the portion of the map update the server sends you. " 1020 tooltip => "This is the size of the portion of the map update the server sends you. "
759 . "If you set this to a high value you will be able to see further, " 1021 . "If you set this to a high value you will be able to see further, "
760 . "but you also increase bandwidth requirements and latency. " 1022 . "but you also increase bandwidth requirements and latency. "
761 . "This option is only used once at log-in.", 1023 . "This option is only used once at log-in.",
762 connect_changed => sub { 1024 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
763 my ($self, $value) = @_;
764
765 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
766 },
767 ); 1025 );
768 1026
769 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1027 $table->add (0, 8, new CFClient::UI::Label valign => 0, align => 1, text => "Face Prefetch");
770 $table->add (1, 8, new CFClient::UI::CheckBox 1028 $table->add (1, 8, new CFClient::UI::CheckBox
771 state => $CFG->{face_prefetch}, 1029 state => $CFG->{face_prefetch},
… …
774 . "This might increase or create lag, but increases the chances " 1032 . "This might increase or create lag, but increases the chances "
775 . "of faces being ready for display when you encounter them. " 1033 . "of faces being ready for display when you encounter them. "
776 . "It also uses up server bandwidth on every connect, " 1034 . "It also uses up server bandwidth on every connect, "
777 . "so only set it if you really need to prefetch images. " 1035 . "so only set it if you really need to prefetch images. "
778 . "This option can be set and unset any time.", 1036 . "This option can be set and unset any time.",
779 connect_changed => sub { $CFG->{face_prefetch} = $_[1] }, 1037 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
780 ); 1038 );
781 1039
782 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count"); 1040 $table->add (0, 9, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Count");
783 $table->add (1, 9, new CFClient::UI::Entry 1041 $table->add (1, 9, new CFClient::UI::Entry
784 text => $CFG->{output_count}, 1042 text => $CFG->{output_count},
785 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.",
786 connect_changed => sub { $CFG->{output_count} = $_[1] }, 1044 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
787 ); 1045 );
788 1046
789 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1047 $table->add (0, 10, new CFClient::UI::Label valign => 0, align => 1, text => "Output-Sync");
790 $table->add (1, 10, new CFClient::UI::Entry 1048 $table->add (1, 10, new CFClient::UI::Entry
791 text => $CFG->{output_sync}, 1049 text => $CFG->{output_sync},
792 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1050 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
793 connect_changed => sub { $CFG->{output_sync} = $_[1] }, 1051 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
794 ); 1052 );
795 1053
796 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button 1054 $table->add (1, 11, $LOGIN_BUTTON = new CFClient::UI::Button
797 expand => 1, 1055 expand => 1,
798 align => 0, 1056 align => 0,
799 text => "Login", 1057 text => "Login",
800 connect_activate => sub { 1058 on_activate => sub {
801 $CONN ? stop_game 1059 $CONN ? stop_game
802 : start_game; 1060 : start_game;
1061 0
803 }, 1062 },
804 ); 1063 );
805 1064
806 $dialog 1065 $table->add (0, 12, new CFClient::UI::Label valign => 0, align => 1, text => "Chat Command");
1066 $table->add (1, 12, my $saycmd = new CFClient::UI::Entry
1067 text => $CFG->{say_command},
1068 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1069 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1070 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1071 on_changed => sub {
1072 my ($self, $value) = @_;
1073 $CFG->{say_command} = $value;
1074 0
1075 }
1076 );
1077
1078 $vbox->add (new CFClient::UI::Label
1079 text => "Server Info",
1080 fontsize => 1.2,
1081 padding_y => 8,
1082 fg => [1, 1, 0, 1],
1083 );
1084
1085 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1086
1087 $vbox
807} 1088}
808 1089
809sub message_window { 1090sub message_window {
810 my $window = new CFClient::UI::FancyFrame 1091 my $window = new CFClient::UI::FancyFrame
1092 name => "message_window",
811 title => "Messages", 1093 title => "Messages",
812 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
813 bg => [0, 0, 0, 0.75], 1095 bg => [0, 0, 0, 0.75],
814 user_w => int $::WIDTH / 3, 1096 x => "max",
1097 y => 0,
1098 force_w => $::WIDTH * 0.4,
815 user_h => int $::HEIGHT / 5, 1099 force_h => $::HEIGHT * 0.5,
816 child => (my $vbox = new CFClient::UI::VBox); 1100 child => (my $vbox = new CFClient::UI::VBox),
1101 has_close_button => 1;
817 1102
818 $vbox->add ($LOGVIEW); 1103 $vbox->add ($LOGVIEW);
819 1104
820 $vbox->add (my $input = new CFClient::UI::Entry 1105 $vbox->add (my $input = new CFClient::UI::Entry
821 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> " 1106 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
822 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). " 1107 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
823 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). " 1108 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
824 . "A better way to submit commands (and the occasional chat command) is often the map command completer.", 1109 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
825 connect_focus_in => sub { 1110 on_focus_in => sub {
826 my ($input, $prev_focus) = @_; 1111 my ($input, $prev_focus) = @_;
827 1112
828 delete $input->{refocus_map}; 1113 delete $input->{refocus_map};
829 1114
830 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) { 1115 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
831 $input->{refocus_map} = 1; 1116 $input->{refocus_map} = 1;
832 } 1117 }
833 delete $input->{auto_activated}; 1118 delete $input->{auto_activated};
1119
1120 0
834 }, 1121 },
835 connect_activate => sub { 1122 on_activate => sub {
836 my ($input, $text) = @_; 1123 my ($input, $text) = @_;
837 $input->set_text (''); 1124 $input->set_text ('');
838 1125
839 if ($text =~ /^\/(.*)/) { 1126 if ($text =~ /^\/(.*)/) {
840 $::CONN->user_send ($1); 1127 $::CONN->user_send ($1);
… …
844 } 1131 }
845 if ($input->{refocus_map}) { 1132 if ($input->{refocus_map}) {
846 delete $input->{refocus_map}; 1133 delete $input->{refocus_map};
847 $MAPWIDGET->focus_in 1134 $MAPWIDGET->focus_in
848 } 1135 }
1136
1137 0
849 }, 1138 },
850 connect_escape => sub { 1139 on_escape => sub {
851 $MAPWIDGET->focus_in 1140 $MAPWIDGET->grab_focus;
1141
1142 0
852 }, 1143 },
853 ); 1144 );
854 1145
855 $CONSOLE = { 1146 $CONSOLE = {
856 window => $window, 1147 window => $window,
857 input => $input 1148 input => $input,
858 }; 1149 };
859 1150
860 $window 1151 $window
861} 1152}
862 1153
863sub open_quit_dialog { 1154sub open_quit_dialog {
864 unless ($QUIT_DIALOG) { 1155 unless ($QUIT_DIALOG) {
865
866 $QUIT_DIALOG = new CFClient::UI::FancyFrame title => "Really Quit?"; 1156 $QUIT_DIALOG = new CFClient::UI::FancyFrame
1157 x => "center",
1158 y => "center",
1159 z => 50,
1160 title => "Really Quit?",
1161 ;
867 1162
868 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1); 1163 $QUIT_DIALOG->add (my $vb = new CFClient::UI::VBox expand => 1);
869 1164
870 $vb->add (new CFClient::UI::Label 1165 $vb->add (new CFClient::UI::Label
871 text => "You should find a savebed and apply it first!", 1166 text => "You should find a savebed and apply it first!",
… …
874 ); 1169 );
875 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 1170 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
876 $hb->add (new CFClient::UI::Button 1171 $hb->add (new CFClient::UI::Button
877 text => "Ok", 1172 text => "Ok",
878 expand => 1, 1173 expand => 1,
879 connect_activate => sub { $QUIT_DIALOG->hide }, 1174 on_activate => sub { $QUIT_DIALOG->hide; 0 },
880 ); 1175 );
881 $hb->add (new CFClient::UI::Button 1176 $hb->add (new CFClient::UI::Button
882 text => "Quit anyway", 1177 text => "Quit anyway",
883 expand => 1, 1178 expand => 1,
884 connect_activate => sub { exit }, 1179 on_activate => sub { exit },
885 );
886
887 $QUIT_DIALOG->show_centered;
888 } else {
889 $QUIT_DIALOG->show_centered;
890 }
891}
892
893sub make_inventory_window {
894 my $invwin = new CFClient::UI::FancyFrame
895 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Inventory";
896
897 $invwin->add (my $hb = new CFClient::UI::HBox expand => 1);
898
899 $hb->add (my $vb1 = new CFClient::UI::VBox expand => 1);
900 $vb1->add (my $lbl = new CFClient::UI::Label xalign => 0.5);
901 $lbl->set_text ("Player");
902 $vb1->add ($INV = new CFClient::UI::Inventory expand => 1);
903
904 $hb->add (my $vb2 = new CFClient::UI::VBox expand => 1);
905 $vb2->add ($INVR_LBL = new CFClient::UI::Label xalign => 0.5);
906 $INVR_LBL->set_text ("Floor");
907 $vb2->add ($INVR = new CFClient::UI::Inventory expand => 1);
908
909 $invwin
910}
911
912sub make_help_window {
913 my $win = new CFClient::UI::FancyFrame
914 user_w => $WIDTH * (7/8), user_h => $HEIGHT * (7/8), title => "Documentation";
915
916 $win->add (my $vbox = new CFClient::UI::VBox);
917
918 $vbox->add (my $buttons = new CFClient::UI::HBox);
919 $vbox->add (my $viewer = new CFClient::UI::TextView expand => 1, fontsize => 0.8);
920
921 for (
922 [intro => "Introduction"],
923 [manual => "Manual"],
924 [command_help => "Commands"],
925 [skill_help => "Skills"],
926 ) {
927 my ($pod, $label) = @$_;
928
929 $buttons->add (new CFClient::UI::Button
930 text => $label,
931 connect_activate => sub {
932 my $parser = new Pod::POM;
933 my $pom = $parser->parse_file (CFClient::find_rcfile "pod/$pod.pod");
934
935 $viewer->clear;
936
937 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
938 for @{ CFClient::pod_to_pango_list $pom };
939
940 $viewer->set_offset (0);
941 },
942 ); 1180 );
943 } 1181 }
944 1182
945 $viewer->add_paragraph ([1, 1, 0, 1], "<big>Use one of the buttons above to display a document.</big>"); 1183 $QUIT_DIALOG->show;
1184}
1185
1186sub autopickup_setup {
1187 my $table = new CFClient::UI::Table;
1188
1189 for (
1190 ["General", 0, 0,
1191 ["Enable autopickup" => PICKUP_NEWMODE],
1192 ["Inhibit autopickup" => PICKUP_INHIBIT],
1193 ["Stop before pickup" => PICKUP_STOP],
1194 ["Debug autopickup" => PICKUP_DEBUG],
1195 ],
1196 ["Weapons", 0, 6,
1197 ["All weapons" => PICKUP_ALLWEAPON],
1198 ["Missile weapons" => PICKUP_MISSILEWEAPON],
1199 ["Bows" => PICKUP_BOW],
1200 ["Arrows" => PICKUP_ARROW],
1201 ],
1202 ["Armour", 0, 12,
1203 ["Helmets" => PICKUP_HELMET],
1204 ["Shields" => PICKUP_SHIELD],
1205 ["Body Armour" => PICKUP_ARMOUR],
1206 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK],
1209 ],
1210
1211 ["Readables", 2, 2,
1212 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ],
1216 ["Misc", 2, 7,
1217 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS],
1226 ],
1227 ["Weight/Value ratio", 2, 17]
1228 )
1229 {
1230 my ($title, $x, $y, @bits) = @$_;
1231 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1232
1233 for (@bits) {
1234 ++$y;
1235
1236 my $mask = $_->[1];
1237 $table->add ($x , $y, new CFClient::UI::Label text => $_->[0], align => 1, expand => 1);
1238 $table->add ($x+1, $y, new CFClient::UI::CheckBox
1239 state => $::CFG->{pickup} & $mask,
1240 on_changed => sub {
1241 my ($box, $value) = @_;
1242
1243 if ($value) {
1244 $::CFG->{pickup} |= $mask;
1245 } else {
1246 $::CFG->{pickup} &= ~$mask;
1247 }
1248
1249 $::CONN->send_command ("pickup $::CFG->{pickup}")
1250 if defined $::CONN;
1251
1252 0
1253 });
1254 }
1255 }
1256
1257 $table->add (2, 18, new CFClient::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99",
1260 to_value => sub { ">= " . 5 * $_[0] },
1261 on_changed => sub {
1262 my ($slider, $value) = @_;
1263
1264 $::CFG->{pickup} &= ~0xF;
1265 $::CFG->{pickup} |= int $value
1266 if $value;
1267 1;
1268 });
1269
1270 $table->add (3, 18, new CFClient::UI::Button
1271 text => "set",
1272 on_activate => sub {
1273 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN;
1275 0
1276 });
1277
1278 $table
1279}
1280
1281sub inventory_widget {
1282 my $hb = new CFClient::UI::HBox homogeneous => 1;
1283
1284 $hb->add (my $vb1 = new CFClient::UI::VBox);
1285 $vb1->add (new CFClient::UI::Label align => 0, text => "Player");
1286 $vb1->add ($INV = new CFClient::UI::Inventory);
1287
1288 $hb->add (my $vb2 = new CFClient::UI::VBox);
1289
1290 $vb2->add ($INV_RIGHT_HB = new CFClient::UI::HBox);
1291
1292 $vb2->add ($INVR = new CFClient::UI::Inventory);
1293
1294 # XXX: Call after $INVR = ... because set_opencont sets the items
1295 CFClient::Protocol::set_opencont ($::CONN, 0, "Floor");
1296
1297 $hb
1298}
1299
1300sub player_window {
1301 my $plwin = $PL_WINDOW = new CFClient::UI::FancyFrame
1302 x => "center",
1303 y => "center",
1304 force_w => $WIDTH * 9/10,
1305 force_h => $HEIGHT * 9/10,
1306 title => "Player",
1307 has_close_button => 1
1308 ;
1309
1310 my $ntb =
1311 $PL_NOTEBOOK =
1312 new CFClient::UI::Notebook
1313 expand => 1,
1314 debug => 1,
1315 filter => (new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1),
1316 ;
1317 $ntb->add (
1318 Inventory => inventory_widget,
1319 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1320 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1321 );
1322
1323 $ntb->add (
1324 Stats => $STATS_WINDOW = stats_window,
1325 "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times."
1326 );
1327 $ntb->add (
1328 Spells => $SETUP_SPELLS = new CFClient::UI::SpellList,
1329 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1330 );
1331
1332 $plwin->add ($ntb);
1333 $plwin
1334}
1335
1336sub update_bindings {
1337 $BIND_UPD_CB->() if $BIND_UPD_CB;
1338}
1339
1340sub keyboard_setup {
1341 my $binding_list = new CFClient::UI::VBox;
1342
1343 my $refresh;
1344 $refresh = $BIND_UPD_CB = sub {
1345 $binding_list->clear ();
1346
1347 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) {
1348 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) {
1349 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1350 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1351
1352 my $lbl = join "; ", @$cmds;
1353 my $nam = CFClient::BindingEditor::keycombo_to_name ($mod, $sym);
1354 $binding_list->add (my $hb = new CFClient::UI::HBox);
1355 $hb->add (new CFClient::UI::Button
1356 text => "delete",
1357 tooltip => "Deletes the binding",
1358 on_activate => sub {
1359 $binding_list->remove ($hb);
1360 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
1361 0
1362 });
1363
1364 $hb->add (new CFClient::UI::Button
1365 text => "edit",
1366 tooltip => "Edits the binding",
1367 on_activate => sub {
1368 $::BIND_EDITOR->set_binding (
1369 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym},
1370 sub {
1371 my ($nmod, $nsym, $ncmds) = @_;
1372 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1373 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1374 $refresh->();
1375 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1376 $SETUP_DIALOG->show;
1377 },
1378 sub {
1379 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1380 $SETUP_DIALOG->show;
1381 });
1382 $::BIND_EDITOR->show;
1383 $SETUP_DIALOG->hide;
1384 0
1385 });
1386
1387 $hb->add (new CFClient::UI::Label text => "(Key: $nam)");
1388 $hb->add (new CFClient::UI::Label text => $lbl, expand => 1);
1389 }
1390 }
1391 };
1392
1393 my $vb = new CFClient::UI::VBox;
1394 $vb->add (my $hb = new CFClient::UI::HBox);
1395 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1396 $hb->add (new CFClient::UI::CheckBox
1397 expand => 1,
1398 state => $CFG->{shift_fire_stop},
1399 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1400 on_changed => sub {
1401 my ($cbox, $value) = @_;
1402 $CFG->{shift_fire_stop} = $value;
1403 0
1404 });
1405
1406 $vb->add ($binding_list);
1407 $vb->add (my $hb = new CFClient::UI::HBox);
1408
1409 $hb->add (new CFClient::UI::Button
1410 text => "record new",
1411 expand => 1,
1412 tooltip => "This button opens the binding editor with an empty binding.",
1413 on_activate => sub {
1414 $::BIND_EDITOR->set_binding (undef, undef, [],
1415 sub {
1416 my ($mod, $sym, $cmds) = @_;
1417 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
1418 $refresh->();
1419 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1420 $SETUP_DIALOG->show;
1421 },
1422 sub {
1423 $SETUP_NOTEBOOK->set_current_page ($SETUP_KEYBOARD);
1424 $SETUP_DIALOG->show;
1425 },
1426 );
1427 $SETUP_DIALOG->hide;
1428 $::BIND_EDITOR->show;
1429 0
1430 },
1431 );
1432
1433 $hb->add (new CFClient::UI::Button
1434 text => "close",
1435 tooltip => "Closes the binding window",
1436 expand => 1,
1437 on_activate => sub {
1438 $SETUP_DIALOG->hide;
1439 0
1440 }
1441 );
1442
1443 $refresh->();
1444
1445 $vb
1446}
1447
1448sub help_window {
1449 my $win = new CFClient::UI::FancyFrame
1450 x => 'center',
1451 y => 'center',
1452 z => 2,
1453 name => 'doc_browser',
1454 force_w => int $WIDTH * 7/8,
1455 force_h => int $HEIGHT * 7/8,
1456 title => "Documentation";
1457
1458 $win->add (my $vbox = new CFClient::UI::VBox);
1459
1460 $vbox->add (my $buttons = new CFClient::UI::HBox);
1461 $vbox->add (my $viewer = new CFClient::UI::TextScroller
1462 expand => 1, fontsize => 0.8, padding_x => 4);
1463
1464 $buttons->add (new CFClient::UI::Label text => "Choose a document to display: ");
1465 $buttons->add (my $combo = new CFClient::UI::Combobox
1466 value => undef,
1467 options => [
1468 [intro => "Introduction"],
1469 [manual => "Main Manual"],
1470 [skill_help => "Skill Reference"],
1471 [command_help => "Command Reference"],
1472 [dmcommand_help => "DM Commands"],
1473 [COPYING => "License Terms"],
1474 ],
1475 on_changed => sub {
1476 my ($self, $pod) = @_;
1477
1478 my $pom = CFClient::load_pod CFClient::find_rcfile "pod/$pod.pod",
1479 doc_viewer => 1, sub { CFClient::pod_to_pango_list $_[0] };
1480
1481 $viewer->clear;
1482
1483# $viewer->add_paragraph ([1, 1, 1, 1], ["<big>Test</big>\n\n \x{fffc} \x{fffc}\n",
1484# (new CFClient::UI::Image path => "x.png", can_hover => 1, can_events => 1),
1485# (new CFClient::UI::Label text => "üüüü", can_hover => 1, can_events => 1, tooltip => "??"),
1486# ]);#d#
1487
1488 $viewer->add_paragraph ([1, 1, 1, 1], $_->[1], $_->[0])
1489 for @$pom;
1490
1491 $viewer->set_offset (0);
1492
1493 0
1494 },
1495 on_visibility_change => sub {
1496 my ($self, $visible) = @_;
1497 return unless $visible;
1498 return if $self->{value};
1499 $self->set_value ("intro");
1500 0
1501 },
1502 );
946 1503
947 $win 1504 $win
948} 1505}
949 1506
950sub sdl_init { 1507sub sdl_init {
… …
980 if ($DEBUG_STATUS) { 1537 if ($DEBUG_STATUS) {
981 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h; 1538 CFClient::UI::rescale_widgets $WIDTH / $old_w, $HEIGHT / $old_h;
982 } else { 1539 } else {
983 # create the widgets 1540 # create the widgets
984 1541
985 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1; 1542 $DEBUG_STATUS = new CFClient::UI::Label
1543 padding => 0,
1544 z => 100,
1545 force_x => "max",
1546 force_y => 0;
986 $DEBUG_STATUS->show; 1547 $DEBUG_STATUS->show;
987 1548
1549 $BIND_EDITOR = new CFClient::BindingEditor (x => "max", y => 0);
1550
988 $STATUSBOX = new CFClient::UI::Statusbox; 1551 $STATUSBOX = new CFClient::UI::Statusbox;
989 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]); 1552 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", timeout => 864000, pri => -100, color => [1, 1, 1, 0.8]);
990 1553
991 (new CFClient::UI::Frame 1554 (new CFClient::UI::Frame
992 bg => [0, 0, 0, 0.4], 1555 bg => [0, 0, 0, 0.4],
993 req_y => -1, 1556 force_x => 0,
1557 force_y => "max",
994 child => $STATUSBOX, 1558 child => $STATUSBOX,
995 )->show; 1559 )->show;
996 1560
997 CFClient::UI::FancyFrame->new ( 1561 CFClient::UI::FancyFrame->new (
1562 title => "Map",
1563 name => "mapmap",
1564 x => 0,
1565 y => $FONTSIZE + 8,
998 border_bg => [1, 1, 1, 192/255], 1566 border_bg => [1, 1, 1, 192/255],
999 bg => [1, 1, 1, 0], 1567 bg => [1, 1, 1, 0],
1000 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1568 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1001 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1569 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1002 ), 1570 ),
… …
1006 $MAPWIDGET->connect (activate_console => sub { 1574 $MAPWIDGET->connect (activate_console => sub {
1007 my ($mapwidget, $preset) = @_; 1575 my ($mapwidget, $preset) = @_;
1008 1576
1009 if ($CONSOLE) { 1577 if ($CONSOLE) {
1010 $CONSOLE->{input}->{auto_activated} = 1; 1578 $CONSOLE->{input}->{auto_activated} = 1;
1011 $CONSOLE->{input}->focus_in; 1579 $CONSOLE->{input}->grab_focus;
1012 1580
1013 if ($preset && $CONSOLE->{input}->get_text eq '') { 1581 if ($preset && $CONSOLE->{input}->get_text eq '') {
1014 $CONSOLE->{input}->set_text ($preset); 1582 $CONSOLE->{input}->set_text ($preset);
1015 } 1583 }
1016 } 1584 }
1017 }); 1585 });
1018 $MAPWIDGET->show; 1586 $MAPWIDGET->show;
1019 $MAPWIDGET->focus_in; 1587 $MAPWIDGET->grab_focus;
1020 1588
1021 $LOGVIEW = new CFClient::UI::TextView 1589 $LOGVIEW = new CFClient::UI::TextScroller
1022 expand => 1, 1590 expand => 1,
1023 font => $FONT_FIXED, 1591 font => $FONT_FIXED,
1024 fontsize => $::CFG->{log_fontsize}, 1592 fontsize => $::CFG->{log_fontsize},
1593 indent => -4,
1025 can_hover => 1, 1594 can_hover => 1,
1026 can_events => 1, 1595 can_events => 1,
1027 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1596 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.",
1028 ; 1597 ;
1029 1598
1030 $BUTTONBAR = new CFClient::UI::HBox; 1599 $SETUP_DIALOG = new CFClient::UI::FancyFrame
1600 title => "Setup",
1601 name => "setup_dialog",
1602 x => 'center',
1603 y => 'center',
1604 z => 2,
1605 force_w => $::WIDTH * 0.6,
1606 force_h => $::HEIGHT * 0.6,
1607 has_close_button => 1,
1608 ;
1031 1609
1610 $METASERVER = metaserver_dialog;
1611
1612 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFClient::UI::Notebook expand => 1, debug => 1,
1613 filter => new CFClient::UI::ScrolledWindow expand => 1, scroll_y => 1);
1614
1615 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1616 "Configure the server to play on, your username, password and other server-related options.");
1617 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1618 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1619 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1620 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1621 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1622 "Configure the use of audio, sound effects and background music.");
1623 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1624 "Lets you define, edit and delete key bindings."
1625 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1626 . "with nothing set and the recording started. After doing the actions you "
1627 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1628 . "After pressing the combo the binding will be saved automatically and the "
1629 . "binding editor closes");
1630 $SETUP_NOTEBOOK->add (Debug => debug_setup,
1631 "Some debuggin' options. Do not ask.");
1632
1633 $BUTTONBAR = new CFClient::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1634
1032 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup, 1635 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1033 tooltip => "Toggles a dialog where you can configure various aspects of the client, such as graphics mode, performance, and audio options."); 1636 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1034 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup, 1637
1035 tooltip => "Toggles a dialog where you can configure the server to play on, your username, password and other server-related options.");
1036 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window, 1638 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window,
1037 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1639 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1038 1640
1039 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 1641 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
1040 1642
1041 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window,
1042 tooltip => "Toggles the statistics window, where all your Stats and Resistances are being displayed at all times.");
1043 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window, 1643 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Player", other => player_window,
1044 tooltip => "Toggles the inventory window, where you can manage your loot (or treaures :)."); 1644 tooltip => "Toggles the player view, where you can manage Inventory, Spells, Skills and see your Stats.");
1045 1645
1046 $BUTTONBAR->add (new CFClient::UI::Button 1646 $BUTTONBAR->add (new CFClient::UI::Button
1047 text => "Save Config", 1647 text => "Save Config",
1048 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.", 1648 tooltip => "Saves the options chosen in the client setting, server settings and the window layout to be restored on later runs.",
1049 connect_activate => sub { 1649 on_activate => sub {
1650 $::CFG->{layout} = CFClient::UI::get_layout;
1050 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 1651 CFClient::write_cfg "$Crossfire::VARDIR/cfplusrc";
1051 status "Configuration Saved"; 1652 status "Configuration Saved";
1653 0
1052 }, 1654 },
1053 ); 1655 );
1054 1656
1055 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => make_help_window, 1657 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Help!", other => help_window,
1056 tooltip => "View Documentation"); 1658 tooltip => "View Documentation");
1057 1659
1058 $BUTTONBAR->add (new CFClient::UI::Button 1660 $BUTTONBAR->add (new CFClient::UI::Button
1059 text => "Quit", 1661 text => "Quit",
1060 tooltip => "Terminates the program", 1662 tooltip => "Terminates the program",
1061 connect_activate => sub { 1663 on_activate => sub {
1062 if ($CONN) { 1664 if ($CONN) {
1063 open_quit_dialog; 1665 open_quit_dialog;
1064 } else { 1666 } else {
1065 exit; 1667 exit;
1066 } 1668 }
1669 0
1067 }, 1670 },
1068 ); 1671 );
1069 1672
1070 $BUTTONBAR->show; 1673 $BUTTONBAR->show;
1071 1674 $SETUP_DIALOG->show;
1072 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1073
1074 # delay till geometry is constant
1075 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
1076 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
1077 my $widget = $GAUGES->{win};
1078 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
1079 });
1080 force_refresh ();
1081 } 1675 }
1676
1677 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1082} 1678}
1083 1679
1084sub video_shutdown { 1680sub video_shutdown {
1681 CFClient::OpenGL::shutdown;
1682
1085 undef $SDL_ACTIVE; 1683 undef $SDL_ACTIVE;
1086} 1684}
1087 1685
1088my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1686my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1089my $bgmusic;#TODO#hack#d# 1687my $bgmusic;#TODO#hack#d#
… …
1153 1751
1154my %demo;#d# 1752my %demo;#d#
1155 1753
1156sub force_refresh { 1754sub force_refresh {
1157 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 1755 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
1158 debug sprintf "%3.2f", $fps; 1756 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1159 1757
1160 $CFClient::UI::ROOT->draw; 1758 $CFClient::UI::ROOT->draw;
1161 1759
1162 $WANT_REFRESH = 0; 1760 $WANT_REFRESH = 0;
1163 $CAN_REFRESH = 0; 1761 $CAN_REFRESH = 0;
… …
1218}; 1816};
1219 1817
1220 CFClient::SDL_GL_SwapBuffers; 1818 CFClient::SDL_GL_SwapBuffers;
1221} 1819}
1222 1820
1223my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 1821my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1224 $NOW = time; 1822 $NOW = time;
1225 1823
1226 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 1824 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1227 for CFClient::SDL_PollEvent; 1825 for CFClient::SDL_PollEvent;
1228 1826
… …
1246sub animation_stop { 1844sub animation_stop {
1247 my ($widget) = @_; 1845 my ($widget) = @_;
1248 delete $animate_object{$widget}; 1846 delete $animate_object{$widget};
1249} 1847}
1250 1848
1251@conn::ISA = Crossfire::Protocol::;
1252
1253sub conn::new {
1254 my $class = shift;
1255
1256 my $self = $class->Crossfire::Protocol::new (@_);
1257
1258 $MAPWIDGET->clr_commands;
1259
1260 my $parser = new Pod::POM;
1261 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/command_help.pod");
1262
1263 for my $head2 ($pod->head1->[-2]->head2) {
1264 $head2->title =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
1265 or next;
1266
1267 my $cmd = $1;
1268 my @args = split /\|/, $2;
1269 @args = (".*") unless @args;
1270
1271 my $text = CFClient::pod_to_pango $head2->content;
1272
1273 for my $arg (@args) {
1274 $arg = $arg eq ".*" ? "" : " $arg";
1275
1276 $MAPWIDGET->add_command ("$cmd$arg", $text);
1277 }
1278 }
1279
1280 $self->{noface} = new_from_file CFClient::Texture
1281 CFClient::find_rcfile "noface.png", minify => 1, mipmap => 1;
1282
1283 $self->{open_container} = 0;
1284
1285 $self
1286}
1287
1288sub conn::stats_update {
1289 my ($self, $stats) = @_;
1290
1291 if (my $exp = $stats->{Crossfire::Protocol::CS_STAT_EXP64}) {
1292 my $diff = $exp - $self->{prev_exp};
1293 $STATUSBOX->add ("$diff experience gained", group => "experience $diff", fg => [0.5, 1, 0.5, 0.8], timeout => 5)
1294 if exists $self->{prev_exp} && $diff;
1295 $self->{prev_exp} = $exp;
1296 }
1297
1298 update_stats_window ($stats);
1299}
1300
1301sub conn::user_send {
1302 my ($self, $command) = @_;
1303
1304 $self->send_command ($command);
1305 status $command;
1306}
1307
1308sub conn::map_scroll {
1309 my ($self, $dx, $dy) = @_;
1310
1311 $MAP->scroll ($dx, $dy);
1312}
1313
1314sub conn::feed_map1a {
1315 my ($self, $data) = @_;
1316
1317# $self->Crossfire::Protocol::feed_map1a ($data);
1318
1319 $MAP->map1a_update ($data);
1320 $MAPWIDGET->update;
1321}
1322
1323sub conn::flush_map {
1324 my ($self) = @_;
1325
1326 my $map_info = delete $self->{map_info}
1327 or return;
1328
1329 my ($hash, $x, $y, $w, $h) = @$map_info;
1330
1331 my $data = $MAP->get_rect ($x, $y, $w, $h);
1332 $MAPCACHE->put ($hash => Compress::LZF::compress $data);
1333 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
1334}
1335
1336sub conn::map_clear {
1337 my ($self) = @_;
1338
1339 $self->flush_map;
1340 delete $self->{neigh_map};
1341
1342 $MAP->clear;
1343}
1344
1345
1346sub conn::load_map($$$) {
1347 my ($self, $hash, $x, $y) = @_;
1348
1349 if (defined (my $data = $MAPCACHE->get ($hash))) {
1350 $data = Compress::LZF::decompress $data;
1351 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
1352 for my $id ($MAP->set_rect ($x, $y, $data)) {
1353 my $data = $TILECACHE->get ($id)
1354 or next;
1355
1356 $self->set_texture ($id => $data);
1357 }
1358 }
1359}
1360
1361# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
1362# (server resource,s latency, bandwidth), so this hack is warranted.
1363# the right fix is to make real tiled maps with an overview file
1364sub conn::send_mapinfo {
1365 my ($self, $data, $cb) = @_;
1366
1367 if ($self->{map_info}[0] =~ m%^/world/world_(\d\d\d)_(\d\d\d)$%) {
1368 my ($wx, $wy) = ($1, $2);
1369
1370 if ($data =~ /^spatial ([1-4]+)$/) {
1371 my @dx = (0, 0, 1, 0, -1);
1372 my @dy = (0, -1, 0, 1, 0);
1373 my ($dx, $dy);
1374
1375 for (split //, $1) {
1376 $dx += $dx[$_];
1377 $dy += $dy[$_];
1378 }
1379
1380 $cb->(spatial => 15,
1381 $self->{map_info}[1] - $MAP->ox + $dx * 50,
1382 $self->{map_info}[2] - $MAP->oy + $dy * 50,
1383 50, 50,
1384 sprintf "/world/world_%03d_%03d", $wx + $dx, $wy + $dy
1385 );
1386
1387 return;
1388 }
1389 }
1390
1391 $self->Crossfire::Protocol::send_mapinfo ($data, $cb);
1392}
1393
1394# this method does a "flood fill" into every tile direction
1395# it assumes that tiles are arranged in a rectangular grid,
1396# i.e. a map is the same as the left of the right map etc.
1397# failure to comply are harmless and result in display errors
1398# at worst.
1399sub conn::flood_fill {
1400 my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
1401
1402 # the server does not allow map paths > 6
1403 return if 7 <= length $path;
1404
1405 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1406
1407 for (
1408 [1, 3, 0, -1],
1409 [2, 4, 1, 0],
1410 [3, 1, 0, 1],
1411 [4, 2, -1, 0],
1412 ) {
1413 my ($tile, $tile2, $dx, $dy) = @$_;
1414
1415 next if $block & (1 << $tile);
1416 my $block = $block | (1 << $tile2);
1417
1418 my $gx = $gx + $dx;
1419 my $gy = $gy + $dy;
1420
1421 next unless $flags & (1 << ($tile - 1));
1422 next if $self->{neigh_grid}{$gx, $gy}++;
1423
1424 my $neigh = $self->{neigh_map}{$hash} ||= [];
1425 if (my $info = $neigh->[$tile]) {
1426 my ($flags, $x, $y, $w, $h, $hash) = @$info;
1427
1428 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1429 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1430
1431 } else {
1432 $self->send_mapinfo ("spatial $path$tile", sub {
1433 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
1434
1435 return if $mode ne "spatial";
1436
1437 $x += $MAP->ox;
1438 $y += $MAP->oy;
1439
1440 $self->load_map ($hash, $x, $y)
1441 unless $self->{neigh_map}{$hash}[5]++;#d#
1442
1443 $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
1444
1445 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
1446 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
1447 });
1448 }
1449 }
1450}
1451
1452sub conn::map_change {
1453 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
1454
1455 $self->flush_map;
1456
1457 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1458
1459 my $mapmapw = $MAPMAP->{w};
1460 my $mapmaph = $MAPMAP->{h};
1461
1462 $self->{neigh_rect} = [
1463 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1464 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1465 ];
1466
1467 delete $self->{neigh_grid};
1468
1469 $x += $ox;
1470 $y += $oy;
1471
1472 $self->{map_info} = [$hash, $x, $y, $w, $h];
1473
1474 (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
1475 $STATWIDS->{map}->set_text ("Map: " . $map);
1476
1477 $self->load_map ($hash, $x, $y);
1478 $self->flood_fill (0, 0, 0, "", $hash, $flags);
1479}
1480
1481sub conn::face_find {
1482 my ($self, $facenum, $face) = @_;
1483
1484 my $hash = "$face->{chksum},$face->{name}";
1485
1486 my $id = $FACEMAP->get ($hash);
1487
1488 unless ($id) {
1489 # create new id for face
1490 # I love transactions
1491 for (1..100) {
1492 my $txn = $CFClient::DB_ENV->txn_begin;
1493 my $status = $FACEMAP->db_get (id => $id, BerkeleyDB::DB_RMW);
1494 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
1495 $id = ($id || 16) + 1;
1496 if ($FACEMAP->put (id => $id) == 0
1497 && $FACEMAP->put ($hash => $id) == 0) {
1498 $txn->txn_commit;
1499
1500 goto gotid;
1501 }
1502 }
1503 $txn->abort;
1504 }
1505
1506 CFClient::fatal "maximum number of transaction retries reached - database problems?";
1507 }
1508
1509gotid:
1510 $face->{id} = $id;
1511 $MAP->set_face ($facenum => $id);
1512 $self->{faceid}[$facenum] = $id;#d#
1513
1514 my $face = $TILECACHE->get ($id);
1515
1516 if ($face) {
1517 #$self->face_prefetch;
1518 $face
1519 } else {
1520 my $tex = $self->{noface};
1521 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1522 undef
1523 };
1524}
1525
1526sub conn::face_update {
1527 my ($self, $facenum, $face) = @_;
1528
1529 $TILECACHE->put ($face->{id} => $face->{image}); #TODO: try to avoid duplicate writes
1530
1531 $self->set_texture ($face->{id} => delete $face->{image});
1532}
1533
1534sub conn::set_texture {
1535 my ($self, $id, $data) = @_;
1536
1537 $self->{texture}[$id] ||= do {
1538 my $tex =
1539 new_from_image CFClient::Texture
1540 $data, minify => 1, mipmap => 1;
1541
1542 $MAP->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
1543 $MAPWIDGET->update;
1544
1545 $tex
1546 };
1547}
1548
1549sub conn::sound_play {
1550 my ($self, $x, $y, $soundnum, $type) = @_;
1551
1552 $SDL_MIXER
1553 or return;
1554
1555 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
1556 or return;
1557
1558 $chunk->play;
1559# warn "sound $x,$y,$soundnum,$type\n";#d#
1560}
1561
1562my $LAST_QUERY; # server is stupid, stupid, stupid
1563
1564sub conn::query {
1565 my ($self, $flags, $prompt) = @_;
1566
1567 $prompt = $LAST_QUERY unless length $prompt;
1568 $LAST_QUERY = $prompt;
1569
1570 my $dialog = new CFClient::UI::FancyFrame
1571 title => "Query",
1572 child => my $vbox = new CFClient::UI::VBox;
1573
1574 $vbox->add (new CFClient::UI::Label
1575 max_w => $::WIDTH * 0.4,
1576 ellipsise => 0,
1577 text => $prompt);
1578
1579 if ($flags & Crossfire::Protocol::CS_QUERY_YESNO) {
1580 $vbox->add (my $hbox = new CFClient::HBox);
1581 $hbox->add (new CFClient::Button
1582 text => "No",
1583 connect_activate => sub {
1584 $self->send ("reply n");
1585 $dialog->destroy;
1586 $MAPWIDGET->focus_in;
1587 }
1588 );
1589 $hbox->add (new CFClient::Button
1590 text => "Yes",
1591 connect_activate => sub {
1592 $self->send ("reply y");
1593 $dialog->destroy;
1594 },
1595 );
1596
1597 $dialog->focus_in;
1598
1599 } elsif ($flags & Crossfire::Protocol::CS_QUERY_SINGLECHAR) {
1600 $dialog->{tooltip} = "Press a key (click on the entry to make sure it has keyboard focus)";
1601 $vbox->add (my $entry = new CFClient::UI::Entry
1602 connect_changed => sub {
1603 $self->send ("reply $_[1]");
1604 $dialog->destroy;
1605 },
1606 );
1607
1608 $entry->focus_in;
1609
1610 } else {
1611 $dialog->{tooltip} = "Enter the reply and press return (click on the entry to make sure it has keyboard focus)";
1612
1613 $vbox->add (my $entry = new CFClient::UI::Entry
1614 $flags & Crossfire::Protocol::CS_QUERY_HIDEINPUT ? (hiddenchar => "*") : (),
1615 connect_activate => sub {
1616 $self->send ("reply $_[1]");
1617 $dialog->destroy;
1618 },
1619 );
1620
1621 $entry->focus_in;
1622 }
1623
1624 $dialog->show_centered;
1625}
1626
1627sub conn::drawinfo {
1628 my ($self, $color, $text) = @_;
1629
1630 my @color = (
1631 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
1632 [1.00, 1.00, 1.00],
1633 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
1634 [1.00, 0.00, 0.00],
1635 [1.00, 0.54, 0.00],
1636 [0.11, 0.56, 1.00],
1637 [0.93, 0.46, 0.00],
1638 [0.18, 0.54, 0.34],
1639 [0.56, 0.73, 0.56],
1640 [0.80, 0.80, 0.80],
1641 [0.55, 0.41, 0.13],
1642 [0.99, 0.77, 0.26],
1643 [0.74, 0.65, 0.41],
1644 );
1645
1646 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1647
1648 $text = CFClient::UI::Label::escape $text;
1649 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1650 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1651
1652 $LOGVIEW->add_paragraph ($color[$color],
1653 join "\n", map "$time $_", split /\n/, $text);
1654
1655 $STATUSBOX->add ($text,
1656 group => $text,
1657 fg => $color[$color],
1658 timeout => 10,
1659 tooltip_font => $::FONT_FIXED,
1660 );
1661}
1662
1663sub conn::drawextinfo {
1664 my ($self, $color, $type, $subtype, $message) = @_;
1665
1666 $self->drawinfo ($color, $message);
1667}
1668
1669sub conn::spell_add {
1670 my ($self, $spell) = @_;
1671
1672 # TODO
1673 # create a widget dynamically, using spell face (CF::Protocol downloads them)
1674 $MAPWIDGET->add_command ("invoke $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1675 $MAPWIDGET->add_command ("cast $spell->{name}", CFClient::UI::Label::escape $spell->{message});
1676}
1677
1678sub conn::spell_delete {
1679 my ($self, $spell) = @_;
1680}
1681
1682sub conn::addme_success {
1683 my ($self) = @_;
1684
1685 $self->send ("command output-sync $CFG->{output_sync}");
1686 $self->send ("command output-count $CFG->{output_count}");
1687
1688 my $parser = new Pod::POM;
1689 my $pod = $parser->parse_file (CFClient::find_rcfile "pod/skill_help.pod");
1690
1691 my %skill_tooltip;
1692
1693 for my $head2 ($pod->head1->[-2]->head2) {
1694 $skill_tooltip{$head2->title} = CFClient::pod_to_pango $head2->content;
1695 }
1696
1697 for my $skill (values %{$self->{skill_info}}) {
1698 $MAPWIDGET->add_command ("ready_skill $skill",
1699 (CFClient::UI::Label::escape "Ready the skill '$skill'\n\n")
1700 . $skill_tooltip{$skill});
1701 $MAPWIDGET->add_command ("use_skill $skill",
1702 (CFClient::UI::Label::escape "Immediately use the skill '$skill'\n\n")
1703 . $skill_tooltip{$skill});
1704 }
1705}
1706
1707sub conn::eof {
1708 $MAPWIDGET->clr_commands;
1709
1710 stop_game;
1711}
1712
1713sub conn::image_info {
1714 my ($self, $numfaces) = @_;
1715
1716 $self->{num_faces} = $numfaces;
1717 $self->{face_prefetch} = [1 .. $numfaces];
1718 $self->face_prefetch;
1719}
1720
1721sub conn::face_prefetch {
1722 my ($self) = @_;
1723
1724 return unless $CFG->{face_prefetch};
1725
1726 if ($self->{num_faces}) {
1727 return if @{ $self->{send_queue} || [] };
1728 my $todo = @{ $self->{face_prefetch} }
1729 or return;
1730
1731 my ($face) = splice @{ $self->{face_prefetch} }, + rand @{ $self->{face_prefetch} }, 1, ();
1732
1733 $self->send ("requestinfo image_sums $face $face");
1734
1735 $STATUSBOX->add (CFClient::UI::Label::escape "prefetching $todo",
1736 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1737 } elsif (!exists $self->{num_faces}) {
1738 $self->send ("requestinfo image_info");
1739
1740 $self->{num_faces} = 0;
1741
1742 $STATUSBOX->add (CFClient::UI::Label::escape "starting to prefetch",
1743 group => "prefetch", timeout => 2, fg => [1, 1, 0, 0.5]);
1744 }
1745}
1746
1747# check once/second for faces that need to be prefetched 1849# check once/second for faces that need to be prefetched
1748# this should, of course, only run on demand, but 1850# this should, of course, only run on demand, but
1749# SDL forces worse things on us.... 1851# SDL forces worse things on us....
1750 1852
1751Event->timer (after => 1, interval => 0.25, cb => sub { 1853Event->timer (after => 1, interval => 0.25, cb => sub {
1752 $CONN->face_prefetch 1854 $CONN->face_prefetch
1753 if $CONN; 1855 if $CONN;
1754}); 1856});
1755
1756sub update_floorbox {
1757 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1758 return unless $CONN;
1759
1760 $FLOORBOX->clear;
1761
1762 my $row;
1763 for (@{ $CONN->{container}{0} }) {
1764 if ($row < 7) {
1765 local $_->{face_widget}; # hack to force recreation of widget
1766 local $_->{desc_widget}; # hack to force recreation of widget
1767 CFClient::Item::update_widgets $_;
1768
1769 $FLOORBOX->add (0, $row, $_->{face_widget});
1770 $FLOORBOX->add (1, $row, $_->{desc_widget});
1771
1772 $row++;
1773 } else {
1774 $FLOORBOX->add (1, $row, new CFClient::UI::Label text => "More...");
1775 last;
1776 }
1777 }
1778 });
1779
1780 $WANT_REFRESH++;
1781}
1782
1783sub set_opencont {
1784 my ($conn, $tag, $name) = @_;
1785 $conn->{open_container} = $tag;
1786 $INVR_LBL->set_text ($name);
1787 $INVR->set_items ($conn->{container}{$tag});
1788}
1789
1790sub update_container {
1791 my ($tag) = @_;
1792 $INVR->set_items ($::CONN->{container}{$CONN->{open_container}})
1793 if $tag == $CONN->{open_container};
1794}
1795
1796sub conn::container_add {
1797 my ($self, $tag, $items) = @_;
1798
1799 #d# print "container_add: container $tag ($self->{player}{tag})\n";
1800
1801 if ($tag == 0) {
1802 update_floorbox;
1803 update_container (0);
1804 } elsif ($tag == $self->{player}{tag}) {
1805 $INV->set_items ($self->{container}{$self->{player}{tag}})
1806 } else {
1807 update_container ($tag);
1808 }
1809
1810 # $self-<{player}{tag} => player inv
1811 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1812}
1813
1814sub conn::container_clear {
1815 my ($self, $tag) = @_;
1816
1817 #d# print "container_clear: container $tag ($self->{player}{tag})\n";
1818
1819 if ($tag == 0) {
1820 update_floorbox;
1821 update_container (0);
1822 } elsif ($tag == $self->{player}{tag}) {
1823 $INV->set_items ($self->{container}{$tag})
1824 }
1825
1826# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1827}
1828
1829sub conn::item_delete {
1830 my ($self, @items) = @_;
1831
1832 for (@items) {
1833 #d# print "item_delete: $_->{tag} from $_->{container} ($self->{player}{tag})\n";
1834
1835 if ($_->{container} == 0) {
1836 update_floorbox;
1837 update_container ($_->{tag});
1838 } elsif ($_->{container} == $self->{player}{tag}) {
1839 $INV->set_items ($self->{container}{$self->{player}{tag}})
1840 } else {
1841 update_container ($_->{tag});
1842 }
1843 }
1844}
1845
1846sub conn::item_update {
1847 my ($self, $item) = @_;
1848
1849 #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($CONN->{open_container})\n";
1850
1851 if ($item->{tag} == $self->{player}{tag}) {
1852 $STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $item->{weight} / 1000);
1853 return
1854 }
1855
1856 CFClient::Item::update_widgets $item;
1857
1858 if ($item->{tag} == $CONN->{open_container} && not ($item->{flags} & Crossfire::Protocol::F_OPEN)) {
1859 set_opencont ($CONN, 0, "Floor");
1860
1861 } elsif ($item->{flags} & Crossfire::Protocol::F_OPEN) {
1862 set_opencont ($CONN, $item->{tag}, CFClient::Item::desc_string $item);
1863 } else {
1864 if ($item->{container} == 0) {
1865 update_floorbox;
1866 update_container (0);
1867 } elsif ($item->{container} == $self->{player}{tag}) {
1868 $INV->set_items ($self->{container}{$item->{container}})
1869 }
1870 }
1871}
1872 1857
1873%SDL_CB = ( 1858%SDL_CB = (
1874 CFClient::SDL_QUIT => sub { 1859 CFClient::SDL_QUIT => sub {
1875 Event::unloop -1; 1860 Event::unloop -1;
1876 }, 1861 },
… …
1908############################################################################# 1893#############################################################################
1909 1894
1910$SIG{INT} = $SIG{TERM} = sub { exit }; 1895$SIG{INT} = $SIG{TERM} = sub { exit };
1911 1896
1912{ 1897{
1913 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] }; 1898 local $SIG{__DIE__} = sub {
1899 return unless defined $^S && !$^S;
1900 Carp::confess $_[1];#d#TODO: remove when stable
1901 CFClient::fatal $_[0];
1902 };
1914 1903
1915 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 1904 CFClient::read_cfg "$Crossfire::VARDIR/cfplusrc";
1916 1905 CFClient::UI::set_layout ($::CFG->{layout});
1917 $TILECACHE = CFClient::db_table "tilecache";
1918 $FACEMAP = CFClient::db_table "facemap";
1919 1906
1920 my %DEF_CFG = ( 1907 my %DEF_CFG = (
1921 sdl_mode => 0, 1908 sdl_mode => 0,
1922 width => 640, 1909 width => 640,
1923 height => 480, 1910 height => 480,
1924 fullscreen => 0, 1911 fullscreen => 0,
1925 fast => 0, 1912 fast => 0,
1926 map_scale => 1, 1913 map_scale => 1,
1927 fow_enable => 1, 1914 fow_enable => 1,
1928 fow_intensity => 0.45, 1915 fow_intensity => 0.45,
1929 fow_smooth => 0, 1916 fow_smooth => 0,
1930 gui_fontsize => 1, 1917 gui_fontsize => 1,
1931 log_fontsize => 1, 1918 log_fontsize => 0.7,
1932 gauge_fontsize=> 1, 1919 gauge_fontsize => 1,
1933 gauge_size => 0.35, 1920 gauge_size => 0.35,
1934 stat_fontsize => 1, 1921 stat_fontsize => 0.7,
1935 mapsize => 100, 1922 mapsize => 100,
1936 host => "crossfire.schmorp.de",
1937 say_command => 'say', 1923 say_command => 'say',
1938 audio_enable => 1, 1924 audio_enable => 1,
1939 bgm_enable => 1, 1925 bgm_enable => 1,
1940 bgm_volume => 0.25, 1926 bgm_volume => 0.25,
1941 face_prefetch => 0, 1927 face_prefetch => 0,
1942 output_sync => 1, 1928 output_sync => 1,
1943 output_count => 1, 1929 output_count => 1,
1930 pickup => 0,
1931 default => "profile", # default profile
1932 );
1944 ); 1933
1945
1946 while (my ($k, $v) = each %DEF_CFG) { 1934 while (my ($k, $v) = each %DEF_CFG) {
1947 $CFG->{$k} = $v unless exists $CFG->{$k}; 1935 $CFG->{$k} = $v unless exists $CFG->{$k};
1948 } 1936 }
1937
1938 $CFG->{profile}{default}{host} ||= "crossfire.schmorp.de";
1949 1939
1950 sdl_init; 1940 sdl_init;
1951 1941
1952 @SDL_MODES = reverse 1942 @SDL_MODES = reverse
1953 grep $_->[0] >= 640 && $_->[1] >= 480, 1943 grep $_->[0] >= 640 && $_->[1] >= 480,
… …
1995 video_init; 1985 video_init;
1996 audio_init; 1986 audio_init;
1997} 1987}
1998 1988
1999Event::loop; 1989Event::loop;
1990#CFClient::SDL_Quit;
1991#CFClient::_exit 0;
2000 1992
2001END { CFClient::SDL_Quit } 1993END { CFClient::SDL_Quit }
2002 1994
2003=head1 NAME 1995=head1 NAME
2004 1996
2005pclient - A Crossfire+ and Crossfire game client 1997cfplus - A Crossfire+ and Crossfire game client
2006 1998
2007=head1 SYNOPSIS 1999=head1 SYNOPSIS
2008 2000
2009Just run it - no commandline arguments are supported. 2001Just run it - no commandline arguments are supported.
2010 2002
2011=head1 USAGE 2003=head1 USAGE
2012 2004
2013Pclient utilises OpenGL for all UI elements and the game. It is supposed to be used 2005cfplus utilises OpenGL for all UI elements and the game. It is supposed to be used
2014fullscreen and interactively. 2006fullscreen and interactively.
2015 2007
2008=head1 DEBUGGING
2009
2010
2011CFPLUS_DEBUG - environment variable
2012
2013 1 draw borders around widgets
2014 2 add low-level widget info to tooltips
2015 4 show fps
2016 8 suppress tooltips
2017
2016=head1 AUTHOR 2018=head1 AUTHOR
2017 2019
2018Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org> 2020Marc Lehmann <crossfire@schmorp.de>, Robin Redeker <elmex@ta-sa.org>
2019 2021
2020 2022

Diff Legend

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