[nexuiz-commits] r6775 - in branches/nexuiz-2.0: . data/qcsrc/server misc/tools server server/rcon2irc
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue May 26 06:38:01 EDT 2009
Author: div0
Date: 2009-05-26 06:38:00 -0400 (Tue, 26 May 2009)
New Revision: 6775
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
branches/nexuiz-2.0/data/qcsrc/server/t_plats.qc
branches/nexuiz-2.0/misc/tools/nexuiz-map-compiler
branches/nexuiz-2.0/server/rcon.pl
branches/nexuiz-2.0/server/rcon2irc/rbiserver.pl
branches/nexuiz-2.0/server/rcon2irc/rcon2irc.pl
Log:
r6770 | div0 | 2009-05-25 11:36:13 -0400 (Mon, 25 May 2009) | 2 lines
srcon: compatible protocol change
r6771 | div0 | 2009-05-25 11:36:38 -0400 (Mon, 25 May 2009) | 2 lines
same rcon change
r6772 | div0 | 2009-05-25 14:34:07 -0400 (Mon, 25 May 2009) | 2 lines
nexuiz-map-compiler: add option -order vis,light,minimap
r6773 | mrbougo | 2009-05-26 04:40:54 -0400 (Tue, 26 May 2009) | 1 line
reset trigger_multiple correctly: don't assume they all use .health
r6774 | mrbougo | 2009-05-26 05:04:47 -0400 (Tue, 26 May 2009) | 1 line
make the door entities stop their movement on reset
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-05-26 09:04:47 UTC (rev 6774)
+++ branches/nexuiz-2.0/.patchsets 2009-05-26 10:38:00 UTC (rev 6775)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6746,6749-6749,6751-6766
+revisions_applied = 1-6746,6749-6749,6751-6766,6770-6774
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc 2009-05-26 09:04:47 UTC (rev 6774)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_triggers.qc 2009-05-26 10:38:00 UTC (rev 6775)
@@ -221,10 +221,14 @@
void multi_reset()
{
- self.touch = multi_touch;
- self.health = self.max_health;
- self.takedamage = DAMAGE_YES;
- self.solid = SOLID_BBOX;
+ if ( !(self.spawnflags & SPAWNFLAG_NOTOUCH) )
+ self.touch = multi_touch;
+ if (self.max_health)
+ {
+ self.health = self.max_health;
+ self.takedamage = DAMAGE_YES;
+ self.solid = SOLID_BBOX;
+ }
self.think = SUB_Null;
self.team = self.team_saved;
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/t_plats.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_plats.qc 2009-05-26 09:04:47 UTC (rev 6774)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_plats.qc 2009-05-26 10:38:00 UTC (rev 6775)
@@ -1181,6 +1181,7 @@
void door_reset()
{
setorigin(self, self.pos1);
+ self.velocity = '0 0 0';
self.state = STATE_BOTTOM;
self.think = SUB_Null;
}
@@ -1282,6 +1283,7 @@
void door_rotating_reset()
{
self.angles = self.pos1;
+ self.avelocity = '0 0 0';
self.state = STATE_BOTTOM;
self.think = SUB_Null;
}
Modified: branches/nexuiz-2.0/misc/tools/nexuiz-map-compiler
===================================================================
--- branches/nexuiz-2.0/misc/tools/nexuiz-map-compiler 2009-05-26 09:04:47 UTC (rev 6774)
+++ branches/nexuiz-2.0/misc/tools/nexuiz-map-compiler 2009-05-26 10:38:00 UTC (rev 6775)
@@ -30,6 +30,9 @@
# Default flags for the -minimap stage
our $MINIMAPFLAGS = '';
+ # Default order of commands
+ our $ORDER = 'light,vis,minimap';
+
# end of user changable part
do "$ENV{HOME}/.nexuiz-map-compiler";
@@ -49,6 +52,7 @@
vis => [split /\s+/, $VISFLAGS],
light => [split /\s+/, $LIGHTFLAGS],
minimap => [split /\s+/, $MINIMAPFLAGS],
+ order => [split /\s*,\s*/, $ORDER],
maps => [],
scale => 1
};
@@ -95,6 +99,10 @@
{
$options->{minimap} = undef;
}
+ elsif($_ eq '-order')
+ {
+ $options->{order} = [split /\s*,\s*/, shift @ARGV];
+ }
elsif($_ =~ /^-(-.*)/)
{
if($curmode eq 'maps')
@@ -244,16 +252,39 @@
rename "${m}_s.bsp", "$m.bsp"
or die "rename ${m}_s.bsp $m.bsp: $!";
}
- if(defined $options->{light})
+ my @o = @{$options->{order}};
+ push @o, qw/light vis minimap/;
+ my %o = ();
+
+ for(@o)
{
- q3map2 '-light', @{$options->{light}}, "$m.map"
- or die "-light: $?";
+ next if $o{$_}++;
+ if($_ eq 'light')
+ {
+ if(defined $options->{light})
+ {
+ q3map2 '-light', @{$options->{light}}, "$m.map"
+ or die "-light: $?";
+ }
+ }
+ if($_ eq 'vis')
+ {
+ if(defined $options->{vis})
+ {
+ q3map2 '-vis', @{$options->{vis}}, "$m.map"
+ or die "-vis: $?";
+ }
+ }
+ if($_ eq 'minimap')
+ {
+ if(defined $options->{minimap})
+ {
+ q3map2 '-minimap', @{$options->{minimap}}, "$m.map"
+ or die "-minimap: $?";
+ }
+ }
}
- if(defined $options->{vis})
- {
- q3map2 '-vis', @{$options->{vis}}, "$m.map"
- or die "-vis: $?";
- }
+
if($postscale != 1)
{
q3map2 '-scale', $postscale, "$m.bsp"
@@ -261,11 +292,6 @@
rename "${m}_s.bsp", "$m.bsp"
or die "rename ${m}_s.bsp $m.bsp: $!";
}
- if(defined $options->{minimap})
- {
- q3map2 '-minimap', @{$options->{minimap}}, "$m.map"
- or die "-minimap: $?";
- }
unlink "$m.srf";
Modified: branches/nexuiz-2.0/server/rcon.pl
===================================================================
--- branches/nexuiz-2.0/server/rcon.pl 2009-05-26 09:04:47 UTC (rev 6774)
+++ branches/nexuiz-2.0/server/rcon.pl 2009-05-26 10:38:00 UTC (rev 6775)
@@ -409,7 +409,7 @@
my ($self, $line, $nothrottle) = @_;
if($self->{secure})
{
- my $t = sprintf "%ld", time();
+ my $t = sprintf "%ld.%06d", time(), int rand 1000000;
my $key = Digest::HMAC::hmac("$t $line", $self->{password}, \&Digest::MD4::md4);
return $self->{connector}->send("\377\377\377\377srcon HMAC-MD4 TIME $key $t $line");
}
Modified: branches/nexuiz-2.0/server/rcon2irc/rbiserver.pl
===================================================================
--- branches/nexuiz-2.0/server/rcon2irc/rbiserver.pl 2009-05-26 09:04:47 UTC (rev 6774)
+++ branches/nexuiz-2.0/server/rcon2irc/rbiserver.pl 2009-05-26 10:38:00 UTC (rev 6775)
@@ -77,7 +77,8 @@
[ dp => q{pure: -(\S+) (.*)} => sub {
my ($status, $nick) = @_;
$nick = color_dp2irc $nick;
- out irc => 0, "PRIVMSG $config{irc_channel} :\001ACTION thinks $nick is $status\001";
+ out irc => 0, "PRIVMSG $config{irc_channel} :\001ACTION thinks $nick is $status\001"
+ unless $status eq 'MODIFIED'; # in this case, either DETAIL_TIMEOUT or DETAIL_MISMATCH follows
return 0;
} ],
[ dp => q{pure: \*DETAIL_MISMATCH (.*) (\S+)$} => sub {
Modified: branches/nexuiz-2.0/server/rcon2irc/rcon2irc.pl
===================================================================
--- branches/nexuiz-2.0/server/rcon2irc/rcon2irc.pl 2009-05-26 09:04:47 UTC (rev 6774)
+++ branches/nexuiz-2.0/server/rcon2irc/rcon2irc.pl 2009-05-26 10:38:00 UTC (rev 6775)
@@ -466,7 +466,7 @@
my ($self, $line, $nothrottle) = @_;
if($self->{secure})
{
- my $t = sprintf "%ld", time();
+ my $t = sprintf "%ld.%06d", time(), int rand 1000000;
my $key = Digest::HMAC::hmac("$t $line", $self->{password}, \&Digest::MD4::md4);
return $self->{connector}->send("\377\377\377\377srcon HMAC-MD4 TIME $key $t $line");
}
More information about the nexuiz-commits
mailing list