Converted some DOS newlines to UNIX

5 files changed, 220 insertions, 220 deletions

diff --git a/src/gui/magic.cpp b/src/gui/magic.cpp
index a31b661a..ca7b5489 100644
--- a/src/gui/magic.cpp
+++ b/src/gui/magic.cpp
@@ -1,92 +1,92 @@
-/*

- *  The Mana World

- *  Copyright 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

- *  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.

- *

- *  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

- */

-

-#include <guichan/widgets/label.hpp>

-#include <guichan/widgets/container.hpp>

-

-#include "magic.h"

-

-#include "button.h"

-

-#include "../localplayer.h"

-

-#include "../utils/dtor.h"

-#include "../utils/tostring.h"

-#include "../utils/gettext.h"

-

-MagicDialog::MagicDialog():

-    Window(_("Magic"))

-{

-    setCloseButton(true);

-    setDefaultSize(255, 25, 175, 225);

-

-    gcn::Button *spellButton1 = new Button(_("Cast Test Spell 1"), "spell_1", this);

-    gcn::Button *spellButton2 = new Button(_("Cast Test Spell 2"), "spell_2", this);

-    gcn::Button *spellButton3 = new Button(_("Cast Test Spell 3"), "spell_3", this);

-

-    spellButton1->setPosition(10, 30);

-    spellButton2->setPosition(10, 60);

-    spellButton3->setPosition(10, 90);

-

-    add(spellButton1);

-    add(spellButton2);

-    add(spellButton3);

-

-    update();

-

-    setLocationRelativeTo(getParent());

-    loadWindowState(_("Magic"));

-}

-

-MagicDialog::~MagicDialog()

-{

-}

-

-void MagicDialog::action(const gcn::ActionEvent &event)

-{

-    if (event.getId() == "spell_1")

-    {

-        player_node->useSpecial(1);

-    }

-    if (event.getId() == "spell_2")

-    {

-        player_node->useSpecial(2);

-    }

-    if (event.getId() == "spell_3")

-    {

-        player_node->useSpecial(3);

-    }

-    else if (event.getId() == "close")

-    {

-        setVisible(false);

-    }

-}

-

-void MagicDialog::draw(gcn::Graphics *g)

-{

-    update();

-

-    Window::draw(g);

-}

-

-void MagicDialog::update()

-{

-}

+/*
+ *  The Mana World
+ *  Copyright 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
+ *  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.
+ *
+ *  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
+ */
+
+#include <guichan/widgets/label.hpp>
+#include <guichan/widgets/container.hpp>
+
+#include "magic.h"
+
+#include "button.h"
+
+#include "../localplayer.h"
+
+#include "../utils/dtor.h"
+#include "../utils/tostring.h"
+#include "../utils/gettext.h"
+
+MagicDialog::MagicDialog():
+    Window(_("Magic"))
+{
+    setCloseButton(true);
+    setDefaultSize(255, 25, 175, 225);
+
+    gcn::Button *spellButton1 = new Button(_("Cast Test Spell 1"), "spell_1", this);
+    gcn::Button *spellButton2 = new Button(_("Cast Test Spell 2"), "spell_2", this);
+    gcn::Button *spellButton3 = new Button(_("Cast Test Spell 3"), "spell_3", this);
+
+    spellButton1->setPosition(10, 30);
+    spellButton2->setPosition(10, 60);
+    spellButton3->setPosition(10, 90);
+
+    add(spellButton1);
+    add(spellButton2);
+    add(spellButton3);
+
+    update();
+
+    setLocationRelativeTo(getParent());
+    loadWindowState(_("Magic"));
+}
+
+MagicDialog::~MagicDialog()
+{
+}
+
+void MagicDialog::action(const gcn::ActionEvent &event)
+{
+    if (event.getId() == "spell_1")
+    {
+        player_node->useSpecial(1);
+    }
+    if (event.getId() == "spell_2")
+    {
+        player_node->useSpecial(2);
+    }
+    if (event.getId() == "spell_3")
+    {
+        player_node->useSpecial(3);
+    }
+    else if (event.getId() == "close")
+    {
+        setVisible(false);
+    }
+}
+
+void MagicDialog::draw(gcn::Graphics *g)
+{
+    update();
+
+    Window::draw(g);
+}
+
+void MagicDialog::update()
+{
+}
diff --git a/src/gui/magic.h b/src/gui/magic.h
index af46c823..48146b9c 100644
--- a/src/gui/magic.h
+++ b/src/gui/magic.h
@@ -1,75 +1,75 @@
-/*

- *  The Mana World

- *  Copyright 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

- *  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.

- *

- *  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

- */

-

-#ifndef _TMW_MAGIC_H

-#define _TMW_MAGIC_H

-

-#include <guichan/actionlistener.hpp>

-

-#include "window.h"

-#include "gccontainer.h"

-

-#include "../guichanfwd.h"

-

-

-/**

- * The skill dialog.

- *

- * \ingroup Interface

- */

-class MagicDialog : public Window, public gcn::ActionListener

-{

-    public:

-        /**

-         * Constructor.

-         */

-        MagicDialog();

-

-        /**

-         * Destructor.

-         */

-        ~MagicDialog();

-

-        /**

-         * Called when receiving actions from widget.

-         */

-        void action(const gcn::ActionEvent &event);

-

-        /**

-         * Update the tabs in this dialog

-         */

-        void update();

-

-        /**

-          * Draw this window.

-          */

-        void draw(gcn::Graphics *g);

-

-    private:

-

-};

-

-

-

-

-extern MagicDialog *magicDialog;

-

-#endif

