Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Changed defaults to be specific to triggers, aliases, timers
  • Loading branch information
nickgammon committed Jul 17, 2010
1 parent 743748e commit 328e54d
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 25 deletions.
26 changes: 13 additions & 13 deletions dialogs/world_prefs/prefspropertypages.cpp
Expand Up @@ -2593,19 +2593,19 @@ void CPrefsP7::InitDialog (CDialog * pDlg)

dlg->m_pDoc = m_doc;

dlg->m_bIgnoreCase = m_doc->m_bDefaultIgnoreCase;
dlg->m_bIgnoreCase = m_doc->m_bDefaultAliasIgnoreCase;
dlg->m_bEnabled = TRUE;
dlg->m_bExpandVariables = m_doc->m_bDefaultExpandVariables;
dlg->m_bExpandVariables = m_doc->m_bDefaultAliasExpandVariables;
dlg->m_bOmitFromLogFile = FALSE;
dlg->m_bRegexp = m_doc->m_bDefaultRegexp;
dlg->m_iSequence = m_doc->m_iDefaultSequence;
dlg->m_bKeepEvaluating = m_doc->m_bDefaultKeepEvaluating;
dlg->m_bRegexp = m_doc->m_bDefaultAliasRegexp;
dlg->m_iSequence = m_doc->m_iDefaultAliasSequence;
dlg->m_bKeepEvaluating = m_doc->m_bDefaultAliasKeepEvaluating;
dlg->m_bOneShot = FALSE;
dlg->m_bEchoAlias = FALSE;
dlg->m_bOmitFromCommandHistory = FALSE;
dlg->m_bTemporary = FALSE;
// dlg->m_bDelayed = FALSE;
dlg->m_iSendTo = m_doc->m_iDefaultSendTo;
dlg->m_iSendTo = m_doc->m_iDefaultAliasSendTo;

dlg->m_pAliasMap = &m_doc->m_AliasMap;
dlg->m_current_alias = NULL;
Expand Down Expand Up @@ -3367,22 +3367,22 @@ void CPrefsP8::InitDialog (CDialog * pDlg)
dlg->m_pDoc = m_doc;

dlg->m_bUTF_8 = m_doc->m_bUTF_8;
dlg->m_ignore_case = m_doc->m_bDefaultIgnoreCase;
dlg->m_ignore_case = m_doc->m_bDefaultTriggerIgnoreCase;
dlg->m_colour = 0; // no change
dlg->m_sound_pathname = NOSOUNDLIT;
dlg->m_omit_from_log = FALSE;
dlg->m_pTriggerMap = &m_doc->m_TriggerMap;
dlg->m_current_trigger = NULL;
dlg->m_bOmitFromOutput = FALSE;
dlg->m_bKeepEvaluating = m_doc->m_bDefaultKeepEvaluating;
dlg->m_bKeepEvaluating = m_doc->m_bDefaultTriggerKeepEvaluating;
dlg->m_bOneShot = FALSE;
dlg->m_bEnabled = TRUE;
dlg->m_iClipboardArg = 0;
dlg->m_iSendTo = m_doc->m_iDefaultSendTo;
dlg->m_bRegexp = m_doc->m_bDefaultRegexp;
dlg->m_iSendTo = m_doc->m_iDefaultTriggerSendTo;
dlg->m_bRegexp = m_doc->m_bDefaultTriggerRegexp;
dlg->m_bRepeat = FALSE;
dlg->m_bExpandVariables = m_doc->m_bDefaultExpandVariables;
dlg->m_iSequence = m_doc->m_iDefaultSequence;
dlg->m_bExpandVariables = m_doc->m_bDefaultTriggerExpandVariables;
dlg->m_iSequence = m_doc->m_iDefaultTriggerSequence;
dlg->m_iMatchTextColour = 0; // any
dlg->m_iMatchBackColour = 0; // any
dlg->m_iMatchBold = 2; // any
Expand Down Expand Up @@ -5828,7 +5828,7 @@ void CPrefsP16::InitDialog (CDialog * pDlg)

dlg->m_pTimerMap = &m_doc->m_TimerMap;
dlg->m_current_timer = NULL;
dlg->m_iSendTo = m_doc->m_iDefaultSendTo;
dlg->m_iSendTo = m_doc->m_iDefaultTimerSendTo;

} // end of CPrefsP16::InitDialog

Expand Down
21 changes: 15 additions & 6 deletions doc.h
Expand Up @@ -845,12 +845,21 @@ class CMUSHclientDoc : public CDocument

