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

Unify tmap storage branches

Browse source
This commit is contained in:
Kp 2016-02-20 17:28:11 +00:00
parent d5a12ba5af
commit c26a688af5
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
similar/main/newdemo.cpp
View file

@ -1875,11 +1875,10 @@ static void newdemo_pop_ctrlcen_triggers()
auto cside = find_connect_side(seg, csegp);
const auto anim_num = vcwallptr(seg->sides[side].wall_num)->clip_num;
n = WallAnims[anim_num].num_frames;
if (WallAnims[anim_num].flags & WCF_TMAP1) {
seg->sides[side].tmap_num = csegp->sides[cside].tmap_num = WallAnims[anim_num].frames[n-1];
} else {
seg->sides[side].tmap_num2 = csegp->sides[cside].tmap_num2 = WallAnims[anim_num].frames[n-1];
}
const auto t = WallAnims[anim_num].flags & WCF_TMAP1
? &side::tmap_num
: &side::tmap_num2;
seg->sides[side].*t = csegp->sides[cside].*t = WallAnims[anim_num].frames[n-1];
}
}
@ -2925,12 +2924,10 @@ static int newdemo_read_frame_information(int rewrite)
const auto &&csegp = vsegptr(segp->children[side]);
const auto &&cside = find_connect_side(segp, csegp);
const auto anim_num = vwallptr(segp->sides[side].wall_num)->clip_num;
if (WallAnims[anim_num].flags & WCF_TMAP1) {
segp->sides[side].tmap_num = csegp->sides[cside].tmap_num = WallAnims[anim_num].frames[0];
} else {
segp->sides[side].tmap_num2 = csegp->sides[cside].tmap_num2 = WallAnims[anim_num].frames[0];
}
const auto t = WallAnims[anim_num].flags & WCF_TMAP1
? &side::tmap_num
: &side::tmap_num2;
segp->sides[side].*t = csegp->sides[cside].*t = WallAnims[anim_num].frames[0];
}
break;
}