summaryrefslogtreecommitdiff
path: root/src/map/script.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-20 20:40:34 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-20 20:40:34 +0000
commit0c42180571429f5a11ada59e3adc8fff5711c073 (patch)
tree811ce8e6c7f572f07bab57a37679b71ffbfe567b /src/map/script.c
parentb6ea55b755afff6cd8353896353272563498bfe2 (diff)
downloadhercules-0c42180571429f5a11ada59e3adc8fff5711c073.tar.gz
hercules-0c42180571429f5a11ada59e3adc8fff5711c073.tar.bz2
hercules-0c42180571429f5a11ada59e3adc8fff5711c073.tar.xz
hercules-0c42180571429f5a11ada59e3adc8fff5711c073.zip
- Fixed one missed malloc->aMallocA typo, causing memory deallocation problems
- Some small trunk-stable formatting synchronization git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10595 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/script.c')
-rw-r--r--src/map/script.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 7432cad79..2a4c4ccc5 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2375,7 +2375,7 @@ int isstr(struct script_data *c)
return 0;
}
-/// Triary operators
+/// Ternary operators
/// test ? if_true : if_false
void op_3(struct script_state* st, int op)
{
@@ -3825,9 +3825,7 @@ BUILDIN_FUNC(sleep);
BUILDIN_FUNC(sleep2);
BUILDIN_FUNC(awake);
BUILDIN_FUNC(getvariableofnpc);
-// [blackhole89] -->
BUILDIN_FUNC(warpportal);
-// <-- [blackhole89]
BUILDIN_FUNC(homunculus_evolution) ; //[orn]
BUILDIN_FUNC(eaclass);
BUILDIN_FUNC(roclass);