Skip to content

Commit

Permalink
Fixups related to moving the files to a subdirectory
Browse files Browse the repository at this point in the history
  • Loading branch information
nickgammon committed Sep 26, 2010
1 parent 814d672 commit 0665664
Show file tree
Hide file tree
Showing 32 changed files with 142 additions and 142 deletions.
2 changes: 1 addition & 1 deletion scripting/methods/methods.cpp
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\..\MUSHclient.h"

//=============================================================
// IMPORTANT - when adding methods here remember to add the 'glue'
Expand Down
16 changes: 8 additions & 8 deletions scripting/methods/methods_accelerators.cpp
@@ -1,20 +1,20 @@
// methods_accelerators.cpp - stuff for the Accelerator command and variants

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\..\MUSHclient.h"

//=============================================================
// IMPORTANT - when adding methods here remember to add the 'glue'
// routine in lua_methods.cpp and add it to the library table
// - see comments at the end of methods.cpp
//=============================================================
#include "..\doc.h"
#include "..\MUSHview.h"
#include "..\mainfrm.h"
#include "..\flags.h"
#include "errors.h"
#include "..\childfrm.h"
#include "..\sendvw.h"
#include "..\..\doc.h"
#include "..\..\MUSHview.h"
#include "..\..\mainfrm.h"
#include "..\..\flags.h"
#include "..\errors.h"
#include "..\..\childfrm.h"
#include "..\..\sendvw.h"



Expand Down
12 changes: 6 additions & 6 deletions scripting/methods/methods_aliases.cpp
Expand Up @@ -3,18 +3,18 @@
// Aliases processing

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\..\MUSHclient.h"

//=============================================================
// IMPORTANT - when adding methods here remember to add the 'glue'
// routine in lua_methods.cpp and add it to the library table
// - see comments at the end of methods.cpp
//=============================================================
#include "..\doc.h"
#include "..\MUSHview.h"
#include "..\mainfrm.h"
#include "..\flags.h"
#include "errors.h"
#include "..\..\doc.h"
#include "..\..\MUSHview.h"
#include "..\..\mainfrm.h"
#include "..\..\flags.h"
#include "..\errors.h"

// ******************************************************************************
// **************************** ALIASES ****************************************
Expand Down
6 changes: 3 additions & 3 deletions scripting/methods/methods_arrays.cpp
Expand Up @@ -3,9 +3,9 @@
// Array processing

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\errors.h"

