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.143 by root, Wed Sep 3 06:07:39 2008 UTC vs.
Revision 1.149 by root, Tue Jan 13 00:01:48 2009 UTC

… …
163sub invoke_button_down { 163sub invoke_button_down {
164 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
165 165
166 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
167 $self->grab_focus; 167 $self->grab_focus;
168 return unless $::CONN; 168 return unless $::CONN && $self->{ctilesize};
169 169
170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
172 172
173 $x -= DC::floor $::MAP->w * 0.5; 173 $x -= DC::floor $::MAP->w * 0.5;
… …
201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
206 [
207 $::PICKUP_ENABLE->{state}
208 ? "Disable automatic pickup"
209 : "Enable automatic pickup",
210 sub { $::PICKUP_ENABLE->toggle }
211 ],
212 ); 206 );
213 207
214 if ($::CONN && $::CONN->{editor_support}) { 208 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [ 209# push @items, [
216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 210# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
… …
432 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 426 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
433 427
434 # the minimum time for a single tile movement 428 # the minimum time for a single tile movement
435 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); 429 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
436 430
431 $spd *= $self->{tilesize};
432
437 # jump if "impossibly high" speed 433 # jump if "impossibly high" speed
438 if ( 434 if (
439 (max abs $self->{sdx}, abs $self->{sdy}) 435 (max abs $self->{sdx}, abs $self->{sdy})
440 > $spd * $self->{tilesize} * $mintime * 1.1 436 > $spd * $mintime * 2.1
441 ) { 437 ) {
442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# 438 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
443 $self->{sdx} = $self->{sdy} = 0; 439 $self->{sdx} = $self->{sdy} = 0;
444 } else { 440 } else {
445 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction 441 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
446 442
447 my $dx = $self->{sdx} < 0 ? -$spd : $spd; 443 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
448 my $dy = $self->{sdy} < 0 ? -$spd : $spd; 444 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
449 445
450 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } 446 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } 447 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
452
453 $self->update;
454 } 448 }
449
450 $self->update;
455 } 451 }
456 } else { 452 } else {
457 $self->{sdx} = $self->{sdy} = 0; 453 $self->{sdx} = $self->{sdy} = 0;
458 } 454 }
459 455
… …
509 glNewList ($self->{list} ||= glGenList); 505 glNewList ($self->{list} ||= glGenList);
510 506
511 glPushMatrix; 507 glPushMatrix;
512 glTranslate $sx0, $sy0; 508 glTranslate $sx0, $sy0;
513 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 509 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
514 glTranslate $self->{sdx}, $self->{sdy}; 510 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
515 511
516 $::MAP->draw ($dx, $dy, $sw, $sh, 512 $::MAP->draw ($dx, $dy, $sw, $sh,
517 $self->{tilesize}, 513 $self->{tilesize},
518 $::CONN->{player}{tag}, 514 $::CONN->{player}{tag},
519 -$self->{sdx}, -$self->{sdy}); 515 -$self->{sdx}, -$self->{sdy});
520 516
521 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchro fow at player 517 #glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
522 glScale $self->{tilesize}, $self->{tilesize}; 518 glScale $self->{tilesize}, $self->{tilesize};
523 519
524 if (my $tex = $self->{fow_texture}) { 520 if (my $tex = $self->{fow_texture}) {
525 glPushMatrix; 521 glPushMatrix;
526 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); 522 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
… …
610sub refresh_hook { 606sub refresh_hook {
611 my ($self) = @_; 607 my ($self) = @_;
612 608
613 if ($::MAP && $self->{texture_atime} < time) { 609 if ($::MAP && $self->{texture_atime} < time) {
614 my ($w, $h) = @$self{qw(w h)}; 610 my ($w, $h) = @$self{qw(w h)};
611
612 return unless $w && $h;
615 613
616 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 614 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
617 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 615 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
618 616
619 my $ox = 0.5 * ($w - $sw); 617 my $ox = 0.5 * ($w - $sw);

Diff Legend

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