Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved the options to disable specific compiler warnings from the generic 'AdditionalOptions' to the appropriate 'DisableSpecificWarnings' section.

Browse Source 
Corrected an ancient mistake in the grfio/zlib code (calling inflateEnd in case of an error during the Deflate process).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12726 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-05-26 12:16:53 +00:00
parent 6b904e34cb
commit 2ecdab9606
9 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/grfio.c
View File

@ -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;

7
src/map/clif.c
View File

@ -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;
}

2
src/map/map.h
View File

@ -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

4
vcproj-9/char-server_sql.vcproj
View File

@ -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"

4
vcproj-9/char-server_txt.vcproj
View File

@ -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"

4
vcproj-9/login-server_sql.vcproj
View File

@ -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"

4
vcproj-9/login-server_txt.vcproj
View File

@ -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"

4
vcproj-9/map-server_sql.vcproj
View File

@ -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"

20
vcproj-9/map-server_txt.vcproj
View File

@ -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"
@ -377,6 +377,14 @@
RelativePath="..\src\map\pet.h"
>
</File>
<File
RelativePath="..\src\map\quest.c"
>
</File>
<File
RelativePath="..\src\map\quest.h"
>
</File>
<File
RelativePath="..\src\map\script.c"
>
@ -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"