From 82bfe67b47a6f51242dec643334fb6b7e2cfaad6 Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Sat, 29 Mar 2008 13:14:18 +0000
Subject: Fixed a compilation issue with r12446 (C can't handle non-constant
initializers for static variables). Switched trunk's VS9 project files back
to "Compile as C code" (topic:183217).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12448 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
src/login/login.c | 4 +++-
src/login_sql/login.c | 4 +++-
vcproj-9/char-server_sql.vcproj | 4 ++--
vcproj-9/char-server_txt.vcproj | 4 ++--
vcproj-9/ladmin.vcproj | 4 ++--
vcproj-9/login-server_sql.vcproj | 4 ++--
vcproj-9/login-server_txt.vcproj | 4 ++--
vcproj-9/map-server_sql.vcproj | 4 ++--
vcproj-9/map-server_txt.vcproj | 4 ++--
vcproj-9/mapcache.vcproj | 4 ++--
vcproj-9/txt-converter-char.vcproj | 4 ++--
vcproj-9/txt-converter-login.vcproj | 4 ++--
12 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/login/login.c b/src/login/login.c
index 1fefb5831..d6b7eeb2e 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -45,6 +45,7 @@ int gm_account_filename_check_timer = 15; // Timer to check if GM_account file h
//Account registration flood protection [Kevin]
int allowed_regs = 1;
int time_allowed = 10; //in seconds
+unsigned int new_reg_tick = 0;
// data handling (TXT)
@@ -895,7 +896,6 @@ int mmo_auth_new(struct mmo_account* account, char sex, char* email)
int mmo_auth(struct mmo_account* account, int fd)
{
static int num_regs = 0; // registration counter
- static unsigned int new_reg_tick = gettick();
unsigned int i;
time_t raw_time;
@@ -2361,6 +2361,8 @@ int do_init(int argc, char** argv)
//##TODO invoke a CONSOLE_START plugin event
}
+ new_reg_tick = gettick();
+
// server port open & binding
login_fd = make_listen_bind(login_config.login_ip, login_config.login_port);
diff --git a/src/login_sql/login.c b/src/login_sql/login.c
index 281d2a09b..311e47e9b 100644
--- a/src/login_sql/login.c
+++ b/src/login_sql/login.c
@@ -42,6 +42,7 @@ unsigned int GM_num = 0; // number of gm accounts
//Account registration flood protection [Kevin]
int allowed_regs = 1;
int time_allowed = 10; //in seconds
+unsigned int new_reg_tick = 0;
// data handling (SQL)
@@ -391,7 +392,6 @@ bool check_password(struct login_session_data* ld, int passwdenc, const char* pa
int mmo_auth_new(struct mmo_account* account, char sex)
{
static int num_regs = 0; // registration counter
- static unsigned int new_reg_tick = gettick();
unsigned int tick = gettick();
char md5buf[32+1];
@@ -1978,6 +1978,8 @@ int do_init(int argc, char** argv)
//##TODO invoke a CONSOLE_START plugin event
}
+ new_reg_tick = gettick();
+
// server port open & binding
login_fd = make_listen_bind(login_config.login_ip, login_config.login_port);
diff --git a/vcproj-9/char-server_sql.vcproj b/vcproj-9/char-server_sql.vcproj
index b4d46301d..52ec7d7df 100644
--- a/vcproj-9/char-server_sql.vcproj
+++ b/vcproj-9/char-server_sql.vcproj
@@ -55,7 +55,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -145,7 +145,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/char-server_txt.vcproj b/vcproj-9/char-server_txt.vcproj
index ef6806380..cf909c7c0 100644
--- a/vcproj-9/char-server_txt.vcproj
+++ b/vcproj-9/char-server_txt.vcproj
@@ -55,7 +55,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -144,7 +144,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/ladmin.vcproj b/vcproj-9/ladmin.vcproj
index 69307a132..a734da38a 100644
--- a/vcproj-9/ladmin.vcproj
+++ b/vcproj-9/ladmin.vcproj
@@ -53,7 +53,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -142,7 +142,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/login-server_sql.vcproj b/vcproj-9/login-server_sql.vcproj
index ba9a6027c..693216f22 100644
--- a/vcproj-9/login-server_sql.vcproj
+++ b/vcproj-9/login-server_sql.vcproj
@@ -55,7 +55,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -147,7 +147,7 @@
PrecompiledHeaderFile=""
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/login-server_txt.vcproj b/vcproj-9/login-server_txt.vcproj
index 1ef895c32..1b5a61613 100644
--- a/vcproj-9/login-server_txt.vcproj
+++ b/vcproj-9/login-server_txt.vcproj
@@ -54,7 +54,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -143,7 +143,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj
index df0d9a7c3..d752dda68 100644
--- a/vcproj-9/map-server_sql.vcproj
+++ b/vcproj-9/map-server_sql.vcproj
@@ -54,7 +54,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -144,7 +144,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/map-server_txt.vcproj b/vcproj-9/map-server_txt.vcproj
index 567a27ccc..e80547c57 100644
--- a/vcproj-9/map-server_txt.vcproj
+++ b/vcproj-9/map-server_txt.vcproj
@@ -54,7 +54,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -144,7 +144,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/mapcache.vcproj b/vcproj-9/mapcache.vcproj
index a67a7fce8..113611965 100644
--- a/vcproj-9/mapcache.vcproj
+++ b/vcproj-9/mapcache.vcproj
@@ -53,7 +53,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -142,7 +142,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/txt-converter-char.vcproj b/vcproj-9/txt-converter-char.vcproj
index ce2ff1762..97debfe11 100644
--- a/vcproj-9/txt-converter-char.vcproj
+++ b/vcproj-9/txt-converter-char.vcproj
@@ -54,7 +54,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -145,7 +145,7 @@
PrecompiledHeaderFile=""
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/vcproj-9/txt-converter-login.vcproj b/vcproj-9/txt-converter-login.vcproj
index baf84d9e8..2b2097e11 100644
--- a/vcproj-9/txt-converter-login.vcproj
+++ b/vcproj-9/txt-converter-login.vcproj
@@ -54,7 +54,7 @@
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="4"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -145,7 +145,7 @@
PrecompiledHeaderFile=""
WarningLevel="3"
DebugInformationFormat="3"
- CompileAs="2"
+ CompileAs="1"
/>
<Tool
Name="VCManagedResourceCompilerTool"
--
cgit v1.2.3-70-g09d2