zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 11:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

CON: Add wall.blend to structure access.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6277 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-06-25 11:23:58 +00:00
parent cb12f25cda
commit 0d7518891b
3 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/duke3d/src/gamedef.cpp
View file

@ -768,6 +768,7 @@ const memberlabel_t WallLabels[]=
{ "extra", WALL_EXTRA, 0, 0 }, { "extra", WALL_EXTRA, 0, 0 },
{ "ulotag", WALL_ULOTAG, 0, 0 }, { "ulotag", WALL_ULOTAG, 0, 0 },
{ "uhitag", WALL_UHITAG, 0, 0 }, { "uhitag", WALL_UHITAG, 0, 0 },
{ "blend", WALL_BLEND, 0, 0 },
{ "", -1, 0, 0 } // END OF LIST { "", -1, 0, 0 } // END OF LIST
}; };

1
source/duke3d/src/gamedef.h
View file

@ -583,6 +583,7 @@ enum WallLabel_t
WALL_EXTRA, WALL_EXTRA,
WALL_ULOTAG, WALL_ULOTAG,
WALL_UHITAG, WALL_UHITAG,
WALL_BLEND,
WALL_END WALL_END
}; };

14
source/duke3d/src/gamestructures.cpp
View file

@ -834,6 +834,13 @@ int32_t __fastcall VM_GetWall(int32_t const wallNum, int32_t labelNum)
case WALL_ULOTAG: labelNum = pWall->lotag; break; case WALL_ULOTAG: labelNum = pWall->lotag; break;
case WALL_UHITAG: labelNum = pWall->hitag; break; case WALL_UHITAG: labelNum = pWall->hitag; break;
case WALL_EXTRA: labelNum = pWall->extra; break; case WALL_EXTRA: labelNum = pWall->extra; break;
case WALL_BLEND:
#ifdef NEW_MAP_FORMAT
labelNum = pWall->blend;
#else
labelNum = wallext[wallNum].blend;
#endif
break;
default: labelNum = -1; default: labelNum = -1;
} }
@ -871,6 +878,13 @@ void __fastcall VM_SetWall(int32_t const wallNum, int32_t const labelNum, int32_
case WALL_ULOTAG: pWall->lotag = iSet; break; case WALL_ULOTAG: pWall->lotag = iSet; break;
case WALL_UHITAG: pWall->hitag = iSet; break; case WALL_UHITAG: pWall->hitag = iSet; break;
case WALL_EXTRA: pWall->extra = iSet; break; case WALL_EXTRA: pWall->extra = iSet; break;
case WALL_BLEND:
#ifdef NEW_MAP_FORMAT
pWall->blend = iSet;
#else
wallext[wallNum].blend = iSet;
#endif
break;
} }
return; return;