Added modules and moved some files around.

13 files changed, 257 insertions, 18 deletions

diff --git a/.cvsignore b/.cvsignore
index dda97de5..f68913c5 100755
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,6 +7,8 @@ tmw
 config.h.in
 config.h
 config.log
+config.status
 aclocal.m4
+Makefile.in
 Makefile
 configure
diff --git a/docs/AUTHORS.txt b/AUTHORS
index 1910cc84..17d77974 100644
--- a/docs/AUTHORS.txt
+++ b/AUTHORS
@@ -8,6 +8,9 @@ The Mana World Dev Team
 
 Programmers
 
+ Bertram
+ (SDL input, progress bar drawing)
+
  Hammerbear aka Bjorn lindeijer (bjorn@lindeijer.nl)
  (various parts, Guichan expert)
 
@@ -23,6 +26,9 @@ Programmers
  Usiu
  (several GUI parts)
 
+ zenogais
+ (resource manager)
+
 
 Artists
 
diff --git a/docs/LICENSE.txt b/COPYING
index 5b6e7c66..5b6e7c66 100644
--- a/docs/LICENSE.txt
+++ b/COPYING
diff --git a/docs/CHANGELOG.txt b/ChangeLog
index 057074cb..057074cb 100644
--- a/docs/CHANGELOG.txt
+++ b/ChangeLog
diff --git a/INSTALL b/INSTALL
new file mode 100644
index 00000000..095b1eb4
--- /dev/null
+++ b/INSTALL
@@ -0,0 +1,231 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PREFIX', the package will
+use PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the `--target=TYPE' option to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+will cause the specified gcc to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff --git a/Makefile.am b/Makefile.am
index 02520f20..d0307496 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = foreign 1.4
+# Subdirectories to include in a distribution
+#DIST_SUBDIRS = src data docs
 
+# Subdirectories to build
 SUBDIRS = src
diff --git a/NEWS b/NEWS
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/NEWS
diff --git a/docs/README.txt b/README
index 074adf53..c5c611ba 100644
--- a/docs/README.txt
+++ b/README
@@ -33,7 +33,6 @@
 
 1. Account
 2. Commands
-3. Version history
 
 1. Account
 ----------
@@ -59,7 +58,3 @@ Ultramichy for hosting the server).
 - Alt + I Show inventory
 - F5 to sit
 
-3. Version history
-------------------
-
-See "CHANGELOG.txt".
diff --git a/configure.ac b/configure.ac
index df03a3a9..d80598cb 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(The Mana World, 0.0.9, umperio@users.sourceforge.net)
+AC_INIT([The Mana World], [0.0.9], [umperio@users.sourceforge.net])
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 AC_LANG_CPLUSPLUS
@@ -14,6 +14,14 @@ AC_PROG_MAKE_SET
 #AC_CHECK_LIB([guichan], [_ZN3gcn7TextBox6addRowESs])
 #AC_CHECK_LIB([guichan_sdl], [_ZN3gcn8SDLInput17dequeueMouseInputEv])
 
+# Check for SDL_image and SDL_mixer library
+AC_CHECK_LIB(SDL_image, IMG_LoadPNG_RW, , 
+AC_MSG_ERROR([ *** Unable to find SDL_image library with PNG support
+(http://www.libsdl.org/projects/SDL_image/)]))
+AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, , 
+AC_MSG_ERROR([ *** Unable to find SDL_mixer library 
+(http://www.libsdl.org/projects/SDL_mixer/)]))
+
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h unistd.h])
@@ -90,14 +98,6 @@ AC_DEFUN(FIND_PATH,
    fi
 ])
 
-# Check for SDL_image and SDL_mixer library
-AC_CHECK_LIB(SDL_image, IMG_LoadPNG_RW, , 
-AC_MSG_ERROR([ *** Unable to find SDL_image library with PNG support 
-(http://www.libsdl.org/projects/SDL_image/)]))
-AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, , 
-AC_MSG_ERROR([ *** Unable to find SDL_mixer library 
-(http://www.libsdl.org/projects/SDL_mixer/)]))
-
 FIND_PATH(sdl-config, LIBSDL_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
   AC_MSG_ERROR([Could not find libsdl anywhere, check http://www.sdl.org])
 ])
diff --git a/file.list b/file.list
index 053f8381..3339611c 100644
--- a/file.list
+++ b/file.list
@@ -9,6 +9,7 @@ MODULES = src/sound/sound.cpp \
           src/gui/chat.cpp \
           src/gui/checkbox.cpp \
           src/gui/confirm_dialog.cpp \
+          src/gui/equipment.cpp \
           src/gui/gui.cpp \
           src/gui/inventory.cpp \
           src/gui/itemcontainer.cpp \
diff --git a/src/.cvsignore b/src/.cvsignore
new file mode 100644
index 00000000..9a639215
--- /dev/null
+++ b/src/.cvsignore
@@ -0,0 +1,3 @@
+.deps
+Makefile.in
+Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 9e4aff80..8f2c4ef8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,6 +10,7 @@ tmw_SOURCES = sound/sound.cpp \
 	gui/chat.cpp \
 	gui/checkbox.cpp \
 	gui/confirm_dialog.cpp \
+	gui/equipment.cpp \
 	gui/gui.cpp \
 	gui/inventory.cpp \
 	gui/itemcontainer.cpp \
diff --git a/src/gui/equipment.cpp b/src/gui/equipment.cpp
index 69e3a97a..c34a9b30 100644
--- a/src/gui/equipment.cpp
+++ b/src/gui/equipment.cpp
@@ -47,4 +47,4 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
 
 void EquipmentWindow::action(const std::string &eventId)
 {
-}
\ No newline at end of file
+}