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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.93 by root, Fri Dec 22 03:43:05 2006 UTC vs.
Revision 1.103 by root, Mon Apr 23 19:17:41 2007 UTC

… …
4use strict; 4use strict;
5 5
6use Crossfire::Protocol::Constants; 6use Crossfire::Protocol::Constants;
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::DB;
9use CFPlus::UI; 10use CFPlus::UI;
10use CFPlus::Pod; 11use CFPlus::Pod;
11use CFPlus::Macro; 12use CFPlus::Macro;
12use CFPlus::Item; 13use CFPlus::Item;
13 14
14use Crossfire::Protocol::Base 0.95; 15use Crossfire::Protocol::Base 0.95;
15 16
16use base 'Crossfire::Protocol::Base'; 17use base 'Crossfire::Protocol::Base';
17 18
18sub new { 19sub new {
19 my $class = shift; 20 my ($class, %arg) = @_;
20 21
21 my $self = $class->SUPER::new (@_, setup_req => { extmap => 1 }); 22 my $self = $class->SUPER::new (%arg,
23 setup_req => {
24 extmap => 1,
25 excmd => 1,
26 %{$arg{setup_req} || {}},
27 },
28 );
22 29
23 $self->{map_widget}->clr_commands; 30 $self->{map_widget}->clr_commands;
24 31
25 my @cmd_help = map { 32 my @cmd_help = map {
26 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x 33 $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
… …
37 for @args; 44 for @args;
38 45
39 map ["$cmd$_", $text], 46 map ["$cmd$_", $text],
40 sort { (length $a) <=> (length $b) } 47 sort { (length $a) <=> (length $b) }
41 @args 48 @args
42 } sort { $a->{par} <=> $b->{par} } 49 } sort { $a->{par} <=> $b->{par} }
43 CFPlus::Pod::find command => "*"; 50 CFPlus::Pod::find command => "*";
44 51
52 $self->connect_ext (event_capabilities => sub {
53 my ($cap) = @_;
54
55 if (my $ts = $cap->{tileset}) {
56 if (my ($default) = grep $_->[2] & 1, @$ts) {
57 $self->{tileset} = $default;
58 $self->{tilesize} = $default->[3];
59 $self->setup_req (tileset => $default->[0]);
60
61 my $w = int $self->{mapw} * 32 / $self->{tilesize};
62 my $h = int $self->{maph} * 32 / $self->{tilesize};
63
64 $self->setup_req (mapsize => "${w}x${h}");
65 }
66 }
67 });
68
45 $self->{map_widget}->add_command (@$_) 69 $self->{map_widget}->add_command (@$_)
46 for @cmd_help; 70 for @cmd_help;
47
48 $self->{noface} = new_from_file CFPlus::Texture
49 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
50 71
51 { 72 {
52 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture 73 $self->{dialogue} = my $tex = new_from_file CFPlus::Texture
53 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1; 74 CFPlus::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
54 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 75 $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
55 } 76 }
56 77
78 {
79 $self->{noface} = my $tex = new_from_file CFPlus::Texture
80 CFPlus::find_rcfile "noface.png", minify => 1, mipmap => 1;
81 $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
82 }
83
57 $self->{open_container} = 0; 84 $self->{open_container} = 0;
58 85
59 # "global"
60 $self->{tilecache} = CFPlus::db_table "tilecache"
61 or die "tilecache: unable to open database table";
62 $self->{facemap} = CFPlus::db_table "facemap"
63 or die "facemap: unable to open database table";
64
65 # per server 86 # per server
66 $self->{mapcache} = CFPlus::db_table "mapcache_$self->{host}_$self->{port}" 87 $self->{mapcache} = "mapcache_$self->{host}_$self->{port}";
67 or die "mapcache_$self->{host}_$self->{port}: unable to open database table";
68 88
69 $self 89 $self
70} 90}
71 91
72sub logprint { 92sub logprint {
… …
374 or return; 394 or return;
375 395
376 my ($hash, $x, $y, $w, $h) = @$map_info; 396 my ($hash, $x, $y, $w, $h) = @$map_info;
377 397
378 my $data = $self->{map}->get_rect ($x, $y, $w, $h); 398 my $data = $self->{map}->get_rect ($x, $y, $w, $h);
379 $self->{mapcache}->put ($hash => Compress::LZF::compress $data); 399 CFPlus::DB::put $self->{mapcache} => $hash => Compress::LZF::compress $data, sub { };
380 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d# 400 #warn sprintf "SAVEmap[%s] length %d\n", $hash, length $data;#d#
381} 401}
382 402
383sub map_clear { 403sub map_clear {
384 my ($self) = @_; 404 my ($self) = @_;
… …
388 408
389 $self->{map}->clear; 409 $self->{map}->clear;
390 delete $self->{map_widget}{magicmap}; 410 delete $self->{map_widget}{magicmap};
391} 411}
392 412
413sub bg_fetch {
414 my ($self) = @_;
415
416 my $id;
417
418 do {
419 $id = pop @{$self->{bg_fetch}}
420 or return;
421 } while $self->{texture}[$id];
422
423 CFPlus::DB::get tilecache => $id, sub {
424 my ($data) = @_;
425
426 return unless $self->{map}; # stop when destroyed
427
428 $self->set_texture ($id => $data)
429 if defined $data;
430
431 $self->bg_fetch;
432 };
433}
393 434
394sub load_map($$$) { 435sub load_map($$$) {
395 my ($self, $hash, $x, $y) = @_; 436 my ($self, $hash, $x, $y) = @_;
396 437
397 if (defined (my $data = $self->{mapcache}->get ($hash))) { 438 my $gen = $self->{map_change_gen};
439
440 CFPlus::DB::get $self->{mapcache} => $hash, sub {
441 return unless $gen == $self->{map_change_gen};
442
443 my ($data) = @_;
444
445 if (defined $data) {
398 $data = Compress::LZF::decompress $data; 446 $data = Compress::LZF::decompress $data;
399 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d# 447 #warn sprintf "LOADmap[%s,%d,%d] length %d\n", $hash, $x, $y, length $data;#d#
400 for my $id ($self->{map}->set_rect ($x, $y, $data)) {
401 my $data = $self->{tilecache}->get ($id)
402 or next;
403 448
404 $self->set_texture ($id => $data); 449 my $inprogress = @{ $self->{bg_fetch} || [] };
450 unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
451 $self->bg_fetch unless $inprogress;
405 } 452 }
406 } 453 };
407} 454}
408 455
409# hardcode /world/world_xxx_xxx map names, the savings are enourmous, 456# hardcode /world/world_xxx_xxx map names, the savings are enourmous,
410# (server resource,s latency, bandwidth), so this hack is warranted. 457# (server resource,s latency, bandwidth), so this hack is warranted.
411# the right fix is to make real tiled maps with an overview file 458# the right fix is to make real tiled maps with an overview file
… …
475 522
476 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags) 523 $self->flood_fill ($block, $gx, $gy, "$path$tile", $hash, $flags)
477 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1; 524 if $x >= $x0 && $x + $w < $x1 && $y >= $y0 && $y + $h < $y1;
478 525
479 } else { 526 } else {
527 my $gen = $self->{map_change_gen};
480 $self->send_mapinfo ("spatial $path$tile", sub { 528 $self->send_mapinfo ("spatial $path$tile", sub {
529 return unless $gen == $self->{map_change_gen};
530
481 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_; 531 my ($mode, $flags, $x, $y, $w, $h, $hash) = @_;
482 532
483 return if $mode ne "spatial"; 533 return if $mode ne "spatial";
484 534
485 $x += $self->{map}->ox; 535 $x += $self->{map}->ox;
… …
499 549
500sub map_change { 550sub map_change {
501 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_; 551 my ($self, $mode, $flags, $x, $y, $w, $h, $hash) = @_;
502 552
503 $self->flush_map; 553 $self->flush_map;
554
555 ++$self->{map_change_gen};
504 556
505 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy); 557 my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
506 558
507 my $mapmapw = $self->{mapmap}->{w}; 559 my $mapmapw = $self->{mapmap}->{w};
508 my $mapmaph = $self->{mapmap}->{h}; 560 my $mapmaph = $self->{mapmap}->{h};
… …
525 $self->load_map ($hash, $x, $y); 577 $self->load_map ($hash, $x, $y);
526 $self->flood_fill (0, 0, 0, "", $hash, $flags); 578 $self->flood_fill (0, 0, 0, "", $hash, $flags);
527} 579}
528 580
529sub face_find { 581sub face_find {
530 my ($self, $facenum, $face) = @_; 582 my ($self, $facenum, $face, $cb) = @_;
531 583
532 my $hash = "$face->{chksum},$face->{name}"; 584 my $hash = "$face->{chksum},$face->{name}";
533 585
534 my $id = $self->{facemap}->get ($hash); 586 my $id = CFPlus::DB::get_tile_id_sync $hash;
535 587
536 unless ($id) {
537 # create new id for face
538 # I love transactions
539 for (1..100) {
540 my $txn = $CFPlus::DB_ENV->txn_begin;
541 my $status = $self->{facemap}->db_get (id => $id);
542 if ($status == 0 || $status == BerkeleyDB::DB_NOTFOUND) {
543 $id = ($id || 64) + 1;
544 if ($self->{facemap}->put (id => $id) == 0
545 && $self->{facemap}->put ($hash => $id) == 0) {
546 $txn->txn_commit;
547
548 goto gotid;
549 }
550 }
551 $txn->txn_abort;
552 }
553
554 CFPlus::fatal "maximum number of transaction retries reached - database problems?";
555 }
556
557gotid:
558 $face->{id} = $id; 588 $face->{id} = $id;
559 $self->{map}->set_face ($facenum => $id);
560 $self->{faceid}[$facenum] = $id;#d# 589 $self->{faceid}[$facenum] = $id;
561 590
562 my $face = $self->{tilecache}->get ($id); 591 $self->{map}->set_tileid ($facenum => $id);
563 592
564 if ($face) { 593 CFPlus::DB::get tilecache => $id, $cb;
565 #$self->face_prefetch;
566 $face
567 } else {
568 my $tex = $self->{noface};
569 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
570 undef
571 };
572} 594}
573 595
574sub face_update { 596sub face_update {
575 my ($self, $facenum, $face, $changed) = @_; 597 my ($self, $facenum, $face, $changed) = @_;
576 598
577 $self->{tilecache}->put ($face->{id} => $face->{image}) if $changed; 599 CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
600 if $changed;
578 601
579 $self->set_texture ($face->{id} => delete $face->{image}); 602 $self->set_texture ($face->{id} => delete $face->{image});
603}
604
605sub smooth_update {
606 my ($self, $facenum, $face) = @_;
607
608 $self->{map}->set_smooth ($facenum, $face->{smoothface}, $face->{smoothlevel});
580} 609}
581 610
582sub set_texture { 611sub set_texture {
583 my ($self, $id, $data) = @_; 612 my ($self, $id, $data) = @_;
584 613
585 $self->{texture}[$id] ||= do { 614 $self->{texture}[$id] = my $tex =
586 my $tex =
587 new_from_image CFPlus::Texture 615 new_from_image CFPlus::Texture
588 $data, minify => 1, mipmap => 1; 616 $data, minify => 1, mipmap => 1;
589 617
590 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}}); 618 $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
591 $self->{map_widget}->update; 619 $self->{map_widget}->update;
592
593 $tex
594 };
595} 620}
596 621
597sub sound_play { 622sub sound_play {
598 my ($self, $x, $y, $soundnum, $type) = @_; 623 my ($self, $x, $y, $soundnum, $type) = @_;
599 624
… …
609 $LAST_QUERY = $prompt; 634 $LAST_QUERY = $prompt;
610 635
611 $self->{query}-> ($self, $flags, $prompt); 636 $self->{query}-> ($self, $flags, $prompt);
612} 637}
613 638
639our @CF_COLOR = (
640 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
641 [1.00, 1.00, 1.00],
642 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
643 [1.00, 0.00, 0.00],
644 [1.00, 0.54, 0.00],
645 [0.11, 0.56, 1.00],
646 [0.93, 0.46, 0.00],
647 [0.18, 0.54, 0.34],
648 [0.56, 0.73, 0.56],
649 [0.80, 0.80, 0.80],
650 [0.75, 0.61, 0.20],
651 [0.99, 0.77, 0.26],
652 [0.74, 0.65, 0.41],
653);
654
614sub drawinfo { 655sub drawinfo {
615 my ($self, $color, $text) = @_; 656 my ($self, $color, $text) = @_;
616 657
617 my @color = ( 658 my $fg = $CF_COLOR[$color % @CF_COLOR];
618 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
619 [1.00, 1.00, 1.00],
620 [0.50, 0.50, 1.00], #[0.00, 0.00, 0.55]
621 [1.00, 0.00, 0.00],
622 [1.00, 0.54, 0.00],
623 [0.11, 0.56, 1.00],
624 [0.93, 0.46, 0.00],
625 [0.18, 0.54, 0.34],
626 [0.56, 0.73, 0.56],
627 [0.80, 0.80, 0.80],
628 [0.75, 0.61, 0.20],
629 [0.99, 0.77, 0.26],
630 [0.74, 0.65, 0.41],
631 );
632
633 my $fg = $color[$color % @color];
634 659
635 $self->logprint ("info: ", $text); 660 $self->logprint ("info: ", $text);
636 661
637 # try to create single paragraphs of multiple lines sent by the server 662 ## try to create single paragraphs of multiple lines sent by the server
663 # no longer neecssary with TRT servers
638 $text =~ s/(?<=\S)\n(?=\w)/ /g; 664 #$text =~ s/(?<=\S)\n(?=\w)/ /g;
639 665
640 $text = CFPlus::asxml $text; 666 $text = CFPlus::asxml $text;
641 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g; 667 $text =~ s/\[b\](.*?)\[\/b\]/<b>\1<\/b>/g;
642 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g; 668 $text =~ s/\[color=(.*?)\](.*?)\[\/color\]/<span foreground='\1'>\2<\/span>/g;
643 669
… …
679} 705}
680 706
681sub setup { 707sub setup {
682 my ($self, $setup) = @_; 708 my ($self, $setup) = @_;
683 709
710 $self->{map_widget}->set_tilesize ($self->{tilesize});
684 $::MAP->resize ($self->{mapw}, $self->{maph}); 711 $::MAP->resize ($self->{mapw}, $self->{maph});
685} 712}
686 713
687sub addme_success { 714sub addme_success {
688 my ($self) = @_; 715 my ($self) = @_;
… …
928 955
929 $self->update_server_info; 956 $self->update_server_info;
930 957
931 $self->send_command ("output-sync $::CFG->{output_sync}"); 958 $self->send_command ("output-sync $::CFG->{output_sync}");
932 $self->send_command ("output-count $::CFG->{output_count}"); 959 $self->send_command ("output-count $::CFG->{output_count}");
960 $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
933 $self->send_command ("pickup $::CFG->{pickup}"); 961 $self->send_command ("pickup $::CFG->{pickup}");
934} 962}
935 963
936sub buildat { 964sub buildat {
937 my ($self, $builditem, $x, $y) = @_; 965 my ($self, $builditem, $x, $y) = @_;

Diff Legend

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