mpo
/
VVVVVV
mirror of https://github.com/TerryCavanagh/VVVVVV.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #547 from InfoTeddy/general-bug-fixes 

Fix Secret Lab Time Trial trophies having wrong colors
This commit is contained in:
Terry Cavanagh 2021-01-09 19:02:25 +10:30 committed by GitHub
parent 952a130595 d271907f8c
commit 261e898267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
desktop_version/src/Entity.cpp
View File

@ -1745,21 +1745,21 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo
if(game.bestrank[1]>=3) if(game.bestrank[1]>=3)
{ {
entity.tile = 186 + vx; entity.tile = 186 + vx;
entity.colour = 35; entity.colour = 33;
} }
break; break;
case 3: case 3:
if(game.bestrank[2]>=3) if(game.bestrank[2]>=3)
{ {
entity.tile = 184 + vx; entity.tile = 184 + vx;
entity.colour = 33; entity.colour = 35;
} }
break; break;
case 4: case 4:
if(game.bestrank[3]>=3) if(game.bestrank[3]>=3)
{ {
entity.tile = 184 + vx; entity.tile = 184 + vx;
entity.colour = 32; entity.colour = 30;
} }
break; break;
case 5: case 5:
@ -1773,7 +1773,7 @@ void entityclass::createentity( float xp, float yp, int t, float vx /*= 0*/, flo
if(game.bestrank[5]>=3) if(game.bestrank[5]>=3)
{ {
entity.tile = 184 + vx; entity.tile = 184 + vx;
entity.colour = 30; entity.colour = 32;
} }
break; break;

8
desktop_version/src/Graphics.cpp
View File

@ -2618,7 +2618,7 @@ void Graphics::setcol( int t )
break; break;
//Trophies //Trophies
//cyan //Yellow
case 30: case 30:
ct.colour = RGBf(160, 200, 220); ct.colour = RGBf(160, 200, 220);
break; break;
@ -2626,11 +2626,11 @@ void Graphics::setcol( int t )
case 31: case 31:
ct.colour = RGBf(220, 120, 210); ct.colour = RGBf(220, 120, 210);
break; break;
//Yellow //cyan
case 32: case 32:
ct.colour = RGBf(220, 210, 120); ct.colour = RGBf(220, 210, 120);
break; break;
//red //Blue
case 33: case 33:
ct.colour = RGBf(255, 70, 70); ct.colour = RGBf(255, 70, 70);
break; break;
@ -2638,7 +2638,7 @@ void Graphics::setcol( int t )
case 34: case 34:
ct.colour = RGBf(120, 220, 120); ct.colour = RGBf(120, 220, 120);
break; break;
//Blue //red
case 35: case 35:
ct.colour = RGBf(75, 75, 255); ct.colour = RGBf(75, 75, 255);
break; break;