mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-22 17:49:43 +01:00
Merge pull request #547 from InfoTeddy/general-bug-fixes
Fix Secret Lab Time Trial trophies having wrong colors
This commit is contained in:
commit
261e898267
2 changed files with 8 additions and 8 deletions
|
@ -1745,21 +1745,21 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo
|
|||
if(game.bestrank[1]>=3)
|
||||
{
|
||||
entity.tile = 186 + vx;
|
||||
entity.colour = 35;
|
||||
entity.colour = 33;
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
if(game.bestrank[2]>=3)
|
||||
{
|
||||
entity.tile = 184 + vx;
|
||||
entity.colour = 33;
|
||||
entity.colour = 35;
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
if(game.bestrank[3]>=3)
|
||||
{
|
||||
entity.tile = 184 + vx;
|
||||
entity.colour = 32;
|
||||
entity.colour = 30;
|
||||
}
|
||||
break;
|
||||
case 5:
|
||||
|
@ -1773,7 +1773,7 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo
|
|||
if(game.bestrank[5]>=3)
|
||||
{
|
||||
entity.tile = 184 + vx;
|
||||
entity.colour = 30;
|
||||
entity.colour = 32;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
@ -2618,7 +2618,7 @@ void Graphics::setcol( int t )
|
|||
break;
|
||||
|
||||
//Trophies
|
||||
//cyan
|
||||
//Yellow
|
||||
case 30:
|
||||
ct.colour = RGBf(160, 200, 220);
|
||||
break;
|
||||
|
@ -2626,11 +2626,11 @@ void Graphics::setcol( int t )
|
|||
case 31:
|
||||
ct.colour = RGBf(220, 120, 210);
|
||||
break;
|
||||
//Yellow
|
||||
//cyan
|
||||
case 32:
|
||||
ct.colour = RGBf(220, 210, 120);
|
||||
break;
|
||||
//red
|
||||
//Blue
|
||||
case 33:
|
||||
ct.colour = RGBf(255, 70, 70);
|
||||
break;
|
||||
|
@ -2638,7 +2638,7 @@ void Graphics::setcol( int t )
|
|||
case 34:
|
||||
ct.colour = RGBf(120, 220, 120);
|
||||
break;
|
||||
//Blue
|
||||
//red
|
||||
case 35:
|
||||
ct.colour = RGBf(75, 75, 255);
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue