zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-13 07:58:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Comment out and refactor some unnecessary (IMO) console startup messages... seems to improve win32 startup times, possibly due to less scrolling of the startup window text buffer.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@848 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2008-07-09 23:25:38 +00:00
parent 098c99e3f7
commit 4ddfc3e9d9
18 changed files with 3002 additions and 2985 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
polymer/build/src/baselayer.c
View file

@ -56,7 +56,7 @@ static int osdfunc_setrendermode(const osdfuncparm_t *parm)
char *modestrs[] =
{
"classic software", "polygonal flat-shaded software",
"classic software", "completely broken polygonal flat-shaded software",
"polygonal textured software", "polygonal OpenGL", "great justice"
};
@ -106,8 +106,15 @@ int osdcmd_glinfo(const osdfuncparm_t *parm)
initprintf("OpenGL Information:\n"
" Version: %s\n"
" Vendor: %s\n"
" Renderer: %s\n"
" Maximum anisotropy: %.1f%s\n"
" Renderer: %s\n",
glinfo.version,
glinfo.vendor,
glinfo.renderer);
if (!glinfo.dumped)
return OSDCMD_OK;
initprintf(" Maximum anisotropy: %.1f%s\n"
" BGRA textures: %s\n"
" Non-x^2 textures: %s\n"
" Texure compression: %s\n"
@ -123,9 +130,6 @@ int osdcmd_glinfo(const osdfuncparm_t *parm)
" env_combine: %s\n"
" Vertex Buffer Objects: %s\n"
" Extensions:\n",
glinfo.version,
glinfo.vendor,
glinfo.renderer,
glinfo.maxanisotropy, glinfo.maxanisotropy>1.0?"":" (no anisotropic filtering)",
glinfo.bgra ? "supported": "not supported",
glinfo.texnpot ? "supported": "not supported",

41
polymer/build/src/winlayer.c
View file

@ -522,7 +522,7 @@ int initsystem(void)
{
DEVMODE desktopmode;
initprintf("Initializing Windows DirectX/GDI system interface\n");
// initprintf("Initializing Windows DirectX/GDI system interface\n");
// get the desktop dimensions before anything changes them
ZeroMemory(&desktopmode, sizeof(DEVMODE));
@ -873,9 +873,9 @@ void uninitmouse(void)
grabmouse(0);
moustat=mousegrab=0;
SetEvent(inputevt[MOUSE]);
if (WaitForSingleObject(mousethread, 300) == WAIT_OBJECT_0)
initprintf("DirectInput: Mouse thread has exited\n");
else
if (WaitForSingleObject(mousethread, 300) != WAIT_OBJECT_0)
// initprintf("DirectInput: Mouse thread has exited\n");
// else
initprintf("DirectInput: Mouse thread failed to exit!\n");
}
@ -1194,7 +1194,7 @@ static BOOL InitDirectInput(void)
// load up the DirectInput DLL
if (!hDInputDLL)
{
initprintf(" - Loading DINPUT.DLL\n");
// initprintf(" - Loading DINPUT.DLL\n");
hDInputDLL = LoadLibrary("DINPUT.DLL");
if (!hDInputDLL)
{
@ -1208,7 +1208,7 @@ static BOOL InitDirectInput(void)
if (!aDirectInputCreateA) ShowErrorBox("Error fetching DirectInputCreateA()");
// create a new DirectInput object
initprintf(" - Creating DirectInput object\n");
// initprintf(" - Creating DirectInput object\n");
result = aDirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &lpDI, NULL);
if FAILED(result) { HorribleDInputDeath("DirectInputCreateA() failed", result); }
else if (result != DI_OK) initprintf(" Created DirectInput object with warning: %s\n",GetDInputError(result));
@ -1234,7 +1234,7 @@ static BOOL InitDirectInput(void)
if ((inputdevices & (1<<devn)) == 0) continue;
*devicedef[devn].did = NULL;
initprintf(" - Creating %s device\n", devicedef[devn].name);
// initprintf(" - Creating %s device\n", devicedef[devn].name);
result = IDirectInput_CreateDevice(lpDI, &guidDevs[devn], &dev, NULL);
if FAILED(result) { HorribleDInputDeath("Failed creating device", result); }
else if (result != DI_OK) initprintf(" Created device with warning: %s\n",GetDInputError(result));
@ -1345,7 +1345,7 @@ static void UninitDirectInput(void)
{
if (*devicedef[devn].did)
{
initprintf(" - Releasing %s device\n", devicedef[devn].name);
// initprintf(" - Releasing %s device\n", devicedef[devn].name);
if (devn != JOYSTICK) IDirectInputDevice2_SetEventNotification(*devicedef[devn].did, NULL);
@ -1361,14 +1361,14 @@ static void UninitDirectInput(void)
if (lpDI)
{
initprintf(" - Releasing DirectInput object\n");
// initprintf(" - Releasing DirectInput object\n");
IDirectInput_Release(lpDI);
lpDI = NULL;
}
if (hDInputDLL)
{
initprintf(" - Unloading DINPUT.DLL\n");
// initprintf(" - Unloading DINPUT.DLL\n");
FreeLibrary(hDInputDLL);
hDInputDLL = NULL;
}
@ -2128,8 +2128,9 @@ int setvideomode(int x, int y, int c, int fs)
validmode[validmodecnt].fs=f; \
validmode[validmodecnt].extra=n; \
validmodecnt++; \
initprintf(" - %dx%d %d-bit %s\n", x, y, c, (f&1)?"fullscreen":"windowed"); \
}
}
/* initprintf(" - %dx%d %d-bit %s\n", x, y, c, (f&1)?"fullscreen":"windowed"); \
} */
#define CHECK(w,h) if ((w < maxx) && (h < maxy))
@ -2228,7 +2229,7 @@ void getvalidmodes(void)
if (modeschecked) return;
validmodecnt=0;
initprintf("Detecting video modes:\n");
// initprintf("Detecting video modes:\n");
if (bDDrawInited)
{
@ -2723,7 +2724,7 @@ static BOOL WINAPI InitDirectDraw_enum(GUID *lpGUID, LPSTR lpDesc, LPSTR lpName,
UNREFERENCED_PARAMETER(lpGUID);
UNREFERENCED_PARAMETER(lpName);
UNREFERENCED_PARAMETER(lpContext);
initprintf(" * %s\n", lpDesc);
// initprintf(" * %s\n", lpDesc);
return 1;
}
@ -2741,7 +2742,7 @@ static BOOL InitDirectDraw(void)
// load up the DirectDraw DLL
if (!hDDrawDLL)
{
initprintf(" - Loading DDRAW.DLL\n");
// initprintf(" - Loading DDRAW.DLL\n");
hDDrawDLL = LoadLibrary("DDRAW.DLL");
if (!hDDrawDLL)
{
@ -2760,7 +2761,7 @@ static BOOL InitDirectDraw(void)
}
// enumerate the devices to make us look fancy
initprintf(" - Enumerating display devices\n");
// initprintf(" - Enumerating display devices\n");
aDirectDrawEnumerate(InitDirectDraw_enum, NULL);
// get the pointer to DirectDrawCreate
@ -2773,7 +2774,7 @@ static BOOL InitDirectDraw(void)
}
// create a new DirectDraw object
initprintf(" - Creating DirectDraw object\n");
// initprintf(" - Creating DirectDraw object\n");
result = aDirectDrawCreate(NULL, &lpDD, NULL);
if (result != DD_OK)
{
@ -2783,7 +2784,7 @@ static BOOL InitDirectDraw(void)
}
// fetch capabilities
initprintf(" - Checking capabilities\n");
// initprintf(" - Checking capabilities\n");
ddcaps.dwSize = sizeof(DDCAPS);
result = IDirectDraw_GetCaps(lpDD, &ddcaps, NULL);
if (result != DD_OK)
@ -2815,14 +2816,14 @@ static void UninitDirectDraw(void)
if (lpDD)
{
initprintf(" - Releasing DirectDraw object\n");
// initprintf(" - Releasing DirectDraw object\n");
IDirectDraw_Release(lpDD);
lpDD = NULL;
}
if (hDDrawDLL)
{
initprintf(" - Unloading DDRAW.DLL\n");
// initprintf(" - Unloading DDRAW.DLL\n");
FreeLibrary(hDDrawDLL);
hDDrawDLL = NULL;
}

4
polymer/eduke32/eduke32.vcproj
View file

@ -781,6 +781,10 @@
RelativePath=".\source\jaudiolib\music.c"
>
</File>
<File
RelativePath=".\source\jaudiolib\mv_mix-c.c"
>
</File>
<File
RelativePath=".\source\jaudiolib\openal.c"
>

2
polymer/eduke32/source/astub.c
View file

@ -1874,7 +1874,7 @@ static void ReadPaletteTable()
return;
}
}
initprintf("Loading palette lookups... ");
// initprintf("Loading palette lookups... ");
kread(fp,&num_tables,1);
for (j=0;j<num_tables;j++)
{

10
polymer/eduke32/source/config.c
View file

@ -164,7 +164,7 @@ void CONFIG_SetDefaultKeys(int type)
ud.config.KeyboardKeys[f][1] = KB_StringToScanCode((char *)oldkeydefaults[i+2]);
if (f == gamefunc_Show_Console) OSD_CaptureKey(ud.config.KeyboardKeys[f][0]);
else MapKey(f, ud.config.KeyboardKeys[f][0], 0, ud.config.KeyboardKeys[f][1], 0);
else CONFIG_MapKey(f, ud.config.KeyboardKeys[f][0], 0, ud.config.KeyboardKeys[f][1], 0);
}
return;
}
@ -177,7 +177,7 @@ void CONFIG_SetDefaultKeys(int type)
ud.config.KeyboardKeys[f][1] = KB_StringToScanCode(keydefaults[i+2]);
if (f == gamefunc_Show_Console) OSD_CaptureKey(ud.config.KeyboardKeys[f][0]);
else MapKey(f, ud.config.KeyboardKeys[f][0], 0, ud.config.KeyboardKeys[f][1], 0);
else CONFIG_MapKey(f, ud.config.KeyboardKeys[f][0], 0, ud.config.KeyboardKeys[f][1], 0);
}
}
@ -382,12 +382,12 @@ void CONFIG_ReadKeys(void)
if (i == gamefunc_Show_Console)
OSD_CaptureKey(ud.config.KeyboardKeys[i][0]);
else
MapKey(i, ud.config.KeyboardKeys[i][0], 0, ud.config.KeyboardKeys[i][1], 0);
CONFIG_MapKey(i, ud.config.KeyboardKeys[i][0], 0, ud.config.KeyboardKeys[i][1], 0);
}
}
// wrapper for CONTROL_MapKey(), generates key bindings to reflect changes to keyboard setup
void MapKey(int32 which, kb_scancode key1, kb_scancode oldkey1, kb_scancode key2, kb_scancode oldkey2)
void CONFIG_MapKey(int32 which, kb_scancode key1, kb_scancode oldkey1, kb_scancode key2, kb_scancode oldkey2)
{
int i, j, k;
int ii[] = { key1, key2, oldkey1, oldkey2 };
@ -421,7 +421,7 @@ void MapKey(int32 which, kb_scancode key1, kb_scancode oldkey1, kb_scancode key2
i = Bstrlen(boundkeys[ii[k]].cmd);
if (i)
boundkeys[ii[k]].cmd[i-2] = 0; // cut off the trailing "; "
boundkeys[ii[k]].cmd[i-2] = 0; // cut off the trailing "; "
}
}

