summaryrefslogtreecommitdiff
path: root/src/beingmanager.cpp
diff options
context:
space:
mode:
authorPhilipp Sehmisch <crush@themanaworld.org>2009-01-23 14:33:20 +0100
committerPhilipp Sehmisch <crush@themanaworld.org>2009-01-23 14:33:20 +0100
commit35fb23f4c447004b8d6488bff697932f7abdba73 (patch)
tree25e8e16b17cb01b726e0f48795f55b69f9347785 /src/beingmanager.cpp
parentcae4571d182fcd64f6bef94552770768f651f30a (diff)
parent3d5cde132a10ccb1905688e29dca428aa772c777 (diff)
downloadmana-35fb23f4c447004b8d6488bff697932f7abdba73.tar.gz
mana-35fb23f4c447004b8d6488bff697932f7abdba73.tar.bz2
mana-35fb23f4c447004b8d6488bff697932f7abdba73.tar.xz
mana-35fb23f4c447004b8d6488bff697932f7abdba73.zip
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/beingmanager.cpp')
-rw-r--r--src/beingmanager.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/beingmanager.cpp b/src/beingmanager.cpp
index a1cb61e8..551820da 100644
--- a/src/beingmanager.cpp
+++ b/src/beingmanager.cpp
@@ -1,21 +1,21 @@
/*
* The Mana World
- * Copyright 2004 The Mana World Development Team
+ * Copyright (C) 2004 The Mana World Development Team
*
* This file is part of The Mana World.
*
- * The Mana World is free software; you can redistribute it and/or modify
+ * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* any later version.
*
- * The Mana World is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with The Mana World; if not, write to the Free Software
+ * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
@@ -71,15 +71,15 @@ Being* BeingManager::createBeing(Uint32 id, Uint16 job)
if (job < 10)
being = new Player(id, job, mMap);
- else if (job >= 100 && job < 200)
+ else if (job >= 50 && job < 1002)
being = new NPC(id, job, mMap, mNetwork);
- else if (job >= 1000 && job < 1200)
+ else if (job >= 1002 && job < 1500)
being = new Monster(id, job, mMap);
else
being = new Being(id, job, mMap);
// Player or NPC
- if (job < 200)
+ if (job < 1002)
{
MessageOut outMsg(mNetwork);
outMsg.writeInt16(0x0094);