From 7b93b2e2e05cd077cf7bb598876f0a7c764f31a7 Mon Sep 17 00:00:00 2001
From: Ali El Gariani <alinkmaze@gmail.com>
Date: Mon, 26 Mar 2007 17:35:08 +0000
Subject: [PATCH] Fix glitches when scrolling the map if zoomed out (bug #8768)

---
 src/display.cpp  |  4 ++--
 wesnoth.kdevelop | 48 +++++++++++++++++++++++++++++-------------------
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/display.cpp b/src/display.cpp
index 71d0d225231..b5b50e6eed7 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -451,7 +451,7 @@ void display::scroll(int xmove, int ymove)
 	if (dy != 0) {
 		SDL_Rect r = map_area();
 		if (dy < 0) {
-			r.y += r.h-abs(dy);
+			r.y = r.h-abs(dy);
 		}
 		r.h = abs(dy);
 		invalidate_locations_in_rect(r);
@@ -459,7 +459,7 @@ void display::scroll(int xmove, int ymove)
 	if (dx != 0) {
 		SDL_Rect r = map_area();
 		if (dx < 0) {
-			r.x += r.w-abs(dx);
+			r.x = r.w-abs(dx);
 		}
 		r.w = abs(dx);
 		invalidate_locations_in_rect(r);
diff --git a/wesnoth.kdevelop b/wesnoth.kdevelop
index 539f79ee7c8..c400834f357 100644
--- a/wesnoth.kdevelop
+++ b/wesnoth.kdevelop
@@ -1,9 +1,9 @@
 <?xml version = '1.0'?>
 <kdevelop>
   <general>
-    <author/>
-    <email/>
-    <version/>
+    <author></author>
+    <email></email>
+    <version></version>
     <projectmanagement>KDevAutoProject</projectmanagement>
     <primarylanguage>C++</primarylanguage>
     <keywords>
@@ -12,7 +12,7 @@
     </keywords>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
+    <description></description>
     <ignoreparts/>
     <secondaryLanguages/>
     <projectname>wesnoth</projectname>
@@ -49,20 +49,21 @@
         <f77flags/>
       </optimized>
       <debug>
-        <configargs>--enable-debug=full --enable-editor</configargs>
+        <configargs>--enable-debug=full --with-preferences-dir=.wesnoth-1.3.1 --program-suffix=-1.3.1 --with-datadir-name=wesnoth-1.3.1</configargs>
         <builddir>.</builddir>
         <ccompiler>kdevgccoptions</ccompiler>
         <cxxcompiler>kdevgppoptions</cxxcompiler>
         <f77compiler>kdevg77options</f77compiler>
         <cxxflags>-O0 -g3</cxxflags>
-        <topsourcedir/>
-        <cppflags/>
-        <ldflags/>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
-        <cflags/>
-        <f77flags/>
+        <topsourcedir></topsourcedir>
+        <cppflags></cppflags>
+        <ldflags></ldflags>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary></cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
+        <cflags></cflags>
+        <f77flags></f77flags>
+        <envvars/>
       </debug>
       <default>
         <configargs>--enable-editor</configargs>
@@ -210,6 +211,14 @@
       <designer>/usr/bin/designer</designer>
       <designerpluginpaths/>
     </qt>
+    <creategettersetter>
+      <prefixGet></prefixGet>
+      <prefixSet>set</prefixSet>
+      <prefixVariable>m_,_</prefixVariable>
+      <parameterName>theValue</parameterName>
+      <inlineGet>true</inlineGet>
+      <inlineSet>true</inlineSet>
+    </creategettersetter>
   </kdevcppsupport>
   <cppsupportpart>
     <filetemplates>
@@ -219,12 +228,12 @@
   </cppsupportpart>
   <kdevdebugger>
     <general>
-      <programargs/>
-      <gdbpath/>
-      <dbgshell/>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <programargs></programargs>
+      <gdbpath></gdbpath>
+      <dbgshell></dbgshell>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
@@ -232,6 +241,7 @@
     <display>
       <staticmembers>true</staticmembers>
       <demanglenames>true</demanglenames>
+      <outputradix>10</outputradix>
     </display>
   </kdevdebugger>
 </kdevelop>