ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Video[ Re-add some code accidentally removed

This commit is contained in:
zilmar 2017-07-23 07:26:11 +10:00
parent 5a42c92eaf
commit 5c625351e4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-video/Combine.cpp
View File

@ -15512,6 +15512,8 @@ void Combine()
= cmb.modfactor_0 = cmb.modfactor_1 = 0; = cmb.modfactor_0 = cmb.modfactor_1 = 0;
cmb.ccolor = cmb.tex_ccolor = 0; cmb.ccolor = cmb.tex_ccolor = 0;
cmb.cmb_ext_use = 0;
cmb.tex_cmb_ext_use = 0;
uint32_t cmb_mode_c = (rdp.cycle1 << 16) | (rdp.cycle2 & 0xFFFF); uint32_t cmb_mode_c = (rdp.cycle1 << 16) | (rdp.cycle2 & 0xFFFF);
uint32_t cmb_mode_a = (rdp.cycle1 & 0x0FFF0000) | ((rdp.cycle2 >> 16) & 0x00000FFF); uint32_t cmb_mode_a = (rdp.cycle1 & 0x0FFF0000) | ((rdp.cycle2 >> 16) & 0x00000FFF);