zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-12 06:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some more config file fixes

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@113 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-04-25 05:01:27 +00:00
parent 2308af760d
commit 65697dbd4f
2 changed files with 72 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -196,8 +196,8 @@ void CONFIG_SetDefaults( void )
// JBF 20031211 // JBF 20031211
int32 i,f; int32 i,f;
FXDevice = -1; FXDevice = 0;
MusicDevice = -1; MusicDevice = 0;
NumVoices = 32; NumVoices = 32;
NumChannels = 2; NumChannels = 2;
NumBits = 16; NumBits = 16;
@ -251,65 +251,65 @@ void CONFIG_SetDefaults( void )
Bstrcpy(ud.ridecule[9], "AARRRGHHHHH!!!"); Bstrcpy(ud.ridecule[9], "AARRRGHHHHH!!!");
// JBF 20031211 // JBF 20031211
memset(KeyboardKeys, 0xff, sizeof(KeyboardKeys)); memset(KeyboardKeys, 0xff, sizeof(KeyboardKeys));
for (i=0; i < NUMGAMEFUNCTIONS; i+=3) { for (i=0; i < (int32)(sizeof(keydefaults)/sizeof(keydefaults[0])); i+=3) {
f = CONFIG_FunctionNameToNum( keydefaults[i+0] ); f = CONFIG_FunctionNameToNum( keydefaults[i+0] );
if (f == -1) continue; if (f == -1) continue;
KeyboardKeys[f][0] = KB_StringToScanCode( keydefaults[i+1] ); KeyboardKeys[f][0] = KB_StringToScanCode( keydefaults[i+1] );
KeyboardKeys[f][1] = KB_StringToScanCode( keydefaults[i+2] ); KeyboardKeys[f][1] = KB_StringToScanCode( keydefaults[i+2] );
if (f == gamefunc_Show_Console) OSD_CaptureKey(KeyboardKeys[f][0]); if (f == gamefunc_Show_Console) OSD_CaptureKey(KeyboardKeys[f][0]);
else CONTROL_MapKey( f, KeyboardKeys[f][0], KeyboardKeys[f][1] ); else CONTROL_MapKey( f, KeyboardKeys[f][0], KeyboardKeys[f][1] );
} }
memset(MouseFunctions, -1, sizeof(MouseFunctions)); memset(MouseFunctions, -1, sizeof(MouseFunctions));
for (i=0; i<MAXMOUSEBUTTONS; i++) { for (i=0; i<MAXMOUSEBUTTONS; i++) {
MouseFunctions[i][0] = CONFIG_FunctionNameToNum( mousedefaults[i] ); MouseFunctions[i][0] = CONFIG_FunctionNameToNum( mousedefaults[i] );
CONTROL_MapButton( MouseFunctions[i][0], i, 0, controldevice_mouse ); CONTROL_MapButton( MouseFunctions[i][0], i, 0, controldevice_mouse );
if (i<4) continue; if (i<4) continue;
MouseFunctions[i][1] = CONFIG_FunctionNameToNum( mouseclickeddefaults[i] ); MouseFunctions[i][1] = CONFIG_FunctionNameToNum( mouseclickeddefaults[i] );
CONTROL_MapButton( MouseFunctions[i][1], i, 1, controldevice_mouse ); CONTROL_MapButton( MouseFunctions[i][1], i, 1, controldevice_mouse );
} }
memset(MouseDigitalFunctions, -1, sizeof(MouseDigitalFunctions)); memset(MouseDigitalFunctions, -1, sizeof(MouseDigitalFunctions));
for (i=0; i<MAXMOUSEAXES; i++) { for (i=0; i<MAXMOUSEAXES; i++) {
MouseAnalogueScale[i] = 65536; MouseAnalogueScale[i] = 65536;
CONTROL_SetAnalogAxisScale( i, MouseAnalogueScale[i], controldevice_mouse ); CONTROL_SetAnalogAxisScale( i, MouseAnalogueScale[i], controldevice_mouse );
MouseDigitalFunctions[i][0] = CONFIG_FunctionNameToNum( mousedigitaldefaults[i*2] ); MouseDigitalFunctions[i][0] = CONFIG_FunctionNameToNum( mousedigitaldefaults[i*2] );
MouseDigitalFunctions[i][1] = CONFIG_FunctionNameToNum( mousedigitaldefaults[i*2+1] ); MouseDigitalFunctions[i][1] = CONFIG_FunctionNameToNum( mousedigitaldefaults[i*2+1] );
CONTROL_MapDigitalAxis( i, MouseDigitalFunctions[i][0], 0, controldevice_mouse ); CONTROL_MapDigitalAxis( i, MouseDigitalFunctions[i][0], 0, controldevice_mouse );
CONTROL_MapDigitalAxis( i, MouseDigitalFunctions[i][1], 1, controldevice_mouse ); CONTROL_MapDigitalAxis( i, MouseDigitalFunctions[i][1], 1, controldevice_mouse );
MouseAnalogueAxes[i] = CONFIG_AnalogNameToNum( mouseanalogdefaults[i] ); MouseAnalogueAxes[i] = CONFIG_AnalogNameToNum( mouseanalogdefaults[i] );
CONTROL_MapAnalogAxis( i, MouseAnalogueAxes[i], controldevice_mouse); CONTROL_MapAnalogAxis( i, MouseAnalogueAxes[i], controldevice_mouse);
} }
CONTROL_SetMouseSensitivity(32768); CONTROL_SetMouseSensitivity(32768);
memset(JoystickFunctions, -1, sizeof(JoystickFunctions)); memset(JoystickFunctions, -1, sizeof(JoystickFunctions));
for (i=0; i<MAXJOYBUTTONS; i++) { for (i=0; i<MAXJOYBUTTONS; i++) {
JoystickFunctions[i][0] = CONFIG_FunctionNameToNum( joystickdefaults[i] ); JoystickFunctions[i][0] = CONFIG_FunctionNameToNum( joystickdefaults[i] );
JoystickFunctions[i][1] = CONFIG_FunctionNameToNum( joystickclickeddefaults[i] ); JoystickFunctions[i][1] = CONFIG_FunctionNameToNum( joystickclickeddefaults[i] );
CONTROL_MapButton( JoystickFunctions[i][0], i, 0, controldevice_joystick ); CONTROL_MapButton( JoystickFunctions[i][0], i, 0, controldevice_joystick );
CONTROL_MapButton( JoystickFunctions[i][1], i, 1, controldevice_joystick ); CONTROL_MapButton( JoystickFunctions[i][1], i, 1, controldevice_joystick );
} }
memset(JoystickDigitalFunctions, -1, sizeof(JoystickDigitalFunctions)); memset(JoystickDigitalFunctions, -1, sizeof(JoystickDigitalFunctions));
for (i=0; i<MAXJOYAXES; i++) { for (i=0; i<MAXJOYAXES; i++) {
JoystickAnalogueScale[i] = 65536; JoystickAnalogueScale[i] = 65536;
JoystickAnalogueDead[i] = 1000; JoystickAnalogueDead[i] = 1000;
JoystickAnalogueSaturate[i] = 9500; JoystickAnalogueSaturate[i] = 9500;
CONTROL_SetAnalogAxisScale( i, JoystickAnalogueScale[i], controldevice_joystick ); CONTROL_SetAnalogAxisScale( i, JoystickAnalogueScale[i], controldevice_joystick );
JoystickDigitalFunctions[i][0] = CONFIG_FunctionNameToNum( joystickdigitaldefaults[i*2] ); JoystickDigitalFunctions[i][0] = CONFIG_FunctionNameToNum( joystickdigitaldefaults[i*2] );
JoystickDigitalFunctions[i][1] = CONFIG_FunctionNameToNum( joystickdigitaldefaults[i*2+1] ); JoystickDigitalFunctions[i][1] = CONFIG_FunctionNameToNum( joystickdigitaldefaults[i*2+1] );
CONTROL_MapDigitalAxis( i, JoystickDigitalFunctions[i][0], 0, controldevice_joystick ); CONTROL_MapDigitalAxis( i, JoystickDigitalFunctions[i][0], 0, controldevice_joystick );
CONTROL_MapDigitalAxis( i, JoystickDigitalFunctions[i][1], 1, controldevice_joystick ); CONTROL_MapDigitalAxis( i, JoystickDigitalFunctions[i][1], 1, controldevice_joystick );
JoystickAnalogueAxes[i] = CONFIG_AnalogNameToNum( joystickanalogdefaults[i] ); JoystickAnalogueAxes[i] = CONFIG_AnalogNameToNum( joystickanalogdefaults[i] );
CONTROL_MapAnalogAxis(i, JoystickAnalogueAxes[i], controldevice_joystick); CONTROL_MapAnalogAxis(i, JoystickAnalogueAxes[i], controldevice_joystick);
} }
} }
/* /*
=================== ===================
@ -544,9 +544,9 @@ void readsavenames(void)
void CONFIG_ReadSetup( void ) void CONFIG_ReadSetup( void )
{ {
int i; int32 dummy, i;
int32 dummy;
char commmacro[] = "CommbatMacro# "; char commmacro[] = "CommbatMacro# ";
extern int32 CommandWeaponChoice;
CONTROL_ClearAssignments(); CONTROL_ClearAssignments();
CONFIG_SetDefaults(); CONFIG_SetDefaults();
@ -610,25 +610,16 @@ void CONFIG_ReadSetup( void )
SCRIPT_GetNumber( scripthandle, "Misc", "MPMessageDisplayTime",&ud.msgdisptime); SCRIPT_GetNumber( scripthandle, "Misc", "MPMessageDisplayTime",&ud.msgdisptime);
ps[0].palookup = ud.pcolor[0] = ud.color; ps[0].palookup = ud.pcolor[0] = ud.color;
dummy = useprecache; SCRIPT_GetNumber( scripthandle, "Misc", "UsePrecache",&dummy); useprecache = dummy != 0; dummy = useprecache; SCRIPT_GetNumber( scripthandle, "Misc", "UsePrecache",&dummy); useprecache = dummy != 0;
if(ud.wchoice[0][0] == 0 && ud.wchoice[0][1] == 0)
{
ud.wchoice[0][0] = 3;
ud.wchoice[0][1] = 4;
ud.wchoice[0][2] = 5;
ud.wchoice[0][3] = 7;
ud.wchoice[0][4] = 8;
ud.wchoice[0][5] = 6;
ud.wchoice[0][6] = 0;
ud.wchoice[0][7] = 2;
ud.wchoice[0][8] = 9;
ud.wchoice[0][9] = 1;
for(dummy=0;dummy<10;dummy++) // weapon choices are defaulted in checkcommandline, which may override them
if (!CommandWeaponChoice)
for(i=0;i<10;i++)
{ {
Bsprintf(buf,"WeaponChoice%ld",dummy); Bsprintf(buf,"WeaponChoice%ld",i);
SCRIPT_GetNumber( scripthandle, "Misc", buf, &ud.wchoice[0][dummy]); dummy = -1;
SCRIPT_GetNumber( scripthandle, "Misc", buf, &dummy);
if (dummy >= 0) ud.wchoice[0][i] = dummy;
} }
}
SCRIPT_GetNumber( scripthandle, "Sound Setup", "FXDevice",&FXDevice); SCRIPT_GetNumber( scripthandle, "Sound Setup", "FXDevice",&FXDevice);
SCRIPT_GetNumber( scripthandle, "Sound Setup", "MusicDevice",&MusicDevice); SCRIPT_GetNumber( scripthandle, "Sound Setup", "MusicDevice",&MusicDevice);

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

@ -61,6 +61,7 @@ static int32 CommandSoundToggleOff = 0;
static int32 CommandMusicToggleOff = 0; static int32 CommandMusicToggleOff = 0;
static char *CommandMap = NULL; static char *CommandMap = NULL;
static char *CommandName = NULL; static char *CommandName = NULL;
int32 CommandWeaponChoice = 0;
char confilename[BMAX_PATH] = {"EDUKE.CON"}, boardfilename[BMAX_PATH] = {0}; char confilename[BMAX_PATH] = {"EDUKE.CON"}, boardfilename[BMAX_PATH] = {0};
char waterpal[768], slimepal[768], titlepal[768], drealms[768], endingpal[768]; char waterpal[768], slimepal[768], titlepal[768], drealms[768], endingpal[768];
@ -7458,6 +7459,16 @@ void checkcommandline(int argc,char **argv)
ud.warp_on = 0; ud.warp_on = 0;
ud.cashman = 0; ud.cashman = 0;
ud.m_player_skill = ud.player_skill = 2; ud.m_player_skill = ud.player_skill = 2;
ud.wchoice[0][0] = 3;
ud.wchoice[0][1] = 4;
ud.wchoice[0][2] = 5;
ud.wchoice[0][3] = 7;
ud.wchoice[0][4] = 8;
ud.wchoice[0][5] = 6;
ud.wchoice[0][6] = 0;
ud.wchoice[0][7] = 2;
ud.wchoice[0][8] = 9;
ud.wchoice[0][9] = 1;
if(argc > 1) if(argc > 1)
{ {
@ -7742,6 +7753,7 @@ void checkcommandline(int argc,char **argv)
break; break;
case 'u': case 'u':
case 'U': case 'U':
CommandWeaponChoice = 1;
c++; c++;
j = 0; j = 0;
if(*c) if(*c)