zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-11 18:50:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@944 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-08-08 23:04:05 +00:00
parent 2a090515e2
commit bdd43da5c0
4 changed files with 1078 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
polymer/build/src/build.c
View file

@ -6896,7 +6896,7 @@ int menuselect_pk(int direction) // 20080104: jump to next (direction!=0) or pre
int menuselect(void) int menuselect(void)
{ {
int listsize; static int listsize;
int i; int i;
char ch, buffer[78], /*PK*/ *chptr; char ch, buffer[78], /*PK*/ *chptr;
static char oldpath[BMAX_PATH]; static char oldpath[BMAX_PATH];
@ -6951,10 +6951,14 @@ int menuselect(void)
if (finddirshigh) if (finddirshigh)
{ {
dir = finddirshigh; dir = finddirshigh;
for (i=listsize/2-1; i>=0; i--) if (!dir->prev) break; else dir=dir->prev; for (i=(listsize/2)-1; i>=0; i--)
for (i=0; i<listsize && dir; i++, dir=dir->next)
{ {
int c = dir->type == CACHE1D_FIND_DIR ? 2/*4*/ : 3; //PK if (!dir->prev) break;
else dir=dir->prev;
}
for (i=0; ((i<listsize) && dir); i++, dir=dir->next)
{
int c = (dir->type == CACHE1D_FIND_DIR ? 2 : 3); //PK
memset(buffer,0,sizeof(buffer)); memset(buffer,0,sizeof(buffer));
strncpy(buffer,dir->name,25); strncpy(buffer,dir->name,25);
if (strlen(buffer) == 25) if (strlen(buffer) == 25)
@ -6974,8 +6978,12 @@ int menuselect(void)
if (findfileshigh) if (findfileshigh)
{ {
dir = findfileshigh; dir = findfileshigh;
for (i=listsize/2-1; i>=0; i--) if (!dir->prev) break; else dir=dir->prev; for (i=(listsize/2)-1; i>=0; i--)
for (i=0; i<listsize && dir; i++, dir=dir->next) {
if (!dir->prev) break;
else dir=dir->prev;
}
for (i=0; ((i<listsize) && dir); i++, dir=dir->next)
{ {
if (dir == findfileshigh) if (dir == findfileshigh)
{ {

2
polymer/build/src/polymost.c
View file

@ -2023,7 +2023,7 @@ void drawpoly(double *dpx, double *dpy, int n, int method)
} }
} }
// hack: this is for drawing the 8-bit crosshair recolored in polymost // hack: this is for drawing the 8-bit crosshair recolored in polymost
else if (globalpal == (MAXPALOOKUPS>>1)) else if (hictinting[globalpal].f & 16)
{ {
pc[0] *= (float)hictinting[globalpal].r / 255.0; pc[0] *= (float)hictinting[globalpal].r / 255.0;
pc[1] *= (float)hictinting[globalpal].g / 255.0; pc[1] *= (float)hictinting[globalpal].g / 255.0;

1055
polymer/eduke32/source/game.c
View file

File diff suppressed because it is too large Load diff

6
polymer/eduke32/source/osdcmds.c
View file

@ -37,6 +37,7 @@ struct osdcmd_cheatsinfo osdcmd_cheatsinfo_stat;
float r_ambientlight = 1.0, r_ambientlightrecip = 1.0; float r_ambientlight = 1.0, r_ambientlightrecip = 1.0;
extern int althud_numbertile; extern int althud_numbertile;
extern int althud_numberpal; extern int althud_numberpal;
extern int althud_shadows;
static inline int osdcmd_quit(const osdfuncparm_t *parm) static inline int osdcmd_quit(const osdfuncparm_t *parm)
{ {
@ -659,8 +660,9 @@ cvarmappings cvar[] =
{ "crosshair", "crosshair: enable/disable crosshair", (void*)&ud.crosshair, CVAR_BOOL, 0, 0, 1 }, { "crosshair", "crosshair: enable/disable crosshair", (void*)&ud.crosshair, CVAR_BOOL, 0, 0, 1 },
{ "hud_althud", "hud_althud: enable/disable alternate mini-hud", (void*)&ud.althud, CVAR_BOOL, 0, 0, 1 }, { "hud_althud", "hud_althud: enable/disable alternate mini-hud", (void*)&ud.althud, CVAR_BOOL, 0, 0, 1 },
{ "hud_althudnumbertile", "hud_althudnumbertile: first tile in alt hud number set", (void*)&althud_numbertile, CVAR_INT, 0, 0, MAXTILES-10 }, { "hud_numbertile", "hud_numbertile: first tile in alt hud number set", (void*)&althud_numbertile, CVAR_INT, 0, 0, MAXTILES-10 },
{ "hud_althudnumberpal", "hud_althudnumberpal: pal for alt hud numbers", (void*)&althud_numberpal, CVAR_INT, 0, 0, MAXPALOOKUPS }, { "hud_numberpal", "hud_numberpal: pal for alt hud numbers", (void*)&althud_numberpal, CVAR_INT, 0, 0, MAXPALOOKUPS },
{ "hud_shadows", "hud_shadows: enable/disable althud shadows", (void*)&althud_shadows, CVAR_BOOL, 0, 0, 1 },
{ "cl_autoaim", "cl_autoaim: enable/disable weapon autoaim", (void*)&ud.config.AutoAim, CVAR_INT|CVAR_MULTI, 0, 0, 2 }, { "cl_autoaim", "cl_autoaim: enable/disable weapon autoaim", (void*)&ud.config.AutoAim, CVAR_INT|CVAR_MULTI, 0, 0, 2 },
{ "cl_automsg", "cl_automsg: enable/disable automatically sending messages to all players", (void*)&ud.automsg, CVAR_BOOL, 0, 0, 1 }, { "cl_automsg", "cl_automsg: enable/disable automatically sending messages to all players", (void*)&ud.automsg, CVAR_BOOL, 0, 0, 1 },
{ "cl_autovote", "cl_autovote: enable/disable automatic voting", (void*)&ud.autovote, CVAR_INT|CVAR_MULTI, 0, 0, 2 }, { "cl_autovote", "cl_autovote: enable/disable automatic voting", (void*)&ud.autovote, CVAR_INT|CVAR_MULTI, 0, 0, 2 },