… | |
… | |
70 | close CFG; |
70 | close CFG; |
71 | } |
71 | } |
72 | |
72 | |
73 | mkdir "$Crossfire::VARDIR/cfplus", 0777; |
73 | mkdir "$Crossfire::VARDIR/cfplus", 0777; |
74 | |
74 | |
|
|
75 | our $DB_ENV; |
|
|
76 | |
75 | { |
77 | { |
76 | use strict; |
78 | use strict; |
77 | |
79 | |
|
|
80 | my $recover = $BerkeleyDB::db_version >= 4.4 |
|
|
81 | ? eval "DB_REGISTER | DB_RECOVER" |
|
|
82 | : 0; |
|
|
83 | |
78 | our $DB_ENV = new BerkeleyDB::Env |
84 | $DB_ENV = new BerkeleyDB::Env |
79 | -Home => "$Crossfire::VARDIR/cfplus", |
85 | -Home => "$Crossfire::VARDIR/cfplus", |
80 | -Cachesize => 1_000_000, |
86 | -Cachesize => 1_000_000, |
81 | -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt", |
87 | -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt", |
82 | # -ErrPrefix => "DATABASE", |
88 | # -ErrPrefix => "DATABASE", |
83 | -Verbose => 1, |
89 | -Verbose => 1, |
84 | -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, |
90 | -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, |
85 | -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE | DB_TXN_WRITE_NOSYNC, |
91 | -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, |
86 | or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; |
92 | or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; |
87 | } |
93 | } |
88 | |
94 | |
89 | sub db_table($) { |
95 | sub db_table($) { |
90 | my ($table) = @_; |
96 | my ($table) = @_; |
… | |
… | |
245 | |
251 | |
246 | if ($self->{container} == $::CONN->{player}{tag}) { |
252 | if ($self->{container} == $::CONN->{player}{tag}) { |
247 | $targ = $::CONN->{open_container}; |
253 | $targ = $::CONN->{open_container}; |
248 | } |
254 | } |
249 | |
255 | |
250 | $::CONN->send ("move $targ $self->{tag} 0"); |
256 | $::CONN->send ("move $targ $self->{tag} 0") |
|
|
257 | if $targ || !($self->{flags} & F_LOCKED); |
251 | } elsif ($ev->{button} == 1) { |
258 | } elsif ($ev->{button} == 1) { |
252 | $::CONN->send ("examine $self->{tag}"); |
259 | $::CONN->send ("examine $self->{tag}"); |
253 | } elsif ($ev->{button} == 2) { |
260 | } elsif ($ev->{button} == 2) { |
254 | $::CONN->send ("apply $self->{tag}"); |
261 | $::CONN->send ("apply $self->{tag}"); |
255 | } elsif ($ev->{button} == 3) { |
262 | } elsif ($ev->{button} == 3) { |