2
polymer/eduke32/source/config.h
View file

@ -37,6 +37,6 @@ void CONFIG_SetDefaultKeys(int type);
int32 CONFIG_GetMapBestTime(char *mapname);
int32 CONFIG_SetMapBestTime(char *mapname, int32 tm);
void MapKey(int32 which, kb_scancode key1, kb_scancode oldkey1, kb_scancode key2, kb_scancode oldkey2);
void CONFIG_MapKey(int32 which, kb_scancode key1, kb_scancode oldkey1, kb_scancode key2, kb_scancode oldkey2);
#endif

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

@ -359,8 +359,8 @@ int gametext_z(int small, int starttile, int x,int y,const char *t,int s,int p,i
rotatesprite(x<<16,(y<<16)+(small?ud.config.ScreenHeight<<15:0),z,0,ac,s,p,small?(8|16):(2|orientation),x1,y1,x2,y2);
// if ((*t >= '0' && *t <= '9'))
x += 8*z/65536;
// else x += tilesizx[ac]*z/65536;//(tilesizx[ac]>>small);
x += 8*z/65536;
// else x += tilesizx[ac]*z/65536;//(tilesizx[ac]>>small);
if (t-oldt >= (signed)TEXTWRAPLEN-!small) oldt = (char *)t, x = oldx, y+=8*z/65536;
t++;
}
@ -9832,11 +9832,11 @@ static void Startup(void)
inittimer(TICRATE);
//initprintf("* Hold Esc to Abort. *\n");
initprintf("Loading art header...\n");
// initprintf("Loading art header...\n");
if (loadpics("tiles000.art",MAXCACHE1DSIZE) < 0)
gameexit("Failed loading art.");
initprintf("Loading palette/lookups...\n");
// initprintf("Loading palette/lookups...\n");
genspriteremaps();
readsavenames();
@ -10517,9 +10517,9 @@ void app_main(int argc,const char **argv)
ud.config.ScreenBPP = bpp[i];
}
initprintf("Checking music inits...\n");
initprintf("Initializing music...\n");
MusicStartup();
initprintf("Checking sound inits...\n");
initprintf("Initializing sound...\n");
SoundStartup();
loadtmb();

