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

Compare commits

base: mpo:261e8982670088f97a8deb2897d28ee22354a66c
Branches Tags
mpo:master
mpo:2.4-updates
mpo:2.3-updates
mpo:2.4.1
mpo:2.4
mpo:2.3.6
mpo:2.3.5
mpo:2.3.4
mpo:2.3.3
mpo:2.3.2
mpo:2.3.1
mpo:2.3
mpo:2.2
..
compare: mpo:952a130595945c118cba49843381e9ac8afdd99f
Branches Tags
mpo:master
mpo:2.4-updates
mpo:2.3-updates
mpo:2.4.1
mpo:2.4
mpo:2.3.6
mpo:2.3.5
mpo:2.3.4
mpo:2.3.3
mpo:2.3.2
mpo:2.3.1
mpo:2.3
mpo:2.2

No commits in common. "261e8982670088f97a8deb2897d28ee22354a66c" and "952a130595945c118cba49843381e9ac8afdd99f" have entirely different histories.
261e898267 ... 952a130595

2 changed files with 8 additions and 8 deletions
Show Stats 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)
{
entity.tile = 186 + vx;
entity.colour = 33;
entity.colour = 35;
}
break;
case 3:
if(game.bestrank[2]>=3)
{
entity.tile = 184 + vx;
entity.colour = 35;
entity.colour = 33;
}
break;
case 4:
if(game.bestrank[3]>=3)
{
entity.tile = 184 + vx;
entity.colour = 30;
entity.colour = 32;
}
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 = 32;
entity.colour = 30;
}
break;

8
desktop_version/src/Graphics.cpp
View File

@ -2618,7 +2618,7 @@ void Graphics::setcol( int t )
break;
//Trophies
//Yellow
//cyan
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;
//cyan
//Yellow
case 32:
ct.colour = RGBf(220, 210, 120);
break;
//Blue
//red
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;
//red
//Blue
case 35:
ct.colour = RGBf(75, 75, 255);
break;