// version 4.54

unsigned short m_iDefaultSendTo; // default send-to location for triggers/aliases/timers
unsigned short m_iDefaultSequence; // default sequence for triggers/aliases
unsigned short m_bDefaultRegexp; // default regular expression flag for triggers/aliases
unsigned short m_bDefaultExpandVariables; // default expand-variables flag for triggers/aliases
unsigned short m_bDefaultKeepEvaluating; // default keep-evaluating flag for triggers/aliases
unsigned short m_bDefaultIgnoreCase; // default ignore-case flag for triggers/aliases
unsigned short m_iDefaultTriggerSendTo; // default send-to location for triggers
unsigned short m_iDefaultTriggerSequence; // default sequence for triggers
unsigned short m_bDefaultTriggerRegexp; // default regular expression flag for triggers
unsigned short m_bDefaultTriggerExpandVariables; // default expand-variables flag for triggers
unsigned short m_bDefaultTriggerKeepEvaluating; // default keep-evaluating flag for triggers
unsigned short m_bDefaultTriggerIgnoreCase; // default ignore-case flag for triggers

unsigned short m_iDefaultAliasSendTo; // default send-to location for aliases
unsigned short m_iDefaultAliasSequence; // default sequence for aliases
unsigned short m_bDefaultAliasRegexp; // default regular expression flag for aliases
unsigned short m_bDefaultAliasExpandVariables; // default expand-variables flag for aliases
unsigned short m_bDefaultAliasKeepEvaluating; // default keep-evaluating flag for aliases
unsigned short m_bDefaultAliasIgnoreCase; // default ignore-case flag for aliases

unsigned short m_iDefaultTimerSendTo; // default send-to location for timers

// end of stuff saved to disk **************************************************************

Expand Down
21 changes: 15 additions & 6 deletions scriptingoptions.cpp
Expand Up @@ -73,12 +73,21 @@ tConfigurationNumericOption OptionsTable [] = {
{"ctrl_z_goes_to_end_of_buffer", false, O(m_bCtrlZGoesToEndOfBuffer)},
{"custom_16_is_default_colour", false, O(m_bCustom16isDefaultColour), 0, 0, OPT_UPDATE_VIEWS},

{"default_send_to", eSendToWorld, O(m_iDefaultSendTo), eSendToWorld, eSendToLast - 1},
{"default_sequence", DEFAULT_TRIGGER_SEQUENCE, O(m_iDefaultSequence), 0, 10000},
{"default_regexp", false, O(m_bDefaultRegexp)},
{"default_expand_variables", false, O(m_bDefaultExpandVariables)},
{"default_keep_evaluating", false, O(m_bDefaultKeepEvaluating)},
{"default_ignore_case", false, O(m_bDefaultIgnoreCase)},
{"default_trigger_send_to", eSendToWorld, O(m_iDefaultTriggerSendTo), eSendToWorld, eSendToLast - 1},
{"default_trigger_sequence", DEFAULT_TRIGGER_SEQUENCE, O(m_iDefaultTriggerSequence), 0, 10000},
{"default_trigger_regexp", false, O(m_bDefaultTriggerRegexp)},
{"default_trigger_expand_variables", false, O(m_bDefaultTriggerExpandVariables)},
{"default_trigger_keep_evaluating", false, O(m_bDefaultTriggerKeepEvaluating)},
{"default_trigger_ignore_case", false, O(m_bDefaultTriggerIgnoreCase)},

{"default_alias_send_to", eSendToWorld, O(m_iDefaultAliasSendTo), eSendToWorld, eSendToLast - 1},
{"default_alias_sequence", DEFAULT_ALIAS_SEQUENCE, O(m_iDefaultAliasSequence), 0, 10000},
{"default_alias_regexp", false, O(m_bDefaultAliasRegexp)},
{"default_alias_expand_variables", false, O(m_bDefaultAliasExpandVariables)},
{"default_alias_keep_evaluating", false, O(m_bDefaultAliasKeepEvaluating)},
{"default_alias_ignore_case", false, O(m_bDefaultAliasIgnoreCase)},

{"default_timer_send_to", eSendToWorld, O(m_iDefaultTimerSendTo), eSendToWorld, eSendToLast - 1},

{"detect_pueblo", true, O(m_bPueblo)},
{"do_not_add_macros_to_command_history",false, O(m_bDoNotAddMacrosToCommandHistory)},
Expand Down

0 comments on commit 328e54d

Please sign in to comment.