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.57 by root, Mon Jun 5 21:10:04 2006 UTC vs.
Revision 1.58 by root, Mon Jun 5 22:07:43 2006 UTC

935sub autopickup_setup { 935sub autopickup_setup {
936 my $table = new CFClient::UI::Table; 936 my $table = new CFClient::UI::Table;
937 937
938 for ( 938 for (
939 ["General", 0, 0, 939 ["General", 0, 0,
940 ["Enable autopickup" => CFClient::Pickup::PU_NEWMODE], 940 ["Enable autopickup" => PICKUP_NEWMODE],
941 ["Inhibit autopickup" => CFClient::Pickup::PU_INHIBIT], 941 ["Inhibit autopickup" => PICKUP_INHIBIT],
942 ["Stop before pickup" => CFClient::Pickup::PU_STOP], 942 ["Stop before pickup" => PICKUP_STOP],
943 ["Debug autopickup" => CFClient::Pickup::PU_DEBUG], 943 ["Debug autopickup" => PICKUP_DEBUG],
944 ], 944 ],
945 ["Weapons", 0, 6, 945 ["Weapons", 0, 6,
946 ["All weapons" => CFClient::Pickup::PU_ALLWEAPON], 946 ["All weapons" => PICKUP_ALLWEAPON],
947 ["Missile weapons" => CFClient::Pickup::PU_MISSILEWEAPON], 947 ["Missile weapons" => PICKUP_MISSILEWEAPON],
948 ["Bows" => CFClient::Pickup::PU_BOW], 948 ["Bows" => PICKUP_BOW],
949 ["Arrows" => CFClient::Pickup::PU_ARROW], 949 ["Arrows" => PICKUP_ARROW],
950 ], 950 ],
951 ["Armour", 0, 12, 951 ["Armour", 0, 12,
952 ["Helmets" => CFClient::Pickup::PU_HELMET], 952 ["Helmets" => PICKUP_HELMET],
953 ["Shields" => CFClient::Pickup::PU_SHIELD], 953 ["Shields" => PICKUP_SHIELD],
954 ["Body Armour" => CFClient::Pickup::PU_ARMOUR], 954 ["Body Armour" => PICKUP_ARMOUR],
955 ["Boots" => CFClient::Pickup::PU_BOOTS], 955 ["Boots" => PICKUP_BOOTS],
956 ["Gloves" => CFClient::Pickup::PU_GLOVES], 956 ["Gloves" => PICKUP_GLOVES],
957 ["Cloaks" => CFClient::Pickup::PU_CLOAK], 957 ["Cloaks" => PICKUP_CLOAK],
958 ], 958 ],
959 959
960 ["Readables", 2, 2, 960 ["Readables", 2, 2,
961 ["Spellbooks" => CFClient::Pickup::PU_SPELLBOOK], 961 ["Spellbooks" => PICKUP_SPELLBOOK],
962 ["Skillscrolls" => CFClient::Pickup::PU_SKILLSCROLL], 962 ["Skillscrolls" => PICKUP_SKILLSCROLL],
963 ["Normal Books/Scrolls" => CFClient::Pickup::PU_READABLES], 963 ["Normal Books/Scrolls" => PICKUP_READABLES],
964 ], 964 ],
965 ["Misc", 2, 7, 965 ["Misc", 2, 7,
966 ["Food" => CFClient::Pickup::PU_FOOD], 966 ["Food" => PICKUP_FOOD],
967 ["Drinks" => CFClient::Pickup::PU_DRINK], 967 ["Drinks" => PICKUP_DRINK],
968 ["Valuables (Money, Gems)" => CFClient::Pickup::PU_VALUABLES], 968 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
969 ["Keys" => CFClient::Pickup::PU_KEY], 969 ["Keys" => PICKUP_KEY],
970 ["Magical Items" => CFClient::Pickup::PU_MAGICAL], 970 ["Magical Items" => PICKUP_MAGICAL],
971 ["Potions" => CFClient::Pickup::PU_POTION], 971 ["Potions" => PICKUP_POTION],
972 ["Magic Devices" => CFClient::Pickup::PU_MAGIC_DEVICE], 972 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
973 ["Ignore cursed" => CFClient::Pickup::PU_NOT_CURSED], 973 ["Ignore cursed" => PICKUP_NOT_CURSED],
974 ["Jewelery" => CFClient::Pickup::PU_JEWELS], 974 ["Jewelery" => PICKUP_JEWELS],
975 ], 975 ],
976 ) 976 )
977 { 977 {
978 my ($title, $x, $y, @bits) = @$_; 978 my ($title, $x, $y, @bits) = @$_;
979 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 979 $table->add ($x, $y, new CFClient::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1273 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1); 1273 filter => new CFClient::UI::ScrolledWindow xxx => 1, expand => 1, scroll_y => 1);
1274 1274
1275 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1275 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1276 "Configure the server to play on, your username, password and other server-related options."); 1276 "Configure the server to play on, your username, password and other server-related options.");
1277 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1277 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup,
1278 "Configure autopicking stetings, i.e. which items you will pick up automatically when walking over them."); 1278 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1279 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1279 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1280 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1280 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1281 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1281 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1282 "Configure the use of audio, sound effects and background music."); 1282 "Configure the use of audio, sound effects and background music.");
1283 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1283 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines