eukara/ngunix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

misc fixes

Browse source
This commit is contained in:
eukos 2015-07-29 18:20:08 +02:00
parent 57f6606a3a
commit 501121463c
5 changed files with 44 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
WinQuake/cl_parse.c
View file

@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "quakedef.h"
#ifdef DUMB
#include "..\dumb\dumb.h"
#include <dumb.h>
#endif
#ifdef ASS_MIDI

113
WinQuake/draw.c
View file

@ -1238,28 +1238,26 @@ void MassiveLookupTablesInit (void)
unsigned char* thepaltouse;
InitSmooth();
if (erh == 53)
#ifdef _WIN32
if (erh == 53)
thepaltouse = vid_curpal; // leilei - silly experiment to try adjusted palettes as a basis
// just for recalculating the big tables to see less color clashing
else
#endif
thepaltouse = host_basepal;
#ifdef linux
thepaltouse = host_basepal;
#endif
//InitBump(thepaltouse);
// InitFader();
// if (COM_CheckParm ("-cache"))
// lookupcaching = 1; // try to cache it all for future loading
#ifndef linux
if (inthedos)
#ifdef linux
inthedos = 1;
#endif
printf ("\nGenerating additive table - ");
if (inthedos)
fprintf(stderr,"\nGenerating additive table - ");
for (l=0;l<255;l++)
{
for (c=0 ; c<255 ; c++)
@ -1269,10 +1267,8 @@ void MassiveLookupTablesInit (void)
blue = thepaltouse[c*3+2] + thepaltouse[l*3+2];
addTable[l][c] = BestColor(red,green,blue, 0, 254);
}
#ifndef linux
if (inthedos)
#endif
printf (".");
fprintf(stderr,".");
}
@ -1281,10 +1277,8 @@ void MassiveLookupTablesInit (void)
// Make the Alpha Transparency table
#ifndef linux
if (inthedos)
#endif
printf ("\nGenerating alpha table - ");
fprintf(stderr,"\nGenerating alpha table - ");
for (l=0;l<255;l++)
{
@ -1296,7 +1290,7 @@ void MassiveLookupTablesInit (void)
transTable[l][c] = BestColor(red,green,blue, 0, 254);
}
if (inthedos) printf (".");
if (inthedos) fprintf(stderr,".");
}
@ -1305,20 +1299,16 @@ void MassiveLookupTablesInit (void)
if (COM_CheckParm ("-nolookups")){
nolookups = 1;
#ifndef linux
if (inthedos)
#endif
printf ("Color lookup tables are skipped\n");
fprintf(stderr,"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");
fprintf(stderr,"\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")){
printf ("UGLY GENERAION MODE ON!\n");
fprintf(stderr,"UGLY GENERAION MODE ON!\n");
ugly = 1;}
else
ugly = 0;
@ -1330,10 +1320,8 @@ void MassiveLookupTablesInit (void)
//printf ("da\n");
#ifndef linux
if (inthedos)
#endif
printf ("\nGenerating 15-bit lookup table - ");
fprintf(stderr,"\nGenerating 15-bit lookup table - ");
for (r=0 ; r<256 ; r+=8)
{
for (g=0 ; g<256 ; g+=8)
@ -1391,25 +1379,19 @@ void MassiveLookupTablesInit (void)
}
}
#ifndef linux
if (inthedos)
#endif
printf("."); // yep do the dot thing. it's a big 32k table so we have to
fprintf(stderr,"."); // 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");
fprintf(stderr,"FAILED!\n");
else{
#ifndef linux
if (inthedos)
#endif
printf ("!\n");
fprintf(stderr,"!\n");
}
@ -1421,10 +1403,8 @@ void MassiveLookupTablesInit (void)
// if (r_lightquality->value){
if (COM_CheckParm ("-no18")){
#ifndef linux
if (inthedos)
#endif
printf("\n18-bit lookup generation skipped - High quality light mode DISABLED!\n");
fprintf(stderr,"\n18-bit lookup generation skipped - High quality light mode DISABLED!\n");
}
else
{
@ -1433,10 +1413,8 @@ void MassiveLookupTablesInit (void)
// if (!fileinfo3)
{
#ifndef linux
if (inthedos)
#endif
printf ("\nGenerating 18-bit lookup table - ");
fprintf(stderr,"\nGenerating 18-bit lookup table - ");
for (r=0 ; r<256 ; r+=4)
{
for (g=0 ; g<256 ; g+=4)
@ -1452,23 +1430,17 @@ void MassiveLookupTablesInit (void)
}
}
#ifndef linux
if (inthedos)
#endif
printf ("."); // yep do the dot thing. it's a big 256k table so we have to
fprintf(stderr,"."); // yep do the dot thing. it's a big 256k table so we have to
}
}
if (!palmap2)
#ifndef linux
if (inthedos)
#endif
printf ("FAILED!\n");
fprintf(stderr,"FAILED!\n");
else{
#ifndef linux
if (inthedos)
#endif
printf ("!\n");
fprintf(stderr,"!\n");
}
@ -1481,10 +1453,8 @@ void MassiveLookupTablesInit (void)
// printf ("\nGenerating rgb color surface clamping table - ");
// Make the Additive Lookup Table
#ifndef linux
if (inthedos)
#endif
printf ("\nGenerating additive table - ");
fprintf(stderr,"\nGenerating additive table - ");
for (l=0;l<255;l++)
{
for (c=0 ; c<255 ; c++)
@ -1496,29 +1466,23 @@ void MassiveLookupTablesInit (void)
else
addTable[l][c] = BestColor(red,green,blue, 0, 254);
}
#ifndef linux
if (inthedos)
#endif
printf (".");
fprintf(stderr,".");
}
if (!addTable)
#ifndef linux
if (inthedos)
#endif
printf ("FAILED!\n");
fprintf(stderr,"FAILED!\n");
else{
#ifndef linux
if (inthedos)
#endif
printf ("!\n");
fprintf(stderr,"!\n");
}
// Make the Multiply Lookup Table which doesn't work
#ifndef linux
if (inthedos)
#endif
printf ("\nGenerating multiply blend table - ");
fprintf(stderr,"\nGenerating multiply blend table - ");
for (l=0;l<255;l++)
{
for (c=0 ; c<255 ; c++)
@ -1536,21 +1500,17 @@ void MassiveLookupTablesInit (void)
else
mulTable[l][c] = BestColor(red,green,blue, 0, 223);
}
#ifndef linux
if (inthedos)
#endif
printf (".");
fprintf(stderr,".");
}
if (!mulTable)
#ifndef linux
if (inthedos)
#endif
printf ("FAILED!\n");
fprintf(stderr,"FAILED!\n");
else{
#ifndef linux
if (inthedos)
#endif
printf ("!\n");
fprintf(stderr,"!\n");
}
@ -3643,7 +3603,7 @@ void Draw_Bloom (void)
// VID_LockBuffer ();
}
#if 0
// Dunno what this'll be.
void Draw_Something (void)
{
@ -3738,7 +3698,7 @@ void Draw_Something (void)
S_ExtraUpdate ();
VID_LockBuffer ();
}
#endif
//=============================================================================
/*
@ -3769,6 +3729,3 @@ void Draw_EndDisc (void)
D_EndDirectRect (vid.width - 24, 0, 24, 24);
}

8
WinQuake/menu.c
View file

@ -978,9 +978,11 @@ void M_SinglePlayer_Key (int key)
switch (m_singleplayer_cursor)
{
case 0:
#ifndef linux
if (sv.active)
if (!SCR_ModalMessage("Are you sure you want to\nstart a new game?\n"))
break;
#endif
key_dest = key_game;
if (sv.active)
Cbuf_AddText ("disconnect\n");
@ -1916,9 +1918,9 @@ void M_DrawCheckboxAspect (int x, int y, int on)
void M_DrawCheckboxVirtual (int x, int y, int on)
{
if (on == 1)
M_Print (x, y, "Crap");
M_Print (x, y, "crap");
else if (on == 2)
M_Print (x, y, "Low");
M_Print (x, y, "low");
else if (on == 3)
M_Print (x, y, "320x400");
else if (on == 4)
@ -1926,7 +1928,7 @@ void M_DrawCheckboxVirtual (int x, int y, int on)
else if (on == 5)
M_Print (x, y, "640x400");
else
M_Print (x, y, "Normal");
M_Print (x, y, "normal");
}

2
WinQuake/snd_dma.c
View file

@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#endif
#ifdef DUMB
#include "..\dumb\dumb.h"
#include <dumb.h>
#endif
#ifdef ASS_MIDI

4
WinQuake/sys_linux.c
View file

@ -399,7 +399,7 @@ int main (int c, char **v)
#ifdef GLQUAKE
parms.memsize = 16*1024*1024;
#else
parms.memsize = 20*1024*1024;
parms.memsize = 18*1024*1024;
#endif
j = COM_CheckParm("-mem");
@ -422,7 +422,7 @@ int main (int c, char **v)
nostdout = 1;
else {
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
printf ("Linux Quake -- Version %0.3f\n", LINUX_VERSION);
printf ("Engoo UNIX -- Version %0.3f\n", LINUX_VERSION);
}
oldtime = Sys_FloatTime () - 0.1;