diff options
author | Simon Howard | 2009-10-01 01:10:17 +0000 |
---|---|---|
committer | Simon Howard | 2009-10-01 01:10:17 +0000 |
commit | 06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7 (patch) | |
tree | 91532a8428caeba2c2ba3ba21b8299a5dfad79a5 /setup | |
parent | 4a70f989d2aacabffc2f02017704de042be7418a (diff) | |
parent | 508c3fd3fa5b3149d329e15ea3e072ad2a7aa2f2 (diff) | |
download | chocolate-doom-06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7.tar.gz chocolate-doom-06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7.tar.bz2 chocolate-doom-06c73f7a43b0b569c63fb1153e9f8da25f3ddfb7.zip |
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1702
Diffstat (limited to 'setup')
-rw-r--r-- | setup/joystick.c | 2 | ||||
-rw-r--r-- | setup/mainmenu.c | 6 | ||||
-rw-r--r-- | setup/multiplayer.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/setup/joystick.c b/setup/joystick.c index fa59c559..867fa5c2 100644 --- a/setup/joystick.c +++ b/setup/joystick.c @@ -34,7 +34,7 @@ typedef enum CALIBRATE_UP, } calibration_stage_t; -// SDL joystick successfully initialised? +// SDL joystick successfully initialized? static int joystick_initted = 0; diff --git a/setup/mainmenu.c b/setup/mainmenu.c index c7e4f48d..ba85ca1f 100644 --- a/setup/mainmenu.c +++ b/setup/mainmenu.c @@ -138,7 +138,7 @@ void MainMenu(void) } // -// Initialise all configuration variables, load config file, etc +// Initialize all configuration variables, load config file, etc // static void InitConfig(void) @@ -194,7 +194,7 @@ static void SetIcon(void) } // -// Initialise and run the textscreen GUI. +// Initialize and run the textscreen GUI. // static void RunGUI(void) @@ -203,7 +203,7 @@ static void RunGUI(void) if (!TXT_Init()) { - fprintf(stderr, "Failed to initialise GUI\n"); + fprintf(stderr, "Failed to initialize GUI\n"); exit(-1); } diff --git a/setup/multiplayer.c b/setup/multiplayer.c index ee46c3f1..c5d0d1e9 100644 --- a/setup/multiplayer.c +++ b/setup/multiplayer.c @@ -716,7 +716,7 @@ void SetChatMacroDefaults(void) HUSTR_CHATMACRO0, }; - // If the chat macros have not been set, initialise with defaults. + // If the chat macros have not been set, initialize with defaults. for (i=0; i<10; ++i) { |