diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-08 10:23:24 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-02-08 10:23:24 +0000 |
| commit | f29359fcf2aa39215fa25d296b657fc4bc88f834 (patch) | |
| tree | c963dfaa831707f0839f220f964712041192092c | |
| parent | e02735add93bb769c7911976eecac42544f33736 (diff) | |
| download | hercules-f29359fcf2aa39215fa25d296b657fc4bc88f834.tar.gz hercules-f29359fcf2aa39215fa25d296b657fc4bc88f834.tar.bz2 hercules-f29359fcf2aa39215fa25d296b657fc4bc88f834.tar.xz hercules-f29359fcf2aa39215fa25d296b657fc4bc88f834.zip | |
Fixed wrong message in item group loading code (bugreport:936)
Fixed 'charisalpha' not working for the first char (bugreport:940)
Disabled signed/unsigned warnings for visual studio 2005
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12186 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 4 | ||||
| -rw-r--r-- | src/map/itemdb.c | 2 | ||||
| -rw-r--r-- | src/map/script.c | 2 | ||||
| -rw-r--r-- | vcproj-8/map-server_sql.vcproj | 1 | ||||
| -rw-r--r-- | vcproj-8/map-server_txt.vcproj | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 9f6ccf9b8..361c58a9d 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,10 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2008/02/08 + * Fixed wrong message in item group loading code (bugreport:936) + * Fixed 'charisalpha' not working for the first char (bugreport:940) + * Disabled signed/unsigned warnings for visual studio 2005 [ultramage] 2008/02/07 * Fixed the disguise commands using the wrong variable when attempting to disguise as an npc. diff --git a/src/map/itemdb.c b/src/map/itemdb.c index bce1989e5..7d2623fce 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -515,7 +515,7 @@ static void itemdb_read_itemgroup_sub(const char* filename) char w1[1024], w2[1024]; if( (fp=fopen(filename,"r"))==NULL ){ - ShowError("can't read %s\n", line); + ShowError("can't read %s\n", filename); return; } diff --git a/src/map/script.c b/src/map/script.c index e907da19d..87d0d40b0 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -11569,7 +11569,7 @@ BUILDIN_FUNC(charisalpha) const char *str=script_getstr(st,2); int pos=script_getnum(st,3); - int val = ( str && pos>0 && (unsigned int)pos<strlen(str) ) ? ISALPHA( str[pos] ) : 0; + int val = ( str && pos >= 0 && (unsigned int)pos < strlen(str) ) ? ISALPHA( str[pos] ) : 0; script_pushint(st,val); return 0; diff --git a/vcproj-8/map-server_sql.vcproj b/vcproj-8/map-server_sql.vcproj index d1cd17c8c..3298d9fb2 100644 --- a/vcproj-8/map-server_sql.vcproj +++ b/vcproj-8/map-server_sql.vcproj @@ -39,6 +39,7 @@ /> <Tool Name="VCCLCompilerTool" + AdditionalOptions="/wd4018
/wd4100" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;MAPREGSQL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" diff --git a/vcproj-8/map-server_txt.vcproj b/vcproj-8/map-server_txt.vcproj index 24069e35c..a25aa9d6c 100644 --- a/vcproj-8/map-server_txt.vcproj +++ b/vcproj-8/map-server_txt.vcproj @@ -39,7 +39,7 @@ /> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/wd4100" + AdditionalOptions="/wd4018
/wd4100" Optimization="0" AdditionalIncludeDirectories="..\src\common;..\src\zlib" PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;PCRE_SUPPORT;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" |