zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-01-18 22:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- renamed setPosFromLoad to setPosFromMap.

Browse source
This commit is contained in:
Christoph Oelckers 2022-02-03 01:02:48 +01:00
parent 109684c029
commit 47a594a96c
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/core/maploader.cpp
View file

@ -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<walltype>& 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);

2
source/core/maptypes.h
View file

@ -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;

2
source/games/blood/src/db.cpp
View file

@ -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);