+/*
+ *  The Mana World
+ *  Copyright 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
+ *  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.
+ *
+ *  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
+ */
+
+#ifndef _TMW_MAGIC_H
+#define _TMW_MAGIC_H
+
+#include <guichan/actionlistener.hpp>
+
+#include "window.h"
+#include "gccontainer.h"
+
+#include "../guichanfwd.h"
+
+
+/**
+ * The skill dialog.
+ *
+ * \ingroup Interface
+ */
+class MagicDialog : public Window, public gcn::ActionListener
+{
+    public:
+        /**
+         * Constructor.
+         */
+        MagicDialog();
+
+        /**
+         * Destructor.
+         */
+        ~MagicDialog();
+
+        /**
+         * Called when receiving actions from widget.
+         */
+        void action(const gcn::ActionEvent &event);
+
+        /**
+         * Update the tabs in this dialog
+         */
+        void update();
+
+        /**
+          * Draw this window.
+          */
+        void draw(gcn::Graphics *g);
+
+    private:
+
+};
+
+
+
+
+extern MagicDialog *magicDialog;
+
+#endif
diff --git a/src/tmw.rc b/src/tmw.rc
index 673b2387..9661ac6b 100644
--- a/src/tmw.rc
+++ b/src/tmw.rc
@@ -1,23 +1,23 @@
-#include <windows.h> // include for version info constants

-

-#include "winver.h"

-

-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"

-

-1 VERSIONINFO

-FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD

-PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD

-FILETYPE VFT_APP {

-    BLOCK "StringFileInfo" {

-        BLOCK "040904E4" {

-            VALUE "CompanyName", "The Mana World Development Team"

-            VALUE "FileVersion", PACKAGE_VERSION

-            VALUE "FileDescription", "The Mana World"

-            VALUE "LegalCopyright", "2004-2006 (C)"

-            VALUE "OriginalFilename", "tmw.exe"

-            VALUE "ProductName", "The Mana World MMORPG"

-            VALUE "ProductVersion", PACKAGE_VERSION

-        }

-    }

-}

-

+#include <windows.h> // include for version info constants
+
+#include "winver.h"
+
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "data/icons/tmw.ico"
+
+1 VERSIONINFO
+FILEVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+PRODUCTVERSION VER_MAJOR,VER_MINOR,VER_RELEASE,VER_BUILD
+FILETYPE VFT_APP {
+    BLOCK "StringFileInfo" {
+        BLOCK "040904E4" {
+            VALUE "CompanyName", "The Mana World Development Team"
+            VALUE "FileVersion", PACKAGE_VERSION
+            VALUE "FileDescription", "The Mana World"
+            VALUE "LegalCopyright", "2004-2006 (C)"
+            VALUE "OriginalFilename", "tmw.exe"
+            VALUE "ProductName", "The Mana World MMORPG"
+            VALUE "ProductVersion", PACKAGE_VERSION
+        }
+    }
+}
+
diff --git a/tools/dyecmd/README b/tools/dyecmd/README
index 0c1a9aba..c2981bb0 100644
--- a/tools/dyecmd/README
+++ b/tools/dyecmd/README
@@ -1,12 +1,12 @@
-DYECMD

-=======

-

-This tool is used to dye item graphics used by the tmw client according to the

-specification described here: http://wiki.themanaworld.org/index.php/Image_dyeing

-

-The tool expects 3 parameters:

-

-dyecmd <source_image> <target_image> <dye_string>

-e.g.:

-dyecmd "armor-legs-shorts.png" "armor-legs-shorts2.png" "W:#222255,6666ff"

-

+DYECMD
+=======
+
+This tool is used to dye item graphics used by the tmw client according to the
+specification described here: http://wiki.themanaworld.org/index.php/Image_dyeing
+
+The tool expects 3 parameters:
+
+dyecmd <source_image> <target_image> <dye_string>
+e.g.:
+dyecmd "armor-legs-shorts.png" "armor-legs-shorts2.png" "W:#222255,6666ff"
+
diff --git a/tools/tmxcopy/Makefile b/tools/tmxcopy/Makefile
index 732dec36..84aa9fc6 100644
--- a/tools/tmxcopy/Makefile
+++ b/tools/tmxcopy/Makefile
@@ -1,18 +1,18 @@
-CC=g++

-CFLAGS=-c `pkg-config --cflags libxml-2.0`

-LDFLAGS=`pkg-config --libs libxml-2.0`

-SOURCES=base64.cpp main.cpp map.cpp xmlutils.cpp zlibutils.cpp

-OBJECTS=$(SOURCES:.cpp=.o)

-EXECUTABLE=tmxcopy

-

-all: $(SOURCES) $(EXECUTABLE)

-	make clean

-

-$(EXECUTABLE): $(OBJECTS)

-	$(CC) $(LDFLAGS) $(OBJECTS) -o $@

-

-.cpp.o:

-	$(CC) $(CFLAGS) $< -o $@

-

-clean:

-	rm -f *.o

+CC=g++
+CFLAGS=-c `pkg-config --cflags libxml-2.0`
+LDFLAGS=`pkg-config --libs libxml-2.0`
+SOURCES=base64.cpp main.cpp map.cpp xmlutils.cpp zlibutils.cpp
+OBJECTS=$(SOURCES:.cpp=.o)
+EXECUTABLE=tmxcopy
+
+all: $(SOURCES) $(EXECUTABLE)
+	make clean
+
+$(EXECUTABLE): $(OBJECTS)
+	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
+
+.cpp.o:
+	$(CC) $(CFLAGS) $< -o $@
+
+clean:
+	rm -f *.o