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

removed mipmap for movies - makes not a real sense or effect

Browse source
This commit is contained in:
zicodxx 2007-01-13 14:14:56 +00:00
parent 442e669dc5
commit 8ef450e17c
4 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
d2x.ini
View file

@ -41,7 +41,6 @@
;-gl_trilinear Set gl texture filters to trilinear mipmapping
;-gl_reticle <r> Use OGL reticle 0=never 1=above 320x* 2=always
;-fixedfont Do not scale fonts to current resolution
;-nomoviesmooth Do not smooth movies
;-gl_scissor_ok <r> Set glScissor. 0=off 1=on (default)
Quickstart:

1
dxx-changelog.txt
View file

@ -5,6 +5,7 @@ D2X-Rebirth Changelog
main/object.c: removing the !dead statement (leftover from WraithX Deathcam) from object_move_one() so the function will return correctly if player dies instead running further and creating invalid code and crashes
arch/cocoa/d2x-rebirth.icns: update to Novacron's 128x128-bit icon
main/kconfig.c: do not select weapon if guide-bot shortcut has done and weapon key is mapped from 0 to 9
d2x.ini, main/inferno.c, main/movie.c: removed mipmap for movies - makes not a real sense or effect
20070112
--------

1
main/inferno.c
View file

@ -229,7 +229,6 @@ void print_commandline_help()
printf( " -gl_reticle <r> %s\n", "Use OGL reticle 0=never 1=above 320x* 2=always");
printf( " -gl_scissor_ok <r> %s\n", "Set glScissor. 0=off 1=on (default)");
printf( " -fixedfont %s\n", "Do not scale fonts to current resolution");
printf( " -nomoviesmooth %s\n", "Do not smooth movies");
#endif // OGL
printf( "\n Quickstart:\n\n");

12
main/movie.c
View file

@ -96,9 +96,6 @@ char movielib_files[4][FILENAME_LEN] = {"intro","other","robots"};
#define EXTRA_ROBOT_LIB N_BUILTIN_MOVIE_LIBS
int MovieHires = 1; //default is highres
#ifdef OGL
int mip;
#endif
SDL_RWops *RoboFile;
@ -144,13 +141,6 @@ int PlayMovie(const char *filename, int must_have)
if (FindArg("-nomovies"))
return MOVIE_NOT_PLAYED;
#ifdef OGL
if (FindArg("-nomoviesmooth"))
mip = 0;
else
mip = 1;
#endif
strcpy(name,filename);
if ((p=strchr(name,'.')) == NULL) //add extension, if missing
@ -207,7 +197,7 @@ void MovieShowFrame(ubyte *buf, uint bufw, uint bufh, uint sx, uint sy, uint w,
dstx*((double)grd_curscreen->sc_w/(MovieHires?640:320)),
dsty*((double)grd_curscreen->sc_h/(MovieHires?480:200)),
bufw, bufh, sx, sy,
&source_bm,&grd_curcanv->cv_bitmap, mip);
&source_bm,&grd_curcanv->cv_bitmap,0);
glEnable (GL_BLEND);