merge

build.sh

@@ -0,0 +1,44 @@
+#!/bin/sh
+
+RELEASEDIR=release
+BUILDDIR=build
+ZIPFILE=$(hg id -b)-$(hg id -n).zip
+
+PLUGINFILES=cstrike
+DOCS=docs
+PLUGINFILE=zombiereloaded.smx
+PLUGINDIR=cstrike/addons/sourcemod/plugins
+
+# Clean release directory if specified and exit.
+if [ "$1" = "clean" ]
+then
+    rm -r $RELEASEDIR
+    echo "Cleaned release directory."
+    exit 0
+fi
+
+# Make release directory.
+mkdir -p $RELEASEDIR
+
+# Check if the plugin is built.
+if [ ! -e $BUILDDIR/$PLUGINFILE ]
+then
+    echo "Cannot build release package, plugin is not built. Missing file '$BUILDDIR/$PLUGINFILE'."
+    exit 1
+fi
+
+# Copy files.
+echo "Copying files..."
+cp -r "$PLUGINFILES" "$RELEASEDIR"
+cp -r "$DOCS" "$RELEASEDIR"
+
+mkdir -p $RELEASEDIR/$PLUGINDIR
+cp -r $BUILDDIR/$PLUGINFILE $RELEASEDIR/$PLUGINDIR/$PLUGINFILE
+cp -r license.txt $RELEASEDIR/$DOCS/license.txt
+
+# Make release package.
+echo "Compressing files..."
+cd $RELEASEDIR
+zip -r $ZIPFILE *
+
+echo "Release package available at $RELEASEDIR/$ZIPFILE."

cstrike/addons/sourcemod/translations/no/zombiereloaded.phrases.txt

@@ -537,6 +537,11 @@
 		"no"		"Våpenet @green{1}@default har en kjøpegrense på @green{2}@default enheter. Vent til neste runde eller gjenoppliving."
 	}
 
+	"Weapons zmarket grenade max"
+	{
+		"no"		"Du kan bare holde {1} granat(er) av denne typen."
+	}
+
 	"Weapons zmarket auto-rebuy toggle on"
 	{
 		"no"		"Autokjøp er aktivert, dine valg vil automatisk bli kjøpt hver runde eller hver gjenoppliving."

src/zr/volfeatures/volanticamp.inc

@@ -369,6 +369,9 @@ VolAnticampApplyAction(client, dataIndex, volumeIndex)
             // Validate amount.
             if (amount > 0.0)
             {
+                // Extinguish player first.
+                ExtinguishEntity(client);
+                
                 // Ignite player for "amount" seconds.
                 IgniteEntity(client, amount);