/*
Expand Down
10 changes: 5 additions & 5 deletions scripting/methods/methods_chat.cpp
Expand Up @@ -3,17 +3,17 @@
// Stuff for the chat system

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\..\MUSHclient.h"

//=============================================================
// IMPORTANT - when adding methods here remember to add the 'glue'
// routine in lua_methods.cpp and add it to the library table
// - see comments at the end of methods.cpp
//=============================================================
#include "..\doc.h"
#include "..\MUSHview.h"
#include "..\mainfrm.h"
#include "errors.h"
#include "..\..\doc.h"
#include "..\..\MUSHview.h"
#include "..\..\mainfrm.h"
#include "..\errors.h"


#define CHATO(arg) offsetof (CChatSocket, arg), sizeof (((CChatSocket *)NULL)->arg)
Expand Down
4 changes: 2 additions & 2 deletions scripting/methods/methods_clipboard.cpp
Expand Up @@ -3,8 +3,8 @@
// Clipboard handling

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"


BSTR CMUSHclientDoc::GetClipboard()
Expand Down
8 changes: 4 additions & 4 deletions scripting/methods/methods_colours.cpp
Expand Up @@ -3,11 +3,11 @@
// To do with colour management

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\errors.h"

#include "..\dialogs\ColourPickerDlg.h"
#include "..\..\dialogs\ColourPickerDlg.h"

long CMUSHclientDoc::ColourNameToRGB(LPCTSTR Name)
{
Expand Down
12 changes: 6 additions & 6 deletions scripting/methods/methods_commands.cpp
Expand Up @@ -3,12 +3,12 @@
// Command window / command handling

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\mainfrm.h"
#include "..\sendvw.h"
#include "..\childfrm.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\..\mainfrm.h"
#include "..\..\sendvw.h"
#include "..\..\childfrm.h"
#include "..\errors.h"

extern tCommandIDMapping CommandIDs [];

Expand Down
8 changes: 4 additions & 4 deletions scripting/methods/methods_database.cpp
Expand Up @@ -3,10 +3,10 @@
// Stuff for SQLite3 database management

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\MUSHview.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\..\MUSHview.h"
#include "..\errors.h"


// Flags For File Open Operations
Expand Down
8 changes: 4 additions & 4 deletions scripting/methods/methods_defaults.cpp
Expand Up @@ -3,10 +3,10 @@
// Defaults (fonts, triggers, etc.)

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\mainfrm.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\..\mainfrm.h"
#include "..\errors.h"

extern tConfigurationNumericOption OptionsTable [];
extern tConfigurationAlphaOption AlphaOptionsTable [];
Expand Down
18 changes: 9 additions & 9 deletions scripting/methods/methods_info.cpp
Expand Up @@ -3,15 +3,15 @@
// General "information" methods

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\MUSHview.h"
#include "..\mainfrm.h"
#include "..\childfrm.h"
#include "..\sendvw.h"
#include "..\winplace.h"
#include "..\png\png.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\..\MUSHview.h"
#include "..\..\mainfrm.h"
#include "..\..\childfrm.h"
#include "..\..\sendvw.h"
#include "..\..\winplace.h"
#include "..\..\png\png.h"
#include "..\errors.h"
#include <direct.h>

extern char working_dir [_MAX_PATH];
Expand Down
8 changes: 4 additions & 4 deletions scripting/methods/methods_infobar.cpp
Expand Up @@ -3,10 +3,10 @@
// Stuff for drawing in the "info" bar

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\mainfrm.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\..\mainfrm.h"
#include "..\errors.h"


void CMUSHclientDoc::ShowInfoBar(BOOL Visible)
Expand Down
6 changes: 3 additions & 3 deletions scripting/methods/methods_logging.cpp
Expand Up @@ -3,9 +3,9 @@
// Relating to logging

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\errors.h"


long CMUSHclientDoc::OpenLog(LPCTSTR LogFileName, BOOL Append)
Expand Down
6 changes: 3 additions & 3 deletions scripting/methods/methods_mapping.cpp
Expand Up @@ -3,9 +3,9 @@
// For "mapping" (capturing speedwalks as you walk around)

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\errors.h"


long CMUSHclientDoc::AddToMapper(LPCTSTR Direction, LPCTSTR Reverse)
Expand Down
12 changes: 6 additions & 6 deletions scripting/methods/methods_miniwindows.cpp
Expand Up @@ -3,12 +3,12 @@
// Methods for miniwindows - main implementation in miniwindows.cpp

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\MUSHview.h"
#include "errors.h"
#include "..\blending.h"
#include "..\color.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\..\MUSHview.h"
#include "..\..\blending.h"
#include "..\..\color.h"
#include "..\errors.h"

/* positions:
Expand Down
16 changes: 8 additions & 8 deletions scripting/methods/methods_notepad.cpp
Expand Up @@ -3,14 +3,14 @@
// Stuff for the internal notepad window

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "errors.h"

#include "..\TextDocument.h"
#include "..\dialogs\ChooseNotepadDlg.h"
#include "..\TextView.h"
#include "..\winplace.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\errors.h"

#include "..\..\TextDocument.h"
#include "..\..\dialogs\ChooseNotepadDlg.h"
#include "..\..\TextView.h"
#include "..\..\winplace.h"

bool CMUSHclientDoc::SwitchToNotepad (void)
{
Expand Down
8 changes: 4 additions & 4 deletions scripting/methods/methods_noting.cpp
Expand Up @@ -3,10 +3,10 @@
// Stuff for writing to the output window (notes, colour notes etc.)

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\MUSHview.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\..\MUSHview.h"
#include "..\errors.h"


// world.note - makes a comment in the output buffer (with newline)
Expand Down
20 changes: 10 additions & 10 deletions scripting/methods/methods_output.cpp
Expand Up @@ -3,16 +3,16 @@
// General output (and frame) window management

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\MUSHview.h"
#include "..\mainfrm.h"
#include "errors.h"

#include "..\childfrm.h"
#include "..\sendvw.h"
#include "..\winplace.h"
#include "..\MakeWindowTransparent.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\..\MUSHview.h"
#include "..\..\mainfrm.h"
#include "..\errors.h"

#include "..\..\childfrm.h"
#include "..\..\sendvw.h"
#include "..\..\winplace.h"
#include "..\..\MakeWindowTransparent.h"


void CMUSHclientDoc::Redraw()
Expand Down
2 changes: 1 addition & 1 deletion scripting/methods/methods_panes.cpp
Expand Up @@ -4,7 +4,7 @@
// (now effectively replaced by miniwindows)

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\..\MUSHclient.h"


#ifdef PANE
Expand Down
6 changes: 3 additions & 3 deletions scripting/methods/methods_plugins.cpp
Expand Up @@ -3,9 +3,9 @@
// Plugins management

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\errors.h"

// gets our own plugin id

Expand Down
10 changes: 5 additions & 5 deletions scripting/methods/methods_sending.cpp
Expand Up @@ -3,11 +3,11 @@
// Stuff for sending things to the MUD

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\MUSHview.h"
#include "..\sendvw.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\..\MUSHview.h"
#include "..\..\sendvw.h"
#include "..\errors.h"


// world.Send - sends the text to the world
Expand Down
6 changes: 3 additions & 3 deletions scripting/methods/methods_sounds.cpp
Expand Up @@ -3,9 +3,9 @@
// Relating to playing sounds

#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\errors.h"


// world.Sound - plays a sound
Expand Down
8 changes: 4 additions & 4 deletions scripting/methods/methods_speedwalks.cpp
Expand Up @@ -4,10 +4,10 @@


#include "stdafx.h"
#include "..\MUSHclient.h"
#include "..\doc.h"
#include "..\mainfrm.h"
#include "errors.h"
#include "..\..\MUSHclient.h"
#include "..\..\doc.h"
#include "..\..\mainfrm.h"
#include "..\errors.h"


// rewritten 17th August 2002 to make it easier to follow and less buggy :)
Expand Down

0 comments on commit 0665664

Please sign in to comment.