* Fixed a deallocation mistake and some buffer overflows in npc_chat.c after doing rtfm@pcre.txt (all caused by incorrect usage of pcre api)

* Removed underscores in npc_chat.c's variable names (easier to read)
* Reindented the whole thing (used spaces half of the time ._.)
* Moved npc pcre-data deallocation from npc_remove_map to npc_unload

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11036 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 61 insertions, 60 deletions

diff --git a/conf-tmpl/charcommand_athena.conf b/conf-tmpl/charcommand_athena.conf
index 927a44054..acd89779a 100644
--- a/conf-tmpl/charcommand_athena.conf
+++ b/conf-tmpl/charcommand_athena.conf
@@ -1,13 +1,13 @@
 // Athena charcommand Configuration file.
 // Translated by Peter Kieser <pfak@telus.net>
 
-// Set here the symbol that you want to use for your commands
-// Only 1 character is get (default is '#'). You can set any character,
-// except control-character (0x00-0x1f), '%' (party chat speaking),
-// '/' (standard ragnarok GM commands) and '@' (Standard GM Commands)
-// With default character, all commands begin by a '#', example: #save SomePlayer
+// The symbol that will be used to recognize commands.
+// You can set any one character, except control-characters (0x00-0x1f),
+// '%', '$' (party/guild chat speaking) and '/' (standard client commands).
+// The symbol must be different from from the standard GM command symbol.
 command_symbol: #
 
+
 //--------------------------
 // 0: normal player commands
 // None for security purposes.
@@ -25,85 +25,86 @@ command_symbol: #
 // 40: Sub-GM commands
 
 
-//View the items in a character's cart
+// View the items in a character's cart
 cartlist: 40
 
-//Apply an effect onto another character
+// Apply an effect onto another character
 effect: 40
 
-//View the exp of a character
+// View the exp of a character
 exp: 40
 
-//List a chacter's items
+// List a chacter's items
 itemlist: 40
 
-//View the jail time remaining
+// View the jail time remaining
 jailtime: 40
 
-//Refresh a character
+// Refresh a character
 refresh: 40
 
-//List a chacter's stats
+// List a chacter's stats
 stats: 40
 
-//List a chacter's storage items
+// List a chacter's storage items
 storagelist: 40
 
 //---------------------
 // 50: Sub-GM+ commands
 
-//Change a character's clothing color
+// Change a character's clothing color
 dye: 50
 
-//Give another character a fake name
+// Give another character a fake name
 fakename: 50
 
-//Open the hatch dialog for a character
+// Open the hatch dialog for a character
 hatch: 50
 
-//Change a character's hair color
+// Change a character's hair color
 hcolor: 50
 haircolor: 50
 
-//Change a character's hair style
+// Change a character's hair style
 hstyle: 50
 hairstyle: 50
 
 // Changes character's model
 model: 50
 
-//Give or remove a peco from a character
+// Give or remove a peco from a character
 mount: 50
 mountpeco: 50
 
-//Make another character's pet friendly/not
+// Make another character's pet friendly/not
 petfriendly: 50
 
-//Rename another character's pet
+// Rename another character's pet
 petrename: 50
 
-//Change a character's size
+// Change a character's size
 size: 50
 
 //----------------
 // 60: GM commands
 
-//Resurrects a dead character
+// Resurrects a dead character
 alive: 60
+revive: 60
 
-//Give a player all the skills available to him/her
+// Give a player all the skills available to him/her
 allskill: 60
 allskills: 60
 skillall: 60
 skillsall: 60
 
-//Give a character the maximum possible stats
+// Give a character the maximum possible stats
 allstat: 60
 allstats: 60
 statall: 60
 statsall: 60
 
-//Change another character's base level (3 same commands)
+// Change another character's base level (3 same commands)
 blvl: 60
 blevel: 60
 baselvl: 60
@@ -112,118 +113,118 @@ baselevel: 60
 // Changes the sex of an online player (all characters on the account)
 changesex: 60
 
-//Delete items from a character
+// Delete items from a character
 delitem: 60
 
-//Disguise a character
+// Disguise a character
 disguise: 60
 undisguise: 60
 
-//Resets another character's designated maps
+// Resets another character's designated maps
 feelreset: 60
 
-//Change the guild level for a character's guild
+// Change the guild level for a character's guild
 glvl: 60
 glevel: 60
 guildlvl: 60
 guildlevel: 60
 
-//Open guild storage for a character
+// Open guild storage for a character
 gstorage: 60
 
-//Heal a character
+// Heal a character
 heal: 60
 
-//Invoke GM Hide on a character
+// Invoke GM Hide on a character
 hide: 60
 
-//Increase a character's homunculus' level
+// Increase a character's homunculus' level
 hlvl: 60
 hlevel: 60
 homlvl: 60
 homlevel: 60
 
-//Evolve a character's homunculus
+// Evolve a character's homunculus
 homevolve: 60
 homevolution: 60
 
-//Change a character's homunculus' friendly value
+// Change a character's homunculus' friendly value
 homfriendly: 60
 
-//Change a character's homunculus' hunger value
+// Change a character's homunculus' hunger value
 homhungry: 60
 
-//View a character's homunculus' stats
+// View a character's homunculus' stats
 hominfo: 40
 
-//Give another character an item
+// Give another character an item
 item: 60
 
-//Create a specific item (with cards, refines, etc
+// Create a specific item (with cards, refines, etc
 item2: 60
 
-//Remove all of a character's possessions
+// Remove all of a character's possessions
 itemreset: 60
 
-//Change another character's job (2 same commands)
+// Change another character's job (2 same commands)
 job: 60
 jobchange: 60
 
-//Change another character's job level (3 same commands)
+// Change another character's job level (3 same commands)
 jlvl: 60
 jlevel: 60
 joblvl: 60
 joblevel: 60
 
-//Allow a character to attack anybody
+// Allow a character to attack anybody
 killer: 60
 
-//Make a character killable by anybody
+// Make a character killable by anybody
 killable: 60
 
-//Return a character to their respawn point
+// Return a character to their respawn point
 load: 60
 
-//Take away a character's platinum skill
+// Take away a character's platinum skill
 lostskill: 60
 
-//Make a character immune to monsters
+// Make a character immune to monsters
 monsterignore: 60
 
-//Apply a certain option to another character
+// Apply a certain option to another character
 option: 60
 
-//Change a character's pet's hungry value
+// Change a character's pet's hungry value
 pethungry: 60
 
-//Produce forged equipment on a character (as if he/she was a blacksmith)
+// Produce forged equipment on a character (as if he/she was a blacksmith)
 produce: 60
 
-//Give another character a platinum skill
+// Give another character a platinum skill
 questskill: 60
 
-//Performs a stat and skill reset on someone else.
+// Performs a stat and skill reset on someone else.
 reset: 60
 
-//Save another character
+// Save another character
 save: 60
 
 // Gives another character skill points
 skpoint: 60
 
-//Change a character's walking speed
+// Change a character's walking speed
 speed: 60
 
-//Give another character spiritball effect
+// Give another character spiritball effect
 spiritball: 60
 
-//Open storage for a character
+// Open storage for a character
 storage: 60
 
 // Gives another character status points
 stpoint: 60
 
-//Change a character's stats
+// Change a character's stats
 str: 60
 agi: 60
 vit: 60
@@ -243,10 +244,10 @@ rura+: 60
 //----------------------
 // 80: GM Chief commands
 
-//Refine a character's equipment
+// Refine a character's equipment
 refine: 80
 
-//Give another character zeny
+// Give another character zeny
 zeny: 80
 
 //---------------------------