diff --git a/source/core/maploader.cpp b/source/core/maploader.cpp index 681df80cb..43dc07a59 100644 --- a/source/core/maploader.cpp +++ b/source/core/maploader.cpp @@ -180,7 +180,7 @@ static void ReadWallV7(FileReader& fr, walltype& wall) { int x = fr.ReadInt32(); int y = fr.ReadInt32(); - wall.setPosFromLoad(x, y); + wall.setPosFromMap(x, y); wall.point2 = fr.ReadInt16(); wall.nextwall = fr.ReadInt16(); wall.nextsector = fr.ReadInt16(); @@ -202,7 +202,7 @@ static void ReadWallV6(FileReader& fr, walltype& wall) { int x = fr.ReadInt32(); int y = fr.ReadInt32(); - wall.setPosFromLoad(x, y); + wall.setPosFromMap(x, y); wall.point2 = fr.ReadInt16(); wall.nextsector = fr.ReadInt16(); wall.nextwall = fr.ReadInt16(); @@ -224,7 +224,7 @@ static void ReadWallV5(FileReader& fr, walltype& wall) { int x = fr.ReadInt32(); int y = fr.ReadInt32(); - wall.setPosFromLoad(x, y); + wall.setPosFromMap(x, y); wall.point2 = fr.ReadInt16(); wall.picnum = fr.ReadInt16(); wall.overpicnum = fr.ReadInt16(); @@ -659,7 +659,7 @@ static void P_LoadBloodMapWalls(uint8_t* data, size_t len, TArray& lwa int x = LittleLong(load.x); int y = LittleLong(load.y); - pWall->setPosFromLoad(x, y); + pWall->setPosFromMap(x, y); pWall->point2 = LittleShort(load.point2); pWall->nextwall = LittleShort(load.nextwall); pWall->nextsector = LittleShort(load.nextsector); diff --git a/source/core/maptypes.h b/source/core/maptypes.h index 30904af66..45d4dc554 100644 --- a/source/core/maptypes.h +++ b/source/core/maptypes.h @@ -379,7 +379,7 @@ struct walltype DVector2 pos; vec2_t wall_int_pos() const { return vec2_t(pos.X * worldtoint, pos.Y * worldtoint); }; - void setPosFromLoad(int x, int y) { pos = { x * maptoworld, y * maptoworld }; } + void setPosFromMap(int x, int y) { pos = { x * maptoworld, y * maptoworld }; } int32_t point2; int32_t nextwall; diff --git a/source/games/blood/src/db.cpp b/source/games/blood/src/db.cpp index 1d70a1d47..871da8ee4 100644 --- a/source/games/blood/src/db.cpp +++ b/source/games/blood/src/db.cpp @@ -391,7 +391,7 @@ void dbLoadMap(const char* pPath, int* pX, int* pY, int* pZ, short* pAngle, int* } int x = LittleLong(load.x); int y = LittleLong(load.y); - pWall->setPosFromLoad(x, y); + pWall->setPosFromMap(x, y); pWall->point2 = LittleShort(load.point2); pWall->nextwall = LittleShort(load.nextwall); pWall->nextsector = LittleShort(load.nextsector);