From b0906cbb3e852db03eaa3203553e4c2dfcee7e42 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 18 Feb 2012 03:23:59 +0300 Subject: Remove from git test scripts. --- build/bmakesnapshot | 43 ------------------------------------------- build/clmake | 16 ---------------- build/makecheck1 | 3 --- build/makecheck2 | 3 --- build/makecheck3 | 4 ---- build/makecheck4 | 5 ----- build/makecheck5 | 6 ------ 7 files changed, 80 deletions(-) delete mode 100755 build/bmakesnapshot delete mode 100755 build/clmake delete mode 100755 build/makecheck1 delete mode 100755 build/makecheck2 delete mode 100755 build/makecheck3 delete mode 100755 build/makecheck4 delete mode 100755 build/makecheck5 (limited to 'build') diff --git a/build/bmakesnapshot b/build/bmakesnapshot deleted file mode 100755 index b13b31bfa..000000000 --- a/build/bmakesnapshot +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh - -cd .. - -dir=`pwd` - -export PATH=/usr/lib/gcc-snapshot/bin:$PATH -export CC=gcc -export CXX=g++ - -export LANG=C - -export CXXFLAGS="-Wvariadic-macros -Wvla -Wredundant-decls \ --Wpacked-bitfield-compat -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 -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-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 -Wc++11-compat -std=c++0x \ --Wdelete-non-virtual-dtor -Wmaybe-uninitialized -Wunused-local-typedefs \ --Wvector-operation-performance -Wfree-nonheap-object -Winvalid-memory-model \ --Wnarrowing -Wzero-as-null-pointer-constant" - -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/logs/gcc47.txt -cd .. -make -j5 2>build/make2.log - diff --git a/build/clmake b/build/clmake deleted file mode 100755 index 3817e6b89..000000000 --- a/build/clmake +++ /dev/null @@ -1,16 +0,0 @@ -#!/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/logs/clang.txt diff --git a/build/makecheck1 b/build/makecheck1 deleted file mode 100755 index 58f231e14..000000000 --- a/build/makecheck1 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -cppcheck --enable=style --enable=information --enable=unusedFunction --force -j 5 -v .. 1>makecheck.txt 2>logs/cppcheck1.txt diff --git a/build/makecheck2 b/build/makecheck2 deleted file mode 100755 index 184903c7a..000000000 --- a/build/makecheck2 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -../../nsiqcppstyle/nsiqcppstyle/nsiqcppstyle --show-url ../src >logs/nsiqcppstyle.txt diff --git a/build/makecheck3 b/build/makecheck3 deleted file mode 100755 index c09d002cb..000000000 --- a/build/makecheck3 +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -cd ../src -../../cppcheck/cppcheck --enable=all -I . -I guichan/include --force -j 5 -v . 1>../build/makecheck.txt 2>../build/logs/cppcheck2.txt diff --git a/build/makecheck4 b/build/makecheck4 deleted file mode 100755 index 946761892..000000000 --- a/build/makecheck4 +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -../../checkheaders/checkheaders --skip debug.h ../src 2>tmp.txt -sed '/(style): Header not found/d' tmp.txt >logs/checkheader.txt -rm tmp.txt diff --git a/build/makecheck5 b/build/makecheck5 deleted file mode 100755 index 9cf5450b6..000000000 --- a/build/makecheck5 +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -find ../src -type f -name "*.cpp" -exec ../../vera++/vera++ {} \; 2>logs/vera.txt -find ../src -type f -name "*.hpp" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt -find ../src -type f -name "*.h" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt -find ../src -type f -name "*.cc" -exec ../../vera++/vera++ {} \; 2>>logs/vera.txt -- cgit v1.2.3-70-g09d2 From 950bc2e6e485c0fe2c6a418913fd4d380f6f21b6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 18 Feb 2012 17:28:44 +0300 Subject: Change version to 1.2.2.19. --- ChangeLog | 15 +++++++++++++++ README | 2 +- README.txt | 2 +- build/packevol | 2 +- build/packwin | 2 +- configure.ac | 2 +- src/main.h | 4 ++-- 7 files changed, 22 insertions(+), 7 deletions(-) (limited to 'build') diff --git a/ChangeLog b/ChangeLog index 2474682d7..2ddfb696d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2012-02-19 New release 1.2.2.19 +add: client data translations (items, etc). +add: increased max value for drop counter from 9 to 30. +add: chat command /setdrop N. to set drop counter from scripts. +add: hide map layers feature. +add: show gms with green color in online list (evol server). +add: relative position for floor items (item drops). +add: option to enable/disable grouping friends in online list. +add: enable chat logging by default. +add: set default max chat lines to 40. +add: update windows libs. +add: center game on screen in windows and osx. +add: race name to status and debug windows. +add: update liberation and mplus fonts. + 2012-02-05 New release 1.2.2.5 ManaPlus: fix: particle font in japan localisation. diff --git a/README b/README index d7e46430c..f2974689c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.2.2.5 Date: 2012-02-05 + Version: 1.2.2.19 Date: 2012-02-19 Development team: - See AUTHORS file for a list diff --git a/README.txt b/README.txt index 4f4a397fc..8f99f0484 100644 --- a/README.txt +++ b/README.txt @@ -1,7 +1,7 @@ THE MANA PLUS CLIENT =============== - Version: 1.2.2.5 Date: 2012-02-05 + Version: 1.2.2.19 Date: 2012-02-19 Development team: - See AUTHORS file for a list diff --git a/build/packevol b/build/packevol index 9059fdf58..7f89238ab 100755 --- a/build/packevol +++ b/build/packevol @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.2.2.5" \ + -DPRODUCT_VERSION="1.2.2.19" \ -DEXESUFFIX=/src \ -DUPX=true \ evol.nsi diff --git a/build/packwin b/build/packwin index 296039482..ab7087768 100755 --- a/build/packwin +++ b/build/packwin @@ -7,7 +7,7 @@ dir=`pwd` cd packaging/windows ./make-translations.sh makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \ - -DPRODUCT_VERSION="1.2.2.5" \ + -DPRODUCT_VERSION="1.2.2.19" \ -DEXESUFFIX=/src \ -DUPX=true \ setup.nsi diff --git a/configure.ac b/configure.ac index 996ad3f3c..e1f2c55db 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.2.2.5], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.2.2.19], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS diff --git a/src/main.h b/src/main.h index fbc672939..abc152ed3 100644 --- a/src/main.h +++ b/src/main.h @@ -45,8 +45,8 @@ * different interfaces, which have different implementations for each server. */ -#define SMALL_VERSION "1.2.2.5" -#define CHECK_VERSION "01.02.02.05" +#define SMALL_VERSION "1.2.2.19" +#define CHECK_VERSION "01.02.02.19" #ifdef HAVE_CONFIG_H #include "../config.h" -- cgit v1.2.3-70-g09d2 From a8d90b8a84b5a21c53fb5d279dc983ae1e2c3217 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 22 Feb 2012 19:50:00 +0300 Subject: Fix code style. --- build/bmake | 1 - src/configuration.cpp | 2 +- src/effectmanager.h | 1 + src/gui/setup_joystick.cpp | 2 +- src/guichan/color.cpp | 18 +++++++++--------- src/guichan/defaultfont.cpp | 2 +- src/guichan/focushandler.cpp | 20 ++++++++++---------- src/guichan/include/guichan/sdl/sdlpixel.hpp | 23 +++++++++++++---------- src/guichan/sdl/sdlimage.cpp | 4 ++-- src/localplayer.cpp | 2 +- src/opengl1graphics.h | 4 ++-- src/openglgraphics.h | 6 +++--- src/particleemitterprop.h | 1 + src/utils/mathutils.h | 2 ++ src/utils/translation/poparser.cpp | 2 +- 15 files changed, 48 insertions(+), 42 deletions(-) (limited to 'build') diff --git a/build/bmake b/build/bmake index d99766ea7..33df5d180 100755 --- a/build/bmake +++ b/build/bmake @@ -8,7 +8,6 @@ cd .. #for feature #-Wstrict-overflow=4 -Wfloat-equal #-Wunsafe-loop-optimizations -#-Wnon-virtual-dtor #-Woverloaded-virtual #-Wformat=2 #-Wswitch-enum diff --git a/src/configuration.cpp b/src/configuration.cpp index 1ff205195..694f94e78 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -334,7 +334,7 @@ float Configuration::getFloatValue(const std::string &key) const (static_cast(itdef->second))->getData()); } else if (itdef->second->getType() - == VariableData::DATA_STRING) + == VariableData::DATA_STRING) { defaultValue = atof((static_cast( itdef->second))->getData().c_str()); diff --git a/src/effectmanager.h b/src/effectmanager.h index df19a0040..f8babd2f5 100644 --- a/src/effectmanager.h +++ b/src/effectmanager.h @@ -24,6 +24,7 @@ #include #include +#include class Being; diff --git a/src/gui/setup_joystick.cpp b/src/gui/setup_joystick.cpp index 290607be4..a3240282a 100644 --- a/src/gui/setup_joystick.cpp +++ b/src/gui/setup_joystick.cpp @@ -146,7 +146,7 @@ void Setup_Joystick::action(const gcn::ActionEvent &event) { mCalibrateButton->setCaption(_("Stop")); mCalibrateLabel->setCaption( - _("Rotate the stick and dont press buttons")); + _("Rotate the stick and don't press buttons")); joystick->startCalibration(); } } diff --git a/src/guichan/color.cpp b/src/guichan/color.cpp index d3dc7a738..f58e7b58e 100644 --- a/src/guichan/color.cpp +++ b/src/guichan/color.cpp @@ -97,23 +97,23 @@ namespace gcn b - color.b, 255); - result.r = (result.r>255?255:(result.r<0?0:result.r)); - result.g = (result.g>255?255:(result.g<0?0:result.g)); - result.b = (result.b>255?255:(result.b<0?0:result.b)); + result.r = (result.r > 255 ? 255 : (result.r < 0 ? 0 : result.r)); + result.g = (result.g > 255 ? 255 : (result.g < 0 ? 0 : result.g)); + result.b = (result.b > 255 ? 255 : (result.b < 0 ? 0 : result.b)); return result; } Color Color::operator*(float value) const { - Color result((int)(r * value), - (int)(g * value), - (int)(b * value), + Color result(static_cast(r * value), + static_cast(g * value), + static_cast(b * value), a); - result.r = (result.r>255?255:(result.r<0?0:result.r)); - result.g = (result.g>255?255:(result.g<0?0:result.g)); - result.b = (result.b>255?255:(result.b<0?0:result.b)); + result.r = (result.r > 255 ? 255 : (result.r < 0 ? 0 : result.r)); + result.g = (result.g > 255 ? 255 : (result.g < 0 ? 0 : result.g)); + result.b = (result.b > 255 ? 255 : (result.b < 0 ? 0 : result.b)); return result; } diff --git a/src/guichan/defaultfont.cpp b/src/guichan/defaultfont.cpp index 8871d51de..70901bc8e 100644 --- a/src/guichan/defaultfont.cpp +++ b/src/guichan/defaultfont.cpp @@ -89,7 +89,7 @@ namespace gcn int DefaultFont::getStringIndexAt(const std::string& text, int x) const { - if (x > (int)text.size() * 8) + if (x > static_cast(text.size() * 8)) return text.size(); return x / 8; diff --git a/src/guichan/focushandler.cpp b/src/guichan/focushandler.cpp index 832a201ad..e3610fb1e 100644 --- a/src/guichan/focushandler.cpp +++ b/src/guichan/focushandler.cpp @@ -158,7 +158,7 @@ namespace gcn { int i; int focusedWidget = -1; - for (i = 0; i < (int)mWidgets.size(); ++i) + for (i = 0; i < static_cast(mWidgets.size()); ++i) { if (mWidgets[i] == mFocusedWidget) focusedWidget = i; @@ -167,7 +167,7 @@ namespace gcn // i is a counter that ensures that the following loop // won't get stuck in an infinite loop - i = (int)mWidgets.size(); + i = static_cast(mWidgets.size()); do { ++ focusedWidget; @@ -180,7 +180,7 @@ namespace gcn -- i; - if (focusedWidget >= (int)mWidgets.size()) + if (focusedWidget >= static_cast(mWidgets.size())) focusedWidget = 0; if (focusedWidget == focused) @@ -213,7 +213,7 @@ namespace gcn int i; int focusedWidget = -1; - for (i = 0; i < (int)mWidgets.size(); ++ i) + for (i = 0; i < static_cast(mWidgets.size()); ++ i) { if (mWidgets[i] == mFocusedWidget) focusedWidget = i; @@ -222,7 +222,7 @@ namespace gcn // i is a counter that ensures that the following loop // won't get stuck in an infinite loop - i = (int)mWidgets.size(); + i = static_cast(mWidgets.size()); do { -- focusedWidget; @@ -342,7 +342,7 @@ namespace gcn int i; int focusedWidget = -1; - for (i = 0; i < (int)mWidgets.size(); ++i) + for (i = 0; i < static_cast(mWidgets.size()); ++ i) { if (mWidgets[i] == mFocusedWidget) focusedWidget = i; @@ -352,7 +352,7 @@ namespace gcn // i is a counter that ensures that the following loop // won't get stuck in an infinite loop - i = (int)mWidgets.size(); + i = static_cast(mWidgets.size()); do { ++ focusedWidget; @@ -365,7 +365,7 @@ namespace gcn -- i; - if (focusedWidget >= (int)mWidgets.size()) + if (focusedWidget >= static_cast(mWidgets.size())) focusedWidget = 0; if (focusedWidget == focused) @@ -411,7 +411,7 @@ namespace gcn int i; int focusedWidget = -1; - for (i = 0; i < (int)mWidgets.size(); ++i) + for (i = 0; i < static_cast(mWidgets.size()); ++ i) { if (mWidgets[i] == mFocusedWidget) focusedWidget = i; @@ -421,7 +421,7 @@ namespace gcn // i is a counter that ensures that the following loop // won't get stuck in an infinite loop - i = (int)mWidgets.size(); + i = static_cast(mWidgets.size()); do { -- focusedWidget; diff --git a/src/guichan/include/guichan/sdl/sdlpixel.hpp b/src/guichan/include/guichan/sdl/sdlpixel.hpp index a0221ca7c..bfd08341b 100644 --- a/src/guichan/include/guichan/sdl/sdlpixel.hpp +++ b/src/guichan/include/guichan/sdl/sdlpixel.hpp @@ -68,7 +68,8 @@ namespace gcn SDL_LockSurface(surface); - Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp; + Uint8 *p = static_cast(surface->pixels) + + y * surface->pitch + x * bpp; unsigned int color = 0; @@ -79,7 +80,7 @@ namespace gcn break; case 2: - color = *(Uint16 *)p; + color = *reinterpret_cast(p); break; case 3: @@ -90,7 +91,7 @@ namespace gcn break; case 4: - color = *(Uint32 *)p; + color = *reinterpret_cast(p); break; default: @@ -123,7 +124,7 @@ namespace gcn SDL_LockSurface(surface); - Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp; + Uint8 *p = static_cast(surface->pixels) + y * surface->pitch + x * bpp; Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b); @@ -134,7 +135,7 @@ namespace gcn break; case 2: - *(Uint16 *)p = pixel; + *reinterpret_cast(p) = pixel; break; case 3: @@ -153,7 +154,7 @@ namespace gcn break; case 4: - *(Uint32 *)p = pixel; + *reinterpret_cast(p) = pixel; break; default: @@ -199,7 +200,7 @@ namespace gcn unsigned int r = ((src & f->Bmask) * a + (dst & f->Bmask) * (255 - a)) >> 8; - return (unsigned short)((b & f->Rmask) + return static_cast((b & f->Rmask) | (g & f->Gmask) | (r & f->Bmask)); } @@ -230,7 +231,8 @@ namespace gcn SDL_LockSurface(surface); - Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x * bpp; + Uint8 *p = static_cast(surface->pixels) + + y * surface->pitch + x * bpp; Uint32 pixel = SDL_MapRGB(surface->format, color.r, color.g, color.b); @@ -241,7 +243,7 @@ namespace gcn break; case 2: - *(Uint16 *)p = SDLAlpha16(pixel, *(Uint32 *)p, + *reinterpret_cast(p) = SDLAlpha16(pixel, *(Uint32 *)p, color.a, surface->format); break; @@ -275,7 +277,8 @@ namespace gcn break; case 4: - *(Uint32 *)p = SDLAlpha32(pixel, *(Uint32 *)p, color.a); + *reinterpret_cast(p) = SDLAlpha32(pixel, + *reinterpret_cast(p), color.a); break; default: break; diff --git a/src/guichan/sdl/sdlimage.cpp b/src/guichan/sdl/sdlimage.cpp index e4aadc465..4f9b9565c 100644 --- a/src/guichan/sdl/sdlimage.cpp +++ b/src/guichan/sdl/sdlimage.cpp @@ -130,8 +130,8 @@ namespace gcn for (i = 0; i < mSurface->w * mSurface->h; ++i) { - if (((unsigned int*)mSurface->pixels)[i] == SDL_MapRGB( - mSurface->format, 255, 0, 255)) + if ((static_cast(mSurface->pixels))[i] + == SDL_MapRGB(mSurface->format, 255, 0, 255)) { hasPink = true; break; diff --git a/src/localplayer.cpp b/src/localplayer.cpp index 03199f7be..b07511196 100644 --- a/src/localplayer.cpp +++ b/src/localplayer.cpp @@ -2153,7 +2153,7 @@ static const char *pvpAttackStrings[] = N_("(a) attack all players"), N_("(f) attack all except friends"), N_("(b) attack bad relations"), - N_("(d) dont attack players"), + N_("(d) don't attack players"), N_("(?) pvp attack") }; diff --git a/src/opengl1graphics.h b/src/opengl1graphics.h index 76dc3ef00..8cc3c89a7 100644 --- a/src/opengl1graphics.h +++ b/src/opengl1graphics.h @@ -23,15 +23,14 @@ #ifndef OPENGL1GRAPHICS_H #define OPENGL1GRAPHICS_H +#ifdef USE_OPENGL #include "main.h" #include "graphics.h" -#ifdef USE_OPENGL #define NO_SDL_GLEXT #include -#endif class OpenGL1Graphics : public Graphics { @@ -140,5 +139,6 @@ class OpenGL1Graphics : public Graphics bool mColorAlpha; bool mSync; }; +#endif #endif diff --git a/src/openglgraphics.h b/src/openglgraphics.h index f3bdc4470..9eeb530ac 100644 --- a/src/openglgraphics.h +++ b/src/openglgraphics.h @@ -23,15 +23,14 @@ #ifndef OPENGLGRAPHICS_H #define OPENGLGRAPHICS_H -#include "main.h" +#ifdef USE_OPENGL +#include "main.h" #include "graphics.h" -#ifdef USE_OPENGL #define NO_SDL_GLEXT #include -#endif class OpenGLGraphics : public Graphics { @@ -154,5 +153,6 @@ class OpenGLGraphics : public Graphics bool mColorAlpha; bool mSync; }; +#endif #endif diff --git a/src/particleemitterprop.h b/src/particleemitterprop.h index cadfa0f3a..2b6b7ba1a 100644 --- a/src/particleemitterprop.h +++ b/src/particleemitterprop.h @@ -21,6 +21,7 @@ */ #include +#include /** * Returns a random numeric value that is larger than or equal min and smaller diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h index 8ccd71e79..6d5a8339d 100644 --- a/src/utils/mathutils.h +++ b/src/utils/mathutils.h @@ -23,7 +23,9 @@ #ifndef UTILS_MATHUTILS_H #define UTILS_MATHUTILS_H +#include #include +#include static uint16_t crc_table[256] = { diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp index 24d2ee4d4..521774592 100644 --- a/src/utils/translation/poparser.cpp +++ b/src/utils/translation/poparser.cpp @@ -144,7 +144,7 @@ bool PoParser::readMsgId() mLine = ""; return true; } - // stop reading if we dont read msgid before + // stop reading if we don't read msgid before return mMsgId.empty(); } } -- cgit v1.2.3-70-g09d2