diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-07-12 22:53:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-12 22:53:58 +0300 |
| commit | 69df5ffa970dbcafde7dbb5d360c0ea28300cb50 (patch) | |
| tree | ba5165b102784eb793da8e9cd8dc35108fbeeed0 /tools | |
| parent | 4b8dd1cdaadba7ae2200f114a4e11ef62454eaa1 (diff) | |
| parent | 14c9f5228fec75fc4e9bc8552e3fbae16f356103 (diff) | |
| download | hercules-69df5ffa970dbcafde7dbb5d360c0ea28300cb50.tar.gz hercules-69df5ffa970dbcafde7dbb5d360c0ea28300cb50.tar.bz2 hercules-69df5ffa970dbcafde7dbb5d360c0ea28300cb50.tar.xz hercules-69df5ffa970dbcafde7dbb5d360c0ea28300cb50.zip | |
Merge pull request #1290 from HerculesWS/common_interfacing
Common interfacing
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/HPMHookGen/HPMDataCheckGen.pl | 2 | ||||
| -rwxr-xr-x | tools/HPMHookGen/HPMHookGen.pl | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tools/HPMHookGen/HPMDataCheckGen.pl b/tools/HPMHookGen/HPMDataCheckGen.pl index f8712f329..e78a7bd93 100644 --- a/tools/HPMHookGen/HPMDataCheckGen.pl +++ b/tools/HPMHookGen/HPMDataCheckGen.pl @@ -47,6 +47,8 @@ foreach my $file (@files) { if ($foldername eq 'COMMON') { if ($filename eq 'MAPINDEX_H') { $plugintypes = 'SERVER_TYPE_CHAR|SERVER_TYPE_MAP'; + } elsif ($filename eq 'GRFIO_H') { + $plugintypes = 'SERVER_TYPE_MAP'; } else { $plugintypes = 'SERVER_TYPE_ALL'; } diff --git a/tools/HPMHookGen/HPMHookGen.pl b/tools/HPMHookGen/HPMHookGen.pl index 1d6a3e122..3203e0b70 100755 --- a/tools/HPMHookGen/HPMHookGen.pl +++ b/tools/HPMHookGen/HPMHookGen.pl @@ -242,6 +242,8 @@ sub parse($$) { $rtinit = ' = PACKET_UNKNOWN'; } elsif ($x =~ /^(?:enum\s+)?DBOptions$/) { # Known enum DBOptions $rtinit = ' = DB_OPT_BASE'; + } elsif ($x =~ /^enum\s+thread_priority$/) { # Known enum DBOptions + $rtinit = ' = THREADPRIO_NORMAL'; } elsif ($x eq 'DBComparator' or $x eq 'DBHasher' or $x eq 'DBReleaser') { # DB function pointers $rtinit = ' = NULL'; } elsif ($x =~ /^(?:struct|union)\s+.*$/) { # Structs and unions @@ -304,6 +306,9 @@ foreach my $file (@files) { # Loop through the xml files } elsif ($key eq "mapindex_interface") { push @servertypes, ("map", "char"); # Currently not used by the login server $servermask = 'SERVER_TYPE_MAP|SERVER_TYPE_CHAR'; + } elsif ($key eq "grfio_interface") { + push @servertypes, ("map"); # Currently not used by the login and char servers + $servermask = 'SERVER_TYPE_MAP'; } else { push @servertypes, ("map", "char", "login"); $servermask = 'SERVER_TYPE_ALL'; @@ -359,6 +364,7 @@ foreach my $file (@files) { # Loop through the xml files my $bstart = $b->{location}->[0]->{bodystart} || $b->{location}->[0]->{line}; $astart <=> $bstart } @$memberdef) { # Loop through the members + next unless $f->{kind} eq 'variable'; # Skip macros my $t = $f->{argsstring}->[0]; my $def = $f->{definition}->[0]; if ($f->{type}->[0] =~ /^\s*LoginParseFunc\s*\*\s*$/) { |