From 410579ec66f7df8757cb980c0a78e3161b7f20d5 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Wed, 30 Sep 2009 23:07:03 +0000 Subject: Change British English spellings to American English, for consistency. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1699 --- src/d_iwad.c | 2 +- src/d_iwad.h | 2 +- src/d_main.c | 4 ++-- src/d_net.h | 2 +- src/deh_defs.h | 2 +- src/deh_main.c | 4 ++-- src/deh_ptr.c | 2 +- src/deh_text.c | 2 +- src/doomdef.h | 2 +- src/i_joystick.c | 2 +- src/i_pcsound.c | 18 +++++++++--------- src/i_sdlmusic.c | 44 ++++++++++++++++++++++---------------------- src/i_sdlsound.c | 18 +++++++++--------- src/i_timer.c | 2 +- src/i_timer.h | 2 +- src/i_video.c | 22 ++++++++++++---------- src/net_client.c | 4 ++-- src/net_common.c | 4 ++-- src/net_defs.h | 4 ++-- src/net_gui.c | 2 +- src/net_loop.c | 4 ++-- src/net_sdl.c | 2 +- src/net_server.c | 14 +++++++------- src/net_server.h | 2 +- src/s_sound.c | 10 +++++----- src/s_sound.h | 6 +++--- src/w_merge.c | 2 +- 27 files changed, 93 insertions(+), 91 deletions(-) (limited to 'src') diff --git a/src/d_iwad.c b/src/d_iwad.c index d1c2f0bf..0e48420d 100644 --- a/src/d_iwad.c +++ b/src/d_iwad.c @@ -19,7 +19,7 @@ // 02111-1307, USA. // // DESCRIPTION: -// Search for and locate an IWAD file, and initialise according +// Search for and locate an IWAD file, and initialize according // to the IWAD type. // //----------------------------------------------------------------------------- diff --git a/src/d_iwad.h b/src/d_iwad.h index 281d3467..cb101305 100644 --- a/src/d_iwad.h +++ b/src/d_iwad.h @@ -19,7 +19,7 @@ // 02111-1307, USA. // // DESCRIPTION: -// Find IWAD and initialise according to IWAD type. +// Find IWAD and initialize according to IWAD type. // //----------------------------------------------------------------------------- diff --git a/src/d_main.c b/src/d_main.c index c59a8fb7..3580c346 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -666,7 +666,7 @@ static struct { NULL, NULL, 0}, }; -// Initialise the game version +// Initialize the game version static void InitGameVersion(void) { @@ -1450,7 +1450,7 @@ void D_DoomMain (void) I_Init (); #ifdef FEATURE_MULTIPLAYER - printf ("NET_Init: Initialise network subsystem.\n"); + printf ("NET_Init: Init network subsystem.\n"); NET_Init (); #endif diff --git a/src/d_net.h b/src/d_net.h index df3d2d4b..e5980a9b 100644 --- a/src/d_net.h +++ b/src/d_net.h @@ -47,7 +47,7 @@ void D_QuitNetGame (void); //? how many ticks to run? void TryRunTics (void); -// Called at start of game loop to initialise timers +// Called at start of game loop to initialize timers void D_StartGameLoop(void); extern boolean drone; diff --git a/src/deh_defs.h b/src/deh_defs.h index a6650544..e7b76182 100644 --- a/src/deh_defs.h +++ b/src/deh_defs.h @@ -41,7 +41,7 @@ struct deh_section_s { char *name; - // Called on startup to initialise code + // Called on startup to initialize code deh_section_init_t init; diff --git a/src/deh_main.c b/src/deh_main.c index 616b30e0..dcdfb00d 100644 --- a/src/deh_main.c +++ b/src/deh_main.c @@ -108,7 +108,7 @@ void DEH_Checksum(md5_digest_t digest) // Called on startup to call the Init functions -static void InitialiseSections(void) +static void InitializeSections(void) { unsigned int i; @@ -383,7 +383,7 @@ void DEH_Init(void) char *filename; int p; - InitialiseSections(); + InitializeSections(); //! // @category mod diff --git a/src/deh_ptr.c b/src/deh_ptr.c index a819ddc0..9841e38c 100644 --- a/src/deh_ptr.c +++ b/src/deh_ptr.c @@ -56,7 +56,7 @@ static void DEH_PointerInit(void) { int i; - // Initialise list of dehacked pointers + // Initialize list of dehacked pointers for (i=0; iabuf = Z_Malloc(expanded_length, PU_STATIC, &destination->abuf); - // If we can, use the standard / optimised SDL conversion routines. + // If we can, use the standard / optimized SDL conversion routines. if (samplerate <= mixer_freq && ConvertibleRatio(samplerate, mixer_freq) @@ -548,7 +548,7 @@ static void I_SDL_UpdateSoundParams(int handle, int vol, int sep) { int left, right; - if (!sound_initialised) + if (!sound_initialized) { return; } @@ -577,7 +577,7 @@ static int I_SDL_StartSound(int id, int channel, int vol, int sep) { Mix_Chunk *chunk; - if (!sound_initialised) + if (!sound_initialized) { return -1; } @@ -611,7 +611,7 @@ static int I_SDL_StartSound(int id, int channel, int vol, int sep) static void I_SDL_StopSound (int handle) { - if (!sound_initialised) + if (!sound_initialized) { return; } @@ -659,7 +659,7 @@ static void I_SDL_UpdateSound(void) static void I_SDL_ShutdownSound(void) { - if (!sound_initialised) + if (!sound_initialized) { return; } @@ -667,7 +667,7 @@ static void I_SDL_ShutdownSound(void) Mix_CloseAudio(); SDL_QuitSubSystem(SDL_INIT_AUDIO); - sound_initialised = false; + sound_initialized = false; } // Calculate slice size, based on MAX_SOUND_SLICE_TIME. @@ -721,7 +721,7 @@ static boolean I_SDL_InitSound(void) if (Mix_OpenAudio(snd_samplerate, AUDIO_S16SYS, 2, GetSliceSize()) < 0) { - fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError()); + fprintf(stderr, "Error initializing SDL_mixer: %s\n", Mix_GetError()); return false; } @@ -751,7 +751,7 @@ static boolean I_SDL_InitSound(void) SDL_PauseAudio(0); - sound_initialised = true; + sound_initialized = true; return true; } diff --git a/src/i_timer.c b/src/i_timer.c index 5fd7fba9..48be83be 100644 --- a/src/i_timer.c +++ b/src/i_timer.c @@ -76,7 +76,7 @@ void I_Sleep(int ms) void I_InitTimer(void) { - // initialise timer + // initialize timer SDL_Init(SDL_INIT_TIMER); } diff --git a/src/i_timer.h b/src/i_timer.h index 83ccecc9..d90094c8 100644 --- a/src/i_timer.h +++ b/src/i_timer.h @@ -38,7 +38,7 @@ int I_GetTimeMS (void); // Pause for a specified number of ms void I_Sleep(int ms); -// Initialise timer +// Initialize timer void I_InitTimer(void); #endif diff --git a/src/i_video.c b/src/i_video.c index 582a7fa7..5f5979d2 100644 --- a/src/i_video.c +++ b/src/i_video.c @@ -101,7 +101,7 @@ static int windowwidth, windowheight; // display has been set up? -static boolean initialised = false; +static boolean initialized = false; // disable mouse? @@ -246,7 +246,7 @@ static void UpdateFocus(void) state = SDL_GetAppState(); // We should have input (keyboard) focus and be visible - // (not minimised) + // (not minimized) window_focused = (state & SDL_APPINPUTFOCUS) && (state & SDL_APPACTIVE); @@ -396,14 +396,14 @@ static int TranslateKey(SDL_keysym *sym) void I_ShutdownGraphics(void) { - if (initialised) + if (initialized) { SDL_ShowCursor(1); SDL_WM_GrabInput(SDL_GRAB_OFF); SDL_QuitSubSystem(SDL_INIT_VIDEO); - initialised = false; + initialized = false; } } @@ -622,7 +622,7 @@ static void I_ReadMouse(void) // void I_StartTic (void) { - if (!initialised) + if (!initialized) { return; } @@ -741,7 +741,7 @@ void I_BeginRead(void) + (SCREENWIDTH - LOADING_DISK_W); int y; - if (!initialised || disk_image == NULL) + if (!initialized || disk_image == NULL) return; // save background and copy the disk image in @@ -769,7 +769,7 @@ void I_EndRead(void) + (SCREENWIDTH - LOADING_DISK_W); int y; - if (!initialised || disk_image == NULL) + if (!initialized || disk_image == NULL) return; // save background and copy the disk image in @@ -797,7 +797,7 @@ void I_FinishUpdate (void) int i; // UNUSED static unsigned char *bigscreen=0; - if (!initialised) + if (!initialized) return; if (noblit) @@ -1500,7 +1500,7 @@ void I_InitGraphics(void) if (SDL_Init(SDL_INIT_VIDEO) < 0) { - I_Error("Failed to initialise video: %s", SDL_GetError()); + I_Error("Failed to initialize video: %s", SDL_GetError()); } // Check for command-line video-related parameters. @@ -1564,6 +1564,8 @@ void I_InitGraphics(void) flags |= SDL_FULLSCREEN; } + flags |= SDL_NOFRAME; + screen = SDL_SetVideoMode(windowwidth, windowheight, 8, flags); if (screen == NULL) @@ -1679,6 +1681,6 @@ void I_InitGraphics(void) CenterMouse(); } - initialised = true; + initialized = true; } diff --git a/src/net_client.c b/src/net_client.c index 36dafe7a..0d6dd2fc 100644 --- a/src/net_client.c +++ b/src/net_client.c @@ -1152,7 +1152,7 @@ boolean NET_CL_Connect(net_addr_t *addr) client_context = NET_NewContext(); - // initialise module for client mode + // initialize module for client mode if (!addr->module->InitClient()) { @@ -1164,7 +1164,7 @@ boolean NET_CL_Connect(net_addr_t *addr) net_client_connected = true; net_client_received_wait_data = false; - // Initialise connection + // Initialize connection NET_Conn_InitClient(&client_connection, addr); diff --git a/src/net_common.c b/src/net_common.c index 5af6aaa7..da3d7fd5 100644 --- a/src/net_common.c +++ b/src/net_common.c @@ -59,7 +59,7 @@ static void NET_Conn_Init(net_connection_t *conn, net_addr_t *addr) conn->reliable_recv_seq = 0; } -// Initialise as a client connection +// Initialize as a client connection void NET_Conn_InitClient(net_connection_t *conn, net_addr_t *addr) { @@ -67,7 +67,7 @@ void NET_Conn_InitClient(net_connection_t *conn, net_addr_t *addr) conn->state = NET_CONN_STATE_CONNECTING; } -// Initialise as a server connection +// Initialize as a server connection void NET_Conn_InitServer(net_connection_t *conn, net_addr_t *addr) { diff --git a/src/net_defs.h b/src/net_defs.h index c575020f..66b17c77 100644 --- a/src/net_defs.h +++ b/src/net_defs.h @@ -45,11 +45,11 @@ struct _net_packet_s struct _net_module_s { - // Initialise this module for use as a client + // Initialize this module for use as a client boolean (*InitClient)(void); - // Initialise this module for use as a server + // Initialize this module for use as a server boolean (*InitServer)(void); diff --git a/src/net_gui.c b/src/net_gui.c index 9816346b..ed9a58e9 100644 --- a/src/net_gui.c +++ b/src/net_gui.c @@ -262,7 +262,7 @@ void NET_WaitForStart(void) { if (!TXT_Init()) { - fprintf(stderr, "Failed to initialise GUI\n"); + fprintf(stderr, "Failed to initialize GUI\n"); exit(-1); } diff --git a/src/net_loop.c b/src/net_loop.c index 890dcbf2..abba96e0 100644 --- a/src/net_loop.c +++ b/src/net_loop.c @@ -99,7 +99,7 @@ static boolean NET_CL_InitClient(void) static boolean NET_CL_InitServer(void) { - I_Error("NET_CL_InitServer: attempted to initialise client pipe end as a server!"); + I_Error("NET_CL_InitServer: attempted to initialize client pipe end as a server!"); return false; } @@ -161,7 +161,7 @@ net_module_t net_loop_client_module = static boolean NET_SV_InitClient(void) { - I_Error("NET_SV_InitClient: attempted to initialise server pipe end as a client!"); + I_Error("NET_SV_InitClient: attempted to initialize server pipe end as a client!"); return false; } diff --git a/src/net_sdl.c b/src/net_sdl.c index 92606fac..9c647cc9 100644 --- a/src/net_sdl.c +++ b/src/net_sdl.c @@ -57,7 +57,7 @@ typedef struct static addrpair_t **addr_table; static int addr_table_size = -1; -// Initialises the address table +// Initializes the address table static void NET_SDL_InitAddrTable(void) { diff --git a/src/net_server.c b/src/net_server.c index a90ed4fd..383608be 100644 --- a/src/net_server.c +++ b/src/net_server.c @@ -119,7 +119,7 @@ typedef struct } net_client_recv_t; static net_server_state_t server_state; -static boolean server_initialised = false; +static boolean server_initialized = false; static net_client_t clients[MAXNETNODES]; static net_client_t *sv_players[MAXPLAYERS]; static net_context_t *server_context; @@ -612,7 +612,7 @@ static void NET_SV_ParseSYN(net_packet_t *packet, return; } - // Activate, initialise connection + // Activate, initialize connection NET_SV_InitNewClient(client, addr, player_name); @@ -1489,13 +1489,13 @@ void NET_SV_AddModule(net_module_t *module) NET_AddModule(server_context, module); } -// Initialise server and wait for connections +// Initialize server and wait for connections void NET_SV_Init(void) { int i; - // initialise send/receive context + // initialize send/receive context server_context = NET_NewContext(); @@ -1510,7 +1510,7 @@ void NET_SV_Init(void) server_state = SERVER_WAITING_START; sv_gamemode = indetermined; - server_initialised = true; + server_initialized = true; } // Run server code to check for new packets/send packets as the server @@ -1522,7 +1522,7 @@ void NET_SV_Run(void) net_packet_t *packet; int i; - if (!server_initialised) + if (!server_initialized) { return; } @@ -1564,7 +1564,7 @@ void NET_SV_Shutdown(void) boolean running; int start_time; - if (!server_initialised) + if (!server_initialized) { return; } diff --git a/src/net_server.h b/src/net_server.h index 3d0cf6e4..93b22fc3 100644 --- a/src/net_server.h +++ b/src/net_server.h @@ -24,7 +24,7 @@ #ifndef NET_SERVER_H #define NET_SERVER_H -// initialise server and wait for connections +// initialize server and wait for connections void NET_SV_Init(void); diff --git a/src/s_sound.c b/src/s_sound.c index 70fa75f3..9b4f71aa 100644 --- a/src/s_sound.c +++ b/src/s_sound.c @@ -176,7 +176,7 @@ static boolean SndDeviceInList(snddevice_t device, snddevice_t *list, return false; } -// Find and initialise a sound_module_t appropriate for the setting +// Find and initialize a sound_module_t appropriate for the setting // in snd_sfxdevice. static void InitSfxModule(void) @@ -194,7 +194,7 @@ static void InitSfxModule(void) sound_modules[i]->sound_devices, sound_modules[i]->num_sound_devices)) { - // Initialise the module + // Initialize the module if (sound_modules[i]->Init()) { @@ -205,7 +205,7 @@ static void InitSfxModule(void) } } -// Initialise music according to snd_musicdevice. +// Initialize music according to snd_musicdevice. static void InitMusicModule(void) { @@ -222,7 +222,7 @@ static void InitMusicModule(void) music_modules[i]->sound_devices, music_modules[i]->num_sound_devices)) { - // Initialise the module + // Initialize the module if (music_modules[i]->Init()) { @@ -268,7 +268,7 @@ void S_Init(int sfxVolume, int musicVolume) nomusic = M_CheckParm("-nomusic") > 0; - // Initialise the sound and music subsystems. + // Initialize the sound and music subsystems. if (!nosound && !screensaver_mode) { diff --git a/src/s_sound.h b/src/s_sound.h index 67071338..b8d0e766 100644 --- a/src/s_sound.h +++ b/src/s_sound.h @@ -54,8 +54,8 @@ typedef struct snddevice_t *sound_devices; int num_sound_devices; - // Initialise sound module - // Returns true if successfully initialised + // Initialize sound module + // Returns true if successfully initialized boolean (*Init)(void); @@ -99,7 +99,7 @@ typedef struct snddevice_t *sound_devices; int num_sound_devices; - // Initialise the music subsystem + // Initialize the music subsystem boolean (*Init)(void); diff --git a/src/w_merge.c b/src/w_merge.c index 372b3583..6b6ae659 100644 --- a/src/w_merge.c +++ b/src/w_merge.c @@ -143,7 +143,7 @@ static void SetupLists(void) SetupList(&pwad_sprites, &pwad, "S_START", "S_END", "SS_START", "SS_END"); } -// Initialise the replace list +// Initialize the replace list static void InitSpriteList(void) { -- cgit v1.2.3