ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.419 by root, Sun Apr 13 01:34:09 2008 UTC

… …
1775our $MAX_RESET = 3600; 1775our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1776our $DEFAULT_RESET = 3000;
1777 1777
1778sub generate_random_map { 1778sub generate_random_map {
1779 my ($self, $rmp) = @_; 1779 my ($self, $rmp) = @_;
1780
1781 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1782
1780 # mit "rum" bekleckern, nicht 1783 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1784 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1785 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1786 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1787 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1906 1909
1907# the temporary/swap location 1910# the temporary/swap location
1908sub save_path { 1911sub save_path {
1909 my ($self) = @_; 1912 my ($self) = @_;
1910 1913
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1915 "$TMPDIR/$path.map"
1913} 1916}
1914 1917
1915# the unique path, undef == no special unique path 1918# the unique path, undef == no special unique path
1916sub uniq_path { 1919sub uniq_path {
1917 my ($self) = @_; 1920 my ($self) = @_;
1918 1921
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1923 "$UNIQUEDIR/$path"
1921} 1924}
1922 1925
1923# and all this just because we cannot iterate over 1926# and all this just because we cannot iterate over
1924# all maps in C++... 1927# all maps in C++...
… …
2370 2373
2371sub unique_maps() { 2374sub unique_maps() {
2372 [ 2375 [
2373 map { 2376 map {
2374 utf8::decode $_; 2377 utf8::decode $_;
2375 /\.map$/ 2378 s/\.map$//; # TODO future compatibility hack
2379 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2380 ? ()
2376 ? normalise $_ 2381 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2382 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2383 ]
2380} 2384}
2381 2385
2382=back 2386=back
… …
2389 2393
2390=over 4 2394=over 4
2391 2395
2392=item $ob->inv_recursive 2396=item $ob->inv_recursive
2393 2397
2394Returns the inventory of the object _and_ their inventories, recursively. 2398Returns the inventory of the object I<and> their inventories, recursively,
2399but I<not> the object itself.
2395 2400
2396=cut 2401=cut
2397 2402
2398sub inv_recursive_; 2403sub inv_recursive_;
2399sub inv_recursive_ { 2404sub inv_recursive_ {
… …
2404 inv_recursive_ inv $_[0] 2409 inv_recursive_ inv $_[0]
2405} 2410}
2406 2411
2407=item $ref = $ob->ref 2412=item $ref = $ob->ref
2408 2413
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2414Creates and returns a persistent reference to an object that can be stored as a string.
2410 2415
2411=item $ob = cf::object::deref ($refstring) 2416=item $ob = cf::object::deref ($refstring)
2412 2417
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2418returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2419even if the object actually exists. May block.

Diff Legend

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