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.181 by root, Tue Apr 25 10:39:45 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
… …
364 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."); 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. 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."); 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 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 dieing. 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."); 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
… …
410 [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."], 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."],
411 ) { 453 ) {
412 my ($col, $row, $id, $label, $template, $tooltip) = @$_; 454 my ($col, $row, $id, $label, $template, $tooltip) = @$_;
413 455
414 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label 456 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFClient::UI::Label
415 can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip); 457 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, align => +1, template => $template, tooltip => $tooltip);
416 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label 458 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFClient::UI::Label
417 can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip); 459 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $black, valign => 0, align => -1, text => $label, tooltip => $tooltip);
418 } 460 }
419 461
420 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1); 462 $hb->add (my $tbl2 = new CFClient::UI::Table expand => 1);
421 463
422 my $row = 0; 464 my $row = 0;
423 my $col = 0; 465 my $col = 0;
424 466
425 my %resist_names = ( 467 my %resist_names = (
426 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.)",
427 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.)",
428 conf => "Confusion", 470 conf => "Confusion (If you are hit by confusion you will move into random directions, and likely into monsters.)",
429 fire => "Fire", 471 fire => "Fire (just your resistance to fire spells like burning hands, dragonbreath, meteor swarm fire, ...)",
430 depl => "Depletion (some monsters and other effects can cause stats depletion)", 472 depl => "Depletion (some monsters and other effects can cause stats depletion)",
431 magic => "Magic", 473 magic => "Magic (resistance to magic spells like magic missile or similar)",
432 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)", 474 drain => "Draining (some monsters (e.g. vampires) and other effects can steal experience)",
433 acid => "Acid", 475 acid => "Acid (resistance to acid, acid hurts pretty much and also corrodes your weapons)",
434 pois => "Poison", 476 pois => "Poison (resistance to getting poisoned)",
435 para => "Paralysation", 477 para => "Paralysation (this resistance affects the chance you get paralysed)",
436 deat => "Death (resistance against death spells)", 478 deat => "Death (resistance against death spells)",
437 phys => "Physical", 479 phys => "Physical (this is the resistance against physical attacks, like when a monster hit you in melee combat)",
438 blind => "Blind", 480 blind => "Blind (blind resistance affects the chance of a successful blinding attack)",
439 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)",
440 tund => "Turn undead", 482 tund => "Turn undead",
441 elec => "Electricity", 483 elec => "Electricity (resistance againt electricity, spells like large lightning, small lightning, ...)",
442 cold => "Cold", 484 cold => "Cold (this is your resistance against cold spells like icestorm, snowstorm, ...)",
443 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)", 485 ghit => "Ghost hit (special attack used by ghosts and ghost-like beings)",
444 ); 486 );
445 for (qw/slow holyw conf fire depl magic 487 for (qw/slow holyw conf fire depl magic
446 drain acid pois para deat phys 488 drain acid pois para deat phys
447 blind fear tund elec cold ghit/) 489 blind fear tund elec cold ghit/)
448 { 490 {
449 $tbl2->add ($col, $row, 491 $tbl2->add ($col, $row,
450 $STATWIDS->{"res_$_"} = 492 $STATWIDS->{"res_$_"} =
451 new CFClient::UI::Label 493 new CFClient::UI::Label
494 font => $FONT_FIXED,
452 template => "-100%", 495 template => "-100%",
453 align => +1, 496 align => +1,
454 valign => 0, 497 valign => 0,
455 can_events => 1, 498 can_events => 1,
456 can_hover => 1, 499 can_hover => 1,
457 tooltip => $resist_names{$_}, 500 tooltip => $resist_names{$_},
458 ); 501 );
459 $tbl2->add ($col + 1, $row, new CFClient::UI::Image 502 $tbl2->add ($col + 1, $row, new CFClient::UI::Image
503 font => $FONT_FIXED,
460 can_hover => 1, 504 can_hover => 1,
461 can_events => 1, 505 can_events => 1,
462 image => "ui/resist/resist_$_.png", 506 image => "ui/resist/resist_$_.png",
463 tooltip => $resist_names{$_}, 507 tooltip => $resist_names{$_},
464 ); 508 );
… …
547 591
548} 592}
549 593
550sub metaserver_dialog { 594sub metaserver_dialog {
551 my $dialog = new CFClient::UI::FancyFrame 595 my $dialog = new CFClient::UI::FancyFrame
552 title => "Metaserver", 596 title => "Server List",
553 child => (my $vbox = new CFClient::UI::VBox); 597 child => (my $vbox = new CFClient::UI::VBox);
554 598
555 $vbox->add ($dialog->{table} = new CFClient::UI::Table); 599 $vbox->add ($dialog->{table} = new CFClient::UI::Table);
556 600
557 $dialog 601 $dialog
… …
659 703
660 $METASERVER = metaserver_dialog; 704 $METASERVER = metaserver_dialog;
661 705
662 $vbox->add (new CFClient::UI::Flopper 706 $vbox->add (new CFClient::UI::Flopper
663 expand => 1, 707 expand => 1,
664 text => "Metaserver", 708 text => "Server List",
665 other => $METASERVER, 709 other => $METASERVER,
666 tooltip => "Show a list of avaible crossfire servers", 710 tooltip => "Show a list of available crossfire servers",
667 connect_open => sub { 711 connect_open => sub {
668 update_metaserver $HOST; 712 update_metaserver $HOST;
669 } 713 }
670 ); 714 );
671 } 715 }
… …
686 hidden => 1, 730 hidden => 1,
687 tooltip => "The password for your character", 731 tooltip => "The password for your character",
688 connect_changed => sub { 732 connect_changed => sub {
689 my ($self, $value) = @_; 733 my ($self, $value) = @_;
690 $CFG->{password} = $value; 734 $CFG->{password} = $value;
691 }
692 );
693
694 $table->add (0, 6, new CFClient::UI::Label valign => 0, align => 1, text => "Def. say cmd");
695 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry
696 text => $CFG->{say_command},
697 tooltip => "This is the command that will be used if you write a line in the message window entry. "
698 ."Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
699 ."But you could also set it to 'tell <playername>' to only chat with that user.",
700 connect_changed => sub {
701 my ($self, $value) = @_;
702 $CFG->{say_command} = $value;
703 } 735 }
704 ); 736 );
705 737
706 $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");
707 $table->add (1, 7, new CFClient::UI::Slider 739 $table->add (1, 7, new CFClient::UI::Slider
… …
714 746
715 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 747 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
716 }, 748 },
717 ); 749 );
718 750
719 $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
720 start_game; 757 : start_game;
758 },
721 }); 759 );
722 760
723 $dialog 761 $dialog
724} 762}
725 763
726sub message_window { 764sub message_window {
727 my $window = new CFClient::UI::FancyFrame 765 my $window = new CFClient::UI::FancyFrame
728 title => "Messages", 766 title => "Messages",
729 border_bg => [1, 1, 1, 0.5], 767 border_bg => [1, 1, 1, 1],
730 bg => [0.3, 0.3, 0.3, 0.8], 768 bg => [0, 0, 0, 0.5],
731 user_w => int $::WIDTH / 3, 769 user_w => int $::WIDTH / 3,
732 user_h => int $::HEIGHT / 5, 770 user_h => int $::HEIGHT / 5,
733 child => (my $vbox = new CFClient::UI::VBox); 771 child => (my $vbox = new CFClient::UI::VBox);
734 772
735 $vbox->add ($LOGVIEW = new CFClient::UI::TextView 773 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
… …
775 }; 813 };
776 814
777 $window 815 $window
778} 816}
779 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
780sub sdl_init { 824sub sdl_init {
781 CFClient::SDL_Init 825 CFClient::SDL_Init
782 and die "SDL::Init failed!\n"; 826 and die "SDL::Init failed!\n";
783} 827}
784 828
785sub video_init { 829sub video_init {
786 sdl_init; 830 sdl_init;
787 831
832 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
833
788 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 834 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
789 $FULLSCREEN = $CFG->{fullscreen}; 835 $FULLSCREEN = $CFG->{fullscreen};
790 $FAST = $CFG->{fast}; 836 $FAST = $CFG->{fast};
791 837
792 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 838 CFClient::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN
793 or die "SDL_SetVideoMode failed!\n"; 839 or die "SDL_SetVideoMode failed!\n";
794 840
795 $SDL_ACTIVE = 1; 841 $SDL_ACTIVE = 1;
796
797 $LAST_REFRESH = time - 0.01; 842 $LAST_REFRESH = time - 0.01;
798 843
799 CFClient::gl_init; 844 CFClient::gl_init;
800 845
801 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize}; 846 $FONTSIZE = int $HEIGHT / 40 * $CFG->{gui_fontsize};
802 847
848 $CFClient::UI::ROOT->configure (0, 0, $WIDTH, $HEIGHT);#d#
849
803 ############################################################################# 850 #############################################################################
804 851
852 unless ($DEBUG_STATUS) {
853 # create the widgets
854
805 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100; 855 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100, req_x => -1;
806 $DEBUG_STATUS->show; 856 $DEBUG_STATUS->show;
807 857
808 $STATUS_LINE = new CFClient::UI::Label 858 $STATUSBOX = new CFClient::UI::Statusbox;
809 padding => 0, 859 $STATUSBOX->add ("Use <b>Alt-Enter</b> to toggle fullscreen mode", pri => -100, color => [1, 1, 1, 0.8]);
810 y => $HEIGHT - $FONTSIZE * 1.8;
811 $STATUS_LINE->show;
812 860
813 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 861 (new CFClient::UI::Frame
814 padding => 0, 862 bg => [0, 0, 0, 0.4],
815 fontsize => 0.8, 863 req_y => -1,
816 markup => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 864 child => $STATUSBOX,
817 $ALT_ENTER_MESSAGE->show; 865 )->show;
818 $ALT_ENTER_MESSAGE->move (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h});
819 866
820 $CFClient::UI::ROOT->add ($MAPWIDGET = new CFClient::MapWidget); 867 CFClient::UI::FancyFrame->new (
821 $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;
822 $MAPWIDGET->connect (activate_console => sub { 874 $MAPWIDGET->connect (activate_console => sub {
823 my ($mapwidget, $preset) = @_; 875 my ($mapwidget, $preset) = @_;
824 876
825 if ($CONSOLE) { 877 if ($CONSOLE) {
826 $CONSOLE->{input}->{auto_activated} = 1; 878 $CONSOLE->{input}->{auto_activated} = 1;
827 $CONSOLE->{input}->focus_in; 879 $CONSOLE->{input}->focus_in;
828 880
829 if ($preset && $CONSOLE->{input}->get_text eq '') { 881 if ($preset && $CONSOLE->{input}->get_text eq '') {
830 $CONSOLE->{input}->set_text ($preset); 882 $CONSOLE->{input}->set_text ($preset);
883 }
831 } 884 }
832 } 885 });
833 }); 886 $MAPWIDGET->show;
887 $MAPWIDGET->focus_in;
834 888
835 $CFClient::UI::ROOT->add ($BUTTONBAR = new CFClient::UI::HBox); 889 $BUTTONBAR = new CFClient::UI::HBox;
836 890
837 $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);
838 $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);
839 $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);
840 894
841 $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
842 $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);
843 899
844 $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 {
845 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 901 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
846 status "Configuration Saved"; 902 status "Configuration Saved";
847 }); 903 });
848 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 {
849 $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 }
850} 917}
851 918
852sub video_shutdown { 919sub video_shutdown {
853 $CFClient::UI::ROOT->{children} = [];
854 undef $CFClient::UI::GRAB;
855 undef $CFClient::UI::HOVER;
856 undef $SDL_ACTIVE; 920 undef $SDL_ACTIVE;
857} 921}
858 922
859my @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#
860my $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}
861 931
862sub audio_music_finished { 932sub audio_music_finished {
863 return unless $CFG->{bgm_enable}; 933 return unless $CFG->{bgm_enable};
864 934
865 # TODO: hack, do play loop and mood music 935 # TODO: hack, do play loop and mood music
… …
869 push @bgmusic, shift @bgmusic; 939 push @bgmusic, shift @bgmusic;
870} 940}
871 941
872sub audio_init { 942sub audio_init {
873 if ($CFG->{audio_enable}) { 943 if ($CFG->{audio_enable}) {
874 if (open my $fh, "<:utf8", CFClient::find_rcfile "sounds/config") { 944 if (open my $fh, "<", CFClient::find_rcfile "sounds/config") {
875 $SDL_MIXER = !CFClient::Mix_OpenAudio; 945 $SDL_MIXER = !CFClient::Mix_OpenAudio;
876 CFClient::Mix_AllocateChannels 8; 946 CFClient::Mix_AllocateChannels 8;
877 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128; 947 CFClient::MixMusic::volume $CFG->{bgm_volume} * 128;
878 948
879 audio_music_finished; 949 audio_music_finished;
… …
906} 976}
907 977
908my %animate_object; 978my %animate_object;
909my $animate_timer; 979my $animate_timer;
910 980
911my $want_refresh;
912my $can_refresh;
913
914my $fps = 9; 981my $fps = 9;
915 982
916sub force_refresh { 983sub force_refresh {
917 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 984 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
918 debug sprintf "%3.2f", $fps; 985 debug sprintf "%3.2f", $fps;
919 986
920 $want_refresh = 0;
921 $can_refresh = 0;
922
923 $CFClient::UI::ROOT->draw; 987 $CFClient::UI::ROOT->draw;
924
925 CFClient::SDL_GL_SwapBuffers; 988 CFClient::SDL_GL_SwapBuffers;
926 989
990 $WANT_REFRESH = 0;
991 $CAN_REFRESH = 0;
927 $LAST_REFRESH = $NOW; 992 $LAST_REFRESH = $NOW;
928} 993}
929 994
930my $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 {
931 $NOW = time; 996 $NOW = time;
… …
933 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 998 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
934 for CFClient::SDL_PollEvent; 999 for CFClient::SDL_PollEvent;
935 1000
936 if (%animate_object) { 1001 if (%animate_object) {
937 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 1002 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
938 $want_refresh++; 1003 $WANT_REFRESH++;
939 } 1004 }
940 1005
941 if ($want_refresh) { 1006 if ($WANT_REFRESH) {
942 force_refresh; 1007 force_refresh;
943 } else { 1008 } else {
944 $can_refresh = 1; 1009 $CAN_REFRESH = 1;
945 } 1010 }
946}); 1011});
947
948sub refresh {
949 $want_refresh++;
950}
951 1012
952sub animation_start { 1013sub animation_start {
953 my ($widget) = @_; 1014 my ($widget) = @_;
954 $animate_object{$widget} = $widget; 1015 $animate_object{$widget} = $widget;
955} 1016}
… …
1034# at worst. 1095# at worst.
1035sub conn::flood_fill { 1096sub conn::flood_fill {
1036 my ($self, $gx, $gy, $path, $hash, $flags) = @_; 1097 my ($self, $gx, $gy, $path, $hash, $flags) = @_;
1037 1098
1038 # the server does not allow map paths > 6 1099 # the server does not allow map paths > 6
1039 return if 6 <= length $path; 1100 return if 7 <= length $path;
1040 1101
1041 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}}; 1102 my ($x0, $y0, $x1, $y1) = @{$self->{neigh_rect}};
1042 1103
1043 for ( 1104 for (
1044 [1, 0, -1], 1105 [1, 0, -1],
… …
1087 1148
1088 $self->flush_map; 1149 $self->flush_map;
1089 1150
1090 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 1151 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
1091 1152
1092 my $mapmapw = 250; 1153 my $mapmapw = $MAPMAP->{w};
1093 my $mapmaph = 250; 1154 my $mapmaph = $MAPMAP->{h};
1094 1155
1095 $self->{neigh_rect} = [ 1156 $self->{neigh_rect} = [
1096 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5, 1157 $ox - $mapmapw * 0.5, $oy - $mapmapw * 0.5,
1097 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h, 1158 $ox + $mapmapw * 0.5 + $w, $oy + $mapmapw * 0.5 + $h,
1098 ]; 1159 ];
… …
1267 [0.55, 0.41, 0.13], 1328 [0.55, 0.41, 0.13],
1268 [0.99, 0.77, 0.26], 1329 [0.99, 0.77, 0.26],
1269 [0.74, 0.65, 0.41], 1330 [0.74, 0.65, 0.41],
1270 ); 1331 );
1271 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
1272 $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);
1273} 1354}
1274 1355
1275sub conn::spell_add { 1356sub conn::spell_add {
1276 my ($self, $spell) = @_; 1357 my ($self, $spell) = @_;
1277 1358
… …
1290 1371
1291 for my $skill (values %{$self->{skill_info}}) { 1372 for my $skill (values %{$self->{skill_info}}) {
1292 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'"); 1373 $MAPWIDGET->add_command ("ready_skill $skill", "Ready the skill '$skill'");
1293 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'"); 1374 $MAPWIDGET->add_command ("use_skill $skill", "Immediately use the skill '$skill'");
1294 } 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;
1295} 1385}
1296 1386
1297sub update_floorbox { 1387sub update_floorbox {
1298 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub { 1388 $CFClient::UI::ROOT->on_refresh ($FLOORBOX => sub {
1389 return unless $CONN;
1390
1299 $FLOORBOX->clear; 1391 $FLOORBOX->clear;
1300 $FLOORBOX->add (new CFClient::UI::Empty expand => 1); 1392 $FLOORBOX->add (new CFClient::UI::Empty expand => 1);
1301 1393
1302 my @items = values %{ $CONN->{container}{0} }; 1394 my $count = 4;
1303 1395 for (@{ $CONN->{container}{0} }) {
1304 # we basically have to use the same sorting as everybody else 1396 if (--$count) {
1305 @items = sort { $a->{type} <=> $b->{type} } @items; 1397 $FLOORBOX->add (new CFClient::UI::InventoryItem item => $_);
1306 1398 } else {
1307 for my $item (reverse @items) { 1399 $FLOORBOX->add (new CFClient::UI::Label text => "More...");
1308 my $desc = $item->{nrof} < 2
1309 ? $item->{name}
1310 : "$item->{nrof} $item->{name_pl}";
1311 # todo: animation widget, face widget, weight(?) etc.
1312 $FLOORBOX->add (my $hbox = new CFClient::UI::HBox
1313 tooltip => (CFClient::UI::Label->escape ($desc)
1314 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
1315 can_hover => 1,
1316 can_events => 1,
1317 connect_button_down => sub {
1318 my ($self, $ev, $x, $y) = @_;
1319
1320 # todo: maybe put examine on 1? but should just be a tooltip :(
1321 if ($ev->{button} == 1) {
1322 $CONN->send ("move $CONN->{player}{tag} $item->{tag} 0");
1323 } elsif ($ev->{button} == 2) {
1324 $CONN->send ("apply $item->{tag}");
1325 } elsif ($ev->{button} == 3) {
1326 # examine, lock, mark, maybe other things
1327 warn "MENU not implemented yet\n";
1328 }
1329
1330 1
1331 }, 1400 last;
1332 );
1333
1334 $hbox->add (new CFClient::UI::Face
1335 can_events => 0,
1336 face => $item->{face},
1337 anim => $item->{anim},
1338 animspeed => $item->{animspeed},
1339 );
1340 1401 }
1341 $hbox->add (new CFClient::UI::Label
1342 can_events => 0,
1343 text => $desc,
1344 );
1345 } 1402 }
1346 }); 1403 });
1347 refresh; 1404
1405 $WANT_REFRESH++;
1348} 1406}
1349 1407
1350sub conn::container_add { 1408sub conn::container_add {
1351 my ($self, $id, $items) = @_; 1409 my ($self, $tag, $items) = @_;
1352 1410
1353 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
1354 # $self-<{player}{tag} => player inv 1416 # $self-<{player}{tag} => player inv
1355 #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}};
1356} 1418}
1357 1419
1358sub conn::container_clear { 1420sub conn::container_clear {
1359 my ($self, $id) = @_; 1421 my ($self, $tag) = @_;
1360 1422
1361 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
1362# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0}; 1428# use PApp::Util; warn PApp::Util::dumpval $self->{container}{0};
1363} 1429}
1364 1430
1365sub conn::item_delete { 1431sub conn::item_delete {
1366 my ($self, @items) = @_; 1432 my ($self, @items) = @_;
1367 1433
1368 for (@items) { 1434 for (@items) {
1369 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};
1370 } 1439 }
1371} 1440}
1372 1441
1373sub conn::item_update { 1442sub conn::item_update {
1374 my ($self, $item) = @_; 1443 my ($self, $item) = @_;
1375 1444
1376 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};
1377} 1449}
1378 1450
1379%SDL_CB = ( 1451%SDL_CB = (
1380 CFClient::SDL_QUIT => sub { 1452 CFClient::SDL_QUIT => sub {
1381 Event::unloop -1; 1453 Event::unloop -1;
1382 }, 1454 },
1383 CFClient::SDL_VIDEORESIZE => sub { 1455 CFClient::SDL_VIDEORESIZE => sub {
1384 }, 1456 },
1385 CFClient::SDL_VIDEOEXPOSE => \&refresh, 1457 CFClient::SDL_VIDEOEXPOSE => sub {
1458 $WANT_REFRESH++;
1459 },
1386 CFClient::SDL_ACTIVEEVENT => sub { 1460 CFClient::SDL_ACTIVEEVENT => sub {
1387# 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#
1388 }, 1462 },
1389 CFClient::SDL_KEYDOWN => sub { 1463 CFClient::SDL_KEYDOWN => sub {
1390 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) { 1464 if ($_[0]{mod} & CFClient::KMOD_ALT && $_[0]{sym} == 13) {
… …
1394 video_init; 1468 video_init;
1395 } else { 1469 } else {
1396 CFClient::UI::feed_sdl_key_down_event ($_[0]); 1470 CFClient::UI::feed_sdl_key_down_event ($_[0]);
1397 } 1471 }
1398 }, 1472 },
1399 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event, 1473 CFClient::SDL_KEYUP => \&CFClient::UI::feed_sdl_key_up_event,
1400 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event, 1474 CFClient::SDL_MOUSEMOTION => \&CFClient::UI::feed_sdl_motion_event,
1401 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event, 1475 CFClient::SDL_MOUSEBUTTONDOWN => \&CFClient::UI::feed_sdl_button_down_event,
1402 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event, 1476 CFClient::SDL_MOUSEBUTTONUP => \&CFClient::UI::feed_sdl_button_up_event,
1403 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 },
1404); 1484);
1405 1485
1406############################################################################# 1486#############################################################################
1407 1487
1408$SIG{INT} = $SIG{TERM} = sub { exit }; 1488$SIG{INT} = $SIG{TERM} = sub { exit };
1409 1489
1410$TILECACHE = CFClient::db_table "tilecache";
1411$FACEMAP = CFClient::db_table "facemap";
1412
1413CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
1414
1415my %DEF_CFG = (
1416 sdl_mode => 0,
1417 width => 640,
1418 height => 480,
1419 fullscreen => 0,
1420 fast => 0,
1421 map_scale => 0.5,
1422 fow_enable => 1,
1423 fow_intensity => 0.45,
1424 fow_smooth => 0,
1425 gui_fontsize => 1,
1426 log_fontsize => 1,
1427 gauge_fontsize => 1,
1428 gauge_size => 0.35,
1429 stat_fontsize => 1,
1430 mapsize => 100,
1431 host => "crossfire.schmorp.de",
1432 say_command => 'say',
1433 audio_enable => 1,
1434 bgm_enable => 1,
1435 bgm_volume => 0.25,
1436);
1437
1438while (my ($k, $v) = each %DEF_CFG) {
1439 $CFG->{$k} = $v unless exists $CFG->{$k};
1440}
1441
1442sdl_init;
1443
1444@SDL_MODES = reverse
1445 grep $_->[0] >= 640 && $_->[1] >= 480,
1446 CFClient::SDL_ListModes;
1447
1448@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
1449
1450$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
1451
1452{ 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 {
1453 my @fonts = map CFClient::find_rcfile "fonts/$_", qw( 1536 my @fonts = map CFClient::find_rcfile "fonts/$_", qw(
1454 DejaVuSans.ttf 1537 DejaVuSans.ttf
1455 DejaVuSansMono.ttf 1538 DejaVuSansMono.ttf
1456 DejaVuSans-Bold.ttf 1539 DejaVuSans-Bold.ttf
1457 DejaVuSansMono-Bold.ttf 1540 DejaVuSansMono-Bold.ttf
1458 DejaVuSans-Oblique.ttf 1541 DejaVuSans-Oblique.ttf
1459 DejaVuSansMono-Oblique.ttf 1542 DejaVuSansMono-Oblique.ttf
1460 DejaVuSans-BoldOblique.ttf 1543 DejaVuSans-BoldOblique.ttf
1461 DejaVuSansMono-BoldOblique.ttf 1544 DejaVuSansMono-BoldOblique.ttf
1462 ); 1545 );
1463 1546
1464 CFClient::add_font $_ for @fonts; 1547 CFClient::add_font $_ for @fonts;
1465 1548
1549 CFClient::pango_init;
1550
1466 $FONT_PROP = new_from_file CFClient::Font $fonts[0]; 1551 $FONT_PROP = new_from_file CFClient::Font $fonts[0];
1467 $FONT_FIXED = new_from_file CFClient::Font $fonts[1]; 1552 $FONT_FIXED = new_from_file CFClient::Font $fonts[1];
1468 1553
1469 $FONT_PROP->make_default; 1554 $FONT_PROP->make_default;
1470} 1555 }
1471 1556
1472video_init; 1557 video_init;
1473audio_init; 1558 audio_init;
1559}
1474 1560
1475Event::loop; 1561Event::loop;
1476 1562
1477END { CFClient::SDL_Quit } 1563END { CFClient::SDL_Quit }
1478 1564

Diff Legend

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