games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

- fix for #1106 and #1107

Browse Source
This commit is contained in:
Ivan Savenko 2012-09-29 19:18:35 +00:00
parent 657ed41088
commit 77710eaffb
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/CMessage.cpp
View File

@ -28,6 +28,7 @@
const int COMPONENT_TO_SUBTITLE = 17;
const int BETWEEN_COMPS_ROWS = 10;
const int BEFORE_COMPONENTS = 30;
const int BETWEEN_COMPS = 30;
const int SIDE_MARGIN = 30;
template <typename T, typename U> std::pair<T,U> max(const std::pair<T,U> &x, const std::pair<T,U> &y)
@ -435,7 +436,7 @@ void CMessage::drawIWindow(CInfoWindow * ret, std::string text, int player)
if (ret->components.size())
{
curh += BEFORE_COMPONENTS;
comps.blitCompsOnSur (_or, 40, curh, ret->bitmap);
comps.blitCompsOnSur (_or, BETWEEN_COMPS, curh, ret->bitmap);
}
if(ret->buttons.size())
{
@ -575,7 +576,7 @@ ComponentsToBlit::ComponentsToBlit(std::vector<CComponent*> & SComps, int maxw,
{
ComponentResolved *cur = new ComponentResolved(SComps[i]);
int toadd = (cur->pos.w + 12 + (_or ? _or->w : 0));
int toadd = (cur->pos.w + BETWEEN_COMPS + (_or ? _or->w : 0));
if (curw + toadd > maxw)
{
curr++;

3
configure vendored
View File

@ -17535,7 +17535,7 @@ VCMI_AI_LIBS_DIR="$libdir/vcmi/AI"
VCMI_SCRIPTING_LIBS_DIR="$libdir/vcmi/Scripting"
ac_config_files="$ac_config_files Makefile lib/Makefile client/Makefile server/Makefile AI/FuzzyLite/Makefile AI/Makefile AI/StupidAI/Makefile AI/EmptyAI/Makefile AI/VCAI/Makefile Scripting/ERM/Makefile"
ac_config_files="$ac_config_files Makefile lib/Makefile client/Makefile server/Makefile AI/FuzzyLite/Makefile AI/Makefile AI/StupidAI/Makefile AI/BattleAI/Makefile AI/EmptyAI/Makefile AI/VCAI/Makefile Scripting/ERM/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -18672,6 +18672,7 @@ do
"AI/FuzzyLite/Makefile") CONFIG_FILES="$CONFIG_FILES AI/FuzzyLite/Makefile" ;;
"AI/Makefile") CONFIG_FILES="$CONFIG_FILES AI/Makefile" ;;
"AI/StupidAI/Makefile") CONFIG_FILES="$CONFIG_FILES AI/StupidAI/Makefile" ;;
"AI/BattleAI/Makefile") CONFIG_FILES="$CONFIG_FILES AI/BattleAI/Makefile" ;;
"AI/EmptyAI/Makefile") CONFIG_FILES="$CONFIG_FILES AI/EmptyAI/Makefile" ;;
"AI/VCAI/Makefile") CONFIG_FILES="$CONFIG_FILES AI/VCAI/Makefile" ;;
"Scripting/ERM/Makefile") CONFIG_FILES="$CONFIG_FILES Scripting/ERM/Makefile" ;;

2
configure.ac
View File

@ -110,4 +110,4 @@ AC_SUBST(VCMI_AI_LIBS_DIR)
VCMI_SCRIPTING_LIBS_DIR="$libdir/vcmi/Scripting"
AC_SUBST(VCMI_SCRIPTING_LIBS_DIR)
AC_OUTPUT(Makefile lib/Makefile client/Makefile server/Makefile AI/FuzzyLite/Makefile AI/Makefile AI/StupidAI/Makefile AI/EmptyAI/Makefile AI/VCAI/Makefile Scripting/ERM/Makefile)
AC_OUTPUT(Makefile lib/Makefile client/Makefile server/Makefile AI/FuzzyLite/Makefile AI/Makefile AI/StupidAI/Makefile AI/BattleAI/Makefile AI/EmptyAI/Makefile AI/VCAI/Makefile Scripting/ERM/Makefile)