diff options
Diffstat (limited to 'src/common')
-rw-r--r-- | src/common/configuration.cpp | 15 | ||||
-rw-r--r-- | src/common/configuration.hpp | 13 | ||||
-rw-r--r-- | src/common/inventorydata.hpp | 26 | ||||
-rw-r--r-- | src/common/transaction.hpp | 26 |
4 files changed, 39 insertions, 41 deletions
diff --git a/src/common/configuration.cpp b/src/common/configuration.cpp index e749af88..e840e6f7 100644 --- a/src/common/configuration.cpp +++ b/src/common/configuration.cpp @@ -1,22 +1,21 @@ /* - * The Mana World - * Copyright 2004 The Mana World Development Team + * The Mana Server + * Copyright (C) 2004 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of The Mana Server. * - * The Mana World is free software; you can redistribute it and/or modify + * The Mana Server 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, + * The Mana Server 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 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ #include <cmath> @@ -44,7 +43,7 @@ void Configuration::initialize(const std::string &filename) xmlNodePtr node = xmlDocGetRootElement(doc); if (!node || !xmlStrEqual(node->name, BAD_CAST "configuration")) { - LOG_WARN("No configuration file '" << filename.c_str() << "'."); + LOG_WARN("No configuration file '" << filename.c_str() << "'."); return; } diff --git a/src/common/configuration.hpp b/src/common/configuration.hpp index b7c296f3..1cabdf51 100644 --- a/src/common/configuration.hpp +++ b/src/common/configuration.hpp @@ -1,22 +1,21 @@ /* - * The Mana World - * Copyright 2004-2007 The Mana World Development Team + * The Mana Server + * Copyright (C) 2004-2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of The Mana Server. * - * The Mana World is free software; you can redistribute it and/or modify + * The Mana Server 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, + * The Mana Server 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 - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ #ifndef __INIREAD_H diff --git a/src/common/inventorydata.hpp b/src/common/inventorydata.hpp index 75e8f5b3..486d5605 100644 --- a/src/common/inventorydata.hpp +++ b/src/common/inventorydata.hpp @@ -1,21 +1,21 @@ /* - * The Mana World Server - * Copyright 2007 The Mana World Development Team + * The Mana Server + * Copyright (C) 2007 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of The Mana Server. * - * The Mana World 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 Server 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, 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. + * The Mana Server 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 Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ #ifndef COMMON_INVENTORYDATA_HPP diff --git a/src/common/transaction.hpp b/src/common/transaction.hpp index 0a995483..9186436b 100644 --- a/src/common/transaction.hpp +++ b/src/common/transaction.hpp @@ -1,21 +1,21 @@ /* - * The Mana World Server - * Copyright 2009 The Mana World Development Team + * The Mana Server + * Copyright (C) 2009 The Mana World Development Team * - * This file is part of The Mana World. + * This file is part of The Mana Server. * - * The Mana World 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 Server 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, 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. + * The Mana Server 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 Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ #ifndef TRANSACTION_H |