MAXSPRITESONSCREEN = 4096 and a few other things

git-svn-id: https://svn.eduke32.com/eduke32@458 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2007-01-15 05:46:49 +00:00
parent 699f26d1e7
commit 530edf77b8
5 changed files with 10 additions and 5 deletions

View file

@ -33,7 +33,7 @@ extern "C" {
#define MAXYDIM 1200
#define MAXPALOOKUPS 256
#define MAXPSKYTILES 256
#define MAXSPRITESONSCREEN 2048
#define MAXSPRITESONSCREEN 4096
#define MAXUNIQHUDID 256 //Extra slots so HUD models can store animation state without messing game sprites
#define CLIPMASK0 (((1L)<<16)+1L)

View file

@ -688,7 +688,7 @@ void polymost_glinit()
if (!glinfo.arbfp || !glinfo.depthtex || !glinfo.shadow || !glinfo.fbos || !glinfo.rect)
{
OSD_Printf("Your OpenGL implementation doesn't support depth peeling. Forcing it off...\n", i);
OSD_Printf("Your OpenGL implementation doesn't support depth peeling. Disabling...\n");
r_depthpeeling = 0;
}
@ -5128,6 +5128,12 @@ static int osdcmd_polymostvars(const osdfuncparm_t *parm)
else if (!Bstrcasecmp(parm->name, "r_depthpeeling")) {
if (showval) { OSD_Printf("r_depthpeeling is %d\n", r_depthpeeling); }
else {
if (!glinfo.arbfp || !glinfo.depthtex || !glinfo.shadow || !glinfo.fbos || !glinfo.rect)
{
OSD_Printf("r_depthpeeling: Your OpenGL implementation doesn't support depth peeling.\n");
r_depthpeeling = 0;
return OSDCMD_OK;
}
r_depthpeeling = (val != 0);
resetvideomode();
if (setgamemode(fullscreen,xdim,ydim,bpp))

View file

@ -58,7 +58,7 @@ $(OBJ)/pitch.$o: $(SRC)/jaudiolib/pitch.c $(SRC)/jaudiolib/pitch.h
$(OBJ)/multivoc.$o: $(SRC)/jaudiolib/multivoc.c $(SRC)/jaudiolib/usrhooks.h $(SRC)/jaudiolib/linklist.h $(SRC)/jaudiolib/pitch.h $(SRC)/jaudiolib/multivoc.h $(SRC)/jaudiolib/_multivc.h
$(OBJ)/fx_man.$o: $(SRC)/jaudiolib/fx_man.c $(SRC)/jaudiolib/multivoc.h $(SRC)/jaudiolib/ll_man.h $(SRC)/jaudiolib/fx_man.h
$(OBJ)/dsoundout.$o: $(SRC)/jaudiolib/dsoundout.c $(SRC)/jaudiolib/dsoundout.h
$(OBJ)/dsl.$o: $(SRC)/jaudiolib/dsl.c $(EINC)/compat.h
$(OBJ)/dsl.$o: $(SRC)/jaudiolib/dsl.c $(SRC)/jaudiolib/dsl.h $(EINC)/compat.h
$(OBJ)/midi.$o: $(SRC)/jaudiolib/midi.c $(SRC)/jaudiolib/standard.h $(SRC)/jaudiolib/usrhooks.h $(SRC)/jaudiolib/music.h $(SRC)/jaudiolib/_midi.h $(SRC)/jaudiolib/midi.h
$(OBJ)/mpu401.$o: $(SRC)/jaudiolib/mpu401.c $(SRC)/jaudiolib/mpu401.h

View file

@ -26,7 +26,6 @@ Adapted to work with JonoF's port by James Bentler (bentler@cs.umn.edu)
#define MONO_8BIT 0
#define STEREO 1
#define SIXTEEN_BIT 2
#define STEREO_16BIT ( STEREO | SIXTEEN_BIT )
enum DSL_ERRORS
{

View file

@ -71,7 +71,7 @@ int32 RTS_AddFile(const char *filename)
// read the entire file in
// FIXME: shared opens
handle = kopen4load(filename, 0);
handle = kopen4load((char *)filename, 0);
if (handle < 0)
{
initprintf("RTS file %s was not found\n",filename);