Hexen: Fighter is Yellow by default in single-player

skyjake · Jul 9, 2012 · eabae76 · eabae76
1 parent d8526d9
commit eabae76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/doomsday/plugins/common/src/g_game.c b/doomsday/plugins/common/src/g_game.c
@@ -1917,6 +1917,13 @@ void G_PlayerReborn(int player)
 #endif
     p->colorMap = cfg.playerColor[player];
     p->class_ = P_ClassForPlayerWhenRespawning(player, false);
+#if __JHEXEN__
+    if(p->class_ == PCLASS_FIGHTER && !IS_NETGAME)
+    {
+        // In Hexen single-player, the Fighter's default color is Yellow.
+        p->colorMap = 2;
+    }
+#endif
     p->useDown = p->attackDown = true; // Don't do anything immediately.
     p->playerState = PST_LIVE;
     p->health = maxHealth;

diff --git a/doomsday/plugins/common/src/hu_menu.c b/doomsday/plugins/common/src/hu_menu.c
@@ -5248,8 +5248,12 @@ void Hu_MenuPlayerClassPreviewTicker(mn_object_t* ob)
             pClass %= 3; // Number of user-selectable classes.
 
             MNMobjPreview_SetPlayerClass(ob, pClass);
-            MNMobjPreview_SetMobjType(ob, (PCLASS_NONE == pClass? MT_NONE : PCLASS_INFO(pClass)->mobjType));
+            MNMobjPreview_SetMobjType(ob, PCLASS_INFO(pClass)->mobjType);
         }
+
+        // Fighter is Yellow, others Red by default.
+        MNMobjPreview_SetTranslationClass(ob, pClass);
+        MNMobjPreview_SetTranslationMap(ob, pClass == PCLASS_FIGHTER? 2 : 0);
     }
 
     // Call MNMobjPreview's ticker now we've done our own processing.