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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.435 by root, Wed Aug 22 21:40:43 2007 UTC vs.
Revision 1.436 by root, Wed Aug 22 21:40:57 2007 UTC

2896} 2896}
2897 2897
2898sub set_value { 2898sub set_value {
2899 my ($self, $lvl, $exp) = @_; 2899 my ($self, $lvl, $exp) = @_;
2900 2900
2901<<<<<<< UI.pm
2902 $self->{lvl} = $lvl; 2901 $self->{lvl} = $lvl;
2903 $self->{exp} = $exp; 2902 $self->{exp} = $exp;
2904 2903
2905=======
2906 $self->{lvl} = $exp;
2907 $self->{exp} = $exp;
2908
2909>>>>>>> 1.434
2910 my $v = -1; 2904 my $v = -1;
2911 2905
2912 if ($::CONN && (my $table = $::CONN->{exp_table})) { 2906 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2913 my $l0 = $table->[$lvl - 1]; 2907 my $l0 = $table->[$lvl - 1];
2914 my $l1 = $table->[$lvl]; 2908 my $l1 = $table->[$lvl];

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines