From 9815ef57371d0d7f0e808666477d6e7929add7bc Mon Sep 17 00:00:00 2001 From: Meep-Eep Date: Sat, 31 Dec 2011 01:46:56 +0000 Subject: [PATCH] Simplify. git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3725 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/src/uqm/shipyard.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sc2/src/uqm/shipyard.c b/sc2/src/uqm/shipyard.c index a78980088..26cd41069 100644 --- a/sc2/src/uqm/shipyard.c +++ b/sc2/src/uqm/shipyard.c @@ -667,14 +667,10 @@ DoModifyShips (MENU_STATE *pMS) } else if (dx && !HINIBBLE (NewState)) { - NewState = NewState % HANGAR_SHIPS_ROW; - dx += NewState; - if (dx < 0) - NewState = (BYTE)(pMS->CurState + (HANGAR_SHIPS_ROW - 1)); - else if (dx > HANGAR_SHIPS_ROW - 1) - NewState = (BYTE)(pMS->CurState - (HANGAR_SHIPS_ROW - 1)); - else - NewState = (BYTE)(pMS->CurState - NewState + dx); + // Moving horizontally through the escort ship slots, + // wrapping around if necessary. + NewState = (pMS->CurState + HANGAR_SHIPS_ROW + dx) % + HANGAR_SHIPS_ROW; } if (select || cancel