diff options
| -rw-r--r-- | src/map/pc.c | 4 | ||||
| -rw-r--r-- | vcproj-10/char-server_sql.vcxproj | 4 | ||||
| -rw-r--r-- | vcproj-10/char-server_sql.vcxproj.filters | 6 | ||||
| -rw-r--r-- | vcproj-10/map-server_sql.vcxproj | 4 | ||||
| -rw-r--r-- | vcproj-10/map-server_sql.vcxproj.filters | 6 |
5 files changed, 20 insertions, 4 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index 7a0fc67fa..5a28f63b9 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -5574,6 +5574,10 @@ int pc_need_status_point(struct map_session_data* sd, int type, int val) return 0; low = pc_getstat(sd,type); + + if ( low >= pc_maxparameter(sd) && val > 0 ) + return 0; // Official servers show '0' when max is reached + high = low + val; if ( val < 0 ) diff --git a/vcproj-10/char-server_sql.vcxproj b/vcproj-10/char-server_sql.vcxproj index 74c6c835e..a7b57e7aa 100644 --- a/vcproj-10/char-server_sql.vcxproj +++ b/vcproj-10/char-server_sql.vcxproj @@ -154,7 +154,7 @@ <ClInclude Include="..\src\common\utils.h" /> <ClInclude Include="..\src\char\char.h" /> <ClInclude Include="..\src\char\int_auction.h" /> - <ClInclude Include="..\src\char\int_elemental.h" /> + <ClInclude Include="..\src\char\int_elemental.h" /> <ClInclude Include="..\src\char\int_guild.h" /> <ClInclude Include="..\src\char\int_homun.h" /> <ClInclude Include="..\src\char\int_mail.h" /> @@ -188,7 +188,7 @@ <ClCompile Include="..\src\common\utils.c" /> <ClCompile Include="..\src\char\char.c" /> <ClCompile Include="..\src\char\int_auction.c" /> - <ClCompile Include="..\src\char\int_elemental.c" /> + <ClCompile Include="..\src\char\int_elemental.c" /> <ClCompile Include="..\src\char\int_guild.c" /> <ClCompile Include="..\src\char\int_homun.c" /> <ClCompile Include="..\src\char\int_mail.c" /> diff --git a/vcproj-10/char-server_sql.vcxproj.filters b/vcproj-10/char-server_sql.vcxproj.filters index f47beddec..0634ea811 100644 --- a/vcproj-10/char-server_sql.vcxproj.filters +++ b/vcproj-10/char-server_sql.vcxproj.filters @@ -49,6 +49,9 @@ <ClCompile Include="..\src\char\int_auction.c"> <Filter>char_sql</Filter> </ClCompile> + <ClCompile Include="..\src\char\int_elemental.c"> + <Filter>char_sql</Filter> + </ClCompile> <ClCompile Include="..\src\char\int_guild.c"> <Filter>char_sql</Filter> </ClCompile> @@ -156,6 +159,9 @@ <ClInclude Include="..\src\char\int_auction.h"> <Filter>char_sql</Filter> </ClInclude> + <ClInclude Include="..\src\char\int_elemental.h"> + <Filter>char_sql</Filter> + </ClInclude> <ClInclude Include="..\src\char\int_guild.h"> <Filter>char_sql</Filter> </ClInclude> diff --git a/vcproj-10/map-server_sql.vcxproj b/vcproj-10/map-server_sql.vcxproj index 605f03fae..2326f5a6e 100644 --- a/vcproj-10/map-server_sql.vcxproj +++ b/vcproj-10/map-server_sql.vcxproj @@ -164,7 +164,7 @@ <ClInclude Include="..\src\map\clif.h" /> <ClInclude Include="..\src\map\date.h" /> <ClInclude Include="..\src\map\duel.h" /> - <ClInclude Include="..\src\map\elemental.h" /> + <ClInclude Include="..\src\map\elemental.h" /> <ClInclude Include="..\src\map\guild.h" /> <ClInclude Include="..\src\map\intif.h" /> <ClInclude Include="..\src\map\itemdb.h" /> @@ -232,7 +232,7 @@ <ClCompile Include="..\src\map\clif.c" /> <ClCompile Include="..\src\map\date.c" /> <ClCompile Include="..\src\map\duel.c" /> - <ClCompile Include="..\src\map\elemental.c" /> + <ClCompile Include="..\src\map\elemental.c" /> <ClCompile Include="..\src\map\guild.c" /> <ClCompile Include="..\src\map\intif.c" /> <ClCompile Include="..\src\map\itemdb.c" /> diff --git a/vcproj-10/map-server_sql.vcxproj.filters b/vcproj-10/map-server_sql.vcxproj.filters index 343c866c4..76b080658 100644 --- a/vcproj-10/map-server_sql.vcxproj.filters +++ b/vcproj-10/map-server_sql.vcxproj.filters @@ -28,6 +28,9 @@ <ClCompile Include="..\src\map\duel.c"> <Filter>map_sql</Filter> </ClCompile> + <ClCompile Include="..\src\map\elemental.c"> + <Filter>map_sql</Filter> + </ClCompile> <ClCompile Include="..\src\map\guild.c"> <Filter>map_sql</Filter> </ClCompile> @@ -210,6 +213,9 @@ <ClInclude Include="..\src\map\duel.h"> <Filter>map_sql</Filter> </ClInclude> + <ClInclude Include="..\src\map\elemental.h"> + <Filter>map_sql</Filter> + </ClInclude> <ClInclude Include="..\src\map\guild.h"> <Filter>map_sql</Filter> </ClInclude> |