diff options
author | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-13 01:19:04 +0000 |
---|---|---|
committer | gepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-02-13 01:19:04 +0000 |
commit | 526217d77d50dc27b0815e3d5895df7bfa38ff76 (patch) | |
tree | 9fb6152ef59b7d08e7f226fbdc47eb6ba9617cc6 /vcproj-9 | |
parent | 87469dc59de62990878ce6ccd29769ebd5b7d675 (diff) | |
download | hercules-526217d77d50dc27b0815e3d5895df7bfa38ff76.tar.gz hercules-526217d77d50dc27b0815e3d5895df7bfa38ff76.tar.bz2 hercules-526217d77d50dc27b0815e3d5895df7bfa38ff76.tar.xz hercules-526217d77d50dc27b0815e3d5895df7bfa38ff76.zip |
- Added `libconfig` (configuration file library: http://www.hyperrealm.com/libconfig/):
- Updated VS9/10 project files.
- Updated `configure` & `Makefile`s.
- New GM, Commands & Permissions system:
- '''This is a backwards compatibility breaking update''', please read tid:58877
- Replaced GM levels with Player Groups.
- Commands permissions & other privileges now depend on group, not GM level.
- `@help` command improvements: requires "commandname" param and shows more detailed info about commands.
- Modified GM whisper system to deliver messages basing on permissions, not GM level.
- Remote trade request is now possible only if player is allowed to use `@trade` command as well.
- Added a proper permission to use `/changemaptype` command.
- `clif_displaymessage` is now capable of displaying multiline messages.
- All `ACMD_FUNC`s are static now, and the only way to invoke them is with `is_atcommand()`; all client commands (starting with `/`) are now translated into corresponding atcommands (with exception of `/kick` used on monster, as there is no atcommand to kill single monster).
- Removed nonsense "bot check" triggering when player blocked (`/ex`) Server.
- Merged `@monster`, `@monsterbig` and `@monstersmall`.
- Improved flow of atcommand execution to avoid revealing info about online players or existing commands to non-privileged players.
- Merged `atcommand` and `charcommand` script functions (`charcommand` is aliased to `atcommand`).
- Fixed `atcommand` script function reading unknown memory area (possible access violation).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15572 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'vcproj-9')
-rw-r--r-- | vcproj-9/char-server_sql.vcproj | 86 | ||||
-rw-r--r-- | vcproj-9/login-server_sql.vcproj | 88 | ||||
-rw-r--r-- | vcproj-9/map-server_sql.vcproj | 140 | ||||
-rw-r--r-- | vcproj-9/mapcache.vcproj | 12 |
4 files changed, 263 insertions, 63 deletions
diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server_sql.vcproj index 06c006cd4..43b959827 100644 --- a/vcproj-9/char-server_sql.vcproj +++ b/vcproj-9/char-server_sql.vcproj @@ -43,8 +43,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST" GeneratePreprocessedFile="0" ExceptionHandling="0" BasicRuntimeChecks="3" @@ -137,8 +137,8 @@ OmitFramePointers="true" EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST" StringPooling="true" RuntimeLibrary="0" DefaultCharIsUnsigned="false" @@ -204,20 +204,84 @@ <Filter Name="3rdparty" > + <Filter + Name="mt19937ar" + > + <File + RelativePath="..\3rdparty\mt19937ar\mt19937ar.c" + > + </File> + <File + RelativePath="..\3rdparty\mt19937ar\mt19937ar.h" + > + </File> + </Filter> + <Filter + Name="libconfig" + > + <File + RelativePath="..\3rdparty\libconfig\grammar.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\grammar.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\libconfig.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\libconfig.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\parsectx.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanctx.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanctx.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanner.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanner.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\strbuf.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\strbuf.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\wincompat.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="common" + > <File - RelativePath="..\3rdparty\mt19937ar\mt19937ar.c" + RelativePath="..\src\common\cbasetypes.h" > </File> <File - RelativePath="..\3rdparty\mt19937ar\mt19937ar.h" + RelativePath="..\src\common\conf.c" > </File> - </Filter> - <Filter - Name="common" - > <File - RelativePath="..\src\common\cbasetypes.h" + RelativePath="..\src\common\conf.h" > </File> <File diff --git a/vcproj-9/login-server_sql.vcproj b/vcproj-9/login-server_sql.vcproj index d2f9d34d9..a0ce7ceae 100644 --- a/vcproj-9/login-server_sql.vcproj +++ b/vcproj-9/login-server_sql.vcproj @@ -43,8 +43,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;WITH_SQL" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;WITH_SQL" GeneratePreprocessedFile="0" ExceptionHandling="0" BasicRuntimeChecks="3" @@ -137,8 +137,8 @@ OmitFramePointers="true" EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;WITH_SQL" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST;WITH_SQL" StringPooling="true" RuntimeLibrary="0" DefaultCharIsUnsigned="false" @@ -247,6 +247,14 @@ > </File> <File + RelativePath="..\src\common\conf.c" + > + </File> + <File + RelativePath="..\src\common\conf.h" + > + </File> + <File RelativePath="..\src\common\core.c" > </File> @@ -382,14 +390,70 @@ <Filter Name="3rdparty" > - <File - RelativePath="..\3rdparty\mt19937ar\mt19937ar.c" - > - </File> - <File - RelativePath="..\3rdparty\mt19937ar\mt19937ar.h" - > - </File> + <Filter + Name="mt19937ar" + > + <File + RelativePath="..\3rdparty\mt19937ar\mt19937ar.c" + > + </File> + <File + RelativePath="..\3rdparty\mt19937ar\mt19937ar.h" + > + </File> + </Filter> + <Filter + Name="libconfig" + > + <File + RelativePath="..\3rdparty\libconfig\grammar.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\grammar.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\libconfig.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\libconfig.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\parsectx.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanctx.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanctx.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanner.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanner.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\strbuf.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\strbuf.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\wincompat.h" + > + </File> + </Filter> </Filter> </Files> <Globals> diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj index 14c807bcb..39a58e47d 100644 --- a/vcproj-9/map-server_sql.vcproj +++ b/vcproj-9/map-server_sql.vcproj @@ -42,8 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;FD_SETSIZE=4096" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST" GeneratePreprocessedFile="0" ExceptionHandling="0" BasicRuntimeChecks="3" @@ -136,8 +136,8 @@ OmitFramePointers="true" EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;FD_SETSIZE=4096" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\mysql\include;..\3rdparty\zlib\include;..\3rdparty\pcre\include;..\3rdparty\msinttypes\include;..\3rdparty\mt19937ar" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;PCRE_SUPPORT;FD_SETSIZE=4096;LIBCONFIG_STATIC;YY_USE_CONST" StringPooling="true" RuntimeLibrary="0" DefaultCharIsUnsigned="false" @@ -203,20 +203,84 @@ <Filter Name="3rdparty" > + <Filter + Name="mt19937ar" + > + <File + RelativePath="..\3rdparty\mt19937ar\mt19937ar.c" + > + </File> + <File + RelativePath="..\3rdparty\mt19937ar\mt19937ar.h" + > + </File> + </Filter> + <Filter + Name="libconfig" + > + <File + RelativePath="..\3rdparty\libconfig\grammar.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\grammar.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\libconfig.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\libconfig.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\parsectx.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanctx.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanctx.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanner.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\scanner.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\strbuf.c" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\strbuf.h" + > + </File> + <File + RelativePath="..\3rdparty\libconfig\wincompat.h" + > + </File> + </Filter> + </Filter> + <Filter + Name="common" + > <File - RelativePath="..\3rdparty\mt19937ar\mt19937ar.c" + RelativePath="..\src\common\cbasetypes.h" > </File> <File - RelativePath="..\3rdparty\mt19937ar\mt19937ar.h" + RelativePath="..\src\common\conf.c" > </File> - </Filter> - <Filter - Name="common" - > <File - RelativePath="..\src\common\cbasetypes.h" + RelativePath="..\src\common\conf.h" > </File> <File @@ -436,6 +500,14 @@ > </File> <File + RelativePath="..\src\map\config\Data\Const.h" + > + </File> + <File + RelativePath="..\src\map\config\Core.h" + > + </File> + <File RelativePath="..\src\map\date.c" > </File> @@ -452,6 +524,10 @@ > </File> <File + RelativePath="..\src\map\config\Skills\General.h" + > + </File> + <File RelativePath="..\src\map\guild.c" > </File> @@ -500,6 +576,10 @@ > </File> <File + RelativePath="..\src\map\config\Skills\Mage_Classes.h" + > + </File> + <File RelativePath="..\src\map\mail.c" > </File> @@ -576,47 +656,31 @@ > </File> <File - RelativePath="..\src\map\pet.c" + RelativePath="..\src\map\pc_groups.c" > </File> <File - RelativePath="..\src\map\pet.h" + RelativePath="..\src\map\pc_groups.h" > </File> <File - RelativePath="..\src\map\quest.c" - > - </File> - <File - RelativePath="..\src\map\quest.h" + RelativePath="..\src\map\pet.c" > </File> <File - RelativePath="..\src\map\config\Core.h" + RelativePath="..\src\map\pet.h" > </File> <File - RelativePath="..\src\map\config\Renewal.h" + RelativePath="..\src\map\quest.c" > </File> <File - RelativePath="..\src\map\config\Secure.h" + RelativePath="..\src\map\quest.h" > </File> <File - RelativePath="..\src\map\config\Data\Const.h" - > - </File> - <File - RelativePath="..\src\map\config\Skills\General.h" - > - </File> - <File - RelativePath="..\src\map\config\Skills\Mage_Classes.h" - > - </File> - <File - RelativePath="..\src\map\config\Skills\Swordsman_Classes.h" + RelativePath="..\src\map\config\Renewal.h" > </File> <File @@ -636,6 +700,10 @@ > </File> <File + RelativePath="..\src\map\config\Secure.h" + > + </File> + <File RelativePath="..\src\map\skill.c" > </File> @@ -660,6 +728,10 @@ > </File> <File + RelativePath="..\src\map\config\Skills\Swordsman_Classes.h" + > + </File> + <File RelativePath="..\src\map\trade.c" > </File> diff --git a/vcproj-9/mapcache.vcproj b/vcproj-9/mapcache.vcproj index 645ae0b5e..e13f7ab27 100644 --- a/vcproj-9/mapcache.vcproj +++ b/vcproj-9/mapcache.vcproj @@ -42,8 +42,8 @@ Name="VCCLCompilerTool" AdditionalOptions="/MP" Optimization="0" - AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\msinttypes\include" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;MINICORE" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST" GeneratePreprocessedFile="0" ExceptionHandling="0" BasicRuntimeChecks="3" @@ -135,8 +135,8 @@ OmitFramePointers="true" EnableFiberSafeOptimizations="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories="..\3rdparty\zlib\include;..\3rdparty\msinttypes\include" - PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;MINICORE" + AdditionalIncludeDirectories="..\3rdparty\libconfig;..\3rdparty\zlib\include;..\3rdparty\msinttypes\include" + PreprocessorDefinitions="WIN32;_WIN32;__WIN32;NDEBUG;MINICORE;LIBCONFIG_STATIC;YY_USE_CONST" StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="false" @@ -211,11 +211,11 @@ > </File> <File - RelativePath="..\src\common\des.h" + RelativePath="..\src\common\des.c" > </File> <File - RelativePath="..\src\common\des.c" + RelativePath="..\src\common\des.h" > </File> <File |