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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.178 by root, Tue Apr 25 08:39:18 2006 UTC vs.
Revision 1.215 by root, Mon May 15 00:15:08 2006 UTC

… …
37use CFClient; 37use CFClient;
38use CFClient::UI; 38use CFClient::UI;
39use CFClient::MapWidget; 39use CFClient::MapWidget;
40 40
41$Event::DIED = sub { 41$Event::DIED = sub {
42 # TODO: display dialog box or so
42 CFClient::error $_[1]; 43 CFClient::error $_[1];
43}; 44};
44 45
45#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d# 46#$SIG{__WARN__} = sub { Carp::cluck $_[0] };#d#
46 47
… …
59our $NOW; 60our $NOW;
60 61
61our $CFG; 62our $CFG;
62our $CONN; 63our $CONN;
63our $FAST; # fast, low-quality mode, possibly useful for software-rendering 64our $FAST; # fast, low-quality mode, possibly useful for software-rendering
65
66our $WANT_REFRESH;
67our $CAN_REFRESH;
64 68
65our @SDL_MODES; 69our @SDL_MODES;
66our $WIDTH; 70our $WIDTH;
67our $HEIGHT; 71our $HEIGHT;
68our $FULLSCREEN; 72our $FULLSCREEN;
… …
70 74
71our $FONT_PROP; 75our $FONT_PROP;
72our $FONT_FIXED; 76our $FONT_FIXED;
73 77
74our $MAP; 78our $MAP;
79our $MAPMAP;
75our $MAPWIDGET; 80our $MAPWIDGET;
76our $BUTTONBAR; 81our $BUTTONBAR;
77our $LOGVIEW; 82our $LOGVIEW;
78our $CONSOLE; 83our $CONSOLE;
79our $METASERVER; 84our $METASERVER;
85our $LOGIN_BUTTON;
80 86
81our $FLOORBOX; 87our $FLOORBOX;
82our $GAUGES; 88our $GAUGES;
83our $STATWIDS; 89our $STATWIDS;
84 90
… …
88our $SDL_MIXER; 94our $SDL_MIXER;
89our @SOUNDS; # event => file mapping 95our @SOUNDS; # event => file mapping
90our %AUDIO_CHUNKS; # audio files 96our %AUDIO_CHUNKS; # audio files
91 97
92our $ALT_ENTER_MESSAGE; 98our $ALT_ENTER_MESSAGE;
93our $STATUS_LINE; 99our $STATUSBOX;
94our $DEBUG_STATUS; 100our $DEBUG_STATUS;
95 101
102our $INVWIN;
103our $INV;
104
96sub status { 105sub status {
97 $STATUS_LINE->set_text ($_[0]); 106 $STATUSBOX->add ($_[0], pri => -10, group => "status", timeout => 20, fg => [1, 1, 0, 1]);
98 $STATUS_LINE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $STATUS_LINE->{h});
99} 107}
100 108
101sub debug { 109sub debug {
102 $DEBUG_STATUS->set_text ($_[0]); 110 $DEBUG_STATUS->set_text ($_[0]);
103 $DEBUG_STATUS->move ($WIDTH - $DEBUG_STATUS->{w}, 0, $DEBUG_STATUS->{w}, $DEBUG_STATUS->{h}); 111 my ($w, $h) = $DEBUG_STATUS->size_request;
112 $DEBUG_STATUS->move ($WIDTH - $w, 0);
104} 113}
105 114
106sub start_game { 115sub start_game {
107 status "logging in..."; 116 status "logging in...";
108 117
109 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 118 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
110 119
111 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}"; 120 $MAPCACHE = CFClient::db_table "mapcache_$CFG->{host}";
112
113 $MAP = new CFClient::Map $mapsize, $mapsize; 121 $MAP = new CFClient::Map $mapsize, $mapsize;
114 122
115 my ($host, $port) = split /:/, $CFG->{host}; 123 my ($host, $port) = split /:/, $CFG->{host};
116 124
117 $CONN = new conn 125 $CONN = eval {
126 new conn
118 host => $host, 127 host => $host,
119 port => $port || 13327, 128 port => $port || 13327,
120 user => $CFG->{user}, 129 user => $CFG->{user},
121 pass => $CFG->{password}, 130 pass => $CFG->{password},
122 mapw => $mapsize, 131 mapw => $mapsize,
123 maph => $mapsize, 132 maph => $mapsize,
133 ;
124 ; 134 };
125 135
136 if ($CONN) {
137 $LOGIN_BUTTON->set_text ("Logout");
138
126 status "login successful"; 139 status "login successful";
127 140
128 CFClient::lowdelay fileno $CONN->{fh}; 141 CFClient::lowdelay fileno $CONN->{fh};
142 } else {
143 status "unable to connect";
144 stop_game();
145 }
129} 146}
130 147
131sub stop_game { 148sub stop_game {
149 return unless $CONN;
150
151 status "connection closed";
152 $LOGIN_BUTTON->set_text ("Login");
153 $CONN->destroy;
154 $CONN = 0; # false, does not autovivify
155
156 undef $MAPCACHE;
132 undef $CONN; 157 undef $MAP;
133} 158}
134 159
135sub client_setup { 160sub client_setup {
136 my $dialog = new CFClient::UI::FancyFrame 161 my $dialog = new CFClient::UI::FancyFrame
137 title => "Client Setup", 162 title => "Client Setup",
… …
313 audio_shutdown (); 338 audio_shutdown ();
314 audio_init (); 339 audio_init ();
315 } 340 }
316 ); 341 );
317 342
343 $table->add (0, $row, new CFClient::UI::Label valign => 0, align => 1, text => "Communication cmd");
344 $table->add (1, $row++, my $saycmd = new CFClient::UI::Entry
345 text => $CFG->{say_command},
346 tooltip => "This is the command that will be used if you write a line in the message window entry. "
347 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
348 ."But you could also set it to 'tell <playername>' to only chat with that user.",
349 connect_changed => sub {
350 my ($self, $value) = @_;
351 $CFG->{say_command} = $value;
352 }
353 );
354
318 $dialog 355 $dialog
319} 356}
320 357
321sub set_stats_window_fontsize { 358sub set_stats_window_fontsize {
322 for (values %{$STATWIDS}) { 359 for (values %{$STATWIDS}) {
… …
332# local $GAUGES->{win}{parent};#d# 369# local $GAUGES->{win}{parent};#d#
333# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D; 370# use PApp::Util; open D, ">:utf8", "d"; print D PApp::Util::dumpval $GAUGES->{win}; close D;
334} 371}
335 372
336sub make_gauge_window { 373sub make_gauge_window {
337 my $gh = int ($HEIGHT * $CFG->{gauge_size}); 374 my $gh = int $HEIGHT * $CFG->{gauge_size};
338# my $gw = int ($WIDTH * $CFG->{gauge_w_size});
339 375
340 my $win = new CFClient::UI::Frame ( 376 my $win = new CFClient::UI::Frame (
341 y => $HEIGHT - $gh, x => 0, user_w => $WIDTH, user_h => $gh 377 req_y => -1,
378 user_w => $WIDTH,
379 user_h => $gh,
342 ); 380 );
381
343 $win->add (my $hbox = new CFClient::UI::HBox 382 $win->add (my $hbox = new CFClient::UI::HBox
344 children => [ 383 children => [
345 (new CFClient::UI::HBox expand => 1), 384 (new CFClient::UI::HBox expand => 1),
346 ($FLOORBOX = new CFClient::UI::VBox), 385 (new CFClient::UI::VBox children => [
386 (new CFClient::UI::Empty expand => 1),
387 (new CFClient::UI::Frame bg => [0, 0, 0, 0.4], child => ($FLOORBOX = new CFClient::UI::VBox)),
388 ]),
347 (my $vbox = new CFClient::UI::VBox), 389 (my $vbox = new CFClient::UI::VBox),
348 ], 390 ],
349 ); 391 );
350 392
351 $vbox->add (new CFClient::UI::HBox 393 $vbox->add (new CFClient::UI::HBox
… …
355 (my $hb = new CFClient::UI::HBox), 397 (my $hb = new CFClient::UI::HBox),
356 ], 398 ],
357 ); 399 );
358 400
359 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp', 401 $hb->add (my $hg = new CFClient::UI::Gauge type => 'hp',
360 tooltip => "Health points - depletes when you get wounded, refills when you heal or idle"); 402 tooltip => "Health points. Measures of how much damage you can take before dying. Hit points are determined from your level and are influenced by the value of your Con. Hp value may range between 1 to beyond 500 and higher values indicate a greater ability to withstand punishment.");
361 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana', 403 $hb->add (my $mg = new CFClient::UI::Gauge type => 'mana',
362 tooltip => "Spell points - deplete when you cast wizard spells, refills when you idle"); 404 tooltip => "Spell points. Measures of how much \"fuel\" you have for casting spells and incantations. Mana is calculated from your level and your Pow. Mana values can range between 1 to beyond 500 (glowing crystals can increase the current spell points beyond your normal maximum). Higher values indicate greater amounts of mana.");
363 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace', 405 $hb->add (my $gg = new CFClient::UI::Gauge type => 'grace',
364 tooltip => "Grace points - deplete when you cast priest spells, refills when you pray"); 406 tooltip => "Grace points - how favored you are by your god. In game terms, how much divine magic you can cast. Your level, Wis and Pow effect what the value of grace is. Prayong on an altar of your god can increase this value beyond your normal maximum. Grace can take on large positive and negative values. Positive values indicate favor by the gods.");
365 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food', 407 $hb->add (my $fg = new CFClient::UI::Gauge type => 'food',
366 tooltip => "Food - depletes with time, faster when you heal or build mana, refills when you eat healthy food"); 408 tooltip => "Food. Ranges between 0 (starving) and 999 (satiated). At a value of 0 the character begins to die. Some magic can speed up or slow down the character digestion. Healing wounds will speed up digestion too.");
367 409
368 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 410 $vbox->add (my $exp = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
369 tooltip => "Experience points and level - increases when you kill monsters or successfully use skills"); 411 tooltip => "Experience points and overall level - experience is increased as a reward for appropriate action (such as killing monsters) and may decrease as a result of a magical attack or dying. Level is directly derived from the experience value. As the level of the character increases, the character becomes able to succeed at more difficult tasks. A character's level starts at a value of 0 and may range up beyond 100.");
370 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1, 412 $vbox->add (my $rng = new CFClient::UI::Label valign => 0, align => 1, can_hover => 1, can_events => 1,
371 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)"); 413 tooltip => "Ranged attack - how you attack when you press shift-cursor (spell, skill, weapon etc.)");
372 414
373 $GAUGES = { 415 $GAUGES = {
374 exp => $exp, win => $win, range => $rng, 416 exp => $exp, win => $win, range => $rng,
… …
379 421
380 $win 422 $win
381} 423}
382 424
383sub make_stats_window { 425sub make_stats_window {
384 my $tgw = new CFClient::UI::FancyFrame (x => $WIDTH * 2/5, y => 0, title => "Stats"); 426 my $tgw = new CFClient::UI::FancyFrame x => $WIDTH * 2/5, y => 0, title => "Stats";
385 427
386 $tgw->add (my $vb = new CFClient::UI::VBox); 428 $tgw->add (new CFClient::UI::Window child => my $vb = new CFClient::UI::VBox);
387 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1); 429 $vb->add ($STATWIDS->{title} = new CFClient::UI::Label valign => 0, align => -1, text => "Title:", expand => 1);
388 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1); 430 $vb->add ($STATWIDS->{map} = new CFClient::UI::Label valign => 0, align => -1, text => "Map:", expand => 1);
389 431
390 $vb->add (my $hb = new CFClient::UI::HBox expand => 1); 432 $vb->add (my $hb = new CFClient::UI::HBox expand => 1);
391 433
392 $hb->add (my $tbl = new CFClient::UI::Table expand => 1); 434 $hb->add (my $tbl = new CFClient::UI::Table expand => 1);
393 435
394 my $black = [0, 0, 0]; 436 my $black = [0, 0, 0];
395 437
396 $tbl->add (0, 0, $STATWIDS->{st_str} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 438 for (
397 $tbl->add (0, 1, $STATWIDS->{st_dex} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 439 [0, 0, st_str => "Str", 30, "Physical Strength, determines damage dealt with weapons, how much you can carry, and how often you can attack"],
398 $tbl->add (0, 2, $STATWIDS->{st_con} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 440 [0, 1, st_dex => "Dex", 30, "Dexterity, your physical agility. Determines chance of being hit and affects armor class and speed"],
399 $tbl->add (0, 3, $STATWIDS->{st_int} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 441 [0, 2, st_con => "Con", 30, "Constitution, physical health and toughness. Determines how many healthpoints you can have"],
400 $tbl->add (0, 4, $STATWIDS->{st_wis} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 442 [0, 3, st_int => "Int", 30, "Intelligence, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have"],
401 $tbl->add (0, 5, $STATWIDS->{st_pow} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 443 [0, 4, st_wis => "Wis", 30, "Wisdom, the ability to learn and use divine magic (prayers). Determines how many grace points you can have"],
402 $tbl->add (0, 6, $STATWIDS->{st_cha} = new CFClient::UI::Label valign => 0, align => +1, template => "30"); 444 [0, 5, st_pow => "Pow", 30, "Power, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up"],
445 [0, 6, st_cha => "Cha", 30, "Charisma, how well you are received by NPCs. Affects buying and selling prices in shops."],
403 446
404 $tbl->add (1, 0, $STATWIDS->{st_str_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Str"); 447 [2, 0, st_wc => "Wc", -120, "Weapon Class, 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."],
405 $tbl->add (1, 1, $STATWIDS->{st_dex_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dex"); 448 [2, 1, st_ac => "Ac", -120, "Armour Class, 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."],
406 $tbl->add (1, 2, $STATWIDS->{st_con_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Con"); 449 [2, 2, st_dam => "Dam", 120, "Damage, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack."],
407 $tbl->add (1, 3, $STATWIDS->{st_int_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Int"); 450 [2, 3, st_arm => "Arm", 120, "Armour, 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."],
408 $tbl->add (1, 4, $STATWIDS->{st_wis_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wis"); 451 [2, 4, st_spd => "Spd", 10.54, "Speed, 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."],
409 $tbl->add (1, 5, $STATWIDS->{st_pow_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Pow"); 452 [2, 5, st_wspd => "WSp", 10.54, "Weapon Speed, 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."],
410 $tbl->add (1, 6, $STATWIDS->{st_cha_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Cha"); 453 ) {
454 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
411 455
412 $tbl->add (2, 0, $STATWIDS->{st_wc} = new CFClient::UI::Label valign => 0, align => +1, template => "-120"); 456 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
413 $tbl->add (2, 1, $STATWIDS->{st_ac} = new CFClient::UI::Label valign => 0, align => +1, template => "-120"); 457 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
414 $tbl->add (2, 2, $STATWIDS->{st_dam} = new CFClient::UI::Label valign => 0, align => +1, template => "120"); 458 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
415 $tbl->add (2, 3, $STATWIDS->{st_arm} = new CFClient::UI::Label valign => 0, align => +1, template => "120"); 459 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip);
416 $tbl->add (2, 4, $STATWIDS->{st_spd} = new CFClient::UI::Label valign => 0, align => +1, template => "10.54"); 460 }
417 $tbl->add (2, 5, $STATWIDS->{st_wspd} = new CFClient::UI::Label valign => 0, align => +1, template => "9");
418
419 $tbl->add (3, 0, $STATWIDS->{st_wc_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Wc");
420 $tbl->add (3, 1, $STATWIDS->{st_ac_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Ac");
421 $tbl->add (3, 2, $STATWIDS->{st_dam_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Dam");
422 $tbl->add (3, 3, $STATWIDS->{st_arm_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Arm");
423 $tbl->add (3, 4, $STATWIDS->{st_spd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "Sp");
424 $tbl->add (3, 5, $STATWIDS->{st_wspd_lbl} = new CFClient::UI::Label fg => $black, valign => 0, align => -1, text => "WSp");
425 461
426 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 462 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
427 463
428 my $row = 0; 464 my $row = 0;
429 my $col = 0; 465 my $col = 0;
430 466
431 my %resist_names = ( 467 my %resist_names = (
432 slow => "Slow", 468 slow => "Slow (slows you down when you are hit by the spell. Monsters will have an opportunity to come near you faster and hit you more often.)",
433 holyw => "Holy Word", 469 holyw => "Holy Word (resistance you against getting the fear when someone whose god doesn't like you spells the holy word on you.)",
434 conf => "Confusion", 470 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
435 fire => "Fire", 471 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
436 depl => "Depletion", 472 depl => "Depletion (some monsters and other effects can cause stats depletion)",
437 magic => "Magic", 473 magic => "Magic (resistance to magic spells like magic missile or similar)",
438 drain => "Draining", 474 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
439 acid => "Acid", 475 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
440 pois => "Poison", 476 pois => "Poison (resistance to getting poisoned)",
441 para => "Paralysation", 477 para => "Paralysation (this resistance affects the chance you get paralysed)",
442 deat => "Death", 478 deat => "Death (resistance against death spells)",
443 phys => "Physical", 479 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
444 blind => "Blind", 480 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
445 fear => "Fear", 481 fear => "Fear (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)",
446 tund => "Turn undead", 482 tund => "Turn undead",
447 elec => "Electricity", 483 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
448 cold => "Cold", 484 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
449 ghit => "Ghost hit", 485 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
450 ); 486 );
451 for (qw/slow holyw conf fire depl magic 487 for (qw/slow holyw conf fire depl magic
452 drain acid pois para deat phys 488 drain acid pois para deat phys
453 blind fear tund elec cold ghit/) 489 blind fear tund elec cold ghit/)
454 { 490 {
455 $tbl2->add ($col, $row, 491 $tbl2->add ($col, $row,
456 $STATWIDS->{"res_$_"} = 492 $STATWIDS->{"res_$_"} =
457 new CFClient::UI::Label 493 new CFClient::UI::Label
494 font => $FONT_FIXED,
458 template => "-100%", 495 template => "-100%",
459 align => +1, 496 align => +1,
460 valign => 0, 497 valign => 0,
498 can_events => 1,
499 can_hover => 1,
461 tooltip => $resist_names{$_} 500 tooltip => $resist_names{$_},
462 ); 501 );
463 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 502 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
503 font => $FONT_FIXED,
464 can_hover => 1, 504 can_hover => 1,
465 can_events => 1, 505 can_events => 1,
466 image => "ui/resist/resist_$_.png", 506 image => "ui/resist/resist_$_.png",
467 tooltip => $resist_names{$_} 507 tooltip => $resist_names{$_},
468 ); 508 );
469 509
470 $row++; 510 $row++;
471 if ($row % 6 == 0) { 511 if ($row % 6 == 0) {
472 $col += 2; 512 $col += 2;
… …
551 591
552} 592}
553 593
554sub metaserver_dialog { 594sub metaserver_dialog {
555 my $dialog = new CFClient::UI::FancyFrame 595 my $dialog = new CFClient::UI::FancyFrame
556 title => "Metaserver", 596 title => "Server List",
557 child => (my $vbox = new CFClient::UI::VBox); 597 child => (my $vbox = new CFClient::UI::VBox);
558 598
559 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 599 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
560 600
561 $dialog 601 $dialog
562} 602}
603
604my $METASERVER_ATIME;
563 605
564sub update_metaserver { 606sub update_metaserver {
565 my ($HOST) = @_; 607 my ($HOST) = @_;
566 608
609 return if $METASERVER_ATIME > time;
610 $METASERVER_ATIME = time + 60;
611
567 my $table = $METASERVER->{table}; 612 my $table = $METASERVER->{table};
568 $table->clear; 613 $table->clear;
569 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching metaserver list..."); 614 $table->add (0, 0, my $label = new CFClient::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
570 615
571 my $buf; 616 my $buf;
572 617
573 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 618 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0;
574 619
… …
658 703
659 $METASERVER = metaserver_dialog; 704 $METASERVER = metaserver_dialog;
660 705
661 $vbox->add (new CFClient::UI::Flopper 706 $vbox->add (new CFClient::UI::Flopper
662 expand => 1, 707 expand => 1,
663 text => "Metaserver", 708 text => "Server List",
664 other => $METASERVER, 709 other => $METASERVER,
665 tooltip => "Show a list of avaible crossfire servers", 710 tooltip => "Show a list of available crossfire servers",
666 connect_open => sub { 711 connect_open => sub {
667 update_metaserver $HOST; 712 update_metaserver $HOST;
668 } 713 }
669 ); 714 );
670 } 715 }
… …
685 hidden => 1, 730 hidden => 1,
686 tooltip => "The password for your character", 731 tooltip => "The password for your character",
687 connect_changed => sub { 732 connect_changed => sub {
688 my ($self, $value) = @_; 733 my ($self, $value) = @_;
689 $CFG->{password} = $value; 734 $CFG->{password} = $value;
690 }
691 );
692
693 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
694 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
695 text => $CFG->{say_command},
696 tooltip => "This is the command that will be used if you write a line in the message window entry. "
697 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
698 ."But you could also set it to 'tell <playername>' to only chat with that user.",
699 connect_changed => sub {
700 my ($self, $value) = @_;
701 $CFG->{say_command} = $value;
702 } 735 }
703 ); 736 );
704 737
705 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size"); 738 $table->add (0, 7, new CFClient::UI::Label valign => 0, align => 1, text => "Map Size");
706 $table->add (1, 7, new CFClient::UI::Slider 739 $table->add (1, 7, new CFClient::UI::Slider
… …
713 746
714 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 747 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
715 }, 748 },
716 ); 749 );
717 750
718 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 751 $table->add (1, 8, $LOGIN_BUTTON = new CFClient::UI::Button
752 expand => 1,
753 align => 0,
754 text => "Login",
755 connect_activate => sub {
756 $CONN ? stop_game
719 start_game; 757 : start_game;
758 },
720 }); 759 );
721 760
722 $dialog 761 $dialog
723} 762}
724 763
725sub message_window { 764sub message_window {
726 my $window = new CFClient::UI::FancyFrame 765 my $window = new CFClient::UI::FancyFrame
727 title => "Messages", 766 title => "Messages",
728 border_bg => [1, 1, 1, 0.5], 767 border_bg => [1, 1, 1, 1],
729 bg => [0.3, 0.3, 0.3, 0.8], 768 bg => [0, 0, 0, 0.5],
730 user_w => int $::WIDTH / 3, 769 user_w => int $::WIDTH / 3,
731 user_h => int $::HEIGHT / 5, 770 user_h => int $::HEIGHT / 5,
732 child => (my $vbox = new CFClient::UI::VBox); 771 child => (my $vbox = new CFClient::UI::VBox);
733 772
734 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 773 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
774 }; 813 };
775 814
776 $window 815 $window
777} 816}
778 817
818sub make_inventory_window {
819 my $invwin = new CFClient::UI::FancyFrame user_w => 300, user_h => 300, title => "Inventory";
820 $invwin->add ($INV = new CFClient::UI::Inventory expand => 1);
821 $invwin
822}
823
779sub sdl_init { 824sub sdl_init {
780 CFClient::SDL_Init 825 CFClient::SDL_Init
781 and die "SDL::Init failed!\n"; 826 and die "SDL::Init failed!\n";
782} 827}
783 828
784sub video_init { 829sub video_init {
785 sdl_init; 830 sdl_init;
786 831
832 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
833
787 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 834 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
788 $FULLSCREEN = $CFG->{fullscreen}; 835 $FULLSCREEN = $CFG->{fullscreen};
789 $FAST = $CFG->{fast}; 836 $FAST = $CFG->{fast};
790 837
791 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 838 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
792 or die "SDL_SetVideoMode failed!\n"; 839 or die "SDL_SetVideoMode failed!\n";
793 840
794 $SDL_ACTIVE = 1; 841 $SDL_ACTIVE = 1;
795
796 $LAST_REFRESH = time - 0.01; 842 $LAST_REFRESH = time - 0.01;
797 843
798 CFClient::gl_init; 844 CFClient::gl_init;
799 845
800 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 846 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
801 847
848 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
849
802 ############################################################################# 850 #############################################################################
803 851
852 unless ($DEBUG_STATUS) {
853 # create the widgets
854
804 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 855 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
805 $DEBUG_STATUS->show; 856 $DEBUG_STATUS->show;
806 857
807 $STATUS_LINE = new CFClient::UI::Label 858 $STATUSBOX = new CFClient::UI::Statusbox;
808 padding => 0, 859 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
809 y => $HEIGHT - $FONTSIZE * 1.8;
810 $STATUS_LINE->show;
811 860
812 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 861 (new CFClient::UI::Frame
813 padding => 0, 862 bg => [0, 0, 0, 0.4],
814 fontsize => 0.8, 863 req_y => -1,
815 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 864 child => $STATUSBOX,
816 $ALT_ENTER_MESSAGE->show; 865 )->show;
817 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
818 866
819 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 867 CFClient::UI::FancyFrame->new (
820 $MAPWIDGET->focus_in; 868 border_bg => [1, 1, 1, 192/255],
869 bg => [1, 1, 1, 0],
870 child => ($MAPMAP = new CFClient::MapWidget::MapMap),
871 )->show;
872
873 $MAPWIDGET = new CFClient::MapWidget;
821 $MAPWIDGET->connect (activate_console => sub { 874 $MAPWIDGET->connect (activate_console => sub {
822 my ($mapwidget, $preset) = @_; 875 my ($mapwidget, $preset) = @_;
823 876
824 if ($CONSOLE) { 877 if ($CONSOLE) {
825 $CONSOLE->{input}->{auto_activated} = 1; 878 $CONSOLE->{input}->{auto_activated} = 1;
826 $CONSOLE->{input}->focus_in; 879 $CONSOLE->{input}->focus_in;
827 880
828 if ($preset && $CONSOLE->{input}->get_text eq '') { 881 if ($preset && $CONSOLE->{input}->get_text eq '') {
829 $CONSOLE->{input}->set_text ($preset); 882 $CONSOLE->{input}->set_text ($preset);
883 }
830 } 884 }
831 } 885 });
832 }); 886 $MAPWIDGET->show;
887 $MAPWIDGET->focus_in;
833 888
834 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 889 $BUTTONBAR = new CFClient::UI::HBox;
835 890
836 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup); 891 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Client Setup", other => client_setup);
837 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup); 892 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Server Setup", other => server_setup);
838 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window); 893 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Message Window", other => message_window);
839 894
840 $CFClient::UI::ROOT->add (make_gauge_window); # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 895 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
896
841 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window); 897 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Stats Window", other => make_stats_window);
898 $BUTTONBAR->add (new CFClient::UI::Flopper text => "Inventory", other => make_inventory_window);
842 899
843 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub { 900 $BUTTONBAR->add (new CFClient::UI::Button text => "Save Config", connect_activate => sub {
844 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 901 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
845 status "Configuration Saved"; 902 status "Configuration Saved";
846 }); 903 });
847 904
905 $BUTTONBAR->show;
906
907 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
908
909 # delay till geometry is constant
910 $CFClient::UI::ROOT->on_post_alloc (startup => sub {
848 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup 911 $BUTTONBAR->{children}[1]->emit ("activate"); # pop up server setup
912 my $widget = $GAUGES->{win};
913 $widget->move (0, $HEIGHT - $widget->{h});#d# to in toplevel
914 });
915 force_refresh ();
916 }
849} 917}
850 918
851sub video_shutdown { 919sub video_shutdown {
852 $CFClient::UI::ROOT->{children} = [];
853 undef $CFClient::UI::GRAB;
854 undef $CFClient::UI::HOVER;
855 undef $SDL_ACTIVE; 920 undef $SDL_ACTIVE;
856} 921}
857 922
858my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 923my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
859my $bgmusic;#TODO#hack#d# 924my $bgmusic;#TODO#hack#d#
925
926sub audio_channel_finished {
927 my ($channel) = @_;
928
929 warn "channel $channel finished\n";#d#
930}
860 931
861sub audio_music_finished { 932sub audio_music_finished {
862 return unless $CFG->{bgm_enable}; 933 return unless $CFG->{bgm_enable};
863 934
864 # TODO: hack, do play loop and mood music 935 # TODO: hack, do play loop and mood music
… …
868 push @bgmusic, shift @bgmusic; 939 push @bgmusic, shift @bgmusic;
869} 940}
870 941
871sub audio_init { 942sub audio_init {
872 if ($CFG->{audio_enable}) { 943 if ($CFG->{audio_enable}) {
873 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 944 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
874 $SDL_MIXER = !CFClient::Mix_OpenAudio; 945 $SDL_MIXER = !CFClient::Mix_OpenAudio;
875 CFClient::Mix_AllocateChannels 8; 946 CFClient::Mix_AllocateChannels 8;
876 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 947 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
877 948
878 audio_music_finished; 949 audio_music_finished;
… …
905} 976}
906 977
907my %animate_object; 978my %animate_object;
908my $animate_timer; 979my $animate_timer;
909 980
910my $want_refresh;
911my $can_refresh;
912
913my $fps = 9; 981my $fps = 9;
914 982
915sub force_refresh { 983sub force_refresh {
916 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 984 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
917 debug sprintf "%3.2f", $fps; 985 debug sprintf "%3.2f", $fps;
918 986
919 $want_refresh = 0;
920 $can_refresh = 0;
921
922 $CFClient::UI::ROOT->draw; 987 $CFClient::UI::ROOT->draw;
923
924 CFClient::SDL_GL_SwapBuffers; 988 CFClient::SDL_GL_SwapBuffers;
925 989
990 $WANT_REFRESH = 0;
991 $CAN_REFRESH = 0;
926 $LAST_REFRESH = $NOW; 992 $LAST_REFRESH = $NOW;
927} 993}
928 994
929my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub { 995my $refresh_watcher = Event->timer (after => 0, hard => 1, interval => 1 / $MAX_FPS, cb => sub {
930 $NOW = time; 996 $NOW = time;
… …
932 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 998 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
933 for CFClient::SDL_PollEvent; 999 for CFClient::SDL_PollEvent;
934 1000
935 if (%animate_object) { 1001 if (%animate_object) {
936 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1002 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
937 $want_refresh++; 1003 $WANT_REFRESH++;
938 } 1004 }
939 1005
940 if ($want_refresh) { 1006 if ($WANT_REFRESH) {
941 force_refresh; 1007 force_refresh;
942 } else { 1008 } else {
943 $can_refresh = 1; 1009 $CAN_REFRESH = 1;
944 } 1010 }
945}); 1011});
946
947sub refresh {
948 $want_refresh++;
949}
950 1012
951sub animation_start { 1013sub animation_start {
952 my ($widget) = @_; 1014 my ($widget) = @_;
953 $animate_object{$widget} = $widget; 1015 $animate_object{$widget} = $widget;
954} 1016}
… …
1033# at worst. 1095# at worst.
1034sub conn::flood_fill { 1096sub conn::flood_fill {
1035 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1097 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1036 1098
1037 # the server does not allow map paths > 6 1099 # the server does not allow map paths > 6
1038 return if 6 <= length $path; 1100 return if 7 <= length $path;
1039 1101
1040 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1102 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1041 1103
1042 for ( 1104 for (
1043 [1, 0, -1], 1105 [1, 0, -1],
… …
1086 1148
1087 $self->flush_map; 1149 $self->flush_map;
1088 1150
1089 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1151 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1090 1152
1091 my $mapmapw = 250; 1153 my $mapmapw = $MAPMAP->{w};
1092 my $mapmaph = 250; 1154 my $mapmaph = $MAPMAP->{h};
1093 1155
1094 $self->{neigh_rect} = [ 1156 $self->{neigh_rect} = [
1095 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1157 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1096 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1158 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1097 ]; 1159 ];
… …
1266 [0.55, 0.41, 0.13], 1328 [0.55, 0.41, 0.13],
1267 [0.99, 0.77, 0.26], 1329 [0.99, 0.77, 0.26],
1268 [0.74, 0.65, 0.41], 1330 [0.74, 0.65, 0.41],
1269 ); 1331 );
1270 1332
1333 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
1334
1335 $text =~ s/&/&amp;/g; $text =~ s/</&lt;/g;
1336 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
1337 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
1338
1271 $LOGVIEW->add_paragraph ($color[$color], $text); 1339 $LOGVIEW->add_paragraph ($color[$color],
1340 join "\n", map "$time $_", split /\n/, $text);
1341
1342 $STATUSBOX->add ($text,
1343 group => $text,
1344 fg => $color[$color],
1345 timeout => 60,
1346 tooltip_font => $::FONT_FIXED,
1347 );
1348}
1349
1350sub conn::drawextinfo {
1351 my ($self, $color, $type, $subtype, $message) = @_;
1352
1353 $self->drawinfo ($color, $message);
1272} 1354}
1273 1355
1274sub conn::spell_add { 1356sub conn::spell_add {
1275 my ($self, $spell) = @_; 1357 my ($self, $spell) = @_;
1276 1358
… …
1289 1371
1290 for my $skill (values %{$self->{skill_info}}) { 1372 for my $skill (values %{$self->{skill_info}}) {
1291 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1373 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1292 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1374 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1293 } 1375 }
1376
1377 $MAPWIDGET->add_command ("pet\\_mode defend", "Tell pets to stay close to you and defend you");
1378 $MAPWIDGET->add_command ("pet\\_mode arena", "Same as petmode attack, but also attack other players");
1379 $MAPWIDGET->add_command ("pet\\_mode sad", "Search &amp; Destroy - tell pets to roam about and attack enemies");
1380 $MAPWIDGET->add_command ("kill\\_pets", "kill your pets");
1381}
1382
1383sub conn::eof {
1384 stop_game;
1294} 1385}
1295 1386
1296sub update_floorbox { 1387sub update_floorbox {
1297 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1388 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1389 return unless $CONN;
1390
1298 $FLOORBOX->clear; 1391 $FLOORBOX->clear;
1299 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1392 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1300 1393
1301 my @items = values %{ $CONN->{container}{0} }; 1394 my $count = 4;
1302 1395 for (@{ $CONN->{container}{0} }) {
1303 # we basically have to use the same sorting as everybody else 1396 if (--$count) {
1304 @items = sort { $a->{type} <=> $b->{type} } @items; 1397 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1305 1398 } else {
1306 for my $item (reverse @items) { 1399 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1307 my $desc = $item->{nrof} < 2
1308 ? $item->{name}
1309 : "$item->{nrof} $item->{name_pl}";
1310 # todo: animation widget, face widget, weight(?) etc.
1311 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1312 tooltip => (CFClient::UI::Label->escape ($desc)
1313 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1314 can_hover => 1,
1315 can_events => 1,
1316 connect_button_down => sub {
1317 my ($self, $ev, $x, $y) = @_;
1318
1319 # todo: maybe put examine on 1? but should just be a tooltip :(
1320 if ($ev->{button} == 1) {
1321 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1322 } elsif ($ev->{button} == 2) {
1323 $CONN->send ("apply $item->{tag}");
1324 } elsif ($ev->{button} == 3) {
1325 # examine, lock, mark, maybe other things
1326 warn "MENU not implemented yet\n";
1327 }
1328
1329 1
1330 }, 1400 last;
1331 );
1332
1333 $hbox->add (new CFClient::UI::Face
1334 can_events => 0,
1335 face => $item->{face},
1336 anim => $item->{anim},
1337 animspeed => $item->{animspeed},
1338 );
1339 1401 }
1340 $hbox->add (new CFClient::UI::Label
1341 can_events => 0,
1342 text => $desc,
1343 );
1344 } 1402 }
1345 }); 1403 });
1346 refresh; 1404
1405 $WANT_REFRESH++;
1347} 1406}
1348 1407
1349sub conn::container_add { 1408sub conn::container_add {
1350 my ($self, $id, $items) = @_; 1409 my ($self, $tag, $items) = @_;
1351 1410
1352 update_floorbox if $id == 0; 1411 update_floorbox if $tag == 0;
1412
1413 $INV->set_items ($self->{container}{$self->{player}{tag}})
1414 if $tag == $self->{player}{tag};
1415
1353 # $self-<{player}{tag} => player inv 1416 # $self-<{player}{tag} => player inv
1354 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}}; 1417 #use PApp::Util; warn PApp::Util::dumpval $self->{container}{$self->{player}{tag}};
1355} 1418}
1356 1419
1357sub conn::container_clear { 1420sub conn::container_clear {
1358 my ($self, $id) = @_; 1421 my ($self, $tag) = @_;
1359 1422
1360 update_floorbox if $id == 0; 1423 update_floorbox if $tag == 0;
1424
1425 $INV->set_items ($self->{container}{$tag})
1426 if $tag == $self->{player}{tag};
1427
1361# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1428# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1362} 1429}
1363 1430
1364sub conn::item_delete { 1431sub conn::item_delete {
1365 my ($self, @items) = @_; 1432 my ($self, @items) = @_;
1366 1433
1367 for (@items) { 1434 for (@items) {
1368 update_floorbox if $_->{container} == 0; 1435 update_floorbox if $_->{container} == 0;
1436
1437 $INV->set_items ($self->{container}{$_->{container}})
1438 if $_->{container} == $self->{player}{tag};
1369 } 1439 }
1370} 1440}
1371 1441
1372sub conn::item_update { 1442sub conn::item_update {
1373 my ($self, $item) = @_; 1443 my ($self, $item) = @_;
1374 1444
1375 update_floorbox if $item->{container} == 0; 1445 update_floorbox if $item->{container} == 0;
1446
1447 $INV->set_items ($self->{container}{$item->{container}})
1448 if $item->{container} == $self->{player}{tag};
1376} 1449}
1377 1450
1378%SDL_CB = ( 1451%SDL_CB = (
1379 CFClient::SDL_QUIT => sub { 1452 CFClient::SDL_QUIT => sub {
1380 Event::unloop -1; 1453 Event::unloop -1;
1381 }, 1454 },
1382 CFClient::SDL_VIDEORESIZE => sub { 1455 CFClient::SDL_VIDEORESIZE => sub {
1383 }, 1456 },
1384 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1457 CFClient::SDL_VIDEOEXPOSE => sub {
1458 $WANT_REFRESH++;
1459 },
1385 CFClient::SDL_ACTIVEEVENT => sub { 1460 CFClient::SDL_ACTIVEEVENT => sub {
1386# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d# 1461# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
1387 }, 1462 },
1388 CFClient::SDL_KEYDOWN => sub { 1463 CFClient::SDL_KEYDOWN => sub {
1389 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1464 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1393 video_init; 1468 video_init;
1394 } else { 1469 } else {
1395 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1470 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1396 } 1471 }
1397 }, 1472 },
1398 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1473 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1399 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1474 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1400 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1475 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1401 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1476 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1402 CFClient::SDL_USEREVENT => \&audio_music_finished, 1477 CFClient::SDL_USEREVENT => sub {
1478 if ($_[0]{code} == 1) {
1479 audio_channel_finished $_[0]{data1};
1480 } elsif ($_[0]{code} == 0) {
1481 audio_music_finished;
1482 }
1483 },
1403); 1484);
1404 1485
1405############################################################################# 1486#############################################################################
1406 1487
1407$SIG{INT} = $SIG{TERM} = sub { exit }; 1488$SIG{INT} = $SIG{TERM} = sub { exit };
1408 1489
1409$TILECACHE = CFClient::db_table "tilecache";
1410$FACEMAP = CFClient::db_table "facemap";
1411
1412CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1413
1414my %DEF_CFG = (
1415 sdl_mode => 0,
1416 width => 640,
1417 height => 480,
1418 fullscreen => 0,
1419 fast => 0,
1420 map_scale => 0.5,
1421 fow_enable => 1,
1422 fow_intensity => 0.45,
1423 fow_smooth => 0,
1424 gui_fontsize => 1,
1425 log_fontsize => 1,
1426 gauge_fontsize => 1,
1427 gauge_size => 0.35,
1428 stat_fontsize => 1,
1429 mapsize => 100,
1430 host => "crossfire.schmorp.de",
1431 say_command => 'say',
1432 audio_enable => 1,
1433 bgm_enable => 1,
1434 bgm_volume => 0.25,
1435);
1436
1437while (my ($k, $v) = each %DEF_CFG) {
1438 $CFG->{$k} = $v unless exists $CFG->{$k};
1439}
1440
1441sdl_init;
1442
1443@SDL_MODES = reverse
1444 grep $_->[0] >= 640 && $_->[1] >= 480,
1445 CFClient::SDL_ListModes;
1446
1447@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1448
1449$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1450
1451{ 1490{
1491 local $SIG{__DIE__} = sub { CFClient::fatal $_[0] };
1492
1493 CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1494
1495 $TILECACHE = CFClient::db_table "tilecache";
1496 $FACEMAP = CFClient::db_table "facemap";
1497
1498 my %DEF_CFG = (
1499 sdl_mode => 0,
1500 width => 640,
1501 height => 480,
1502 fullscreen => 0,
1503 fast => 0,
1504 map_scale => 0.5,
1505 fow_enable => 1,
1506 fow_intensity => 0.45,
1507 fow_smooth => 0,
1508 gui_fontsize => 1,
1509 log_fontsize => 1,
1510 gauge_fontsize=> 1,
1511 gauge_size => 0.35,
1512 stat_fontsize => 1,
1513 mapsize => 100,
1514 host => "crossfire.schmorp.de",
1515 say_command => 'say',
1516 audio_enable => 1,
1517 bgm_enable => 1,
1518 bgm_volume => 0.25,
1519 );
1520
1521 while (my ($k, $v) = each %DEF_CFG) {
1522 $CFG->{$k} = $v unless exists $CFG->{$k};
1523 }
1524
1525 sdl_init;
1526
1527 @SDL_MODES = reverse
1528 grep $_->[0] >= 640 && $_->[1] >= 480,
1529 CFClient::SDL_ListModes;
1530
1531 @SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1532
1533 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1534
1535 {
1452 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1536 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1453 DejaVuSans.ttf 1537 DejaVuSans.ttf
1454 DejaVuSansMono.ttf 1538 DejaVuSansMono.ttf
1455 DejaVuSans-Bold.ttf 1539 DejaVuSans-Bold.ttf
1456 DejaVuSansMono-Bold.ttf 1540 DejaVuSansMono-Bold.ttf
1457 DejaVuSans-Oblique.ttf 1541 DejaVuSans-Oblique.ttf
1458 DejaVuSansMono-Oblique.ttf 1542 DejaVuSansMono-Oblique.ttf
1459 DejaVuSans-BoldOblique.ttf 1543 DejaVuSans-BoldOblique.ttf
1460 DejaVuSansMono-BoldOblique.ttf 1544 DejaVuSansMono-BoldOblique.ttf
1461 ); 1545 );
1462 1546
1463 CFClient::add_font $_ for @fonts; 1547 CFClient::add_font $_ for @fonts;
1464 1548
1549 CFClient::pango_init;
1550
1465 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1551 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1466 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1552 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1467 1553
1468 $FONT_PROP->make_default; 1554 $FONT_PROP->make_default;
1469} 1555 }
1470 1556
1471video_init; 1557 video_init;
1472audio_init; 1558 audio_init;
1559}
1473 1560
1474Event::loop; 1561Event::loop;
1475 1562
1476END { CFClient::SDL_Quit } 1563END { CFClient::SDL_Quit }
1477 1564
… …
1507limits (like a fixed amount of face numbers). There are still limits, but 1594limits (like a fixed amount of face numbers). There are still limits, but
1508they are not arbitrarily low :) 1595they are not arbitrarily low :)
1509 1596
1510=back 1597=back
1511 1598
1599=head1 USAGE
1600
1601=head2 The Map
1602
1603The map is always displayed in the background, behind all other windows and UI elements.
1604
1605#TODO# middle-click scrolls
1606#
1607# keys:
1608#
1609# a apply
1610# keypad moves, kp_5 applies ranged attack to self
1611
1612Starting to type enters the I<completion mode>. In that mode, you can type
1613abbreviations or commands and have them executed as soon as they match a
1614valid command. This is best explained by a few examples:
1615
1616Typing B<climb> will display a list of commands with I<climb> in their
1617name, such as I<ready_skill climbing> and I<use_skill climbing>.
1618
1619You can abbreviate commands by typing only the first character of every
1620word. For example, typing I<iwor> will likely select I<invoke word of
1621recall>, while I<ccfo> will select I<cast create food>. Likewise, I<rscli>
1622will likely select I<ready_skill climbing> and I<usl> will give you
1623I<use_skill levitation>.
1624
1625=head2 The map overview
1626
1627#TODO#
1628
1629=head2 The Status area in the lower right corner
1630
1631#TODO#
1632
1633=head2 The I<Statistics>/I>Stats> window
1634
1635#TODO#
1636
1512=head1 FAQ 1637=head1 FAQ
1513 1638
1514=over 4 1639=over 4
1515 1640
1516=item The client is very sluggish and slow, what can I do about this? 1641=item The client is very sluggish and slow, what can I do about this?

Diff Legend

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