ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.48 by elmex, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.49 by root, Sat Jun 3 22:50:48 2006 UTC

56sub button_down { 56sub button_down {
57 my ($self, $ev, $x, $y) = @_; 57 my ($self, $ev, $x, $y) = @_;
58 58
59 $self->focus_in; 59 $self->focus_in;
60 60
61 if ($ev->{button} == 2) { 61 if ($ev->{button} == 1) {
62 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
64
65 $self->{motion} = sub {
66 my ($ev, $x, $y) = @_;
67
68 ($x, $y) = ($ev->{x}, $ev->{y});
69
70 $::CFG->{map_shift_x} = $bw + $x - $ox;
71 $::CFG->{map_shift_y} = $bh + $y - $oy;
72
73 $self->update;
74 };
75 } elsif ($ev->{button} == 1) {
76 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 62 my ($ox, $oy) = ($ev->{x}, $ev->{y});
77 63
78 my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99); 64 my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99);
79 my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99); 65 my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99);
80 $fx += $::MAP->x; 66 $fx += $::MAP->x;
82 68
83 $::CONN->send (sprintf "lookat %d %d", $fx, $fy); 69 $::CONN->send (sprintf "lookat %d %d", $fx, $fy);
84 70
85 warn "FOOX: $fx (".$::MAP->ox.")\n"; 71 warn "FOOX: $fx (".$::MAP->ox.")\n";
86 warn "FOOY: $fy (".$::MAP->oy.")\n"; 72 warn "FOOY: $fy (".$::MAP->oy.")\n";
73 } elsif ($ev->{button} == 2) {
74 my ($ox, $oy) = ($ev->{x}, $ev->{y});
75 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
76
77 $self->{motion} = sub {
78 my ($ev, $x, $y) = @_;
79
80 ($x, $y) = ($ev->{x}, $ev->{y});
81
82 $::CFG->{map_shift_x} = $bw + $x - $ox;
83 $::CFG->{map_shift_y} = $bh + $y - $oy;
84
85 $self->update;
86 };
87 } 87 }
88 88
89 1 89 1
90} 90}
91 91

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines