Misc minor things

git-svn-id: https://svn.eduke32.com/eduke32@463 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2007-01-20 03:10:32 +00:00
parent a94063e0be
commit 44e869c8d9
8 changed files with 18 additions and 17 deletions

View file

@ -2773,9 +2773,6 @@ void overheadeditor(void)
drawline16(192,ydim-STATUS2DSIZ,192,ydim-STATUS2DSIZ+24,1);
if (totalclock < 120*5) printext16(8L,ydim-STATUS2DSIZ+32L,9,-1,kensig,0);
Bsprintf(tempbuf,"Mapster32");
printext16(9L,ydim-STATUS2DSIZ+9L,4,-1,tempbuf,0);
printext16(8L,ydim-STATUS2DSIZ+8L,12,-1,tempbuf,0);
// printmessage16("Version: "VERSION);
if (totalclock < 30) printmessage16("Press F1 for help");
drawline16(0,ydim-1-20,xdim-1,ydim-1-20,1);

View file

@ -331,6 +331,7 @@ int loadgldriver(const char *driver)
bglStencilFunc = GETPROC("glStencilFunc");
loadglextensions();
loadglulibrary(getenv("BUILD_GLULIB"));
if (err) unloadgldriver();
return err;
@ -369,6 +370,8 @@ int loadglextensions(void)
int unloadgldriver(void)
{
unloadglulibrary();
#ifdef RENDERTYPEWIN
if (!hGLDLL) return 0;
#endif

View file

@ -220,9 +220,6 @@ int initsystem(void)
initprintf("Failed loading OpenGL driver. GL modes will be unavailable.\n");
nogl = 1;
}
else if (loadglulibrary(getenv("BUILD_GLULIB"))) {
initprintf("Failed loading GLU library.\n");
}
#endif
#ifndef __APPLE__
@ -274,7 +271,6 @@ void uninitsystem(void)
#ifdef USE_OPENGL
unloadgldriver();
unloadglulibrary();
#endif
}

View file

@ -430,9 +430,6 @@ int initsystem(void)
initprintf("Failed loading OpenGL driver. GL modes will be unavailable.\n");
nogl = 1;
}
else if (loadglulibrary(getenv("BUILD_GLULIB"))) {
initprintf("Failed loading GLU library.\n");
}
#endif
// try and start DirectDraw
@ -460,7 +457,6 @@ void uninitsystem(void)
#if defined(USE_OPENGL) && defined(POLYMOST)
unloadgldriver();
unloadglulibrary();
#endif
}

View file

@ -41,7 +41,7 @@ Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
#include "keyboard.h"
#include "scriptfile.h"
#define VERSION " 1.1.0"
#define VERSION " 1.1.0 svn"
short floor_over_floor;
@ -3606,6 +3606,10 @@ static void Keys2d(void)
{if(keystatus[i]==1) {Bsprintf(tempbuf,"key %ld",i); printmessage16(tempbuf);
}}
*/
Bsprintf(tempbuf, "Mapster32"VERSION"");
printext16(9L,ydim-STATUS2DSIZ+9L,4,-1,tempbuf,0);
printext16(8L,ydim-STATUS2DSIZ+8L,12,-1,tempbuf,0);
if ((totalclock > getmessagetimeoff) && (totalclock > (lastpm16time + 120*3)))
{

View file

@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
//-------------------------------------------------------------------------
#define VERSION " 1.4.0 beta 3"
#define VERSION " 1.4.0 svn"
#define HEAD "EDuke32"VERSION" (shareware mode)"
#define HEAD2 "EDuke32"VERSION

View file

@ -2292,6 +2292,7 @@ cheat_for_port_credits:
"GL texture compression",
"Cache textures on disk",
"Compress disk cache",
"Detail texture support",
"-",
"Models",
"-",
@ -2302,8 +2303,6 @@ cheat_for_port_credits:
"-",
"-",
"-",
"-",
"-",
NULL
};
@ -2375,6 +2374,12 @@ cheat_for_port_credits:
gametextpal(d,yy, glusetexcachecompression && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):15, 0);
break;
case 6:
enabled = usehightile;
if (enabled && x==io) r_detailmapping = !r_detailmapping;
if (enabled) modval(0,1,(int *)&r_detailmapping,1,probey==io);
gametextpal(d,yy, r_detailmapping && enabled ? "On" : "Off", enabled?MENUHIGHLIGHT(io):15, 0);
break;
case 7:
if (x==io) usemodels = 1-usemodels;
modval(0,1,(int *)&usemodels,1,probey==io);
gametextpal(d,yy, usemodels ? "On" : "Off", MENUHIGHLIGHT(io), 0);
@ -3113,7 +3118,7 @@ cheat_for_port_credits:
break;
}
// menutext(c+154,50+62+16+16,MENUHIGHLIGHT(5),bpp==8,tempbuf);
gametext(c+154,50+62+16+16-8,tempbuf,MENUHIGHLIGHT(1),2+8+16);
gametext(c+154,50+62+16+16-8,tempbuf,MENUHIGHLIGHT(5),2+8+16);
menutext(c,50+62+16+16+16,MENUHIGHLIGHT(6),bpp==8,"ANISOTROPY");

View file

@ -47,7 +47,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD
CAPTION "Dialog"
FONT 8, "MS Shell Dlg"
BEGIN
CONTROL "&Game or addon:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 5, 100, 8
CONTROL "&Game:", -1, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE, 5, 5, 100, 8
CONTROL "", IDGDATA, "LISTBOX", LBS_NOINTEGRALHEIGHT | LBS_USETABSTOPS | LBS_STANDARD | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 15, 226, 70
END