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://svn.code.sf.net/p/rathena/svn/trunk@12448 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
dc1924cdb3
commit
7b3fbf72a8
@ -45,6 +45,7 @@ int gm_account_filename_check_timer = 15; // Timer to check if GM_account file h
|
|||||||
//Account registration flood protection [Kevin]
|
//Account registration flood protection [Kevin]
|
||||||
int allowed_regs = 1;
|
int allowed_regs = 1;
|
||||||
int time_allowed = 10; //in seconds
|
int time_allowed = 10; //in seconds
|
||||||
|
unsigned int new_reg_tick = 0;
|
||||||
|
|
||||||
|
|
||||||
// data handling (TXT)
|
// 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)
|
int mmo_auth(struct mmo_account* account, int fd)
|
||||||
{
|
{
|
||||||
static int num_regs = 0; // registration counter
|
static int num_regs = 0; // registration counter
|
||||||
static unsigned int new_reg_tick = gettick();
|
|
||||||
|
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
time_t raw_time;
|
time_t raw_time;
|
||||||
@ -2361,6 +2361,8 @@ int do_init(int argc, char** argv)
|
|||||||
//##TODO invoke a CONSOLE_START plugin event
|
//##TODO invoke a CONSOLE_START plugin event
|
||||||
}
|
}
|
||||||
|
|
||||||
|
new_reg_tick = gettick();
|
||||||
|
|
||||||
// server port open & binding
|
// server port open & binding
|
||||||
login_fd = make_listen_bind(login_config.login_ip, login_config.login_port);
|
login_fd = make_listen_bind(login_config.login_ip, login_config.login_port);
|
||||||
|
|
||||||
|
@ -42,6 +42,7 @@ unsigned int GM_num = 0; // number of gm accounts
|
|||||||
//Account registration flood protection [Kevin]
|
//Account registration flood protection [Kevin]
|
||||||
int allowed_regs = 1;
|
int allowed_regs = 1;
|
||||||
int time_allowed = 10; //in seconds
|
int time_allowed = 10; //in seconds
|
||||||
|
unsigned int new_reg_tick = 0;
|
||||||
|
|
||||||
|
|
||||||
// data handling (SQL)
|
// 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)
|
int mmo_auth_new(struct mmo_account* account, char sex)
|
||||||
{
|
{
|
||||||
static int num_regs = 0; // registration counter
|
static int num_regs = 0; // registration counter
|
||||||
static unsigned int new_reg_tick = gettick();
|
|
||||||
|
|
||||||
unsigned int tick = gettick();
|
unsigned int tick = gettick();
|
||||||
char md5buf[32+1];
|
char md5buf[32+1];
|
||||||
@ -1978,6 +1978,8 @@ int do_init(int argc, char** argv)
|
|||||||
//##TODO invoke a CONSOLE_START plugin event
|
//##TODO invoke a CONSOLE_START plugin event
|
||||||
}
|
}
|
||||||
|
|
||||||
|
new_reg_tick = gettick();
|
||||||
|
|
||||||
// server port open & binding
|
// server port open & binding
|
||||||
login_fd = make_listen_bind(login_config.login_ip, login_config.login_port);
|
login_fd = make_listen_bind(login_config.login_ip, login_config.login_port);
|
||||||
|
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
@ -145,7 +145,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
@ -144,7 +144,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
@ -142,7 +142,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -55,7 +55,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
@ -147,7 +147,7 @@
|
|||||||
PrecompiledHeaderFile=""
|
PrecompiledHeaderFile=""
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
@ -143,7 +143,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
@ -144,7 +144,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
@ -144,7 +144,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
@ -142,7 +142,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
@ -145,7 +145,7 @@
|
|||||||
PrecompiledHeaderFile=""
|
PrecompiledHeaderFile=""
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
UsePrecompiledHeader="0"
|
UsePrecompiledHeader="0"
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="4"
|
DebugInformationFormat="4"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
@ -145,7 +145,7 @@
|
|||||||
PrecompiledHeaderFile=""
|
PrecompiledHeaderFile=""
|
||||||
WarningLevel="3"
|
WarningLevel="3"
|
||||||
DebugInformationFormat="3"
|
DebugInformationFormat="3"
|
||||||
CompileAs="2"
|
CompileAs="1"
|
||||||
/>
|
/>
|
||||||
<Tool
|
<Tool
|
||||||
Name="VCManagedResourceCompilerTool"
|
Name="VCManagedResourceCompilerTool"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user