2
polymer/eduke32/source/jaudiolib/dsl.c
View file

@ -275,7 +275,7 @@ int RestoreInterrupts(int flags)
UNREFERENCED_PARAMETER(flags);
if (--interrupts_disabled)
return 0;
// interrupts_disabled = 0;
// interrupts_disabled = 0;
SDL_UnlockAudio();
return(0);
}

1270
polymer/eduke32/source/jaudiolib/dsoundout.c
View file

File diff suppressed because it is too large Load diff

4140
polymer/eduke32/source/jaudiolib/midi.c
View file

File diff suppressed because it is too large Load diff

24
polymer/eduke32/source/jaudiolib/multivoc.c
View file

@ -1766,8 +1766,8 @@ size_t ReadOgg(void *ptr, size_t size1, size_t nmemb, void *datasource)
{
sounddef *d=(sounddef *)datasource;
size1*=nmemb;
/* if (d->pos>=d->size)
return 0;*/
/* if (d->pos>=d->size)
return 0;*/
if (d->pos+size1>=d->size)
size1=d->size-d->pos;
Bmemcpy(ptr,(d->ptrsnd+d->pos),size1);
@ -1780,19 +1780,19 @@ int SeekOgg(void *datasource,ogg_int64_t offset,int whence)
sounddef *d=(sounddef *)datasource;
switch (whence)
{
case SEEK_SET:
case SEEK_SET:
whence=offset;
break;
case SEEK_CUR:
case SEEK_CUR:
whence=d->pos+offset;
break;
case SEEK_END:
case SEEK_END:
whence=d->size-offset;
break;
default: return -1;
}
/* if (whence>=(int)d->size||whence<0)
return -1;*/
/* if (whence>=(int)d->size||whence<0)
return -1;*/
d->pos=whence;
return 0;
}
@ -2454,11 +2454,11 @@ int MV_PlayLoopedOGG(char *ptr, int loopstart, int loopend, int pitchoffset, int
length=ov_pcm_total(&voice->OGGstream.oggStream,-1);
if (!length)
length=0xffffff;
/* if (length == OV_EINVAL)
{
MV_SetErrorCode(MV_InvalidOGGFile);
return(MV_Error);
}*/
/* if (length == OV_EINVAL)
{
MV_SetErrorCode(MV_InvalidOGGFile);
return(MV_Error);
}*/
loopend=length=length>>voice->downsample;

26
polymer/eduke32/source/jaudiolib/music.c
View file

@ -192,7 +192,7 @@ void MUSIC_SetVolume
volume = max(0, volume);
volume = min(volume, 255);
#ifdef USE_OPENAL
AL_SetMusicVolume(volume);
AL_SetMusicVolume(volume);
#endif
if (MUSIC_SoundDevice != -1)
{
@ -300,7 +300,7 @@ void MUSIC_Continue
{
#ifdef USE_OPENAL
AL_Continue();
AL_Continue();
#endif
MIDI_ContinueSong();
}
@ -319,7 +319,7 @@ void MUSIC_Pause
{
#ifdef USE_OPENAL
AL_Pause();
AL_Pause();
#endif
MIDI_PauseSong();
}
@ -338,7 +338,7 @@ int MUSIC_StopSong
{
#ifdef USE_OPENAL
AL_Stop();
AL_Stop();
#endif
MUSIC_StopFade();
MIDI_StopSong();
@ -363,19 +363,19 @@ int MUSIC_PlaySong
int status;
#ifdef USE_OPENAL
AL_PlaySong((char *)song,loopflag);
AL_PlaySong((char *)song,loopflag);
if(AL_isntALmusic())
if (AL_isntALmusic())
#endif
{
MUSIC_StopSong();
status = MIDI_PlaySong(song, loopflag);
if (status != MIDI_Ok)
{
MUSIC_SetErrorCode(MUSIC_MidiError);
return(MUSIC_Warning);
MUSIC_StopSong();
status = MIDI_PlaySong(song, loopflag);
if (status != MIDI_Ok)
{
MUSIC_SetErrorCode(MUSIC_MidiError);
return(MUSIC_Warning);
}
}
}
return(MUSIC_Ok);
}

8
polymer/eduke32/source/jaudiolib/openal.c
View file

@ -403,13 +403,13 @@ int update()
case 1:
while (processed--)
{
ALdoing="update1";
ALdoing="update1";
balSourceUnqueueBuffers(music.source,1,&buffer);
check(1);
active=stream(buffer);
if (active)
{
ALdoing="update2";
ALdoing="update2";
balSourceQueueBuffers(music.source,1,&buffer);
check(1);
}
@ -450,7 +450,7 @@ int stream(ALuint buffer)
{
ALsizei size=0;
int section,result;
while (size<BUFFER_SIZE)
{
result=ov_read(&music.def.oggStream,pcm+size,BUFFER_SIZE-size,0,2,1,&section);
@ -513,7 +513,7 @@ void AL_PlaySong(char *ptr,int loop)
switch (music.type)
{
case 1:
case 1:
stream(music.buffers[0]);
if (!stream(music.buffers[1]))
bf=1;

398
polymer/eduke32/source/jaudiolib/pitch.c
View file

@ -1,199 +1,199 @@
/*
Copyright (C) 1994-1995 Apogee Software, Ltd.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
*/
/**********************************************************************
module: PITCH.C
author: James R. Dose
date: June 14, 1993
Routines for pitch scaling.
(c) Copyright 1993 James R. Dose. All Rights Reserved.
**********************************************************************/
#include <stdlib.h>
//#include <math.h>
#include "standard.h"
#include "pitch.h"
#define MAXDETUNE 25
static unsigned int PitchTable[ 12 ][ MAXDETUNE ] =
{
{
0x10000, 0x10097, 0x1012f, 0x101c7, 0x10260, 0x102f9, 0x10392, 0x1042c,
0x104c6, 0x10561, 0x105fb, 0x10696, 0x10732, 0x107ce, 0x1086a, 0x10907,
0x109a4, 0x10a41, 0x10adf, 0x10b7d, 0x10c1b, 0x10cba, 0x10d59, 0x10df8,
0x10e98
},
{ 0x10f38, 0x10fd9, 0x1107a, 0x1111b, 0x111bd, 0x1125f, 0x11302, 0x113a5,
0x11448, 0x114eb, 0x1158f, 0x11634, 0x116d8, 0x1177e, 0x11823, 0x118c9,
0x1196f, 0x11a16, 0x11abd, 0x11b64, 0x11c0c, 0x11cb4, 0x11d5d, 0x11e06,
0x11eaf },
{ 0x11f59, 0x12003, 0x120ae, 0x12159, 0x12204, 0x122b0, 0x1235c, 0x12409,
0x124b6, 0x12563, 0x12611, 0x126bf, 0x1276d, 0x1281c, 0x128cc, 0x1297b,
0x12a2b, 0x12adc, 0x12b8d, 0x12c3e, 0x12cf0, 0x12da2, 0x12e55, 0x12f08,
0x12fbc },
{ 0x1306f, 0x13124, 0x131d8, 0x1328d, 0x13343, 0x133f9, 0x134af, 0x13566,
0x1361d, 0x136d5, 0x1378d, 0x13846, 0x138fe, 0x139b8, 0x13a72, 0x13b2c,
0x13be6, 0x13ca1, 0x13d5d, 0x13e19, 0x13ed5, 0x13f92, 0x1404f, 0x1410d,
0x141cb },
{ 0x1428a, 0x14349, 0x14408, 0x144c8, 0x14588, 0x14649, 0x1470a, 0x147cc,
0x1488e, 0x14951, 0x14a14, 0x14ad7, 0x14b9b, 0x14c5f, 0x14d24, 0x14dea,
0x14eaf, 0x14f75, 0x1503c, 0x15103, 0x151cb, 0x15293, 0x1535b, 0x15424,
0x154ee },
{ 0x155b8, 0x15682, 0x1574d, 0x15818, 0x158e4, 0x159b0, 0x15a7d, 0x15b4a,
0x15c18, 0x15ce6, 0x15db4, 0x15e83, 0x15f53, 0x16023, 0x160f4, 0x161c5,
0x16296, 0x16368, 0x1643a, 0x1650d, 0x165e1, 0x166b5, 0x16789, 0x1685e,
0x16934 },
{ 0x16a09, 0x16ae0, 0x16bb7, 0x16c8e, 0x16d66, 0x16e3e, 0x16f17, 0x16ff1,
0x170ca, 0x171a5, 0x17280, 0x1735b, 0x17437, 0x17513, 0x175f0, 0x176ce,
0x177ac, 0x1788a, 0x17969, 0x17a49, 0x17b29, 0x17c09, 0x17cea, 0x17dcc,
0x17eae },
{ 0x17f91, 0x18074, 0x18157, 0x1823c, 0x18320, 0x18406, 0x184eb, 0x185d2,
0x186b8, 0x187a0, 0x18888, 0x18970, 0x18a59, 0x18b43, 0x18c2d, 0x18d17,
0x18e02, 0x18eee, 0x18fda, 0x190c7, 0x191b5, 0x192a2, 0x19391, 0x19480,
0x1956f },
{ 0x1965f, 0x19750, 0x19841, 0x19933, 0x19a25, 0x19b18, 0x19c0c, 0x19d00,
0x19df4, 0x19ee9, 0x19fdf, 0x1a0d5, 0x1a1cc, 0x1a2c4, 0x1a3bc, 0x1a4b4,
0x1a5ad, 0x1a6a7, 0x1a7a1, 0x1a89c, 0x1a998, 0x1aa94, 0x1ab90, 0x1ac8d,
0x1ad8b },
{ 0x1ae89, 0x1af88, 0x1b088, 0x1b188, 0x1b289, 0x1b38a, 0x1b48c, 0x1b58f,
0x1b692, 0x1b795, 0x1b89a, 0x1b99f, 0x1baa4, 0x1bbaa, 0x1bcb1, 0x1bdb8,
0x1bec0, 0x1bfc9, 0x1c0d2, 0x1c1dc, 0x1c2e6, 0x1c3f1, 0x1c4fd, 0x1c609,
0x1c716 },
{ 0x1c823, 0x1c931, 0x1ca40, 0x1cb50, 0x1cc60, 0x1cd70, 0x1ce81, 0x1cf93,
0x1d0a6, 0x1d1b9, 0x1d2cd, 0x1d3e1, 0x1d4f6, 0x1d60c, 0x1d722, 0x1d839,
0x1d951, 0x1da69, 0x1db82, 0x1dc9c, 0x1ddb6, 0x1ded1, 0x1dfec, 0x1e109,
0x1e225 },
{ 0x1e343, 0x1e461, 0x1e580, 0x1e6a0, 0x1e7c0, 0x1e8e0, 0x1ea02, 0x1eb24,
0x1ec47, 0x1ed6b, 0x1ee8f, 0x1efb4, 0x1f0d9, 0x1f1ff, 0x1f326, 0x1f44e,
0x1f576, 0x1f69f, 0x1f7c9, 0x1f8f3, 0x1fa1e, 0x1fb4a, 0x1fc76, 0x1fda3,
0x1fed1 }
};
//static int PITCH_Installed = FALSE;
/*---------------------------------------------------------------------
Function: PITCH_Init
Initializes pitch table.
---------------------------------------------------------------------*/
/*
void PITCH_Init
(
void
)
{
int note;
int detune;
if ( !PITCH_Installed )
{
for( note = 0; note < 12; note++ )
{
for( detune = 0; detune < MAXDETUNE; detune++ )
{
PitchTable[ note ][ detune ] = 0x10000 *
pow( 2, ( note * MAXDETUNE + detune ) / ( 12.0 * MAXDETUNE ) );
}
}
PITCH_Installed = TRUE;
}
}
*/
/**********************************************************************
Memory locked functions:
**********************************************************************/
/*---------------------------------------------------------------------
Function: PITCH_GetScale
Returns a fixed-point value to scale number the specified amount.
---------------------------------------------------------------------*/
unsigned int PITCH_GetScale
(
int pitchoffset
)
{
unsigned int scale;
int octaveshift;
int noteshift;
int note;
int detune;
// if ( !PITCH_Installed )
// {
// PITCH_Init();
// }
if (pitchoffset == 0)
{
return(PitchTable[ 0 ][ 0 ]);
}
noteshift = pitchoffset % 1200;
if (noteshift < 0)
{
noteshift += 1200;
}
note = noteshift / 100;
detune = (noteshift % 100) / (100 / MAXDETUNE);
octaveshift = (pitchoffset - noteshift) / 1200;
if (detune < 0)
{
detune += (100 / MAXDETUNE);
note--;
if (note < 0)
{
note += 12;
octaveshift--;
}
}
scale = PitchTable[ note ][ detune ];
if (octaveshift < 0)
{
scale >>= -octaveshift;
}
else
{
scale <<= octaveshift;
}
return(scale);
}
/*
Copyright (C) 1994-1995 Apogee Software, Ltd.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
*/
/**********************************************************************
module: PITCH.C
author: James R. Dose
date: June 14, 1993
Routines for pitch scaling.
(c) Copyright 1993 James R. Dose. All Rights Reserved.
**********************************************************************/
#include <stdlib.h>
//#include <math.h>
#include "standard.h"
#include "pitch.h"
#define MAXDETUNE 25
static unsigned int PitchTable[ 12 ][ MAXDETUNE ] =
{
{
0x10000, 0x10097, 0x1012f, 0x101c7, 0x10260, 0x102f9, 0x10392, 0x1042c,
0x104c6, 0x10561, 0x105fb, 0x10696, 0x10732, 0x107ce, 0x1086a, 0x10907,
0x109a4, 0x10a41, 0x10adf, 0x10b7d, 0x10c1b, 0x10cba, 0x10d59, 0x10df8,
0x10e98
},
{ 0x10f38, 0x10fd9, 0x1107a, 0x1111b, 0x111bd, 0x1125f, 0x11302, 0x113a5,
0x11448, 0x114eb, 0x1158f, 0x11634, 0x116d8, 0x1177e, 0x11823, 0x118c9,
0x1196f, 0x11a16, 0x11abd, 0x11b64, 0x11c0c, 0x11cb4, 0x11d5d, 0x11e06,
0x11eaf },
{ 0x11f59, 0x12003, 0x120ae, 0x12159, 0x12204, 0x122b0, 0x1235c, 0x12409,
0x124b6, 0x12563, 0x12611, 0x126bf, 0x1276d, 0x1281c, 0x128cc, 0x1297b,
0x12a2b, 0x12adc, 0x12b8d, 0x12c3e, 0x12cf0, 0x12da2, 0x12e55, 0x12f08,
0x12fbc },
{ 0x1306f, 0x13124, 0x131d8, 0x1328d, 0x13343, 0x133f9, 0x134af, 0x13566,
0x1361d, 0x136d5, 0x1378d, 0x13846, 0x138fe, 0x139b8, 0x13a72, 0x13b2c,
0x13be6, 0x13ca1, 0x13d5d, 0x13e19, 0x13ed5, 0x13f92, 0x1404f, 0x1410d,
0x141cb },
{ 0x1428a, 0x14349, 0x14408, 0x144c8, 0x14588, 0x14649, 0x1470a, 0x147cc,
0x1488e, 0x14951, 0x14a14, 0x14ad7, 0x14b9b, 0x14c5f, 0x14d24, 0x14dea,
0x14eaf, 0x14f75, 0x1503c, 0x15103, 0x151cb, 0x15293, 0x1535b, 0x15424,
0x154ee },
{ 0x155b8, 0x15682, 0x1574d, 0x15818, 0x158e4, 0x159b0, 0x15a7d, 0x15b4a,
0x15c18, 0x15ce6, 0x15db4, 0x15e83, 0x15f53, 0x16023, 0x160f4, 0x161c5,
0x16296, 0x16368, 0x1643a, 0x1650d, 0x165e1, 0x166b5, 0x16789, 0x1685e,
0x16934 },
{ 0x16a09, 0x16ae0, 0x16bb7, 0x16c8e, 0x16d66, 0x16e3e, 0x16f17, 0x16ff1,
0x170ca, 0x171a5, 0x17280, 0x1735b, 0x17437, 0x17513, 0x175f0, 0x176ce,
0x177ac, 0x1788a, 0x17969, 0x17a49, 0x17b29, 0x17c09, 0x17cea, 0x17dcc,
0x17eae },
{ 0x17f91, 0x18074, 0x18157, 0x1823c, 0x18320, 0x18406, 0x184eb, 0x185d2,
0x186b8, 0x187a0, 0x18888, 0x18970, 0x18a59, 0x18b43, 0x18c2d, 0x18d17,
0x18e02, 0x18eee, 0x18fda, 0x190c7, 0x191b5, 0x192a2, 0x19391, 0x19480,
0x1956f },
{ 0x1965f, 0x19750, 0x19841, 0x19933, 0x19a25, 0x19b18, 0x19c0c, 0x19d00,
0x19df4, 0x19ee9, 0x19fdf, 0x1a0d5, 0x1a1cc, 0x1a2c4, 0x1a3bc, 0x1a4b4,
0x1a5ad, 0x1a6a7, 0x1a7a1, 0x1a89c, 0x1a998, 0x1aa94, 0x1ab90, 0x1ac8d,
0x1ad8b },
{ 0x1ae89, 0x1af88, 0x1b088, 0x1b188, 0x1b289, 0x1b38a, 0x1b48c, 0x1b58f,
0x1b692, 0x1b795, 0x1b89a, 0x1b99f, 0x1baa4, 0x1bbaa, 0x1bcb1, 0x1bdb8,
0x1bec0, 0x1bfc9, 0x1c0d2, 0x1c1dc, 0x1c2e6, 0x1c3f1, 0x1c4fd, 0x1c609,
0x1c716 },
{ 0x1c823, 0x1c931, 0x1ca40, 0x1cb50, 0x1cc60, 0x1cd70, 0x1ce81, 0x1cf93,
0x1d0a6, 0x1d1b9, 0x1d2cd, 0x1d3e1, 0x1d4f6, 0x1d60c, 0x1d722, 0x1d839,
0x1d951, 0x1da69, 0x1db82, 0x1dc9c, 0x1ddb6, 0x1ded1, 0x1dfec, 0x1e109,
0x1e225 },
{ 0x1e343, 0x1e461, 0x1e580, 0x1e6a0, 0x1e7c0, 0x1e8e0, 0x1ea02, 0x1eb24,
0x1ec47, 0x1ed6b, 0x1ee8f, 0x1efb4, 0x1f0d9, 0x1f1ff, 0x1f326, 0x1f44e,
0x1f576, 0x1f69f, 0x1f7c9, 0x1f8f3, 0x1fa1e, 0x1fb4a, 0x1fc76, 0x1fda3,
0x1fed1 }
};
//static int PITCH_Installed = FALSE;
/*---------------------------------------------------------------------
Function: PITCH_Init
Initializes pitch table.
---------------------------------------------------------------------*/
/*
void PITCH_Init
(
void
)
{
int note;
int detune;
if ( !PITCH_Installed )
{
for( note = 0; note < 12; note++ )
{
for( detune = 0; detune < MAXDETUNE; detune++ )
{
PitchTable[ note ][ detune ] = 0x10000 *
pow( 2, ( note * MAXDETUNE + detune ) / ( 12.0 * MAXDETUNE ) );
}
}
PITCH_Installed = TRUE;
}
}
*/
/**********************************************************************
Memory locked functions:
**********************************************************************/
/*---------------------------------------------------------------------
Function: PITCH_GetScale
Returns a fixed-point value to scale number the specified amount.
---------------------------------------------------------------------*/
unsigned int PITCH_GetScale
(
int pitchoffset
)
{
unsigned int scale;
int octaveshift;
int noteshift;
int note;
int detune;
// if ( !PITCH_Installed )
// {
// PITCH_Init();
// }
if (pitchoffset == 0)
{
return(PitchTable[ 0 ][ 0 ]);
}
noteshift = pitchoffset % 1200;
if (noteshift < 0)
{
noteshift += 1200;
}
note = noteshift / 100;
detune = (noteshift % 100) / (100 / MAXDETUNE);
octaveshift = (pitchoffset - noteshift) / 1200;
if (detune < 0)
{
detune += (100 / MAXDETUNE);
note--;
if (note < 0)
{
note += 12;
octaveshift--;
}
}
scale = PitchTable[ note ][ detune ];
if (octaveshift < 0)
{
scale >>= -octaveshift;
}
else
{
scale <<= octaveshift;
}
return(scale);
}

2
polymer/eduke32/source/jmact/control.c
View file

@ -960,10 +960,12 @@ boolean CONTROL_Startup(controltype which, int32(*TimeFunction)(void), int32 tic
// break;
//}
/*
if (CONTROL_MousePresent)
initprintf("CONTROL_Startup: Mouse Present\n");
if (CONTROL_JoyPresent)
initprintf("CONTROL_Startup: Joystick Present\n");
*/
CONTROL_ButtonState1 = 0;
CONTROL_ButtonState2 = 0;

22
polymer/eduke32/source/menus.c
View file

@ -2491,17 +2491,21 @@ cheat_for_port_credits:
gametextpal(d,yy, glwidescreen ? "On" : "Off", MENUHIGHLIGHT(io), 0);
break;
case 1:
{
int dummy = glanisotropy;
modval(0,glinfo.maxanisotropy+1,(int *)&dummy,1,probey==io);
if (dummy > glanisotropy) glanisotropy *= 2;
else if (dummy < glanisotropy) glanisotropy /= 2;
if (x==io)
{
glanisotropy *= 2;
if (glanisotropy > glinfo.maxanisotropy) glanisotropy = 1;
gltexapplyprops();
}
if (glanisotropy > glinfo.maxanisotropy) glanisotropy = 1;
else if (glanisotropy < 1) glanisotropy = glinfo.maxanisotropy;
gltexapplyprops();
if (glanisotropy == 1) strcpy(tempbuf,"NONE");
else sprintf(tempbuf,"%dx",glanisotropy);
gametextpal(d,yy, tempbuf, MENUHIGHLIGHT(io), 0);
break;
}
case 2:
if (x==io) usehightile = 1-usehightile;
modval(0,1,(int *)&usehightile,1,probey==io);
@ -3231,8 +3235,8 @@ cheat_for_port_credits:
(newvidmode==validmodecnt)?ydim:validmode[newvidmode].ydim);
gametext(c+154,50-8,tempbuf,MENUHIGHLIGHT(0),2+8+16);
menutext(c,50+16,MENUHIGHLIGHT(1),0,"VIDEO MODE");
sprintf(tempbuf, "%dbit %s", vidsets[newvidset]&0x0ffff, (vidsets[newvidset]&0x20000)?"Polymost":"Classic");
menutext(c,50+16,MENUHIGHLIGHT(1),0,"RENDERER");
sprintf(tempbuf, "%d-bit %s", vidsets[newvidset]&0x0ffff, (vidsets[newvidset]&0x20000)?"OpenGL":"Software");
gametext(c+154,50+16-8,tempbuf,MENUHIGHLIGHT(1),2+8+16);
menutext(c,50+16+16,MENUHIGHLIGHT(2),0,"FULLSCREEN");
@ -3354,7 +3358,7 @@ cheat_for_port_credits:
key[0] = ud.config.KeyboardKeys[probey][0];
key[1] = ud.config.KeyboardKeys[probey][1];
ud.config.KeyboardKeys[probey][currentlist] = 0xff;
MapKey(probey, ud.config.KeyboardKeys[probey][0], key[0], ud.config.KeyboardKeys[probey][1], key[1]);
CONFIG_MapKey(probey, ud.config.KeyboardKeys[probey][0], key[0], ud.config.KeyboardKeys[probey][1], key[1]);
sound(KICK_HIT);
KB_ClearKeyDown(sc_Delete);
}
@ -3419,7 +3423,7 @@ cheat_for_port_credits:
if (function == gamefunc_Show_Console)
OSD_CaptureKey(KB_GetLastScanCode());
else
MapKey(function, ud.config.KeyboardKeys[function][0], key[0], ud.config.KeyboardKeys[function][1], key[1]);
CONFIG_MapKey(function, ud.config.KeyboardKeys[function][0], key[0], ud.config.KeyboardKeys[function][1], key[1]);
}
cmenu(204);

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

@ -354,9 +354,9 @@ static int osdcmd_restartsound(const osdfuncparm_t *parm)
SoundShutdown();
MusicShutdown();
initprintf("Checking music inits...\n");
initprintf("Initializing music...\n");
MusicStartup();
initprintf("Checking sound inits...\n");
initprintf("Initializing sound...\n");
SoundStartup();
FX_StopAllSounds();

4
polymer/eduke32/source/rts.c
View file

@ -78,7 +78,7 @@ int32 RTS_AddFile(const char *filename)
startlump = numlumps;
// WAD file
initprintf(" Adding %s.\n",filename);
// initprintf(" Adding %s.\n",filename);
kread(handle, &header, sizeof(header));
if (strncmp(header.identification,"IWAD",4))
{
@ -146,7 +146,7 @@ void RTS_Init(const char *filename)
numlumps = 0;
lumpinfo = NULL; // will be realloced as lumps are added
initprintf("RTS Manager Started.\n");
// initprintf("RTS Manager Started.\n");
if (RTS_AddFile(filename)) return;
if (!numlumps) return;