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.267 by root, Sat May 19 00:08:11 2007 UTC vs.
Revision 1.270 by root, Sat May 26 15:44:06 2007 UTC

… …
1904 $self->deactivate_recursive; 1904 $self->deactivate_recursive;
1905 1905
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 1906 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 1907
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map; 1909 if $self->map && $self->map->{path} ne "{link}";
1910 1910
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 1911 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1912} 1912}
1913 1913
1914sub cf::object::player::leave_link { 1914sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 1915 my ($self, $map, $x, $y) = @_;
1916
1917 return unless $self->contr->active;
1916 1918
1917 my $link_pos = delete $self->{_link_pos}; 1919 my $link_pos = delete $self->{_link_pos};
1918 1920
1919 unless ($map) { 1921 unless ($map) {
1920 # restore original map position 1922 # restore original map position
… …
1943 1945
1944 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 1946 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1945 $self->enter_map ($map, $x, $y); 1947 $self->enter_map ($map, $x, $y);
1946} 1948}
1947 1949
1948cf::player->attach (
1949 on_logout => sub {
1950 my ($pl) = @_;
1951
1952 # abort map switching before logout
1953 if ($pl->ob->{_link_pos}) {
1954 cf::sync_job {
1955 $pl->ob->leave_link
1956 };
1957 }
1958 },
1959 on_login => sub {
1960 my ($pl) = @_;
1961
1962 # try to abort aborted map switching on player login :)
1963 # should happen only on crashes
1964 if ($pl->ob->{_link_pos}) {
1965 $pl->ob->enter_link;
1966 (async {
1967 $pl->ob->reply (undef,
1968 "There was an internal problem at your last logout, "
1969 . "the server will try to bring you to your intended destination in a second.",
1970 cf::NDI_RED);
1971 # we need this sleep as the login has a concurrent enter_exit running
1972 # and this sleep increases chances of the player not ending up in scorn
1973 Coro::Timer::sleep 1;
1974 $pl->ob->leave_link;
1975 })->prio (2);
1976 }
1977 },
1978);
1979
1980=item $player_object->goto ($path, $x, $y) 1950=item $player_object->goto ($path, $x, $y[, $check->($map)])
1981 1951
1952Moves the player to the given map-path and coordinates by first freezing
1953her, loading and preparing them map, calling the provided $check callback
1954that has to return the map if sucecssful, and then unfreezes the player on
1955the new (success) or old (failed) map position.
1956
1982=cut 1957=cut
1958
1959our $GOTOGEN;
1983 1960
1984sub cf::object::player::goto { 1961sub cf::object::player::goto {
1985 my ($self, $path, $x, $y) = @_; 1962 my ($self, $path, $x, $y, $check) = @_;
1963
1964 # do generation counting so two concurrent goto's will be executed in-order
1965 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1986 1966
1987 $self->enter_link; 1967 $self->enter_link;
1988 1968
1989 (async { 1969 (async {
1990 my $map = eval { 1970 my $map = eval {
1991 my $map = cf::map::find $path; 1971 my $map = cf::map::find $path;
1972
1973 if ($map) {
1992 $map = $map->customise_for ($self) if $map; 1974 $map = $map->customise_for ($self);
1975 $map = $check->($map) if $check && $map;
1976 } else {
1977 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1978 }
1979
1993 $map 1980 $map
1981 };
1982
1983 if ($@) {
1984 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
1985 LOG llevError | logBacktrace, Carp::longmess $@;
1994 } or 1986 }
1995 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1996 1987
1988 if ($gen == $self->{_goto_generation}) {
1989 delete $self->{_goto_generation};
1997 $self->leave_link ($map, $x, $y); 1990 $self->leave_link ($map, $x, $y);
1991 }
1998 })->prio (1); 1992 })->prio (1);
1999} 1993}
2000 1994
2001=item $player_object->enter_exit ($exit_object) 1995=item $player_object->enter_exit ($exit_object)
2002 1996
… …
2848 my $signal = new Coro::Signal; 2842 my $signal = new Coro::Signal;
2849 push @WAIT_FOR_TICK_BEGIN, $signal; 2843 push @WAIT_FOR_TICK_BEGIN, $signal;
2850 $signal->wait; 2844 $signal->wait;
2851} 2845}
2852 2846
2847 my $min = 1e6;#d#
2848 my $avg = 10;
2853$TICK_WATCHER = Event->timer ( 2849$TICK_WATCHER = Event->timer (
2854 reentrant => 0, 2850 reentrant => 0,
2855 parked => 1, 2851 parked => 1,
2856 prio => 0, 2852 prio => 0,
2857 at => $NEXT_TICK || $TICK, 2853 at => $NEXT_TICK || $TICK,
… …
2864 } 2860 }
2865 2861
2866 $NOW = $tick_start = Event::time; 2862 $NOW = $tick_start = Event::time;
2867 2863
2868 cf::server_tick; # one server iteration 2864 cf::server_tick; # one server iteration
2865
2866 0 && sync_job {#d#
2867 for(1..10) {
2868 my $t = Event::time;
2869 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2870 or die;
2871
2872 $map->width (50);
2873 $map->height (50);
2874 $map->alloc;
2875 $map->_load_objects ("/tmp/x.map", 1);
2876 my $t = Event::time - $t;
2877
2878 #next unless $t < 0.0013;#d#
2879 if ($t < $min) {
2880 $min = $t;
2881 }
2882 $avg = $avg * 0.99 + $t * 0.01;
2883 }
2884 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2885 exit 0;
2886 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2887 };
2869 2888
2870 $RUNTIME += $TICK; 2889 $RUNTIME += $TICK;
2871 $NEXT_TICK += $TICK; 2890 $NEXT_TICK += $TICK;
2872 2891
2873 if ($NOW >= $NEXT_RUNTIME_WRITE) { 2892 if ($NOW >= $NEXT_RUNTIME_WRITE) {

Diff Legend

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