TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove struct side

Browse source
This commit is contained in:
Kp 2018-12-13 02:31:38 +00:00
parent a54c323e45
commit d550cfe680
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/main/segment.h
View file

@ -156,10 +156,6 @@ struct unique_side
array<uvl, 4> uvls;
};
struct side : unique_side, shared_side
{
};
#ifdef dsx
struct shared_segment
{

4
similar/main/gameseg.cpp
View file

@ -174,7 +174,7 @@ bool get_side_is_quad(const shared_side &sidep)
case SIDE_IS_TRI_13:
return false;
default:
throw side::illegal_type(sidep);
throw shared_side::illegal_type(sidep);
}
}
@ -199,7 +199,7 @@ __attribute_cold
__noreturn
static void create_vertex_list_from_invalid_side(const shared_segment &segp, const shared_side &sidep)
{
throw side::illegal_type(segp, sidep);
throw shared_side::illegal_type(segp, sidep);
}
template <typename T, typename V>

8
similar/main/newdemo.cpp
View file

@ -1964,8 +1964,8 @@ static void newdemo_pop_ctrlcen_triggers()
const auto anim_num = vcwallptr(wall_num)->clip_num;
const auto n = WallAnims[anim_num].num_frames;
const auto t = WallAnims[anim_num].flags & WCF_TMAP1
? &side::tmap_num
: &side::tmap_num2;
? &unique_side::tmap_num
: &unique_side::tmap_num2;
seg->unique_segment::sides[side].*t = csegp->unique_segment::sides[cside].*t = WallAnims[anim_num].frames[n-1];
}
}
@ -3048,8 +3048,8 @@ static int newdemo_read_frame_information(int rewrite)
const auto &&cside = find_connect_side(segp, csegp);
const auto anim_num = vmwallptr(segp->shared_segment::sides[side].wall_num)->clip_num;
const auto t = WallAnims[anim_num].flags & WCF_TMAP1
? &side::tmap_num
: &side::tmap_num2;
? &unique_side::tmap_num
: &unique_side::tmap_num2;
segp->unique_segment::sides[side].*t = csegp->unique_segment::sides[cside].*t = WallAnims[anim_num].frames[0];
}
break;

2
similar/main/render.cpp
View file

@ -546,7 +546,7 @@ im_so_ashamed: ;
}
} else
throw side::illegal_type(segp, sside);
throw shared_side::illegal_type(segp, sside);
}
}