Merge lp:~gamag/widelands/bug952404 into lp:widelands

[Gabriel Margiani]

Fixes Bug#952404.
Shall/can I push such little changes
directly to truck in the Future?

[Shevonar (shevonar)]

When we know that m_offset.x < 0 its easier to do ofs.x -= m_offset.x. Could you change that?

review: Needs Fixing

[Shevonar (shevonar)]

And yes I think you can push such changes directly to trunk.

[Gabriel Margiani (gamag)]

review: Needs Resubmitting

[Shevonar (shevonar)]

Thanks for this fix. You should join the Widelands Development Team to commit to trunk yourself, since you do a lot of fixes recently.

review: Approve

=== modified file 'src/graphic/rendertarget.cc'
--- src/graphic/rendertarget.cc	2012-03-02 13:21:49 +0000
+++ src/graphic/rendertarget.cc	2012-03-15 21:47:22 +0000
@@ -223,6 +223,12 @@
 	int32_t srch = picture->get_h();
 
 	if (clip(r)) {
+		if (m_offset.x < 0)
+			ofs.x -= m_offset.x;
+
+		if (m_offset.y < 0)
+			ofs.y -= m_offset.y;
+
 		// Make sure the offset is within bounds
 		ofs.x = ofs.x % srcw;