mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Separate CustomEntity global positions internally

Browse source 
This makes it so that `CustomEntity`s, at least internally, do not use
global tile position. Instead, they will use room-x and room-y
coordinates, which will be separate from their x- and y- positions.

This makes it much easier to deal with `CustomEntity`s, because you
don't have to divide and modulo everywhere to use them.

Since editorclass::add_entity and editorclass::get_entity_at expect
global tile position in their arguments, I've added room-x and room-y
arguments to these functions too.

Of course, due to compatibility reasons, the XML files will still have
to use global tile position. For the same reason, warp token
destinations are still using global tile position too.
This commit is contained in:
Misa 2023-03-29 00:18:42 -07:00
parent 98feeade02
commit 71dbe95dcb
5 changed files with 75 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
desktop_version/src/CustomLevels.cpp
View file

@ -942,12 +942,10 @@ void customlevelclass::findstartpoint(void)
else else
{ {
//Start point spawn //Start point spawn
int tx=customentities[testeditor].x/40; game.edsavex = (customentities[testeditor].x * 8) - 4;
int ty=customentities[testeditor].y/30; game.edsavey = customentities[testeditor].y * 8;
game.edsavex = ((customentities[testeditor].x%40)*8)-4; game.edsaverx = 100 + customentities[testeditor].rx;
game.edsavey = (customentities[testeditor].y%30)*8; game.edsavery = 100 + customentities[testeditor].ry;
game.edsaverx = 100+tx;
game.edsavery = 100+ty;
game.edsavegc = 0; game.edsavegc = 0;
game.edsavey++; game.edsavey++;
game.edsavedir=1-customentities[testeditor].p1; game.edsavedir=1-customentities[testeditor].p1;
@ -1151,6 +1149,8 @@ bool customlevelclass::load(std::string _path)
{ {
CustomEntity entity = CustomEntity(); CustomEntity entity = CustomEntity();
const char* text = edEntityEl->GetText(); const char* text = edEntityEl->GetText();
int global_x = 0;
int global_y = 0;
if (text != NULL) if (text != NULL)
{ {
@ -1195,8 +1195,12 @@ bool customlevelclass::load(std::string _path)
entity.scriptname = std::string(text, len); entity.scriptname = std::string(text, len);
} }
edEntityEl->QueryIntAttribute("x", &entity.x); edEntityEl->QueryIntAttribute("x", &global_x);
edEntityEl->QueryIntAttribute("y", &entity.y); edEntityEl->QueryIntAttribute("y", &global_y);
entity.rx = global_x / SCREEN_WIDTH_TILES;
entity.x = global_x % SCREEN_WIDTH_TILES;
entity.ry = global_y / SCREEN_HEIGHT_TILES;
entity.y = global_y % SCREEN_HEIGHT_TILES;
edEntityEl->QueryIntAttribute("t", &entity.t); edEntityEl->QueryIntAttribute("t", &entity.t);
edEntityEl->QueryIntAttribute("p1", &entity.p1); edEntityEl->QueryIntAttribute("p1", &entity.p1);
@ -1537,8 +1541,10 @@ bool customlevelclass::save(const std::string& _path)
for(size_t i = 0; i < customentities.size(); i++) for(size_t i = 0; i < customentities.size(); i++)
{ {
tinyxml2::XMLElement *edentityElement = doc.NewElement( "edentity" ); tinyxml2::XMLElement *edentityElement = doc.NewElement( "edentity" );
edentityElement->SetAttribute( "x", customentities[i].x); const int global_x = customentities[i].rx * SCREEN_WIDTH_TILES + customentities[i].x;
edentityElement->SetAttribute( "y", customentities[i].y); const int global_y = customentities[i].ry * SCREEN_HEIGHT_TILES + customentities[i].y;
edentityElement->SetAttribute("x", global_x);
edentityElement->SetAttribute("y", global_y);
edentityElement->SetAttribute( "t", customentities[i].t); edentityElement->SetAttribute( "t", customentities[i].t);
edentityElement->SetAttribute( "p1", customentities[i].p1); edentityElement->SetAttribute( "p1", customentities[i].p1);
edentityElement->SetAttribute( "p2", customentities[i].p2); edentityElement->SetAttribute( "p2", customentities[i].p2);

1
desktop_version/src/CustomLevels.h
View file

@ -10,6 +10,7 @@
class CustomEntity class CustomEntity
{ {
public: public:
int rx, ry;
int x, y, t; int x, y, t;
//parameters //parameters
int p1, p2, p3, p4, p5, p6; int p1, p2, p3, p4, p5, p6;

100
desktop_version/src/Editor.cpp
View file

@ -481,25 +481,23 @@ static void draw_edgeguides(void)
} }
const int x = entity->p2 * 8; const int x = entity->p2 * 8;
const int w = entity->p3; const int w = entity->p3;
const int room_x = (entity->x / 40); if (entity->ry != ed.levy)
const int room_y = (entity->y / 30);
if (room_y != ed.levy)
{ {
continue; continue;
} }
if (room_x == POS_MOD(ed.levx - 1, cl.mapwidth) if (entity->rx == POS_MOD(ed.levx - 1, cl.mapwidth)
// It's to the left... // It's to the left...
&& x + w >= 312) && x + w >= 312)
{ {
// And touching the right edge! // And touching the right edge!
graphics.fill_rect(x, (entity->y % 30) * 8, 2, 8, green); graphics.fill_rect(x, entity->y * 8, 2, 8, green);
} }
else if (room_x == POS_MOD(ed.levx + 1, cl.mapwidth) else if (entity->rx == POS_MOD(ed.levx + 1, cl.mapwidth)
// It's to the right... // It's to the right...
&& x <= 0) && x <= 0)
{ {
// And touching the left edge! // And touching the left edge!
graphics.fill_rect(x + w - 2, (entity->y % 30) * 8, 2, 8, green); graphics.fill_rect(x + w - 2, entity->y * 8, 2, 8, green);
} }
} }
} }
@ -512,7 +510,7 @@ static void update_entities(void)
{ {
CustomEntity* entity = &customentities[i]; CustomEntity* entity = &customentities[i];
if (entity->x / 40 != ed.levx || entity->y / 30 != ed.levy) if (entity->rx != ed.levx || entity->ry != ed.levy)
{ {
// It's not in this room, so just continue // It's not in this room, so just continue
continue; continue;
@ -527,9 +525,9 @@ static void update_entities(void)
if ((grav_line && entity->p1 == 0) || (warp_line && entity->p1 >= 2)) if ((grav_line && entity->p1 == 0) || (warp_line && entity->p1 >= 2))
{ {
/* Horizontal */ /* Horizontal */
int tx = entity->x % 40; int tx = entity->x;
int tx2 = tx; int tx2 = tx;
int ty = entity->y % 30; int ty = entity->y;
while (ed.lines_can_pass(tx, ty)) while (ed.lines_can_pass(tx, ty))
{ {
--tx; --tx;
@ -545,8 +543,8 @@ static void update_entities(void)
else else
{ {
/* Vertical */ /* Vertical */
int tx = entity->x % 40; int tx = entity->x;
int ty = entity->y % 30; int ty = entity->y;
int ty2 = ty; int ty2 = ty;
while (ed.lines_can_pass(tx, ty)) while (ed.lines_can_pass(tx, ty))
{ {
@ -573,7 +571,7 @@ static void draw_entities(void)
//Draw entities //Draw entities
obj.customplatformtile = game.customcol * 12; obj.customplatformtile = game.customcol * 12;
const int edent_under_cursor = ed.get_entity_at(ed.tilex + ed.levx * 40, ed.tiley + ed.levy * 30); const int edent_under_cursor = ed.get_entity_at(ed.levx, ed.levy, ed.tilex, ed.tiley);
// Special case for drawing gray entities // Special case for drawing gray entities
bool custom_gray = room->tileset == 3 && room->tilecol == 6; bool custom_gray = room->tileset == 3 && room->tilecol == 6;
@ -584,10 +582,10 @@ static void draw_entities(void)
CustomEntity* entity = &customentities[i]; CustomEntity* entity = &customentities[i];
// If the entity is in the current room, draw it // If the entity is in the current room, draw it
if (entity->x / 40 == ed.levx && entity->y / 30 == ed.levy) if (entity->rx == ed.levx && entity->ry == ed.levy)
{ {
const int x = entity->x % 40 * 8; const int x = entity->x * 8;
const int y = entity->y % 30 * 8; const int y = entity->y * 8;
static const char arrows[] = "V^<>"; static const char arrows[] = "V^<>";
switch (entity->t) switch (entity->t)
@ -819,7 +817,7 @@ static void draw_entities(void)
if (ed.tilex == x / 8 && ed.tiley == y / 8) if (ed.tilex == x / 8 && ed.tiley == y / 8)
{ {
text = "(" + help.String(entity->x / 40 + 1) + "," + help.String(entity->y / 30 + 1) + ")"; text = "(" + help.String(entity->rx + 1) + "," + help.String(entity->ry + 1) + ")";
} }
else else
{ {
@ -1847,10 +1845,12 @@ void editorlogic(void)
} }
} }
void editorclass::add_entity(int xp, int yp, int tp, int p1, int p2, int p3, int p4, int p5, int p6) void editorclass::add_entity(int rx, int ry, int xp, int yp, int tp, int p1, int p2, int p3, int p4, int p5, int p6)
{ {
CustomEntity entity; CustomEntity entity;
entity.rx = rx;
entity.ry = ry;
entity.x = xp; entity.x = xp;
entity.y = yp; entity.y = yp;
entity.t = tp; entity.t = tp;
@ -1870,11 +1870,16 @@ void editorclass::remove_entity(int t)
customentities.erase(customentities.begin() + t); customentities.erase(customentities.begin() + t);
} }
int editorclass::get_entity_at(int xp, int yp) int editorclass::get_entity_at(int rx, int ry, int xp, int yp)
{ {
for (size_t i = 0; i < customentities.size(); i++) for (size_t i = 0; i < customentities.size(); i++)
{ {
if (customentities[i].x == xp && customentities[i].y == yp) return i; const CustomEntity* entity = &customentities[i];
if (entity->rx == rx && entity->ry == ry &&
entity->x == xp && entity->y == yp)
{
return i;
}
} }
return -1; return -1;
} }
@ -1975,7 +1980,9 @@ void editorclass::tool_remove()
for (size_t i = 0; i < customentities.size(); i++) for (size_t i = 0; i < customentities.size(); i++)
{ {
if (customentities[i].x == tilex + (levx * SCREEN_WIDTH_TILES) && customentities[i].y == tiley + (levy * SCREEN_HEIGHT_TILES)) const CustomEntity* entity = &customentities[i];
if (entity->rx == levx && entity->ry == levy &&
entity->x == tilex && entity->y == tiley)
{ {
remove_entity(i); remove_entity(i);
} }
@ -2049,7 +2056,7 @@ void editorclass::entity_clicked(const int index)
void editorclass::tool_place() void editorclass::tool_place()
{ {
const int entity = get_entity_at(tilex + (levx * SCREEN_WIDTH_TILES), tiley + (levy * SCREEN_HEIGHT_TILES)); const int entity = get_entity_at(levx, levy, tilex, tiley);
if (entity != -1) if (entity != -1)
{ {
entity_clicked(entity); entity_clicked(entity);
@ -2085,7 +2092,7 @@ void editorclass::tool_place()
case EditorTool_TRINKETS: case EditorTool_TRINKETS:
if (cl.numtrinkets() < 100) if (cl.numtrinkets() < 100)
{ {
add_entity(tilex + (levx * 40), tiley + (levy * 30), 9); add_entity(levx, levy, tilex, tiley, 9);
lclickdelay = 1; lclickdelay = 1;
} }
else else
@ -2094,39 +2101,39 @@ void editorclass::tool_place()
} }
break; break;
case EditorTool_CHECKPOINTS: case EditorTool_CHECKPOINTS:
add_entity(tilex + (levx * 40), tiley + (levy * 30), 10, 1); add_entity(levx, levy, tilex, tiley, 10, 1);
lclickdelay = 1; lclickdelay = 1;
break; break;
case EditorTool_DISAPPEARING_PLATFORMS: case EditorTool_DISAPPEARING_PLATFORMS:
add_entity(tilex + (levx * 40), tiley + (levy * 30), 3); add_entity(levx, levy, tilex, tiley, 3);
lclickdelay = 1; lclickdelay = 1;
break; break;
case EditorTool_CONVEYORS: case EditorTool_CONVEYORS:
add_entity(tilex + (levx * 40), tiley + (levy * 30), 2, 5); add_entity(levx, levy, tilex, tiley, 2, 5);
lclickdelay = 1; lclickdelay = 1;
break; break;
case EditorTool_MOVING_PLATFORMS: case EditorTool_MOVING_PLATFORMS:
add_entity(tilex + (levx * 40), tiley + (levy * 30), 2, 0); add_entity(levx, levy, tilex, tiley, 2, 0);
lclickdelay = 1; lclickdelay = 1;
break; break;
case EditorTool_ENEMIES: case EditorTool_ENEMIES:
add_entity(tilex + (levx * 40), tiley + (levy * 30), 1, 0); add_entity(levx, levy, tilex, tiley, 1, 0);
lclickdelay = 1; lclickdelay = 1;
break; break;
case EditorTool_GRAVITY_LINES: case EditorTool_GRAVITY_LINES:
add_entity(tilex + (levx * 40), tiley + (levy * 30), 11, 0); add_entity(levx, levy, tilex, tiley, 11, 0);
lclickdelay = 1; lclickdelay = 1;
break; break;
case EditorTool_ROOMTEXT: case EditorTool_ROOMTEXT:
lclickdelay = 1; lclickdelay = 1;
text_entity = customentities.size(); text_entity = customentities.size();
add_entity(tilex + (levx * 40), tiley + (levy * 30), 17); add_entity(levx, levy, tilex, tiley, 17);
get_input_line(TEXT_ROOMTEXT, loc::gettext("Enter roomtext:"), &(customentities[text_entity].scriptname)); get_input_line(TEXT_ROOMTEXT, loc::gettext("Enter roomtext:"), &(customentities[text_entity].scriptname));
break; break;
case EditorTool_TERMINALS: case EditorTool_TERMINALS:
lclickdelay = 1; lclickdelay = 1;
text_entity = customentities.size(); text_entity = customentities.size();
add_entity(tilex + (levx * 40), tiley + (levy * 30), 18, 0); add_entity(levx, levy, tilex, tiley, 18, 0);
get_input_line(TEXT_SCRIPT, loc::gettext("Enter script name:"), &(customentities[text_entity].scriptname)); get_input_line(TEXT_SCRIPT, loc::gettext("Enter script name:"), &(customentities[text_entity].scriptname));
break; break;
case EditorTool_SCRIPTS: case EditorTool_SCRIPTS:
@ -2141,26 +2148,26 @@ void editorclass::tool_place()
case EditorTool_WARP_TOKENS: case EditorTool_WARP_TOKENS:
substate = EditorSubState_DRAW_WARPTOKEN; substate = EditorSubState_DRAW_WARPTOKEN;
warp_token_entity = customentities.size(); warp_token_entity = customentities.size();
add_entity(tilex + (levx * 40), tiley + (levy * 30), 13); add_entity(levx, levy, tilex, tiley, 13);
lclickdelay = 1; lclickdelay = 1;
break; break;
case EditorTool_WARP_LINES: case EditorTool_WARP_LINES:
//Warp lines //Warp lines
if (tilex == 0) if (tilex == 0)
{ {
add_entity(tilex + (levx * 40), tiley + (levy * 30), 50, 0); add_entity(levx, levy, tilex, tiley, 50, 0);
} }
else if (tilex == 39) else if (tilex == 39)
{ {
add_entity(tilex + (levx * 40), tiley + (levy * 30), 50, 1); add_entity(levx, levy, tilex, tiley, 50, 1);
} }
else if (tiley == 0) else if (tiley == 0)
{ {
add_entity(tilex + (levx * 40), tiley + (levy * 30), 50, 2); add_entity(levx, levy, tilex, tiley, 50, 2);
} }
else if (tiley == 29) else if (tiley == 29)
{ {
add_entity(tilex + (levx * 40), tiley + (levy * 30), 50, 3); add_entity(levx, levy, tilex, tiley, 50, 3);
} }
else else
{ {
@ -2171,7 +2178,7 @@ void editorclass::tool_place()
case EditorTool_CREWMATES: case EditorTool_CREWMATES:
if (cl.numcrewmates() < 100) if (cl.numcrewmates() < 100)
{ {
add_entity(tilex + (levx * 40), tiley + (levy * 30), 15, int(fRandom() * 6)); add_entity(levx, levy, tilex, tiley, 15, int(fRandom() * 6));
lclickdelay = 1; lclickdelay = 1;
} }
else else
@ -2189,7 +2196,7 @@ void editorclass::tool_place()
i--; i--;
} }
} }
add_entity(tilex + (levx * 40), tiley + (levy * 30), 16, 0); add_entity(levx, levy, tilex, tiley, 16, 0);
lclickdelay = 1; lclickdelay = 1;
break; break;
default: default:
@ -2458,9 +2465,8 @@ static void start_at_checkpoint(void)
continue; continue;
} }
const int tx = customentities[i].x / 40; const bool in_room = customentities[i].rx == ed.levx &&
const int ty = customentities[i].y / 30; customentities[i].ry == ed.levy;
const bool in_room = tx == ed.levx && ty == ed.levy;
if (!in_room) if (!in_room)
{ {
continue; continue;
@ -2487,12 +2493,10 @@ static void start_at_checkpoint(void)
{ {
ed.current_ghosts = 0; ed.current_ghosts = 0;
int tx = customentities[testeditor].x / 40; game.edsavex = (customentities[testeditor].x) * 8 - 4;
int ty = customentities[testeditor].y / 30; game.edsavey = customentities[testeditor].y * 8;
game.edsavex = (customentities[testeditor].x % 40) * 8 - 4; game.edsaverx = 100 + customentities[testeditor].rx;
game.edsavey = (customentities[testeditor].y % 30) * 8; game.edsavery = 100 + customentities[testeditor].ry;
game.edsaverx = 100 + tx;
game.edsavery = 100 + ty;
if (!startpoint) if (!startpoint)
{ {
@ -2926,7 +2930,7 @@ void editorinput(void)
case BoxType_SCRIPT: case BoxType_SCRIPT:
ed.text_entity = customentities.size(); ed.text_entity = customentities.size();
ed.add_entity((left / 8) + (ed.levx * 40), (top / 8) + (ed.levy * 30), 19, (right - left) / 8, (bottom - top) / 8); ed.add_entity(ed.levx, ed.levy, left / 8, top / 8, 19, (right - left) / 8, (bottom - top) / 8);
ed.get_input_line(TEXT_SCRIPT, loc::gettext("Enter script name:"), &(customentities[ed.text_entity].scriptname)); ed.get_input_line(TEXT_SCRIPT, loc::gettext("Enter script name:"), &(customentities[ed.text_entity].scriptname));
break; break;

4
desktop_version/src/Editor.h
View file

@ -133,11 +133,11 @@ public:
void show_note(const char* text); void show_note(const char* text);
void add_entity(int xp, int yp, int tp, int p1 = 0, int p2 = 0, int p3 = 0, int p4 = 0, int p5 = 320, int p6 = 240); void add_entity(int rx, int ry, int xp, int yp, int tp, int p1 = 0, int p2 = 0, int p3 = 0, int p4 = 0, int p5 = 320, int p6 = 240);
void remove_entity(int t); void remove_entity(int t);
int get_entity_at(int xp, int yp); int get_entity_at(int rx, int ry, int xp, int yp);
void set_tile(int x, int y, int t); void set_tile(int x, int y, int t);

14
desktop_version/src/Map.cpp
View file

@ -429,10 +429,7 @@ void mapclass::initcustommapdata(void)
continue; continue;
} }
const int rx = ent.x / 40; settrinket(ent.rx, ent.ry);
const int ry = ent.y / 30;
settrinket(rx, ry);
} }
#endif #endif
} }
@ -1807,16 +1804,13 @@ void mapclass::loadlevel(int rx, int ry)
{ {
// If entity is in this room, create it // If entity is in this room, create it
const CustomEntity& ent = customentities[edi]; const CustomEntity& ent = customentities[edi];
const int tsx = ent.x / 40; if (ent.rx != rx - 100 || ent.ry != ry - 100)
const int tsy = ent.y / 30;
if (tsx != rx-100 || tsy != ry-100)
{ {
continue; continue;
} }
const int ex = (ent.x % 40) * 8; const int ex = ent.x * 8;
const int ey = (ent.y % 30) * 8; const int ey = ent.y * 8;
// Platform and enemy bounding boxes // Platform and enemy bounding boxes
int bx1 = 0, by1 = 0, bx2 = 0, by2 = 0; int bx1 = 0, by1 = 0, bx2 = 0, by2 = 0;