Commit 4dbf0632 authored by Andrew Price's avatar Andrew Price
Browse files

Remove force_list and K_BIND_FORCE

parent 88a8896c

src/client/alias.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ alias *rpc_list = NULL; 
alias *event_list = NULL;

alias *onoff_list = NULL;

alias *ipc_list = NULL;

alias *force_list = NULL;

alias *shutdown_list = NULL;

alias *eventin_list = NULL;

src/client/alias.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ extern alias *rpc_list; 
extern alias *event_list;

extern alias *onoff_list;

extern alias *ipc_list;

extern alias *force_list;

extern alias *shutdown_list;

extern alias *eventin_list;

src/client/init.c

+1 −12
Original line number Diff line number Diff line
@@ -312,18 +312,7 @@ static int ReadInitFile(const char *base, const char *filename) 
		/* allow user to bind force functions */

		if (!strcasecmp(a, "force"))

		{

			if ((b=strtok(NULL," \t\n\r"))==NULL)

			{

				printf(_("Malformed force bind in %s at line %d\n"),filename,lineno);

				free(backup);

				free(header);

				continue;

			}



			if (AddLink(&force_list, b, ""))

			{

				printf(_("Force bind already exists. Useless instruction at line %d in %s.\n"), lineno, filename);

			}

			/* force has been removed - this is a no-op */

		}else

		/* load mw-script functions */

		if (!strcasecmp(a,"function"))

src/client/js-duk.c

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ const struct binding bindings[] = { 
	{ K_BIND_ALIAS, 1, &alias_list, "Alias" },

	{ K_BIND_EVENT, 0, &event_list, "Event bind" },

	{ K_BIND_ONOFF, 0, &onoff_list, "Check on/off bind" },

	{ K_BIND_FORCE, 0, &force_list, "Force bind" },

	{ K_BIND_SHUTDOWN, 0, &shutdown_list, "Shutdown bind" },

	{ K_BIND_INPUT, 0, &eventin_list, "Input event bind" },

	{ 0, 0, NULL, NULL }

src/client/main.c

+0 −1
Original line number Diff line number Diff line
@@ -885,7 +885,6 @@ void close_down(int logofftype, char *sourceuser, char *reason) 
	DestroyAllLinks(&event_list);

	DestroyAllLinks(&onoff_list);

	DestroyAllLinks(&ipc_list);

	DestroyAllLinks(&force_list);

	DestroyAllLinks(&shutdown_list);



	ScriptCleanup();