ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/NPC_Dialogue.pm
(Generate patch)

Comparing deliantra/server/ext/NPC_Dialogue.pm (file contents):
Revision 1.12 by root, Thu Dec 18 02:49:22 2008 UTC vs.
Revision 1.13 by root, Thu Jan 8 04:35:04 2009 UTC

310 } elsif ($cmd eq "trigger") { 310 } elsif ($cmd eq "trigger") {
311 my ($con, $state) = split /\s+/, $args, 2; 311 my ($con, $state) = split /\s+/, $args, 2;
312 $con = $con * 1; 312 $con = $con * 1;
313 313
314 if (defined $state) { 314 if (defined $state) {
315 $self->{npc}->map->trigger ($args, $state); 315 $self->{npc}->map->trigger ($args, $state, $self->{npc}, $self->{ob});
316 } else { 316 } else {
317 my $rvalue = \$self->{npc}{dialog_trigger}{$con}; 317 my $rvalue = \$self->{npc}{dialog_trigger}{$con};
318 $self->{npc}->map->trigger ($con, $$rvalue = !$$rvalue); 318 $self->{npc}->map->trigger ($con, $$rvalue = !$$rvalue, $self->{npc}, $self->{ob});
319 } 319 }
320 320
321 } elsif ($cmd eq "addtopic") { 321 } elsif ($cmd eq "addtopic") {
322 push @kw, split /\|/, $args; 322 push @kw, split /\|/, $args;
323 $self->{add_topic}->(split /\s*\|\s*/, $args) if $self->{add_topic}; 323 $self->{add_topic}->(split /\s*\|\s*/, $args) if $self->{add_topic};
345 last; 345 last;
346 } 346 }
347 } 347 }
348 } 348 }
349 349
350 $self->{npc}->use_trigger ($self->{ob})
350 $self->{npc}->use_trigger if $self->{npc}->type == cf::MAGIC_EAR; 351 if $self->{npc}->type == cf::MAGIC_EAR;
351 352
352 return wantarray ? ($reply, @kw) : $reply; 353 return wantarray ? ($reply, @kw) : $reply;
353 } 354 }
354 } 355 }
355 } 356 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines