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.66 by elmex, Thu Jun 8 19:43:26 2006 UTC vs.
Revision 1.73 by root, Sat Jun 17 15:07:54 2006 UTC

… …
84our $CONSOLE; 84our $CONSOLE;
85our $METASERVER; 85our $METASERVER;
86our $LOGIN_BUTTON; 86our $LOGIN_BUTTON;
87our $QUIT_DIALOG; 87our $QUIT_DIALOG;
88our $HOST_ENTRY; 88our $HOST_ENTRY;
89our $SERVER_INFO;
89 90
90our $SETUP_DIALOG; 91our $SETUP_DIALOG;
91our $SETUP_NOTEBOOK; 92our $SETUP_NOTEBOOK;
92our $SETUP_SERVER; 93our $SETUP_SERVER;
93our $SETUP_KEYBOARD; 94our $SETUP_KEYBOARD;
… …
362sub stop_game { 363sub stop_game {
363 $LOGIN_BUTTON->set_text ("Login"); 364 $LOGIN_BUTTON->set_text ("Login");
364 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 365 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
365 $SETUP_DIALOG->show; 366 $SETUP_DIALOG->show;
366 $INV_WINDOW->hide; 367 $INV_WINDOW->hide;
368 $SETUP_SPELLS->clear_spells;
367 369
368 return unless $CONN; 370 return unless $CONN;
369 371
370 status "connection closed"; 372 status "connection closed";
371 373
… …
814 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED}); 816 $STATWIDS->{st_spd} ->set_text (sprintf "%.1f", $stats->{+CS_STAT_SPEED});
815 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP}); 817 $STATWIDS->{st_wspd}->set_text (sprintf "%.1f", $stats->{+CS_STAT_WEAP_SP});
816 818
817 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000); 819 $STATWIDS->{m_weight}->set_text (sprintf "Max weight: %.1fkg", $stats->{+CS_STAT_WEIGHT_LIM} / 1000);
818 820
819 # TODO: replace by CS_STAT_RES_xxx constants
820 my %tbl = ( 821 my %tbl = (
821 phys => 100, 822 phys => CS_STAT_RES_PHYS,
822 magic => 101, 823 magic => CS_STAT_RES_MAG,
823 fire => 102, 824 fire => CS_STAT_RES_FIRE,
824 elec => 103, 825 elec => CS_STAT_RES_ELEC,
825 cold => 104, 826 cold => CS_STAT_RES_COLD,
826 conf => 105, 827 conf => CS_STAT_RES_CONF,
827 acid => 106, 828 acid => CS_STAT_RES_ACID,
828 drain => 107, 829 drain => CS_STAT_RES_DRAIN,
829 ghit => 108, 830 ghit => CS_STAT_RES_GHOSTHIT,
830 pois => 109, 831 pois => CS_STAT_RES_POISON,
831 slow => 110, 832 slow => CS_STAT_RES_SLOW,
832 para => 111, 833 para => CS_STAT_RES_PARA,
833 tund => 112, 834 tund => CS_STAT_TURN_UNDEAD,
834 fear => 113, 835 fear => CS_STAT_RES_FEAR,
835 depl => 113, 836 depl => CS_STAT_RES_DEPLETE,
836 deat => 115, 837 deat => CS_STAT_RES_DEATH,
837 holyw => 116, 838 holyw => CS_STAT_RES_HOLYWORD,
838 blind => 117, 839 blind => CS_STAT_RES_BLIND,
839 ); 840 );
840 841
841 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}}) 842 $STATWIDS->{"res_$_"}->set_text (sprintf "%d%", $stats->{$tbl{$_}})
842 for keys %tbl; 843 for keys %tbl;
843} 844}
… …
1076 my ($self, $value) = @_; 1077 my ($self, $value) = @_;
1077 $CFG->{say_command} = $value; 1078 $CFG->{say_command} = $value;
1078 } 1079 }
1079 ); 1080 );
1080 1081
1082 $vbox->add (new CFClient::UI::Label
1083 text => "Server Info",
1084 fontsize => 1.2,
1085 padding_y => 8,
1086 fg => [1, 1, 0, 1],
1087 );
1088
1089 $vbox->add ($SERVER_INFO = new CFClient::UI::Label ellipsise => 0);
1090
1081 $vbox 1091 $vbox
1082} 1092}
1083 1093
1084sub message_window { 1094sub message_window {
1085 my $window = new CFClient::UI::FancyFrame 1095 my $window = new CFClient::UI::FancyFrame
… …
1342 } 1352 }
1343 } 1353 }
1344 }; 1354 };
1345 1355
1346 my $vb = new CFClient::UI::VBox; 1356 my $vb = new CFClient::UI::VBox;
1357 $vb->add (my $hb = new CFClient::UI::HBox);
1358 $hb->add (new CFClient::UI::Label text => "only shift-up stops fire");
1359 $hb->add (new CFClient::UI::CheckBox
1360 expand => 1,
1361 state => $CFG->{shift_fire_stop},
1362 tooltip => "If this checkbox is enabled you will stop fire only if you stop pressing shift",
1363 on_changed => sub {
1364 my ($cbox, $value) = @_;
1365 $CFG->{shift_fire_stop} = $value;
1366 });
1367
1347 $vb->add ($binding_list); 1368 $vb->add ($binding_list);
1348 $vb->add (my $hb = new CFClient::UI::HBox); 1369 $vb->add (my $hb = new CFClient::UI::HBox);
1349 1370
1350 $hb->add (new CFClient::UI::Button 1371 $hb->add (new CFClient::UI::Button
1351 text => "record new", 1372 text => "record new",
… …
1494 name => "mapmap", 1515 name => "mapmap",
1495 x => 0, 1516 x => 0,
1496 y => $FONTSIZE + 8, 1517 y => $FONTSIZE + 8,
1497 border_bg => [1, 1, 1, 192/255], 1518 border_bg => [1, 1, 1, 192/255],
1498 bg => [1, 1, 1, 0], 1519 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1499 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1500 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.", 1522 tooltip => "<b>Map</b>. On servers that support this feature, this will display an overview of the surrounding areas.",
1501 ), 1523 ),
1502 )->show; 1524 )->show;
1503 1525
… …
1607 1629
1608 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1630 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1609} 1631}
1610 1632
1611sub video_shutdown { 1633sub video_shutdown {
1634 CFClient::OpenGL::shutdown;
1635
1612 undef $SDL_ACTIVE; 1636 undef $SDL_ACTIVE;
1613} 1637}
1614 1638
1615my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d# 1639my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1616my $bgmusic;#TODO#hack#d# 1640my $bgmusic;#TODO#hack#d#
… …
1912 video_init; 1936 video_init;
1913 audio_init; 1937 audio_init;
1914} 1938}
1915 1939
1916Event::loop; 1940Event::loop;
1941#CFClient::SDL_Quit;
1942#CFClient::_exit 0;
1917 1943
1918END { CFClient::SDL_Quit } 1944END { CFClient::SDL_Quit }
1919 1945
1920=head1 NAME 1946=head1 NAME
1921 1947

Diff Legend

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