Se.Cherkasov/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2026-09-25 13:27:12 +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 11:45:57 -05:00
committed by GitHub
co-authored by NyakoFox Dav999
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
desktop_version/src/Map.cpp
+5 -5
View File
@@ -519,7 +519,7 @@ void mapclass::changefinalcol(int t)
//Next, entities
for (size_t i = 0; i < obj.entities.size(); i++)
{
if (obj.entities[i].type == 1) //something with a movement behavior
if (obj.entities[i].type == EntityType_MOVING)
{
if (obj.entities[i].animate == 10 || obj.entities[i].animate == 11) //treadmill
{
@@ -542,7 +542,7 @@ void mapclass::changefinalcol(int t)
obj.entities[i].colour = maptiletoenemycol(temp);
}
}
else if (obj.entities[i].type == 2) //disappearing platforms
else if (obj.entities[i].type == EntityType_DISAPPEARING_PLATFORM)
{
obj.entities[i].tile = 915+(temp*40);
}
@@ -892,7 +892,7 @@ void mapclass::gotoroom(int rx, int ry)
//Ok, let's save the position of all lines on the screen
for (size_t i = 0; i < obj.entities.size(); i++)
{
if (obj.entities[i].type == 9)
if (obj.entities[i].type == EntityType_HORIZONTAL_GRAVITY_LINE)
{
//It's a horizontal line
if (obj.entities[i].xp <= 0 || (obj.entities[i].xp + obj.entities[i].w) >= 312)
@@ -1030,7 +1030,7 @@ void mapclass::gotoroom(int rx, int ry)
for (size_t i = 0; i < obj.entities.size(); i++)
{
if (obj.entities[i].type == 9)
if (obj.entities[i].type == EntityType_HORIZONTAL_GRAVITY_LINE)
{
//It's a horizontal line
if (obj.entities[i].xp <= 0 || obj.entities[i].xp + obj.entities[i].w >= 312)
@@ -2058,7 +2058,7 @@ void mapclass::loadlevel(int rx, int ry)
for (size_t i = 0; i < obj.entities.size(); i++)
{
if (obj.entities[i].type == 1 && obj.entities[i].behave >= 8 && obj.entities[i].behave < 10)
if (obj.entities[i].type == EntityType_MOVING && obj.entities[i].behave >= 8 && obj.entities[i].behave < 10)
{
//put a block underneath
int temp = obj.entities[i].xp / 8.0f;