From 4f53866e5d3eaf785d4fcf98093a3912f2f2d9fb Mon Sep 17 00:00:00 2001 From: eukos Date: Tue, 28 Jul 2015 06:42:31 +0200 Subject: [PATCH] Local push that doesn't break everything --- WinQuake/draw.c | 84 +++++++++++++++++++++++++++++++++++--------- WinQuake/r_main.c | 2 +- WinQuake/sys_linux.c | 10 +++++- 3 files changed, 77 insertions(+), 19 deletions(-) diff --git a/WinQuake/draw.c b/WinQuake/draw.c index 5cfd011..650b832 100644 --- a/WinQuake/draw.c +++ b/WinQuake/draw.c @@ -1246,13 +1246,15 @@ void MassiveLookupTablesInit (void) else #endif thepaltouse = host_basepal; - InitBump(thepaltouse); + //InitBump(thepaltouse); // InitFader(); // if (COM_CheckParm ("-cache")) // lookupcaching = 1; // try to cache it all for future loading +#ifndef linux if (inthedos) +#endif printf ("\nGenerating additive table - "); for (l=0;l<255;l++) { @@ -1263,7 +1265,10 @@ void MassiveLookupTablesInit (void) blue = thepaltouse[c*3+2] + thepaltouse[l*3+2]; addTable[l][c] = BestColor(red,green,blue, 0, 254); } - if (inthedos) printf ("."); +#ifndef linux + if (inthedos) +#endif + printf ("."); } @@ -1272,9 +1277,12 @@ void MassiveLookupTablesInit (void) // Make the Alpha Transparency table +#ifndef linux if (inthedos) +#endif printf ("\nGenerating alpha table - "); - for (l=0;l<255;l++) + + for (l=0;l<255;l++) { for (c=0 ; c<255 ; c++) { @@ -1293,12 +1301,16 @@ void MassiveLookupTablesInit (void) if (COM_CheckParm ("-nolookups")){ nolookups = 1; -if (inthedos) +#ifndef linux + if (inthedos) +#endif printf ("Color lookup tables are skipped\n"); // hqlite = 1; // force bestcolor water return; // we don't need your lookupation } +#ifndef linux if (inthedos) +#endif printf ("\n---------------------\nGenerating all the lookup tables\n(If your computer is slow, this will take up to 30 seconds. Use the -nolookups \nparameter if you find this unsettling)\nYou can also skip the 18-bit generation by passing -no18\nAlternatively, you can pass -ugly for faster but ugly generation\n---------------------\n"); if (COM_CheckParm ("-ugly")){ @@ -1314,7 +1326,9 @@ if (inthedos) //printf ("da\n"); - if (inthedos) +#ifndef linux + if (inthedos) +#endif printf ("\nGenerating 15-bit lookup table - "); for (r=0 ; r<256 ; r+=8) { @@ -1373,17 +1387,24 @@ if (inthedos) } } - if (inthedos) +#ifndef linux + if (inthedos) +#endif printf("."); // yep do the dot thing. it's a big 32k table so we have to } } if (!palmap) +#ifndef linux if (inthedos) +#endif + printf ("FAILED!\n"); else{ - if (inthedos) +#ifndef linux + if (inthedos) +#endif printf ("!\n"); @@ -1396,7 +1417,9 @@ if (inthedos) // if (r_lightquality->value){ if (COM_CheckParm ("-no18")){ - if (inthedos) +#ifndef linux + if (inthedos) +#endif printf("\n18-bit lookup generation skipped - High quality light mode DISABLED!\n"); } else @@ -1406,7 +1429,9 @@ if (inthedos) // if (!fileinfo3) { +#ifndef linux if (inthedos) +#endif printf ("\nGenerating 18-bit lookup table - "); for (r=0 ; r<256 ; r+=4) { @@ -1423,15 +1448,22 @@ if (inthedos) } } - if (inthedos) printf ("."); // yep do the dot thing. it's a big 256k table so we have to +#ifndef linux + if (inthedos) +#endif + printf ("."); // yep do the dot thing. it's a big 256k table so we have to } } if (!palmap2) - if (inthedos) +#ifndef linux + if (inthedos) +#endif printf ("FAILED!\n"); else{ - if (inthedos) +#ifndef linux + if (inthedos) +#endif printf ("!\n"); @@ -1445,7 +1477,9 @@ if (inthedos) // printf ("\nGenerating rgb color surface clamping table - "); // Make the Additive Lookup Table +#ifndef linux if (inthedos) +#endif printf ("\nGenerating additive table - "); for (l=0;l<255;l++) { @@ -1458,19 +1492,28 @@ if (inthedos) else addTable[l][c] = BestColor(red,green,blue, 0, 254); } - if (inthedos) printf ("."); +#ifndef linux + if (inthedos) +#endif + printf ("."); } if (!addTable) - if (inthedos) +#ifndef linux + if (inthedos) +#endif printf ("FAILED!\n"); else{ - if (inthedos) +#ifndef linux + if (inthedos) +#endif printf ("!\n"); } // Make the Multiply Lookup Table which doesn't work +#ifndef linux if (inthedos) +#endif printf ("\nGenerating multiply blend table - "); for (l=0;l<255;l++) { @@ -1489,13 +1532,20 @@ if (inthedos) else mulTable[l][c] = BestColor(red,green,blue, 0, 223); } - if (inthedos) printf ("."); +#ifndef linux + if (inthedos) +#endif + printf ("."); } if (!mulTable) - if (inthedos) +#ifndef linux + if (inthedos) +#endif printf ("FAILED!\n"); else{ - if (inthedos) +#ifndef linux + if (inthedos) +#endif printf ("!\n"); diff --git a/WinQuake/r_main.c b/WinQuake/r_main.c index 77eb784..1ee628d 100644 --- a/WinQuake/r_main.c +++ b/WinQuake/r_main.c @@ -1956,7 +1956,7 @@ if (!reflectpass) amilow = 5; r_docrap = amilow; - vid.recalc_refdef = 1; + vid.recalc_refdef = true; } //if (!reflectpass) diff --git a/WinQuake/sys_linux.c b/WinQuake/sys_linux.c index ae763ae..660b450 100644 --- a/WinQuake/sys_linux.c +++ b/WinQuake/sys_linux.c @@ -22,6 +22,7 @@ qboolean isDedicated; int nostdout = 0; +extern cvar_t *menu_quitscreen; char *basedir = "."; char *cachedir = "/tmp"; @@ -110,7 +111,9 @@ void Sys_Printf (char *fmt, ...) static char end1[] = "\x1b[?7h\x1b[40m\x1b[2J\x1b[0;1;41m\x1b[1;1H QUAKE: The Doomed Dimension \x1b[33mby \x1b[44mid\x1b[41m Software \x1b[2;1H ---------------------------------------------------------------------------- \x1b[3;1H CALL 1-800-IDGAMES TO ORDER OR FOR TECHNICAL SUPPORT \x1b[4;1H PRICE: $45.00 (PRICES MAY VARY OUTSIDE THE US.) \x1b[5;1H \x1b[6;1H \x1b[37mYes! You only have one fourth of this incredible epic. That is because most \x1b[7;1H of you have paid us nothing or at most, very little. You could steal the \x1b[8;1H game from a friend. But we both know you'll be punished by God if you do. \x1b[9;1H \x1b[33mWHY RISK ETERNAL DAMNATION? CALL 1-800-IDGAMES AND BUY NOW! \x1b[10;1H \x1b[37mRemember, we love you almost as much as He does. \x1b[11;1H \x1b[12;1H \x1b[33mProgramming: \x1b[37mJohn Carmack, Michael Abrash, John Cash \x1b[13;1H \x1b[33mDesign: \x1b[37mJohn Romero, Sandy Petersen, American McGee, Tim Willits \x1b[14;1H \x1b[33mArt: \x1b[37mAdrian Carmack, Kevin Cloud \x1b[15;1H \x1b[33mBiz: \x1b[37mJay Wilbur, Mike Wilson, Donna Jackson \x1b[16;1H \x1b[33mProjects: \x1b[37mShawn Green \x1b[33mSupport: \x1b[37mBarrett Alexander \x1b[17;1H \x1b[33mSound Effects: \x1b[37mTrent Reznor and Nine Inch Nails \x1b[18;1H For other information or details on ordering outside the US, check out the \x1b[19;1H files accompanying QUAKE or our website at http://www.idsoftware.com. \x1b[20;1H \x1b[0;41mQuake is a trademark of Id Software, inc., (c)1996 Id Software, inc. \x1b[21;1H All rights reserved. NIN logo is a registered trademark licensed to \x1b[22;1H Nothing Interactive, Inc. All rights reserved. \x1b[40m\x1b[23;1H\x1b[0m"; -static char end2[] = "\x1b[0;1;46m\x1b[1;1H\ +static char end2[] = +"\x1b[?7h\x1b[40m\x1b[2J\x1b[0;1;41m\x1b[1;1H QUAKE \x1b[33mby \x1b[44mid\x1b[41m Software \x1b[2;1H ----------------------------------------------------------------------------- \x1b[3;1H \x1b[37mWhy did you quit from the registered version of QUAKE? Did the \x1b[4;1H scary monsters frighten you? Or did Mr. Sandman tug at your \x1b[5;1H little lids? No matter! What is important is you love our \x1b[6;1H game, and gave us your money. Congratulations, you are probably \x1b[7;1H not a thief. \x1b[8;1H Thank You. \x1b[9;1H \x1b[33;44mid\x1b[41m Software is: \x1b[10;1H PROGRAMMING: \x1b[37mJohn Carmack, Michael Abrash, John Cash \x1b[11;1H \x1b[33mDESIGN: \x1b[37mJohn Romero, Sandy Petersen, American McGee, Tim Willits \x1b[12;1H \x1b[33mART: \x1b[37mAdrian Carmack, Kevin Cloud \x1b[13;1H \x1b[33mBIZ: \x1b[37mJay Wilbur, Mike Wilson \x1b[33mPROJECTS MAN: \x1b[37mShawn Green \x1b[14;1H \x1b[33mBIZ ASSIST: \x1b[37mDonna Jackson \x1b[33mSUPPORT: \x1b[37mBarrett Alexander \x1b[15;1H \x1b[33mSOUND EFFECTS AND MUSIC: \x1b[37mTrent Reznor and Nine Inch Nails \x1b[16;1H \x1b[17;1H If you need help running QUAKE refer to the text files in the \x1b[18;1H QUAKE directory, or our website at http://www.idsoftware.com. \x1b[19;1H If all else fails, call our technical support at 1-800-IDGAMES. \x1b[20;1H \x1b[0;41mQuake is a trademark of Id Software, inc., (c)1996 Id Software, inc. \x1b[21;1H All rights reserved. NIN logo is a registered trademark licensed \x1b[22;1H to Nothing Interactive, Inc. All rights reserved. \x1b[23;1H\x1b[40m\x1b[0m"; +static char end_engoo[] = "\x1b[0;1;46m\x1b[1;1H\ ENGOO \x1b[37mversion 2.78 \n\ \x1b[33m================================================================================\n\ \n\ @@ -141,7 +144,12 @@ void Sys_Quit (void) fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); if (registered->value) + { + if (menu_quitscreen->value == 1) printf("%s", end2); + else + printf("%s", end_engoo); + } else printf("%s", end1);