I'm faily certain this also fixes broken logic (g_game.c).