--- deliantra/server/ext/item-worldmap.ext 2007/07/23 21:02:50 1.8 +++ deliantra/server/ext/item-worldmap.ext 2007/11/14 08:09:46 1.18 @@ -25,11 +25,21 @@ my $label = $ws->new (Label => text => $k, fontsize => 0.2, + ); + + my $marker = $ws->new (Face => + face => $ws->{ns}->need_face ("res/map-arrow"), + ); + my $children = [$label, $marker]; + + $ws->{canvas}->add (my $vbox = $ws->new (VBox => + children => $children, c_halign => -.5, c_valign => -1, - ); - $ws->{canvas}->add ($label); - $label + )); + $vbox->{children} = $children; + + $vbox }; $new->{$k} = $label; @@ -43,8 +53,6 @@ } $ws->{labels} = $new; - - #$_->destroy for values %$old;#d# } sub create_widgets { @@ -67,18 +75,13 @@ }, ); - my $face = cf::face::find "res/worldmap.jpg"; - $ns->send_face ($face); - $ns->flush_fx; - $w->add (my $sw = $ws->{window} = $ws->new (ScrolledWindow => scroll_x => 1, scroll_y => 1)); $sw->add (my $canvas = $ws->{canvas} = $ws->new (Canvas => expand => 1)); $ws->{mapface} = $ws->new (Face => - expand => 1, size_w => undef, size_h => undef, - face => $face, + face => $ws->{ns}->need_face ("res/worldmap"), ); $ws->{canvas}->add ($ws->{mapface}); @@ -104,11 +107,10 @@ ; cf::async_ext { - my $schedule_interval = Coro::Event->timer (after => 1); + $Coro::current->{desc} = "worldmap updater"; while () { - $schedule_interval->interval ($WORLDMAP_UPDATE_INTERVAL); - $schedule_interval->next; + Coro::EV::timer_once $WORLDMAP_UPDATE_INTERVAL; cf::get_slot 0.01, -50, "worldmap update";