From 6d3e53146ba15e4d90670db3067fa7f1a67034e1 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 13 Jul 2009 21:39:23 -0600 Subject: Rename Net::SkillHandler to Net::SpecialHandler SkillHandler::up moved to PlayerHandler::increaseSkill --- src/net/tmwserv/playerhandler.cpp | 5 ++++ src/net/tmwserv/playerhandler.h | 2 ++ src/net/tmwserv/skillhandler.cpp | 53 -------------------------------------- src/net/tmwserv/skillhandler.h | 45 -------------------------------- src/net/tmwserv/specialhandler.cpp | 53 ++++++++++++++++++++++++++++++++++++++ src/net/tmwserv/specialhandler.h | 45 ++++++++++++++++++++++++++++++++ 6 files changed, 105 insertions(+), 98 deletions(-) delete mode 100644 src/net/tmwserv/skillhandler.cpp delete mode 100644 src/net/tmwserv/skillhandler.h create mode 100644 src/net/tmwserv/specialhandler.cpp create mode 100644 src/net/tmwserv/specialhandler.h (limited to 'src/net/tmwserv') diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp index 6cf81496..fe1b821c 100644 --- a/src/net/tmwserv/playerhandler.cpp +++ b/src/net/tmwserv/playerhandler.cpp @@ -332,6 +332,11 @@ void PlayerHandler::decreaseStat(LocalPlayer::Attribute attr) // TODO } +void PlayerHandler::increaseSkill(int skillId) +{ + // Not used atm +} + void PlayerHandler::pickUp(FloorItem *floorItem) { int id = floorItem->getId(); diff --git a/src/net/tmwserv/playerhandler.h b/src/net/tmwserv/playerhandler.h index 164d30ae..88844a55 100644 --- a/src/net/tmwserv/playerhandler.h +++ b/src/net/tmwserv/playerhandler.h @@ -42,6 +42,8 @@ class PlayerHandler : public MessageHandler, public Net::PlayerHandler void decreaseStat(LocalPlayer::Attribute attr); + void increaseSkill(int skillId); + void pickUp(FloorItem *floorItem); void setDirection(char direction); diff --git a/src/net/tmwserv/skillhandler.cpp b/src/net/tmwserv/skillhandler.cpp deleted file mode 100644 index e35b896a..00000000 --- a/src/net/tmwserv/skillhandler.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * 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. - * - * 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "net/tmwserv/skillhandler.h" - -Net::SkillHandler *skillHandler; - -namespace TmwServ { - -SkillHandler::SkillHandler() -{ - skillHandler = this; -} - -void SkillHandler::up(int skillId) -{ - // TODO -} - -void SkillHandler::use(int skillId, int level, int beingId) -{ - // TODO -} - -void SkillHandler::use(int skillId, int level, int x, int y) -{ - // TODO -} - -void SkillHandler::use(int skillId, const std::string &map) -{ - // TODO -} - -} // namespace TmwServ diff --git a/src/net/tmwserv/skillhandler.h b/src/net/tmwserv/skillhandler.h deleted file mode 100644 index 8c459c4f..00000000 --- a/src/net/tmwserv/skillhandler.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * The Mana World - * Copyright (C) 2004 The Mana World Development Team - * - * This file is part of The Mana World. - * - * 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. - * - * 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 this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef NET_TMWSERV_SKILLHANDLER_H -#define NET_TMWSERV_SKILLHANDLER_H - -#include "net/skillhandler.h" - -namespace TmwServ { - -class SkillHandler : public Net::SkillHandler -{ - public: - SkillHandler(); - - void up(int skillId); - - void use(int skillId, int level, int beingId); - - void use(int skillId, int level, int x, int y); - - void use(int skillId, const std::string &map); -}; - -} // namespace TmwServ - -#endif diff --git a/src/net/tmwserv/specialhandler.cpp b/src/net/tmwserv/specialhandler.cpp new file mode 100644 index 00000000..5be8272a --- /dev/null +++ b/src/net/tmwserv/specialhandler.cpp @@ -0,0 +1,53 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * 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. + * + * 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "net/tmwserv/specialhandler.h" + +Net::SpecialHandler *specialHandler; + +namespace TmwServ { + +SpecialHandler::SpecialHandler() +{ + specialHandler = this; +} + +void SpecialHandler::use(int id) +{ + // TODO +} + +void SpecialHandler::use(int id, int level, int beingId) +{ + // TODO +} + +void SpecialHandler::use(int id, int level, int x, int y) +{ + // TODO +} + +void SpecialHandler::use(int id, const std::string &map) +{ + // TODO +} + +} // namespace TmwServ diff --git a/src/net/tmwserv/specialhandler.h b/src/net/tmwserv/specialhandler.h new file mode 100644 index 00000000..c7ebd6a2 --- /dev/null +++ b/src/net/tmwserv/specialhandler.h @@ -0,0 +1,45 @@ +/* + * The Mana World + * Copyright (C) 2004 The Mana World Development Team + * + * This file is part of The Mana World. + * + * 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. + * + * 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 this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef NET_TMWSERV_SKILLHANDLER_H +#define NET_TMWSERV_SKILLHANDLER_H + +#include "net/specialhandler.h" + +namespace TmwServ { + +class SpecialHandler : public Net::SpecialHandler +{ + public: + SpecialHandler(); + + void use(int id); + + void use(int id, int level, int beingId); + + void use(int id, int level, int x, int y); + + void use(int id, const std::string &map); +}; + +} // namespace TmwServ + +#endif -- cgit v1.2.3-60-g2f50