012-014.diff.bz2

Uploaded: 11 Oct, 2008
Previous uploads by this submitter: 0

Author: Quixadhal

Downloads: 20

This patch is the attempt to clean up some of the function prototype mess that is merc.h. It adds a couple of new header files, merges a couple of source files, and tries to make it a little easier to find where things are defined.

You might have noticed the jump in numbers. Don't panic, 009-013 aren't lost, I'm just trying to sync my patches to my repository revision numbers. Once everyone is on board with SVN, I'll probably stop doing this and just release patches when we hit milestones, but we're still taking baby steps, so please bear with me. :)

Here's a list of changes:

1 Removed telnet.h – use the system headers, Luke!
2 Removed extern function prototypes from all the source
files.
3 Added function prototypes for every(!) function in the
header files.
4 Created act.h for things related to any of the act_*.c
files.
5 Created special.h to hold the spec_proc stuff.
6 Merged db2.c into db.c
7 Merged magic2.c into magic.c
8 Added new include dependancies, since some things are
now in db.h, act.h, or elsewhere that isn't merc.h
9 As a result of 2-5, the DECLARE_foo() macros aren't
actually used, although they're still there. I don't
like them (it's easier to cut and paste declarations,
and then you aren't hiding how they work).
10 In the process of doing all the above, removed some
of the inconsistent blank lines.. IE: 3 lines between
foo() and foo2(), but 2 lines between foo2() and foo3().