Follow up a24da6d, (bugreport:9135)

- Fixed compile error
- Added filters for MSVS
Follow up 237579c

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>

src/login/loginchrif.c

@@ -203,9 +203,9 @@ int logchrif_send_accdata(int fd, uint32 aid) {
 	int bank_vault = 0;
 	char isvip = false;
 	uint8 char_slots = MIN_CHARS, char_vip = 0;
+	AccountDB* accounts = login_get_accounts_db();
 
 	memset(pincode,0,PINCODE_LENGTH+1);
-	AccountDB* accounts = login_get_accounts_db();
 	if( !accounts->load_num(accounts, &acc, aid) )
 		return -1;
 	else {
@@ -353,9 +353,10 @@ int logchrif_parse_requpdaccstate(int fd, int id, char* ip){
 
 		int account_id = RFIFOL(fd,2);
 		unsigned int state = RFIFOL(fd,6);
+		AccountDB* accounts = login_get_accounts_db();
+
 		RFIFOSKIP(fd,10);
 
-		AccountDB* accounts = login_get_accounts_db();
 		if( !accounts->load_num(accounts, &acc, account_id) )
 			ShowNotice("Char-server '%s': Error of Status change (account: %d not found, suggested status %d, ip: %s).\n", ch_server[id].name, account_id, state, ip);
 		else if( acc.state == state )
@@ -741,9 +742,10 @@ int logchrif_parse_bankvault(int fd, int id, char* ip){
 		int account_id = RFIFOL(fd,2);
 		char type = RFIFOB(fd,6);
 		int32 data = RFIFOL(fd,7);
+		AccountDB* accounts = login_get_accounts_db();
+
 		RFIFOSKIP(fd,11);
 
-		AccountDB* accounts = login_get_accounts_db();
 		if( !accounts->load_num(accounts, &acc, account_id) )
 			ShowNotice("Char-server '%s': Error on banking  (account: %d not found, ip: %s).\n", ch_server[id].name, account_id, ip);
 		else{

src/map/battle.c

@@ -4869,7 +4869,7 @@ static struct Damage battle_calc_weapon_attack(struct block_list *src, struct bl
 		}
 #else
 		// final attack bonuses that aren't affected by cards
-		wd = battle_attack_sc_bonus(wd, src, target, skill_id);
+		wd = battle_attack_sc_bonus(wd, src, skill_id);
 #endif
 
 		if (wd.damage + wd.damage2) { //Check if attack ignores DEF

vcproj-10/login-server_sql.vcxproj.filters

@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\src\login\account_sql.c">
+    <ClCompile Include="..\src\login\account.c">
       <Filter>login_sql</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\login\ipban_sql.c">
+    <ClCompile Include="..\src\login\ipban.c">
       <Filter>login_sql</Filter>
     </ClCompile>
     <ClCompile Include="..\src\login\login.c">
       <Filter>login_sql</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\login\loginlog_sql.c">
+    <ClCompile Include="..\src\login\loginchrif.c">
+      <Filter>login_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\login\loginclif.c">
+      <Filter>login_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\login\logincnslif.c">
+      <Filter>login_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\login\loginlog.c">
       <Filter>login_sql</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\core.c">
@@ -95,10 +104,19 @@
     <ClInclude Include="..\src\login\ipban.h">
       <Filter>login_sql</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\login\loginlog.h">
+    <ClInclude Include="..\src\login\login.h">
       <Filter>login_sql</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\login\login.h">
+    <ClInclude Include="..\src\login\loginchrif.h">
+      <Filter>login_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\login\loginclif.h">
+      <Filter>login_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\login\logincnslif.h">
+      <Filter>login_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\login\loginlog.h">
       <Filter>login_sql</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\cbasetypes.h">

vcproj-12/login-server_sql.vcxproj.filters

@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\src\login\account_sql.c">
+    <ClCompile Include="..\src\login\account.c">
       <Filter>login_sql</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\login\ipban_sql.c">
+    <ClCompile Include="..\src\login\ipban.c">
       <Filter>login_sql</Filter>
     </ClCompile>
     <ClCompile Include="..\src\login\login.c">
       <Filter>login_sql</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\login\loginlog_sql.c">
+    <ClCompile Include="..\src\login\loginchrif.c">
+      <Filter>login_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\login\loginclif.c">
+      <Filter>login_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\login\logincnslif.c">
+      <Filter>login_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\login\loginlog.c">
       <Filter>login_sql</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\core.c">
@@ -93,10 +102,19 @@
     <ClInclude Include="..\src\login\ipban.h">
       <Filter>login_sql</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\login\loginlog.h">
+    <ClInclude Include="..\src\login\login.h">
       <Filter>login_sql</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\login\login.h">
+    <ClInclude Include="..\src\login\loginchrif.h">
+      <Filter>login_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\login\loginclif.h">
+      <Filter>login_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\login\logincnslif.h">
+      <Filter>login_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\login\loginlog.h">
       <Filter>login_sql</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\cbasetypes.h">

vcproj-13/login-server_sql.vcxproj.filters

@@ -1,16 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\src\login\account_sql.c">
+    <ClCompile Include="..\src\login\account.c">
       <Filter>login_sql</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\login\ipban_sql.c">
+    <ClCompile Include="..\src\login\ipban.c">
       <Filter>login_sql</Filter>
     </ClCompile>
     <ClCompile Include="..\src\login\login.c">
       <Filter>login_sql</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\login\loginlog_sql.c">
+    <ClCompile Include="..\src\login\loginchrif.c">
+      <Filter>login_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\login\loginclif.c">
+      <Filter>login_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\login\logincnslif.c">
+      <Filter>login_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\login\loginlog.c">
       <Filter>login_sql</Filter>
     </ClCompile>
     <ClCompile Include="..\src\common\core.c">
@@ -95,10 +104,19 @@
     <ClInclude Include="..\src\login\ipban.h">
       <Filter>login_sql</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\login\loginlog.h">
+    <ClInclude Include="..\src\login\login.h">
       <Filter>login_sql</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\login\login.h">
+    <ClInclude Include="..\src\login\loginchrif.h">
+      <Filter>login_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\login\loginclif.h">
+      <Filter>login_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\login\logincnslif.h">
+      <Filter>login_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\login\loginlog.h">
       <Filter>login_sql</Filter>
     </ClInclude>
     <ClInclude Include="..\src\common\cbasetypes.h">
@@ -208,4 +226,4 @@
       <UniqueIdentifier>{779e8145-9bb2-4a88-9149-60586ab0bdd4}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
+</Project>