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

Removed OGL hack to fix overlapping room in D1 lvl19 and rather move vertex a little. Still a hack but now without messing Depth test

Browse source
This commit is contained in:
zicodxx 2010-07-17 11:19:29 +00:00
parent 06cf80ab18
commit 81baeaeaa4
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.txt
View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20100717
--------
main/gamesave.c, main/render.c: Removed OGL hack to fix overlapping room in D1 lvl19 and rather move vertex a little. Still a hack but now without messing Depth test
20100716
--------
main/gamecntl.c: Fixing showing options menu in demos - was still called (or rather not) by obsolete variable

8
main/gamesave.c
View file

@ -1254,6 +1254,14 @@ int load_level(char * filename_passed)
//NOTE LINK TO ABOVE!!
mine_err = load_mine_data_compiled(LoadFile);
/* !!!HACK!!!
* Descent 1 - Level 19: OBERON MINE has some ugly overlapping rooms (segment 484).
* HACK to make this issue less visible by moving one vertex a little.
*/
if ( !stricmp("Descent: First Strike",Current_mission_longname) && !stricmp("level19.rdl",filename) && cfilelength(LoadFile) == 136706)
Vertices[1905].z =-385*F1_0;
if (mine_err == -1) //error!!
return 1;

6
main/render.c
View file

@ -283,12 +283,6 @@ void render_face(int segnum, int sidenum, int nv, short *vp, int tmap1, int tmap
#endif
{
#ifdef OGL
/* HACK: Level 19 has an unwanted 4D room. Let's use this stupid hack to disguise it. */
if ( !memcmp("Descent: First Strike",Current_mission_longname,MISSION_NAME_LEN+1) && Current_level_num==19 && segnum >= 522 && segnum <=528 )
{
glDepthFunc(GL_ALWAYS);
}
if (bm2)
{
g3_draw_tmap_2(nv,pointlist,uvl_copy,bm,bm2,((tmap2&0xC000)>>14) & 3);