summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-20 21:35:30 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-04-20 21:35:30 +0000
commit220f58528e5ae82203952de6a6df4855519917f4 (patch)
tree8e3a139c59a307b732dbe48ab3600dd6a6fac54d
parent300c953376ea93e9ba8e3ba2b97173dcecd11239 (diff)
downloadmanaserv-220f58528e5ae82203952de6a6df4855519917f4.tar.gz
manaserv-220f58528e5ae82203952de6a6df4855519917f4.tar.bz2
manaserv-220f58528e5ae82203952de6a6df4855519917f4.tar.xz
manaserv-220f58528e5ae82203952de6a6df4855519917f4.zip
Added 100 to NPC IDs to keep 0.0 compatibility for now.
-rw-r--r--ChangeLog2
-rw-r--r--data/test.lua10
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b39b6f9..d6d10bc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
src/net/connectionhandler.cpp, src/game-server/map.cpp,
src/game-server/character.cpp, src/game-server/character.hpp: Fixed
some compiler errors/warnings.
+ * data/test.lua: Added 100 to NPC IDs to keep 0.0 compatibility for
+ now.
2008-04-20 Dennis Friis <peavey@placid.dk>
diff --git a/data/test.lua b/data/test.lua
index 2097c69a..9704a092 100644
--- a/data/test.lua
+++ b/data/test.lua
@@ -5,10 +5,10 @@
require "data/scripts/npclib"
atinit(function()
- create_npc(100, 50 * 32 + 16, 19 * 32 + 16, npc1_talk, npclib.walkaround_small)
- create_npc(101, 51 * 32 + 16, 25 * 32 + 16, npc4_talk, npclib.walkaround_wide)
- create_npc(26, 45 * 32 + 16, 25 * 32 + 16, npc5_talk, npclib.walkaround_map)
- create_npc(22, 58 * 32 + 16, 15 * 32 + 16, npc6_talk, nil)
+ create_npc(200, 50 * 32 + 16, 19 * 32 + 16, npc1_talk, npclib.walkaround_small)
+ create_npc(201, 51 * 32 + 16, 25 * 32 + 16, npc4_talk, npclib.walkaround_wide)
+ create_npc(126, 45 * 32 + 16, 25 * 32 + 16, npc5_talk, npclib.walkaround_map)
+ create_npc(122, 58 * 32 + 16, 15 * 32 + 16, npc6_talk, nil)
end)
function npc1_talk(npc, ch)
@@ -91,4 +91,4 @@ function npc6_talk(npc, ch)
tmw.being_walk(npc, 55 * 32 + 16, 15 * 32 + 16, 400)
guard_position = 1
end
-end \ No newline at end of file
+end