From a0565418d99a3df7fd2f2a731b905703d6e74097 Mon Sep 17 00:00:00 2001 From: Ragnvald Maartmann-Moe IV Date: Wed, 21 Feb 2001 23:45:49 +0000 Subject: [PATCH] Stomped out lots of typos and case inconsistencies. fixme, Fixme, FIXME! --- qw/source/cl_demo.c | 4 ++-- qw/source/cl_input.c | 2 +- qw/source/cl_sys_sdl.c | 4 ++-- qw/source/cmd.c | 2 +- qw/source/console.c | 2 +- qw/source/in_sdl.c | 4 ++-- qw/source/joy_win.c | 4 ++-- qw/source/menu.c | 2 +- qw/source/model_brush.c | 6 +++--- qw/source/net_chan.c | 2 +- qw/source/net_packetlog.c | 16 ++++++++-------- qw/source/r_view.c | 2 +- qw/source/screen.c | 2 +- qw/source/snd_dma.c | 2 +- qw/source/snd_win.c | 2 +- qw/source/sv_main.c | 6 +++--- qw/source/sv_pr_cmds.c | 2 +- qw/source/sv_send.c | 2 +- qw/source/sv_user.c | 10 +++++----- qw/source/vid_sdl.c | 6 +++--- qw/source/vid_sgl.c | 4 ++-- qw/source/vid_wgl.c | 6 +++--- qw/source/zone.c | 2 +- 23 files changed, 47 insertions(+), 47 deletions(-) diff --git a/qw/source/cl_demo.c b/qw/source/cl_demo.c index 30a9184b8..55abce173 100644 --- a/qw/source/cl_demo.c +++ b/qw/source/cl_demo.c @@ -187,14 +187,14 @@ CL_GetDemoMessage (void) // rewind back to time demotime_cached = 1; cached_demotime = demotime; - return 0; // allready read this frame's message + return 0; // already read this frame's message } if (!cls.td_starttime && cls.state == ca_active) { cls.td_starttime = Sys_DoubleTime (); cls.td_startframe = host_framecount; } realtime = demotime; // warp - } else if (!cl.paused && cls.state >= ca_onserver) { // allways grab + } else if (!cl.paused && cls.state >= ca_onserver) { // always grab // until fully // connected if (realtime + 1.0 < demotime) { diff --git a/qw/source/cl_input.c b/qw/source/cl_input.c index 1f0bee7f0..776074a51 100644 --- a/qw/source/cl_input.c +++ b/qw/source/cl_input.c @@ -538,7 +538,7 @@ CL_FinishMove (usercmd_t *cmd) int ms; // -// allways dump the first two message, because it may contain leftover inputs +// always dump the first two message, because it may contain leftover inputs // from the last level // if (++cl.movemessages <= 2) diff --git a/qw/source/cl_sys_sdl.c b/qw/source/cl_sys_sdl.c index 80424a872..c02bd3c54 100644 --- a/qw/source/cl_sys_sdl.c +++ b/qw/source/cl_sys_sdl.c @@ -69,7 +69,7 @@ int starttime; #ifdef _WIN32 # include "winquake.h" - // fixme: minimized is not currently supported under + // FIXME: minimized is not currently supported under // SDL qboolean Minimized = false; void MaskExceptions (void); @@ -286,7 +286,7 @@ SDL_main (int c, char **v) } -/* fixme: evil stub for directsound crap */ +/* FIXME: evil stub for directsound crap */ IN_Accumulate (void) { } diff --git a/qw/source/cmd.c b/qw/source/cmd.c index 6ab008989..587fad44b 100644 --- a/qw/source/cmd.c +++ b/qw/source/cmd.c @@ -400,7 +400,7 @@ Cmd_Alias_f (void) Con_Printf ("Alias name is too long\n"); return; } - // if the alias allready exists, reuse it + // if the alias already exists, reuse it a = (cmdalias_t*)Hash_Find (cmd_alias_hash, s); if (a) { free (a->value); diff --git a/qw/source/console.c b/qw/source/console.c index d0d8ee1bb..b7b392aee 100644 --- a/qw/source/console.c +++ b/qw/source/console.c @@ -428,7 +428,7 @@ Con_DrawInput (void) char temp[MAXCMDLINE]; if (key_dest != key_console && cls.state == ca_active) - return; // don't draw anything (allways draw + return; // don't draw anything (always draw // if not active) text = strcpy (temp, key_lines[edit_line]); diff --git a/qw/source/in_sdl.c b/qw/source/in_sdl.c index 66f14a3f3..584552149 100644 --- a/qw/source/in_sdl.c +++ b/qw/source/in_sdl.c @@ -49,7 +49,7 @@ #include "view.h" #ifdef WIN32 -// fixme: this is evil... +// FIXME: this is evil... # include HWND mainwindow; #endif @@ -57,7 +57,7 @@ HWND mainwindow; cvar_t *_windowed_mouse; int old_windowed_mouse; -int modestate; // fixme: just to avoid cross-comp. +int modestate; // FIXME: just to avoid cross-comp. // errors - remove later diff --git a/qw/source/joy_win.c b/qw/source/joy_win.c index 454c0094b..d08313112 100644 --- a/qw/source/joy_win.c +++ b/qw/source/joy_win.c @@ -27,7 +27,7 @@ $Id$ */ -// fixme: THIS IS NOT FINISHED YET +// FIXME: THIS IS NOT FINISHED YET #ifdef HAVE_CONFIG_H # include "config.h" @@ -521,7 +521,7 @@ JOY_StartupJoystick (void) joy_advancedinit = false; joy_found = true; - // fixme: do this right + // FIXME: do this right joy_active = true; Con_Printf ("\njoystick detected\n\n"); } diff --git a/qw/source/menu.c b/qw/source/menu.c index 3fbd9395b..67c776cf7 100644 --- a/qw/source/menu.c +++ b/qw/source/menu.c @@ -461,7 +461,7 @@ M_AdjustSliders (int dir) Cvar_SetValue (volume, bound (0, volume->value + (dir * 0.1), 1)); break; - case 9: // allways run + case 9: // always run if (cl_forwardspeed->value > 200) { Cvar_SetValue (cl_forwardspeed, 200); Cvar_SetValue (cl_backspeed, 200); diff --git a/qw/source/model_brush.c b/qw/source/model_brush.c index 3ab2cf320..4ef636329 100644 --- a/qw/source/model_brush.c +++ b/qw/source/model_brush.c @@ -1,5 +1,5 @@ /* - model_bursh.c + model_brush.c model loading and caching @@ -212,7 +212,7 @@ Mod_LoadTextures (lump_t *l) if (!tx || tx->name[0] != '+') continue; if (tx->anim_next) - continue; // allready sequenced + continue; // already sequenced // find the number of frames in the animation memset (anims, 0, sizeof (anims)); @@ -553,7 +553,7 @@ Mod_LoadFaces (lump_t *l) out->samples = loadmodel->lightdata + (i * mod_lightmap_bytes); // set the drawing flags flag - // fixme: do this right?-) + // FIXME: do this right?-) if (!out->texinfo->texture) continue; if (!out->texinfo->texture->name) diff --git a/qw/source/net_chan.c b/qw/source/net_chan.c index dc6230f73..63750ca3c 100644 --- a/qw/source/net_chan.c +++ b/qw/source/net_chan.c @@ -81,7 +81,7 @@ If the message buffer is overflowed, either by a single message, or by multiple frames worth piling up while the last reliable transmit goes unacknowledged, the netchan signals a fatal error. -Reliable messages are allways placed first in a packet, then the unreliable +Reliable messages are always placed first in a packet, then the unreliable message is included if there is sufficient room. To the receiver, there is no distinction between the reliable and unreliable diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c index bcbb1ec82..81e275915 100644 --- a/qw/source/net_packetlog.c +++ b/qw/source/net_packetlog.c @@ -28,7 +28,7 @@ $Id$ */ -// fixme: we did support Quake1 protocol too... +// FIXME: we did support Quake1 protocol too... #define QUAKEWORLD #ifdef HAVE_CONFIG_H @@ -397,7 +397,7 @@ Analyze_Server_Packet (byte * data, int len) { byte *safe; int slen; - // Fixme: quick-hack + // FIXME: quick-hack safe=net_message.data; slen=net_message.cursize; @@ -427,7 +427,7 @@ Parse_Server_Packet () } else { seq2 = MSG_ReadLong (); - // fixme display seqs right when reliable + // FIXME: display seqs right when reliable Net_LogPrintf ("\nSeq: %ld Ack: %ld ", seq1 & 0x7FFFFFFF, seq2 & 0x7FFFFFFF); @@ -488,7 +488,7 @@ Parse_Server_Packet () (float) MSG_ReadByte () / 64.0); ii = MSG_ReadByte (); - // fixme: well, cl. for client :-) + // FIXME: well, cl. for client :-) // Net_LogPrintf ("%d (%s) ", ii, sv.sound_precache[ii]); Net_LogPrintf ("%d (%s) ", ii); Net_LogPrintf ("Pos: "); @@ -505,7 +505,7 @@ Parse_Server_Packet () #endif break; case svc_print: - // fixme i==PRINT_CHAT + // FIXME: i==PRINT_CHAT Net_LogPrintf (" [%d]", MSG_ReadByte ()); Net_LogPrintf (" %s", MSG_ReadString ()); break; @@ -575,7 +575,7 @@ Parse_Server_Packet () break; case svc_damage: - // fixme parse damage + // FIXME: parse damage Net_LogPrintf ("armor: %d health: %d", MSG_ReadByte (), MSG_ReadByte ()); Net_LogPrintf (" from %f,%f,%f", MSG_ReadCoord (), @@ -859,7 +859,7 @@ Parse_Server_Packet () void Analyze_Client_Packet (byte * data, int len) { - // fixme quick-hack + // FIXME: quick-hack net_message.data = data; net_message.cursize = len; MSG_BeginReading (); @@ -879,7 +879,7 @@ Parse_Client_Packet (void) Net_LogPrintf ("Special: %s\n", MSG_ReadString ()); return; } else { - // fixme display seqs right when reliable + // FIXME: display seqs right when reliable seq2 = MSG_ReadLong (); Net_LogPrintf ("\nSeq: %ld Ack: %ld ", seq1 & 0x7FFFFFFF, diff --git a/qw/source/r_view.c b/qw/source/r_view.c index 319ab3fd0..6d1261541 100644 --- a/qw/source/r_view.c +++ b/qw/source/r_view.c @@ -561,7 +561,7 @@ V_CalcIntermissionRefdef (void) VectorCopy (cl.simangles, r_refdef.viewangles); view->model = NULL; -// allways idle in intermission +// always idle in intermission old = v_idlescale->value; Cvar_SetValue (v_idlescale, 1); V_AddIdle (); diff --git a/qw/source/screen.c b/qw/source/screen.c index f33bbc848..5ba93c74e 100644 --- a/qw/source/screen.c +++ b/qw/source/screen.c @@ -90,7 +90,7 @@ draw net turn off messages option -the refresh is allways rendered, unless the console is full screen +the refresh is always rendered, unless the console is full screen console is: diff --git a/qw/source/snd_dma.c b/qw/source/snd_dma.c index ba4464a53..0b96bd5e4 100644 --- a/qw/source/snd_dma.c +++ b/qw/source/snd_dma.c @@ -433,7 +433,7 @@ SND_Spatialize (channel_t *ch) vec3_t source_vec; sfx_t *snd; -// anything coming from the view entity will allways be full volume +// anything coming from the view entity will always be full volume if (ch->entnum == cl.viewentity) { ch->leftvol = ch->master_vol; ch->rightvol = ch->master_vol; diff --git a/qw/source/snd_win.c b/qw/source/snd_win.c index 200381adf..42f136547 100644 --- a/qw/source/snd_win.c +++ b/qw/source/snd_win.c @@ -691,7 +691,7 @@ void DSOUND_ClearBuffer(int clear) { DWORD *pData; -// fixme: this should be called with 2nd pbuf2 = NULL, dwsize =0 +// FIXME: this should be called with 2nd pbuf2 = NULL, dwsize =0 pData=DSOUND_LockBuffer(true); memset (pData, clear, shm->samples * shm->samplebits / 8); DSOUND_LockBuffer(false); diff --git a/qw/source/sv_main.c b/qw/source/sv_main.c index 30908f34d..e82662ad0 100644 --- a/qw/source/sv_main.c +++ b/qw/source/sv_main.c @@ -68,7 +68,7 @@ client_t *host_client; // current client // DoS protection // FLOOD_PING, FLOOD_LOG, FLOOD_CONNECT, FLOOD_STATUS, FLOOD_RCON, FLOOD_BAN -// fixme: these default values need to be tweaked after more testing +// FIXME: these default values need to be tweaked after more testing double netdosexpire[DOSFLOODCMDS] = { 1, 1, 2, 0.9, 1, 5 }; double netdosvalues[DOSFLOODCMDS] = { 12, 1, 3, 1, 1, 1 }; @@ -546,7 +546,7 @@ SVC_Log (void) else seq = -1; - if (seq == svs.logsequence - 1 || !sv_fraglogfile) { // they allready + if (seq == svs.logsequence - 1 || !sv_fraglogfile) { // they already // have this // data, or we // aren't logging @@ -1851,7 +1851,7 @@ SV_InitNet (void) Net_Log_Init(); #endif - // heartbeats will allways be sent to the id master + // heartbeats will always be sent to the id master svs.last_heartbeat = -99999; // send immediately // NET_StringToAdr ("192.246.40.70:27000", &idmaster_adr); } diff --git a/qw/source/sv_pr_cmds.c b/qw/source/sv_pr_cmds.c index 094864bc8..3637e3af6 100644 --- a/qw/source/sv_pr_cmds.c +++ b/qw/source/sv_pr_cmds.c @@ -458,7 +458,7 @@ PF_ambientsound (progs_t *pr) weapon, feet, etc. Channel 0 is an auto-allocate channel, the others override anything - allready running on that entity/channel pair. + already running on that entity/channel pair. An attenuation of 0 will play full volume everywhere in the level. Larger attenuations will drop off. diff --git a/qw/source/sv_send.c b/qw/source/sv_send.c index 8607386ad..599ae7261 100644 --- a/qw/source/sv_send.c +++ b/qw/source/sv_send.c @@ -368,7 +368,7 @@ SV_Multicast (vec3_t origin, int to) weapon, feet, etc. Channel 0 is an auto-allocate channel, the others override anything - allready running on that entity/channel pair. + already running on that entity/channel pair. An attenuation of 0 will play full volume everywhere in the level. Larger attenuations will drop off. (max 4 attenuation) diff --git a/qw/source/sv_user.c b/qw/source/sv_user.c index a215f2bb1..094e2daf4 100644 --- a/qw/source/sv_user.c +++ b/qw/source/sv_user.c @@ -164,7 +164,7 @@ SV_Soundlist_f (void) unsigned n; if (host_client->state != cs_connected) { - Con_Printf ("soundlist not valid -- allready spawned\n"); + Con_Printf ("soundlist not valid -- already spawned\n"); return; } // handle the case of a level changing while a client was connecting @@ -214,7 +214,7 @@ SV_Modellist_f (void) unsigned n; if (host_client->state != cs_connected) { - Con_Printf ("modellist not valid -- allready spawned\n"); + Con_Printf ("modellist not valid -- already spawned\n"); return; } // handle the case of a level changing while a client was connecting @@ -263,7 +263,7 @@ SV_PreSpawn_f (void) unsigned int check; if (host_client->state != cs_connected) { - Con_Printf ("prespawn not valid -- allready spawned\n"); + Con_Printf ("prespawn not valid -- already spawned\n"); return; } // handle the case of a level changing while a client was connecting @@ -333,7 +333,7 @@ SV_Spawn_f (void) int n; if (host_client->state != cs_connected) { - Con_Printf ("Spawn not valid -- allready spawned\n"); + Con_Printf ("Spawn not valid -- already spawned\n"); return; } // handle the case of a level changing while a client was connecting @@ -900,7 +900,7 @@ SV_Kill_f (void) if (sv_player->v.v.health <= 0) { SV_BeginRedirect (RD_CLIENT); SV_ClientPrintf (host_client, PRINT_HIGH, - "Can't suicide -- allready dead!\n"); + "Can't suicide -- already dead!\n"); SV_EndRedirect (); return; } diff --git a/qw/source/vid_sdl.c b/qw/source/vid_sdl.c index 5becd106c..3f573b1a3 100644 --- a/qw/source/vid_sdl.c +++ b/qw/source/vid_sdl.c @@ -48,7 +48,7 @@ #include "vid.h" #ifdef WIN32 -/* fixme: this is evil hack to get full DirectSound support with SDL */ +/* FIXME: this is evil hack to get full DirectSound support with SDL */ #include #include HWND mainwindow; @@ -60,7 +60,7 @@ cvar_t *vid_fullscreen; extern viddef_t vid; // global video state unsigned short d_8to16table[256]; -int modestate; // fixme: just to avoid cross-comp. +int modestate; // FIXME: just to avoid cross-comp. // errors - remove later // The original defaults @@ -180,7 +180,7 @@ VID_Init (unsigned char *palette) SDL_ShowCursor (0); #ifdef WIN32 - // fixme: EVIL thing - but needed for win32 until + // FIXME: EVIL thing - but needed for win32 until // SDL_sound works better - without this DirectSound fails. // SDL_GetWMInfo(&info); diff --git a/qw/source/vid_sgl.c b/qw/source/vid_sgl.c index a0e20d3a7..dd00d276d 100644 --- a/qw/source/vid_sgl.c +++ b/qw/source/vid_sgl.c @@ -50,7 +50,7 @@ #include "va.h" #ifdef WIN32 -/* fixme: this is evil hack to get full DirectSound support with SDL */ +/* FIXME: this is evil hack to get full DirectSound support with SDL */ # include # include HWND mainwindow; @@ -211,7 +211,7 @@ VID_Init (unsigned char *palette) vid_initialized = true; #ifdef WIN32 - // fixme: EVIL thing - but needed for win32 until + // FIXME: EVIL thing - but needed for win32 until // SDL_sound works better - without this DirectSound fails. // SDL_GetWMInfo(&info); diff --git a/qw/source/vid_wgl.c b/qw/source/vid_wgl.c index 69c12ecda..0dacc641f 100644 --- a/qw/source/vid_wgl.c +++ b/qw/source/vid_wgl.c @@ -102,7 +102,7 @@ QF_glColorTableEXT qglColorTableEXT = NULL; qboolean is8bit = false; qboolean isPermedia = false; -// fixme: Only used by MGL .. +// FIXME: Only used by MGL .. qboolean DDActive; // If you ever merge screen/gl_screen, don't forget this one @@ -329,7 +329,7 @@ VID_SetFullDIBMode (int modenum) window_width = modelist[modenum].width; window_height = modelist[modenum].height; -// fixme: some drivers have broken FS popup window handling +// FIXME: some drivers have broken FS popup window handling // until I find way around it, or find some other cause for it // this is way to avoid it @@ -1443,7 +1443,7 @@ VID_Init (unsigned char *palette) hIcon = LoadIcon (global_hInstance, MAKEINTRESOURCE (IDI_ICON1)); -// fixme: If you put these back, remember commctrl.h +// FIXME: If you put these back, remember commctrl.h // InitCommonControls (); VID_InitDIB (global_hInstance); diff --git a/qw/source/zone.c b/qw/source/zone.c index bc3c96f88..798502af7 100644 --- a/qw/source/zone.c +++ b/qw/source/zone.c @@ -636,7 +636,7 @@ Cache_Alloc (cache_user_t *c, int size, char *name) cache_system_t *cs; if (c->data) - Sys_Error ("Cache_Alloc: allready allocated"); + Sys_Error ("Cache_Alloc: already allocated"); if (size <= 0) Sys_Error ("Cache_Alloc: size %i", size);