diff options
Diffstat (limited to 'src/g_game.c')
| -rw-r--r-- | src/g_game.c | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/src/g_game.c b/src/g_game.c index ebc75e97..81ae6de9 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -1,7 +1,7 @@ // Emacs style mode select -*- C++ -*- //----------------------------------------------------------------------------- // -// $Id: g_game.c 98 2005-09-11 20:25:56Z fraggle $ +// $Id: g_game.c 110 2005-09-17 20:25:56Z fraggle $ // // Copyright(C) 1993-1996 Id Software, Inc. // Copyright(C) 2005 Simon Howard @@ -22,6 +22,11 @@ // 02111-1307, USA. // // $Log$ +// Revision 1.10 2005/09/17 20:25:56 fraggle +// Set the default values for variables in their initialisers. Remove the +// "defaultvalue" parameter and associated code from the configuration +// file parsing code. +// // Revision 1.9 2005/09/11 20:25:56 fraggle // Second configuration file to allow chocolate doom-specific settings. // Adjust some existing command line logic (for graphics settings and @@ -61,7 +66,7 @@ static const char -rcsid[] = "$Id: g_game.c 98 2005-09-11 20:25:56Z fraggle $"; +rcsid[] = "$Id: g_game.c 110 2005-09-17 20:25:56Z fraggle $"; #include <string.h> #include <stdlib.h> @@ -183,34 +188,34 @@ byte* savebuffer; // -// controls (have defaults) +// Controls // -int key_right; -int key_left; - -int key_up; -int key_down; -int key_strafeleft; -int key_straferight; -int key_fire; -int key_use; -int key_strafe; -int key_speed; - -int mousebfire; -int mousebstrafe; -int mousebforward; - -int joybfire; -int joybstrafe; -int joybuse; -int joybspeed; +int key_right = KEY_RIGHTARROW; +int key_left = KEY_LEFTARROW; + +int key_up = KEY_UPARROW; +int key_down = KEY_DOWNARROW; +int key_strafeleft = ','; +int key_straferight = '.'; +int key_fire = KEY_RCTRL; +int key_use = ' '; +int key_strafe = KEY_RALT; +int key_speed = KEY_RSHIFT; + +int mousebfire = 0; +int mousebstrafe = 1; +int mousebforward = 2; + +int joybfire = 0; +int joybstrafe = 1; +int joybuse = 3; +int joybspeed = 2; // fraggle: Disallow mouse and joystick movement to cause forward/backward // motion. Specified with the '-novert' command line parameter. // This is an int to allow saving to config file -int novert; +int novert = 0; |