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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.63 by root, Thu May 25 16:35:42 2006 UTC vs.
Revision 1.68 by root, Thu May 25 21:48:22 2006 UTC

263 263
264 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 264 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
265 my $targ = $::CONN->{player}{tag}; 265 my $targ = $::CONN->{player}{tag};
266 266
267 if ($self->{container} == $::CONN->{player}{tag}) { 267 if ($self->{container} == $::CONN->{player}{tag}) {
268 $targ = $main::OPENCONT; 268 $targ = $::CONN->{open_container};
269 } 269 }
270 270
271 $::CONN->send ("move $targ $self->{tag} 0"); 271 $::CONN->send ("move $targ $self->{tag} 0");
272 } elsif ($ev->{button} == 1) { 272 } elsif ($ev->{button} == 1) {
273 $::CONN->send ("examine $self->{tag}"); 273 $::CONN->send ("examine $self->{tag}");
283 ? ( 283 ? (
284 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 284 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
285 ) 285 )
286 : ( 286 : (
287 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 287 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
288 ["drop", sub { $::CONN->send ("move $main::OPENCONT $self->{tag} 0") }], 288 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
289 ) 289 )
290 ), 290 ),
291 ); 291 );
292 292
293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 293 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
304 . "</small>\n"; 304 . "</small>\n";
305 305
306 $self->{face_widget} ||= new CFClient::UI::Face 306 $self->{face_widget} ||= new CFClient::UI::Face
307 can_events => 1, 307 can_events => 1,
308 can_hover => 1, 308 can_hover => 1,
309 anim => $self->{anim},
310 animspeed => $self->{animspeed}, # TODO# must be set at creation time
309 connect_button_down => $button_cb, 311 connect_button_down => $button_cb,
310 ; 312 ;
311 $self->{face_widget}{face} = $self->{face}; 313 $self->{face_widget}{face} = $self->{face};
312 $self->{face_widget}{anim} = $self->{anim}; 314 $self->{face_widget}{anim} = $self->{anim};
313 $self->{face_widget}{animspeed} = $self->{animespeed}; 315 $self->{face_widget}{animspeed} = $self->{animspeed};
314 $self->{face_widget}->set_tooltip ( 316 $self->{face_widget}->set_tooltip (
315 "<b>Face/Animation.</b>\n" 317 "<b>Face/Animation.</b>\n"
316 . "Item uses face #$self->{face}. " 318 . "Item uses face #$self->{face}. "
317 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 319 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
318 . "\n\n$tooltip_std" 320 . "\n\n$tooltip_std"
320 322
321 $self->{desc_widget} ||= new CFClient::UI::Label 323 $self->{desc_widget} ||= new CFClient::UI::Label
322 can_events => 1, 324 can_events => 1,
323 can_hover => 1, 325 can_hover => 1,
324 ellipsise => 2, 326 ellipsise => 2,
325 xalign => 0, 327 align => -1,
326 connect_button_down => $button_cb, 328 connect_button_down => $button_cb,
327 ; 329 ;
328 my $desc = CFClient::Item::desc_string $self; 330 my $desc = CFClient::Item::desc_string $self;
329 $self->{desc_widget}->set_text ($desc); 331 $self->{desc_widget}->set_text ($desc);
330 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 332 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
331 333
332 $self->{weight_widget} ||= new CFClient::UI::Label 334 $self->{weight_widget} ||= new CFClient::UI::Label
333 can_events => 1, 335 can_events => 1,
334 can_hover => 1, 336 can_hover => 1,
335 ellipsise => 0, 337 ellipsise => 0,
336 xalign => 0.5, 338 align => 0,
337 connect_button_down => $button_cb, 339 connect_button_down => $button_cb,
338 ; 340 ;
339 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 341 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
340 342
341 $self->{weight_widget}->set_tooltip ( 343 $self->{weight_widget}->set_tooltip (

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines