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.65 by root, Thu Jun 8 01:51:32 2006 UTC vs.
Revision 1.72 by elmex, Tue Jun 13 18:14:03 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
… …
1209 ["Potions" => PICKUP_POTION], 1219 ["Potions" => PICKUP_POTION],
1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1220 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1211 ["Ignore cursed" => PICKUP_NOT_CURSED], 1221 ["Ignore cursed" => PICKUP_NOT_CURSED],
1212 ["Jewelery" => PICKUP_JEWELS], 1222 ["Jewelery" => PICKUP_JEWELS],
1213 ], 1223 ],
1224 ["Weight/Value ratio", 2, 17]
1214 ) 1225 )
1215 { 1226 {
1216 my ($title, $x, $y, @bits) = @$_; 1227 my ($title, $x, $y, @bits) = @$_;
1217 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1228 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1218 1229
… …
1235 $::CONN->send_command ("pickup $::CFG->{pickup}") 1246 $::CONN->send_command ("pickup $::CFG->{pickup}")
1236 if defined $::CONN; 1247 if defined $::CONN;
1237 }); 1248 });
1238 } 1249 }
1239 } 1250 }
1251
1252 $table->add (2, 18, new CFClient::UI::ValSlider
1253 range => [0, 0, 16, 1, 1],
1254 to_value => sub { ">= " . 5 * $_[0] },
1255 on_changed => sub {
1256 my ($slider, $value) = @_;
1257
1258 $::CFG->{pickup} &= ~0x7;
1259 $::CFG->{pickup} |= int $value
1260 if $value;
1261 1;
1262 });
1263 $table->add (3, 18, new CFClient::UI::Button
1264 text => "set",
1265 on_activate => sub {
1266 $::CONN->send_command ("pickup $::CFG->{pickup}")
1267 if defined $::CONN;
1268 1;
1269 });
1240 1270
1241 $table 1271 $table
1242} 1272}
1243 1273
1244sub inventory_window { 1274sub inventory_window {
… …
1322 } 1352 }
1323 } 1353 }
1324 }; 1354 };
1325 1355
1326 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
1327 $vb->add ($binding_list); 1368 $vb->add ($binding_list);
1328 $vb->add (my $hb = new CFClient::UI::HBox); 1369 $vb->add (my $hb = new CFClient::UI::HBox);
1329 1370
1330 $hb->add (new CFClient::UI::Button 1371 $hb->add (new CFClient::UI::Button
1331 text => "record new", 1372 text => "record new",
… …
1474 name => "mapmap", 1515 name => "mapmap",
1475 x => 0, 1516 x => 0,
1476 y => $FONTSIZE + 8, 1517 y => $FONTSIZE + 8,
1477 border_bg => [1, 1, 1, 192/255], 1518 border_bg => [1, 1, 1, 192/255],
1478 bg => [1, 1, 1, 0], 1519 bg => [1, 1, 1, 0],
1520 no_close_button => 1,
1479 child => ($MAPMAP = new CFClient::MapWidget::MapMap 1521 child => ($MAPMAP = new CFClient::MapWidget::MapMap
1480 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.",
1481 ), 1523 ),
1482 )->show; 1524 )->show;
1483 1525
… …
1892 video_init; 1934 video_init;
1893 audio_init; 1935 audio_init;
1894} 1936}
1895 1937
1896Event::loop; 1938Event::loop;
1939#CFClient::SDL_Quit;
1940#CFClient::_exit 0;
1897 1941
1898END { CFClient::SDL_Quit } 1942END { CFClient::SDL_Quit }
1899 1943
1900=head1 NAME 1944=head1 NAME
1901 1945

Diff Legend

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