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

Convert entity types to an enum (#1007)

Browse Source 
In an effort to remove magic numbers, I've given every entity type a
name. Hopefully I didn't miss anywhere.

Also, add `createentity` case 100 for backwards compatibility.

Co-authored-by: NyakoFox <nyakowofox@gmail.com>
Co-authored-by: Dav999 <dav999.tolp@gmail.com>
This commit is contained in:
Ally
2024-11-17 12:45:57 -04:00
committed by GitHub
parent 9c45dfb845
commit 63880169e6
7 changed files with 181 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
desktop_version/src/Script.cpp
View File

@@ -295,7 +295,7 @@ void scriptclass::run(void)
{
for (size_t edi = 0; edi < obj.entities.size(); edi++)
{
if (obj.entities[edi].type == 9 || obj.entities[edi].type == 10)
if (obj.entities[edi].type == EntityType_HORIZONTAL_GRAVITY_LINE || obj.entities[edi].type == EntityType_VERTICAL_GRAVITY_LINE)
{
obj.disableentity(edi);
}
@@ -305,7 +305,7 @@ void scriptclass::run(void)
{
for (size_t edi = 0; edi < obj.entities.size(); edi++)
{
if (obj.entities[edi].type == 11)
if (obj.entities[edi].type == EntityType_WARP_TOKEN)
{
obj.disableentity(edi);
}
@@ -332,7 +332,7 @@ void scriptclass::run(void)
for (size_t edi = 0; edi < obj.entities.size(); edi++)
{
obj.disableblockat(obj.entities[edi].xp, obj.entities[edi].yp);
if (obj.entities[edi].type == 2 && obj.entities[edi].rule == 3)
if (obj.entities[edi].type == EntityType_DISAPPEARING_PLATFORM && obj.entities[edi].rule == 3)
{
obj.disableentity(edi);
}
@@ -1648,7 +1648,7 @@ void scriptclass::run(void)
{
for (j = 0; j < (int) obj.entities.size(); j++)
{
if (obj.entities[j].type == 13)
if (obj.entities[j].type == EntityType_TERMINAL)
{
obj.entities[j].colour = 4;
}