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.125 by root, Thu Nov 16 19:42:46 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 2006 UTC

… …
123 123
124our $INVENTORY_PAGE; 124our $INVENTORY_PAGE;
125our $STATS_PAGE; 125our $STATS_PAGE;
126our $SKILL_PAGE; 126our $SKILL_PAGE;
127our $SPELL_PAGE; 127our $SPELL_PAGE;
128our $SPELL_LIST;
128 129
129our $HELP_WINDOW; 130our $HELP_WINDOW;
130our $MESSAGE_WINDOW; 131our $MESSAGE_WINDOW;
131our $FLOORBOX; 132our $FLOORBOX;
132our $GAUGES; 133our $GAUGES;
… …
1263 $table 1264 $table
1264} 1265}
1265 1266
1266my %SORT_ORDER = ( 1267my %SORT_ORDER = (
1267 type => undef, 1268 type => undef,
1268 mtime => sub { sort { 1269 mtime => sub {
1270 my $NOW = time;
1271 sort {
1272 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1273 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1274
1269 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1275 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1270 or $b->{mtime} <=> $a->{mtime} 1276 or $btime <=> $atime
1271 or $a->{type} <=> $b->{type} 1277 or $a->{type} <=> $b->{type}
1278 } @_
1272 } @_ }, 1279 },
1273 weight => sub { sort { 1280 weight => sub { sort {
1274 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1275 or $a->{type} <=> $b->{type} 1282 or $a->{type} <=> $b->{type}
1276 } @_ }, 1283 } @_ },
1277); 1284);
… …
1302 #TODO# update to weigh/maxweight 1309 #TODO# update to weigh/maxweight
1303 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1304 1311
1305 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1306 $sw1->add ($INV = new CFPlus::UI::Inventory); 1313 $sw1->add ($INV = new CFPlus::UI::Inventory);
1314 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1307 1315
1308 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1316 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1309 1317
1310 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1318 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1311 1319
… …
1351 $ntb->add ( 1359 $ntb->add (
1352 "Skills (F3)" => $SKILL_PAGE = skill_window, 1360 "Skills (F3)" => $SKILL_PAGE = skill_window,
1353 "Shows all your Skills." 1361 "Shows all your Skills."
1354 ); 1362 );
1355 1363
1356 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1364 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1357 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1365 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1358 $ntb->add ( 1366 $ntb->add (
1359 "Spellbook (F4)" => $spellsw, 1367 "Spellbook (F4)" => $spellsw,
1360 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1368 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1361 ); 1369 );
1362 $ntb->add ( 1370 $ntb->add (
… …
1913 CFPlus::Mix_AllocateChannels 8; 1921 CFPlus::Mix_AllocateChannels 8;
1914 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1922 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1915 1923
1916 audio_music_finished; 1924 audio_music_finished;
1917 1925
1926 local $_;
1918 while (<$fh>) { 1927 while (<$fh>) {
1919 next if /^\s*#/; 1928 next if /^\s*#/;
1920 next if /^\s*$/; 1929 next if /^\s*$/;
1921 1930
1922 my ($file, $volume, $event) = split /\s+/, $_, 3; 1931 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
2056 log_fontsize => 0.7, 2065 log_fontsize => 0.7,
2057 gauge_fontsize => 1, 2066 gauge_fontsize => 1,
2058 gauge_size => 0.35, 2067 gauge_size => 0.35,
2059 stat_fontsize => 0.7, 2068 stat_fontsize => 0.7,
2060 mapsize => 100, 2069 mapsize => 100,
2061 say_command => 'say', 2070 say_command => 'chat',
2062 audio_enable => 1, 2071 audio_enable => 1,
2063 bgm_enable => 1, 2072 bgm_enable => 1,
2064 bgm_volume => 0.25, 2073 bgm_volume => 0.25,
2065 face_prefetch => 0, 2074 face_prefetch => 0,
2066 output_sync => 1, 2075 output_sync => 1,

Diff Legend

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