summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-06 15:35:31 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-10-06 15:35:31 +0000
commitf3ac07ef1c9f6224f985d5bff2f405f6bc9bf226 (patch)
tree0bfc02f8ef4c4a924296958465ae1ec480aa7c17 /npc
parent688dc3e7034d4cdbb9a6f62879a2dcdc84ec8180 (diff)
downloadhercules-f3ac07ef1c9f6224f985d5bff2f405f6bc9bf226.tar.gz
hercules-f3ac07ef1c9f6224f985d5bff2f405f6bc9bf226.tar.bz2
hercules-f3ac07ef1c9f6224f985d5bff2f405f6bc9bf226.tar.xz
hercules-f3ac07ef1c9f6224f985d5bff2f405f6bc9bf226.zip
* the mapserver won't exit when no mapcache is found, with use_grf: yes
* Fixed some \r uses, now looks better; /thx to Ai4rei (topic:165952) * Removed that ridiculous spinner that displays during map/npc loading, and added a more informative progress indicator (idea from jA/eapp) * Checked/fixed/removed some old script and npc commands * cmdothernpc - a specialized 'donpcevent' with the event specified as two arguments * enablearena/disablearena - completely equivalent to enablewaitingroomevent & co. * inittimer/stoptimer - removed since its logic was incompatible with the code it depended on * Removed loads of code that supported these functions. Result: -100b per npc => -1,5MB of wasted memory * Fixed related npcs that erroneously used 'stoptimer' git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11374 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/airports/airships.txt4
-rw-r--r--npc/quests/The_Sign_Quest.txt2
3 files changed, 4 insertions, 3 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index fe1fdd154..457a9e353 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,7 @@
Date Added
======
2007/10/06
+ * Fixed scripts that used 'stoptimer' instead of 'stopnpctimer' [ultramage]
* Updated Atroce's respawn time on Veins fields [Playtester]
2007/10/05
* Fixed a bug in Hugel Bingo which caused wrong rotation in player locations. [SinSloth]
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt
index 3ea1ae87e..481fa1cc2 100644
--- a/npc/airports/airships.txt
+++ b/npc/airports/airships.txt
@@ -171,7 +171,7 @@ OnTimer250000:
mapannounce "airplane","Currently, we are in Yuno. The Airship will leave shortly.",1,0x70DBDB;
end;
OnTimer260000:
- stoptimer;
+ stopnpctimer;
}
}
@@ -753,7 +753,7 @@ OnTimer185000:
mapannounce "airplane_01","Currently, we are in Rachel. The Airship will leave shortly.",1,0xFF8600;
end;
OnTimer195000:
- stoptimer;
+ stopnpctimer;
}
OnReturn:
killmonsterall "airplane_01";
diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt
index 9e2a4fe1d..91d8e31d7 100644
--- a/npc/quests/The_Sign_Quest.txt
+++ b/npc/quests/The_Sign_Quest.txt
@@ -3862,7 +3862,7 @@ OnPlayerLogout:
OnTimer3000:
enablewaitingroomevent "Waiting Room#SignDance";
- stoptimer;
+ stopnpctimer;
end;
OnInit: