From 78fe54019f15c2b6b07e129fa38578710143050a Mon Sep 17 00:00:00 2001
From: Lee Salzman <lsalzman@gmail.com>
Date: Thu, 23 Oct 2008 19:06:21 +0000
Subject: [PATCH] renamed "clips" ent to "pistol"

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3209 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 config/docs.cfg         | 4 ++--
 config/menus_edit.cfg   | 2 +-
 config/scripts.cfg      | 2 +-
 source/src/entities.cpp | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/docs.cfg b/config/docs.cfg
index 1f07b605..7e2e565c 100644
--- a/config/docs.cfg
+++ b/config/docs.cfg
@@ -954,7 +954,7 @@ docremark [For example: /mapmsg "Map By Author"];
 
 docident [newent] [Adds a new entity];
 
-docargument [type] [the entity type] [light, playerstart, clips, ammobox, grenades, health, armour, akimbo, mapmodel, ladder, ctf-flag] [0];
+docargument [type] [the entity type] [light, playerstart, pistol, ammobox, grenades, health, armour, akimbo, mapmodel, ladder, ctf-flag] [0];
 
 docargument [value1] [see newent 'type'] [] [0];
 
@@ -980,7 +980,7 @@ docident [newent armour] [Adds a new armour item.];
 
 
 
-docident [newent clips] [Adds a pistol magazine item.];
+docident [newent pistol] [Adds a pistol magazine item.];
 
 
 
diff --git a/config/menus_edit.cfg b/config/menus_edit.cfg
index b96681f4..2d6524e4 100644
--- a/config/menus_edit.cfg
+++ b/config/menus_edit.cfg
@@ -58,7 +58,7 @@ menuitem "Ladder entity"	"saycommand /newent ladder "
 newmenu Pickups
 
 menuitem "Health"		"newent health"
-menuitem "Pistol Magazine"	"newent clips"
+menuitem "Pistol Magazine"	"newent pistol"
 menuitem "Box of Ammo"		"newent ammobox"
 menuitem "Kevlar Vest"		"newent armour"
 menuitem "Akimbo"		"newent akimbo"
diff --git a/config/scripts.cfg b/config/scripts.cfg
index 4378d726..37f9bb87 100644
--- a/config/scripts.cfg
+++ b/config/scripts.cfg
@@ -18,7 +18,7 @@ loop i (listlen $mapcommands) [
 
 complete demo "demos" dmo
 
-alias entcomplete [listcomplete $arg1 "light playerstart clips ammobox grenades health armour akimbo mapmodel trigger ladder ctf-flag sound clip"]
+alias entcomplete [listcomplete $arg1 "light playerstart pistol ammobox grenades health armour akimbo mapmodel trigger ladder ctf-flag sound clip"]
 
 entcomplete newent
 
diff --git a/source/src/entities.cpp b/source/src/entities.cpp
index 8bf19786..d30fa520 100644
--- a/source/src/entities.cpp
+++ b/source/src/entities.cpp
@@ -8,7 +8,7 @@ vector<entity> ents;
 const char *entnames[] =
 {
     "none?", "light", "playerstart",
-    "clips", "ammobox","grenades",
+    "pistol", "ammobox","grenades",
     "health", "armour", "akimbo",
     "mapmodel", "trigger",
     "ladder", "ctf-flag",