diff --git a/source/duke3d/src/gamedef.cpp b/source/duke3d/src/gamedef.cpp index 8ca07f999..6118b31f8 100644 --- a/source/duke3d/src/gamedef.cpp +++ b/source/duke3d/src/gamedef.cpp @@ -768,6 +768,7 @@ const memberlabel_t WallLabels[]= { "extra", WALL_EXTRA, 0, 0 }, { "ulotag", WALL_ULOTAG, 0, 0 }, { "uhitag", WALL_UHITAG, 0, 0 }, + { "blend", WALL_BLEND, 0, 0 }, { "", -1, 0, 0 } // END OF LIST }; diff --git a/source/duke3d/src/gamedef.h b/source/duke3d/src/gamedef.h index 3494bcebc..afb5795eb 100644 --- a/source/duke3d/src/gamedef.h +++ b/source/duke3d/src/gamedef.h @@ -583,6 +583,7 @@ enum WallLabel_t WALL_EXTRA, WALL_ULOTAG, WALL_UHITAG, + WALL_BLEND, WALL_END }; diff --git a/source/duke3d/src/gamestructures.cpp b/source/duke3d/src/gamestructures.cpp index 075a23793..6f862212d 100644 --- a/source/duke3d/src/gamestructures.cpp +++ b/source/duke3d/src/gamestructures.cpp @@ -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_UHITAG: labelNum = pWall->hitag; 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; } @@ -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_UHITAG: pWall->hitag = 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;