summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/common/grfio.c2
-rw-r--r--src/map/clif.c7
-rw-r--r--src/map/map.h2
-rw-r--r--vcproj-9/char-server_sql.vcproj4
-rw-r--r--vcproj-9/char-server_txt.vcproj4
-rw-r--r--vcproj-9/login-server_sql.vcproj4
-rw-r--r--vcproj-9/login-server_txt.vcproj4
-rw-r--r--vcproj-9/map-server_sql.vcproj4
-rw-r--r--vcproj-9/map-server_txt.vcproj20
9 files changed, 29 insertions, 22 deletions
diff --git a/src/common/grfio.c b/src/common/grfio.c
index ed2b84e3f..fe94e0803 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -270,7 +270,7 @@ int encode_zip(unsigned char* dest, unsigned long* destLen, const unsigned char*
err = deflate(&stream, Z_FINISH);
if (err != Z_STREAM_END) {
- inflateEnd(&stream);
+ deflateEnd(&stream);
return err == Z_OK ? Z_BUF_ERROR : err;
}
*destLen = stream.total_out;
diff --git a/src/map/clif.c b/src/map/clif.c
index 663ef51ea..71742011d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -2273,6 +2273,13 @@ int clif_updatestatus(struct map_session_data *sd,int type)
}
WFIFOSET(fd,len);
+ if( type == SP_SPEED )
+ {
+ char buf[256];
+ sprintf(buf, "Your walk speed is now %d", sd->battle_status.speed);
+ clif_displaymessage(fd, buf);
+ }
+
return 0;
}
diff --git a/src/map/map.h b/src/map/map.h
index 954e211b9..03e96d831 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -151,7 +151,7 @@ enum {
#define CHATROOM_TITLE_SIZE (36 + 1)
#define CHATROOM_PASS_SIZE (8 + 1)
//Max allowed chat text length
-#define CHAT_SIZE_MAX 256
+#define CHAT_SIZE_MAX (255 + 1)
#define DEFAULT_AUTOSAVE_INTERVAL 5*60*1000
diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server_sql.vcproj
index 6b97f59e7..2e42ab8b5 100644
--- a/vcproj-9/char-server_sql.vcproj
+++ b/vcproj-9/char-server_sql.vcproj
@@ -41,7 +41,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4800"
Optimization="0"
AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
@@ -56,6 +55,7 @@
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
+ DisableSpecificWarnings="4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -129,7 +129,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4800"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
@@ -146,6 +145,7 @@
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
+ DisableSpecificWarnings="4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/char-server_txt.vcproj b/vcproj-9/char-server_txt.vcproj
index cf909c7c0..d4f212564 100644
--- a/vcproj-9/char-server_txt.vcproj
+++ b/vcproj-9/char-server_txt.vcproj
@@ -41,7 +41,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4800"
Optimization="0"
AdditionalIncludeDirectories="..\src\common;..\src\zlib"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
@@ -56,6 +55,7 @@
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
+ DisableSpecificWarnings="4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -128,7 +128,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4800"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
@@ -145,6 +144,7 @@
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
+ DisableSpecificWarnings="4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/login-server_sql.vcproj b/vcproj-9/login-server_sql.vcproj
index 693216f22..80cbd73c5 100644
--- a/vcproj-9/login-server_sql.vcproj
+++ b/vcproj-9/login-server_sql.vcproj
@@ -41,7 +41,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4800"
Optimization="0"
AdditionalIncludeDirectories="..\src\common;..\src\zlib;..\src\mysql"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
@@ -56,6 +55,7 @@
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
+ DisableSpecificWarnings="4100;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -129,7 +129,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4800"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
@@ -148,6 +147,7 @@
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
+ DisableSpecificWarnings="4100;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/login-server_txt.vcproj b/vcproj-9/login-server_txt.vcproj
index 1b5a61613..78cc1d041 100644
--- a/vcproj-9/login-server_txt.vcproj
+++ b/vcproj-9/login-server_txt.vcproj
@@ -40,7 +40,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4100&#x0D;&#x0A;/wd4800"
Optimization="0"
AdditionalIncludeDirectories="..\src\common;..\src\zlib"
PreprocessorDefinitions="WIN32;_WIN32;__WIN32;_DEBUG;TXT_ONLY;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION"
@@ -55,6 +54,7 @@
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
+ DisableSpecificWarnings="4100;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -127,7 +127,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4800"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
@@ -144,6 +143,7 @@
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
+ DisableSpecificWarnings="4100;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj
index 15e1527b6..19f4d57e8 100644
--- a/vcproj-9/map-server_sql.vcproj
+++ b/vcproj-9/map-server_sql.vcproj
@@ -40,7 +40,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100&#x0D;&#x0A;/wd4800"
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"
@@ -55,6 +54,7 @@
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
+ DisableSpecificWarnings="4018;4100;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -128,7 +128,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100&#x0D;&#x0A;/wd4800"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
@@ -145,6 +144,7 @@
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
+ DisableSpecificWarnings="4018;4100;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/map-server_txt.vcproj b/vcproj-9/map-server_txt.vcproj
index 61a985d5f..5b3872dc0 100644
--- a/vcproj-9/map-server_txt.vcproj
+++ b/vcproj-9/map-server_txt.vcproj
@@ -40,7 +40,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100&#x0D;&#x0A;/wd4800"
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"
@@ -55,6 +54,7 @@
WarningLevel="3"
DebugInformationFormat="4"
CompileAs="1"
+ DisableSpecificWarnings="4018;4100;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -127,7 +127,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- AdditionalOptions="/wd4018&#x0D;&#x0A;/wd4100&#x0D;&#x0A;/wd4800"
Optimization="2"
InlineFunctionExpansion="2"
EnableIntrinsicFunctions="true"
@@ -145,6 +144,7 @@
WarningLevel="3"
DebugInformationFormat="3"
CompileAs="1"
+ DisableSpecificWarnings="4018;4100;4800"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -378,6 +378,14 @@
>
</File>
<File
+ RelativePath="..\src\map\quest.c"
+ >
+ </File>
+ <File
+ RelativePath="..\src\map\quest.h"
+ >
+ </File>
+ <File
RelativePath="..\src\map\script.c"
>
</File>
@@ -433,14 +441,6 @@
RelativePath="..\src\map\vending.h"
>
</File>
- <File
- RelativePath="..\src\map\quest.c"
- >
- </File>
- <File
- RelativePath="..\src\map\quest.h"
- >
- </File>
</Filter>
<Filter
Name="zlib"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-17 14:27:11 +0000