Merge branch 'master' into strippedstripped1.1.10.16

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf

22 files changed, 483 insertions, 0 deletions

diff --git a/build/bcmake b/build/bcmake
new file mode 100755
index 000000000..21de1da77
--- /dev/null
+++ b/build/bcmake
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cd ..
+
+export PATH=/usr/i586-mingw32msvc/bin:$PATH
+CXXFLAGS="-Wall -g0 -O2" cmake -DCMAKE_TOOLCHAIN_FILE=build/toolchain.cmake . 2>build/make1.log
+
+make -j5 2>build/make.log
+
diff --git a/build/bdeb.sh b/build/bdeb.sh
new file mode 100755
index 000000000..a1b2e5b4b
--- /dev/null
+++ b/build/bdeb.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd ..
+dpkg-buildpackage -rfakeroot -uc -b
diff --git a/build/bmake b/build/bmake
new file mode 100755
index 000000000..a8f55ca62
--- /dev/null
+++ b/build/bmake
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+cd ..
+
+#may be
+#-Waggregate-return -Winline 
+
+#for feature
+#-Wstrict-overflow=4 -Wfloat-equal
+#-Wunsafe-loop-optimizations
+#-Wnon-virtual-dtor
+#-Woverloaded-virtual
+#-Wformat=2
+#-Wswitch-enum
+
+#for better code
+# -Weffc++
+
+#need fix: -Wold-style-cast -Wconversion
+#prof -pg
+
+dir=`pwd`
+
+export CC=gcc-4.5
+export CXX=g++-4.5
+
+export LANG=C
+export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \
+-Wabi -Wdisabled-optimization -Wuninitialized \
+-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \
+-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \
+-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \
+-Wctor-dtor-privacy -Wstrict-null-sentinel \
+-Wunused-parameter -Wlogical-op \
+-Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \
+-Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \
+-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \
+-Wpacked -Wshadow -Wunused -Wsynth \
+-Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \
+-Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \
+-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2"
+
+autoreconf -i
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=yes \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no
+
+#--enable-applebuild=yes
+#--without-librt
+
+cd po
+#make -j5 update-po 2>../make1.log
+make -j5 update-gmo 2>../build/make1.log
+cd ..
+make -j5 2>build/make2.log
+
diff --git a/build/bmake0 b/build/bmake0
new file mode 100755
index 000000000..f5808289c
--- /dev/null
+++ b/build/bmake0
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+cd ..
+
+#may be
+#-Wshadow -Waggregate-return -Winline 
+
+#for feature
+#-Wstrict-overflow=4 -Wfloat-equal
+#-Wunsafe-loop-optimizations
+#-Wnon-virtual-dtor
+#-Woverloaded-virtual
+#-Wformat=2
+#-Wswitch-enum
+
+#for better code
+# -Weffc++
+
+#need fix: -Wold-style-cast -Wconversion
+#prof -pg
+
+dir=`pwd`
+
+export CC=gcc-4.5
+export CXX=g++-4.5
+
+export LANG=C
+export CXXFLAGS="-Wunreachable-code -Wmissing-field-initializers \
+-Wabi -Wdisabled-optimization -Wuninitialized \
+-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \
+-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \
+-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \
+-Wctor-dtor-privacy -Wstrict-null-sentinel \
+-Wunused-parameter -Wlogical-op \
+-Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \
+-Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \
+-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O0 -pipe \
+-fno-default-inline -fno-inline"
+
+autoreconf -i
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=no \
+--enable-tcmalloc=yes \
+--enable-googleprofiler=yes
+
+#--without-librt
+
+cd po
+#make -j5 update-po 2>../build/make1.log
+make -j5 update-gmo 2>../build/make1.log
+cd ..
+make -j5 2>build/make2.log
+
diff --git a/build/bmake44 b/build/bmake44
new file mode 100755
index 000000000..ad61b7707
--- /dev/null
+++ b/build/bmake44
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+cd ..
+
+#may be
+#-Wshadow -Waggregate-return -Winline 
+
+#for feature
+#-Wstrict-overflow=4 -Wfloat-equal
+#-Wunsafe-loop-optimizations
+#-Wnon-virtual-dtor
+#-Woverloaded-virtual
+#-Wformat=2
+#-Wswitch-enum
+
+#for better code
+# -Weffc++
+
+#need fix: -Wold-style-cast -Wconversion
+#prof -pg
+
+dir=`pwd`
+
+export CC=gcc-4.4
+export CXX=g++-4.4
+
+export LANG=C
+export CXXFLAGS="-Wmissing-field-initializers \
+-Wabi -Wdisabled-optimization -Wuninitialized \
+-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \
+-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \
+-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \
+-Wctor-dtor-privacy -Wstrict-null-sentinel \
+-Wunused-parameter -Wlogical-op \
+-Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \
+-Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \
+-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \
+-Wpacked -Wshadow -D_FORTIFY_SOURCE=2"
+
+autoreconf -i
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man
+
+cd po
+#make -j5 update-po 2>../build/make1.log
+make -j5 update-gmo 2>../build/make1.log
+cd ..
+make -j5 2>build/make2.log
+
diff --git a/build/bmake46 b/build/bmake46
new file mode 100755
index 000000000..e4d3e7e8e
--- /dev/null
+++ b/build/bmake46
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+cd ..
+
+#may be
+#-Wshadow -Waggregate-return -Winline 
+
+#for feature
+#-Wstrict-overflow=4 -Wfloat-equal
+#-Wunsafe-loop-optimizations
+#-Wnon-virtual-dtor
+#-Woverloaded-virtual
+#-Wformat=2
+#-Wswitch-enum
+#-Werror 
+
+#for better code
+# -Weffc++
+
+#from time to time fix: -Wold-style-cast -Wconversion -Wswitch-enum -Waggregate-return
+#from time to time fix: -Winline -Woverloaded-virtual
+#need fix: -Wsuggest-attribute=pure -Wsuggest-attribute=const
+#need fix: -Wstrict-overflow=5 -fstrict-overflow
+#need fix: -Wstrict-aliasing=3
+#need fix: -Wdouble-promotion
+#need fix: -Wfloat-equal
+#need fix: -Wunsafe-loop-optimizations
+#need fix: -Wpadded
+#prof -pg
+
+dir=`pwd`
+
+export CC=gcc-4.6
+export CXX=g++-4.6
+
+export LANG=C
+
+export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \
+-Wpacked-bitfield-compat -Wcast-qual -Wtrampolines \
+-Wsuggest-attribute=noreturn -Wunused -Wstrict-aliasing=2 \
+-fstrict-aliasing -Wunreachable-code -Wabi -Wdisabled-optimization \
+-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \
+-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \
+-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \
+-Wctor-dtor-privacy -Wstrict-null-sentinel -Wlogical-op \
+-Wcast-align -Wcast-qual -Wpointer-arith -Wundef \
+-Wmissing-include-dirs -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe \
+-Wpacked -Wextra -Wstrict-overflow=1 -Wunknown-pragmas -Wwrite-strings \
+-Wstack-protector -Wshadow -Wunused -Wunused-macros -Wsynth \
+-Wbuiltin-macro-redefined -Wctor-dtor-privacy -Wdeprecated -Wextra \
+-Wendif-labels -Wformat=1 -Wimport -Wnon-virtual-dtor -Wpsabi \
+-Wsign-promo -Wwrite-strings -D_FORTIFY_SOURCE=2"
+
+autoreconf -i
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man
+
+cd po
+#make -j5 update-po 2>../build/make1.log
+make -j5 update-gmo 2>../build/make1.log
+cd ..
+make -j5 2>build/make2.log
+
diff --git a/build/clmake b/build/clmake
new file mode 100755
index 000000000..a290af529
--- /dev/null
+++ b/build/clmake
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+cd ..
+
+dir=`pwd`
+
+export LANG=C
+export CC=clang
+export CXX=clang++
+
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man
+
+make -j5 2>build/make2.log
+
diff --git a/build/fink.sh b/build/fink.sh
new file mode 100755
index 000000000..8c74de65a
--- /dev/null
+++ b/build/fink.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+cd ..
+
+FINKDIR=/sw
+GCCVER=4.0
+
+. ${FINKDIR}/bin/init.sh
+export CC=gcc-${GCCVER}
+export CXX=g++-${GCCVER}
+export CPP=cpp-${GCCVER}
+export CXXCPP=cpp-${GCCVER}
+export CPPFLAGS="-I/sw/include"
+export LDFLAGS="-framework OpenGL"
+dir=`pwd`/run
+#dir=${FINKDIR}
+
+autoreconf -i 2>build/fink1.log
+
+# with prefix
+#./configure --enable-applebuild=yes \
+#--prefix=${dir} \
+#--datadir=${dir}/share/games \
+#--bindir=${dir}/bin \
+#--mandir=${dir}/share/man 2>fink2.log 1>fink2_ok.log
+
+# without prefix
+./configure --enable-applebuild=yes \
+--datarootdir=${dir}/share/games \
+--bindir=${dir}/bin \
+--sbindir=${dir}/bin \
+--mandir=${dir}/share/man 2>build/fink2.log
+
+# simple
+#./configure --enable-applebuild=yes 2>fink2.log 1>fink2_ok.log
+make 2>build/fink3.log
diff --git a/build/makecheck1 b/build/makecheck1
new file mode 100755
index 000000000..96b49e5c7
--- /dev/null
+++ b/build/makecheck1
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>makecheck_err.txt
diff --git a/build/makecheck2 b/build/makecheck2
new file mode 100755
index 000000000..b9108b6ef
--- /dev/null
+++ b/build/makecheck2
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >make_nsiqcppstyle.txt
diff --git a/build/makecheck3 b/build/makecheck3
new file mode 100755
index 000000000..95e04ad28
--- /dev/null
+++ b/build/makecheck3
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+cd ../src
+#../../cppcheck/cppcheck --enable=all --force -j 5 -v -I /usr/include -I /usr/include/c++/4.5 -I /usr/include/libxml2 -I /usr/include/SDL . 1>../makecheck.txt 2>../makecheck_err.txt
+#../../cppcheck/cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v . 1>../makecheck.txt 2>../makecheck_err.txt
+../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../build/makecheck.txt 2>../build/makecheck_err.txt
diff --git a/build/makecheck4 b/build/makecheck4
new file mode 100755
index 000000000..852986459
--- /dev/null
+++ b/build/makecheck4
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+../../checkheaders/checkheaders ../src 2>tmp.txt
+sed '/(style): Header not found/d' tmp.txt >makecheck4.txt
+rm tmp.txt
diff --git a/build/makeflawfinder b/build/makeflawfinder
new file mode 100755
index 000000000..9b5ff2809
--- /dev/null
+++ b/build/makeflawfinder
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+flawfinder ../src 1> makeflawfinder.log
+rats ../src 1> makerats.log
diff --git a/build/makegprof b/build/makegprof
new file mode 100755
index 000000000..d408bf0d3
--- /dev/null
+++ b/build/makegprof
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+mv ../run/gmon.out .
+gprof ../run/bin/manaplus >gprof.txt
+cat gprof.txt | gprof2dot.py >gprof.dot
+cat gprof.dot | dot -Tpng -o gprof.png
diff --git a/build/mclean b/build/mclean
new file mode 100755
index 000000000..fa5ff4ed5
--- /dev/null
+++ b/build/mclean
@@ -0,0 +1,2 @@
+cd ..
+make clean
diff --git a/build/minst b/build/minst
new file mode 100755
index 000000000..2b3f847ce
--- /dev/null
+++ b/build/minst
@@ -0,0 +1,2 @@
+cd ..
+make install
diff --git a/build/packwin b/build/packwin
new file mode 100755
index 000000000..81920b9fa
--- /dev/null
+++ b/build/packwin
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+cd ..
+
+dir=`pwd`
+
+cd packaging/windows
+./make-translations.sh
+makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
+    -DPRODUCT_VERSION="1.1.10.16" \
+    -DEXESUFFIX=/src \
+    -DUPX=true \
+    setup.nsi
+
diff --git a/build/pmake b/build/pmake
new file mode 100755
index 000000000..7ad12eaec
--- /dev/null
+++ b/build/pmake
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+cd ..
+
+dir=`pwd`
+
+export CC=gcc-4.5
+export CXX=g++-4.5
+
+#-D_GLIBCXX_PROFILE
+
+export LANG=C
+export CXXFLAGS="-pg -fno-inline -Wunreachable-code -Wmissing-field-initializers \
+-Wabi -Wdisabled-optimization -Wuninitialized \
+-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \
+-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \
+-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \
+-Wctor-dtor-privacy -Wstrict-null-sentinel \
+-Wunused-parameter -Wredundant-decls -Wlogical-op \
+-Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \
+-Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \
+-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O0 -pipe \
+-fno-default-inline -fno-inline"
+
+autoreconf -i
+./configure --prefix=$dir/run \
+            --datadir=$dir/run/share/games \
+            --bindir=$dir/run/bin \
+            --mandir=$dir/run/share/man
+
+make -j5 2>build/make.log
+
diff --git a/build/pmake46 b/build/pmake46
new file mode 100755
index 000000000..dc9a5f584
--- /dev/null
+++ b/build/pmake46
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+cd ..
+
+dir=`pwd`
+
+export CC=gcc-4.6
+export CXX=g++-4.6
+
+#-D_GLIBCXX_PROFILE
+
+export LANG=C
+export CXXFLAGS="-pg -fno-inline -Wunreachable-code -Wmissing-field-initializers \
+-Wabi -Wdisabled-optimization -Wuninitialized \
+-Wvolatile-register-var -Winvalid-pch -Wredundant-decls \
+-Wnormalized=nfkc -Wmissing-format-attribute -Wmissing-noreturn \
+-Wswitch-default -Wsign-promo -Waddress -Wmissing-declarations \
+-Wctor-dtor-privacy -Wstrict-null-sentinel \
+-Wunused-parameter -Wredundant-decls -Wlogical-op \
+-Wempty-body -Wsign-compare -Wclobbered -Wcast-align -Wcast-qual \
+-Wtype-limits -Wpointer-arith -Wundef -Wmissing-include-dirs \
+-Wignored-qualifiers -Winit-self -pedantic -Wall -ggdb3 -O2 -pipe"
+
+autoreconf -i
+./configure --prefix=$dir/run \
+            --datadir=$dir/run/share/games \
+            --bindir=$dir/run/bin \
+            --mandir=$dir/run/share/man
+
+make -j5 2>build/make.log
+
diff --git a/build/toolchain.cmake b/build/toolchain.cmake
new file mode 100644
index 000000000..c8493c0c5
--- /dev/null
+++ b/build/toolchain.cmake
@@ -0,0 +1,33 @@
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# toolchain prefix, can be overridden by -DTOOLCHAIN=...
+# IF (NOT TOOLCHAIN)
+SET(TOOLCHAIN "i586-mingw32msvc-")
+# ENDIF()
+
+# which compilers to use for C and C++
+SET(CMAKE_C_COMPILER ${TOOLCHAIN}gcc)
+SET(CMAKE_CXX_COMPILER ${TOOLCHAIN}g++)
+SET(CMAKE_RC_COMPILER ${TOOLCHAIN}windres)
+
+SET(CMAKE_INSTALL_PREFIX ./win)
+SET(CMAKE_BUILD_TYPE RelWithDebInfo)
+
+SET(SDLIMAGE_INCLUDE_DIR ../mana_win/libs/include/SDL)
+SET(SDLMIXER_INCLUDE_DIR ../mana_win/libs/include/SDL)
+SET(SDLNET_INCLUDE_DIR ../mana_win/libs/include/SDL)
+SET(SDLTTF_INCLUDE_DIR ../mana_win/libs/include/SDL)
+SET(SDL_INCLUDE_DIR ../mana_win/libs/include/SDL)
+SET(ENABLE_MANASERV OFF)
+
+# here is the target environment located
+SET(CMAKE_FIND_ROOT_PATH  /usr/i586-mingw32msvc /../mana_win/libs )
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
diff --git a/build/toolchain.nightly b/build/toolchain.nightly
new file mode 100644
index 000000000..6093a82f8
--- /dev/null
+++ b/build/toolchain.nightly
@@ -0,0 +1,33 @@
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# toolchain prefix, can be overridden by -DTOOLCHAIN=...
+# IF (NOT TOOLCHAIN)
+SET(TOOLCHAIN "i586-mingw32msvc-")
+# ENDIF()
+
+# which compilers to use for C and C++
+SET(CMAKE_C_COMPILER ${TOOLCHAIN}gcc)
+SET(CMAKE_CXX_COMPILER ${TOOLCHAIN}g++)
+SET(CMAKE_RC_COMPILER ${TOOLCHAIN}windres)
+
+SET(CMAKE_INSTALL_PREFIX ./win)
+SET(CMAKE_BUILD_TYPE Release)
+
+SET(SDLIMAGE_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
+SET(SDLMIXER_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
+SET(SDLNET_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
+SET(SDLTTF_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
+SET(SDL_INCLUDE_DIR ./packaging/windows/libs/include/SDL)
+SET(ENABLE_MANASERV OFF)
+
+# here is the target environment located
+SET(CMAKE_FIND_ROOT_PATH  /usr/i586-mingw32msvc ./packaging/windows/ )
+
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
diff --git a/build/update-creator.sh b/build/update-creator.sh
new file mode 100755
index 000000000..f3fc9e28c
--- /dev/null
+++ b/build/update-creator.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+cd ..
+
+find -name \*.cpp \
+  -o -name \*.h \
+  -o -name \*.am \
+  -o -name \*.txt \
+  -o -name \*.xml \
+  -o -name \*.manaplus \
+  | sort > manaplus.files