From c65fc65f2bec4a9a69e8035cf11014e3a4fe1131 Mon Sep 17 00:00:00 2001
From: Meep-Eep <Meep-Eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sun, 1 Jan 2012 16:47:49 +0000
Subject: [PATCH] Fix for my earlier cleanup...

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3731 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/uqm/shipyard.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sc2/src/uqm/shipyard.c b/sc2/src/uqm/shipyard.c
index 3a367338a..92cb7ac47 100644
--- a/sc2/src/uqm/shipyard.c
+++ b/sc2/src/uqm/shipyard.c
@@ -1040,8 +1040,11 @@ DoModifyShips (MENU_STATE *pMS)
 		{
 			// Moving horizontally through the escort ship slots,
 			// wrapping around if necessary.
-			NewState = (pMS->CurState + HANGAR_SHIPS_ROW + dx) %
-					HANGAR_SHIPS_ROW;
+			BYTE row = pMS->CurState / HANGAR_SHIPS_ROW;
+			BYTE col = pMS->CurState % HANGAR_SHIPS_ROW;
+
+			col = (col + HANGAR_SHIPS_ROW + dx) % HANGAR_SHIPS_ROW;
+			NewState = row * HANGAR_SHIPS_ROW + col;
 		}
 
 		if (select || cancel