From 4b378538046b46a17949416d91c996b7d3cef5c2 Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Tue, 28 May 2013 23:58:33 +0200
Subject: credits player positioning fix

---
 src/creditsMgr.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'src/creditsMgr.cpp')

diff --git a/src/creditsMgr.cpp b/src/creditsMgr.cpp
index ece7b35..c8ef8c2 100644
--- a/src/creditsMgr.cpp
+++ b/src/creditsMgr.cpp
@@ -557,10 +557,25 @@ void dCreditsMgr_c::positionPlayers() {
 	playerPositions[2] = playerPositions[0] + diff;
 	playerPositions[3] = playerPositions[0] + diff + diff;
 
+	// This is annoying
+	dAcPy_c *players[4];
+	for (int i = 0; i < 4; i++)
+		players[i] = dAcPy_c::findByID(i);
+
+	static const int crap[4] = {0,1,3,2};
+
 	int whichPos = 0;
 	for (int i = 0; i < 4; i++) {
-		dAcPy_c *player;
-		if ((player = dAcPy_c::findByID(i))) {
+		dAcPy_c *player = 0;
+		// Find the player matching this ID
+		for (int j = 0; j < 4; j++) {
+			if (Player_ID[players[j]->settings & 0xF] == crap[i]) {
+				player = players[j];
+				break;
+			}
+		}
+
+		if (player) {
 			player->pos.x = playerPositions[whichPos];
 			player->pos.y = -(entrance->yPos + 16);
 			player->direction = 0;
-- 
cgit v1.2.3