Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-01-30 09:54:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactor colors in internal commands

Browse Source 
Originally this started as a "deduplicate a bunch of duplicated code in script commands" PR,
but as I was working on that, I discovered there's a lot more that needs to be done than
just deduplication.
Anything which needs a crewmate entity now calls `getcrewmanfromname(name)`, and anything which
just needs the crewmate's color calls `getcolorfromname(name)`. This was done to make sure that
everything works consistently and no copy/pasting is required. Next is the fallback; instead of
giving up and doing various things when it can't find a specific color, it now attempts to treat
the color name as an ID, and if it can't then it returns -1, where each individual command handles
that return value. This means we can keep around AEM -- a bug used in custom levels -- by not
doing anything with the return value if it's -1.

Also, for some reason, there were two `crewcolour` functions, so I stripped out the one in
entityclass and left (and modified) the one in the graphics class, since the graphics class also
has the `crewcolourreal` function.
This commit is contained in:
Ally
2021-08-31 19:09:51 -03:00
committed by GitHub
parent 8ebf8a21e4
commit 64be7dbd53
7 changed files with 107 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
desktop_version/src/Entity.cpp
View File

@@ -1199,33 +1199,6 @@ bool entityclass::gridmatch( int p1, int p2, int p3, int p4, int p11, int p21, i
return false;
}
int entityclass::crewcolour( int t )
{
//Return the colour of the indexed crewmate
switch(t)
{
case 0:
return 0;
break;
case 1:
return 20;
break;
case 2:
return 14;
break;
case 3:
return 15;
break;
case 4:
return 13;
break;
case 5:
return 16;
break;
}
return 0;
}
static void entityclonefix(entclass* entity)
{
if (entity->behave == 10 || entity->behave == 12)
@@ -2033,7 +2006,7 @@ void entityclass::createentity(int xp, int yp, int t, int meta1, int meta2, int
}else{
entity.tile = 0;
}
entity.colour = crewcolour(meta2);
entity.colour = graphics.crewcolour(meta2);
entity.cx = 6;
entity.cy = 2;
entity.w = 12;
@@ -2883,7 +2856,7 @@ bool entityclass::updateentities( int i )
else if (entities[i].state == 11)
{
//11-15 means to follow a specific character, in crew order (cyan, purple, yellow, red, green, blue)
int j=getcrewman(1); //purple
int j=getcrewman(PURPLE);
if (INBOUNDS_VEC(j, entities))
{
if (entities[j].xp > entities[i].xp + 5)
@@ -2908,7 +2881,7 @@ bool entityclass::updateentities( int i )
else if (entities[i].state == 12)
{
//11-15 means to follow a specific character, in crew order (cyan, purple, yellow, red, green, blue)
int j=getcrewman(2); //yellow
int j=getcrewman(YELLOW);
if (INBOUNDS_VEC(j, entities))
{
if (entities[j].xp > entities[i].xp + 5)
@@ -2933,7 +2906,7 @@ bool entityclass::updateentities( int i )
else if (entities[i].state == 13)
{
//11-15 means to follow a specific character, in crew order (cyan, purple, yellow, red, green, blue)
int j=getcrewman(3); //red
int j=getcrewman(RED);
if (INBOUNDS_VEC(j, entities))
{
if (entities[j].xp > entities[i].xp + 5)
@@ -2958,7 +2931,7 @@ bool entityclass::updateentities( int i )
else if (entities[i].state == 14)
{
//11-15 means to follow a specific character, in crew order (cyan, purple, yellow, red, green, blue)
int j=getcrewman(4); //green
int j=getcrewman(GREEN);
if (INBOUNDS_VEC(j, entities))
{
if (entities[j].xp > entities[i].xp + 5)
@@ -2983,7 +2956,7 @@ bool entityclass::updateentities( int i )
else if (entities[i].state == 15)
{
//11-15 means to follow a specific character, in crew order (cyan, purple, yellow, red, green, blue)
int j=getcrewman(5); //blue
int j=getcrewman(BLUE);
if (INBOUNDS_VEC(j, entities))
{
if (entities[j].xp > entities[i].xp + 5)
@@ -3939,15 +3912,9 @@ int entityclass::getlineat( int t )
return 0;
}
int entityclass::getcrewman( int t )
int entityclass::getcrewman( int t, int fallback /*= 0*/ )
{
//Returns the index of the crewman with colour index given by t
if (t == 0) t = 0;
if (t == 1) t = 20;
if (t == 2) t = 14;
if (t == 3) t = 15;
if (t == 4) t = 13;
if (t == 5) t = 16;
for (size_t i = 0; i < entities.size(); i++)
{
@@ -3961,7 +3928,7 @@ int entityclass::getcrewman( int t )
}
}
return 0;
return fallback;
}
int entityclass::getcustomcrewman( int t )