summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/char_sql/int_mercenary.c3
-rw-r--r--vcproj-8/txt-converter-char.vcproj24
-rw-r--r--vcproj-9/txt-converter-char.vcproj24
3 files changed, 51 insertions, 0 deletions
diff --git a/src/char_sql/int_mercenary.c b/src/char_sql/int_mercenary.c
index b6c4d6313..dfb6dd880 100644
--- a/src/char_sql/int_mercenary.c
+++ b/src/char_sql/int_mercenary.c
@@ -136,6 +136,8 @@ bool mapif_mercenary_delete(int merc_id)
return true;
}
+#ifndef TXT_SQL_CONVERT
+
static void mapif_mercenary_send(int fd, struct s_mercenary *merc, unsigned char flag)
{
int size = sizeof(struct s_mercenary) + 5;
@@ -216,3 +218,4 @@ int inter_mercenary_parse_frommap(int fd)
}
return 1;
}
+#endif //TXT_SQL_CONVERT
diff --git a/vcproj-8/txt-converter-char.vcproj b/vcproj-8/txt-converter-char.vcproj
index a30463c22..91dfa8f03 100644
--- a/vcproj-8/txt-converter-char.vcproj
+++ b/vcproj-8/txt-converter-char.vcproj
@@ -375,6 +375,30 @@
>
</File>
<File
+ RelativePath="..\src\char_sql\int_mercenary.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)_sql.obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)_sql.obj"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\char_sql\int_mercenary.h"
+ >
+ </File>
+ <File
RelativePath="..\src\char_sql\int_party.c"
>
<FileConfiguration
diff --git a/vcproj-9/txt-converter-char.vcproj b/vcproj-9/txt-converter-char.vcproj
index 31a48cc8b..329cd2f8d 100644
--- a/vcproj-9/txt-converter-char.vcproj
+++ b/vcproj-9/txt-converter-char.vcproj
@@ -380,6 +380,30 @@
>
</File>
<File
+ RelativePath="..\src\char_sql\int_mercenary.c"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)_sql.obj"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)_sql.obj"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\src\char_sql\int_mercenary.h"
+ >
+ </File>
+ <File
RelativePath="..\src\char_sql\int_party.c"
>
<FileConfiguration