From dac1c2d2dff052393c2fd10d7300be30a105a87b Mon Sep 17 00:00:00 2001
From: ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Fri, 1 Aug 2008 07:05:16 +0000
Subject: [PATCH] Removed unused guardian hp columns from the guild castles
table in main.sql (should have been done in r11915). Corrected incorrect use
of the datetime column in the `login` table (bugreport:1962). Refreshed txt
account savefile. Cleaned up some random minor source code glitches.
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@13030 54d463be-8e91-2dee-dedb-b68131a5f0ec
---
Changelog-Trunk.txt | 3 ++-
save-tmpl/account.txt | 12 ++++++------
sql-files/main.sql | 8 --------
src/char_sql/int_quest.c | 1 -
src/login/login.c | 2 +-
src/map/script.c | 5 -----
src/map/script.h | 9 ++++++++-
src/map/skill.c | 2 +-
src/map/unit.c | 2 +-
9 files changed, 19 insertions(+), 25 deletions(-)
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 8a6ff63204..95c3753de0 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,8 +4,9 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/08/01
+ * Removed unused guardian hp columns from the castles table in main.sql.
+ * Corrected incorrect use of the datetime column in the `login` table. [ultramage]
* Quagmire now will affect boss monsters, but more info is required to code the debuff exceptions properly. [Brainstorm]
-
2008/07/31
* Fixed: added 'E'-type zenylogs in sql table (bugreport:1957) [akrus]
- added sql file upgrade_svn13025_log.sql
diff --git a/save-tmpl/account.txt b/save-tmpl/account.txt
index 43299d089a..c69de9a544 100644
--- a/save-tmpl/account.txt
+++ b/save-tmpl/account.txt
@@ -7,10 +7,10 @@
// state : 0: account is ok, 1 to 256: error code of packet 0x006a + 1
// unban time : 0: no ban, <other value>: banned until the date (unix timestamp)
// expiration time : 0: unlimited account, <other value>: account expires on the date (unix timestamp)
-1 s1 p1 S a@a.com 0 0 0 0 0 - -
-2 s2 p2 S a@a.com 0 0 0 0 0 - -
-3 s3 p3 S a@a.com 0 0 0 0 0 - -
-4 s4 p4 S a@a.com 0 0 0 0 0 - -
-5 s5 p5 S a@a.com 0 0 0 0 0 - -
-2000001 Test Test M a@a.com 0 0 0 0 0 - -
+1 s1 p1 S a@a.com 0 0 0 0 0 0000-00-00 00:00:00 -
+2 s2 p2 S a@a.com 0 0 0 0 0 0000-00-00 00:00:00 -
+3 s3 p3 S a@a.com 0 0 0 0 0 0000-00-00 00:00:00 -
+4 s4 p4 S a@a.com 0 0 0 0 0 0000-00-00 00:00:00 -
+5 s5 p5 S a@a.com 0 0 0 0 0 0000-00-00 00:00:00 -
+2000001 Test Test M a@a.com 0 0 0 0 0 0000-00-00 00:00:00 -
2000002 %newid%
diff --git a/sql-files/main.sql b/sql-files/main.sql
index 5b9f1a3131..172312f8f7 100644
--- a/sql-files/main.sql
+++ b/sql-files/main.sql
@@ -239,14 +239,6 @@ CREATE TABLE `guild_castle` (
`visibleG5` int(11) unsigned NOT NULL default '0',
`visibleG6` int(11) unsigned NOT NULL default '0',
`visibleG7` int(11) unsigned NOT NULL default '0',
- `gHP0` int(11) unsigned NOT NULL default '0',
- `ghP1` int(11) unsigned NOT NULL default '0',
- `gHP2` int(11) unsigned NOT NULL default '0',
- `gHP3` int(11) unsigned NOT NULL default '0',
- `gHP4` int(11) unsigned NOT NULL default '0',
- `gHP5` int(11) unsigned NOT NULL default '0',
- `gHP6` int(11) unsigned NOT NULL default '0',
- `gHP7` int(11) unsigned NOT NULL default '0',
PRIMARY KEY (`castle_id`),
KEY `guild_id` (`guild_id`)
) ENGINE=MyISAM;
diff --git a/src/char_sql/int_quest.c b/src/char_sql/int_quest.c
index e198754f65..53c2d3cda3 100644
--- a/src/char_sql/int_quest.c
+++ b/src/char_sql/int_quest.c
@@ -41,7 +41,6 @@ int mapif_quests_fromsql(int char_id, struct quest questlog[])
|| SQL_ERROR == SqlStmt_Execute(stmt)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 0, SQLDT_INT, &tmp_quest.quest_id, 0, NULL, NULL)
|| SQL_ERROR == SqlStmt_BindColumn(stmt, 1, SQLDT_INT, &tmp_quest.state, 0, NULL, NULL) )
- //|| SQL_ERROR == SqlStmt_BindColumn(stmt, 2, SQLDT_INT, &tmp_quest.time, 0, NULL, NULL)
SqlStmt_ShowDebug(stmt);
for( i = 0; i < MAX_QUEST && SQL_SUCCESS == SqlStmt_NextRow(stmt); ++i )
diff --git a/src/login/login.c b/src/login/login.c
index a36502194f..9bcc5ba790 100644
--- a/src/login/login.c
+++ b/src/login/login.c
@@ -913,7 +913,7 @@ int mmo_auth_new(const char* userid, const char* pass, const char sex, const cha
acc.sex = sex;
safestrncpy(acc.email, "a@a.com", sizeof(acc.email));
acc.expiration_time = ( login_config.start_limited_time != -1 ) ? time(NULL) + login_config.start_limited_time : 0;
- safestrncpy(acc.lastlogin, "-", sizeof(acc.lastlogin));
+ safestrncpy(acc.lastlogin, "0000-00-00 00:00:00", sizeof(acc.lastlogin));
safestrncpy(acc.last_ip, last_ip, sizeof(acc.last_ip));
if( !accounts->create(accounts, &acc) )
diff --git a/src/map/script.c b/src/map/script.c
index c9839a9529..68828db85c 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2067,11 +2067,6 @@ struct script_code* parse_script(const char *src,const char *file,int line,int o
return code;
}
-//
-// Script state
-//
-enum {RUN = 0,STOP,END,RERUNLINE,GOTO,RETFUNC};
-
/// Returns the player attached to this script, identified by the rid.
/// If there is no player attached, the script is terminated.
TBL_PC *script_rid2sd(struct script_state *st)
diff --git a/src/map/script.h b/src/map/script.h
index 981c5b9855..d4225d8f8b 100644
--- a/src/map/script.h
+++ b/src/map/script.h
@@ -90,10 +90,17 @@ struct script_stack {
struct linkdb_node **var_function; // ���ˑ��ϐ�
};
+
+//
+// Script state
+//
+enum e_script_state { RUN,STOP,END,RERUNLINE,GOTO,RETFUNC };
+
struct script_state {
struct script_stack* stack;
int start,end;
- int pos,state;
+ int pos;
+ enum e_script_state state;
int rid,oid;
struct script_code *script, *scriptroot;
struct sleep_data {
diff --git a/src/map/skill.c b/src/map/skill.c
index e0dddd1f30..8e5b64b64f 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -10220,7 +10220,7 @@ int skill_produce_mix (struct map_session_data *sd, int skill_id, int nameid, in
if(battle_config.wp_rate != 100)
make_per = make_per * battle_config.wp_rate / 100;
}
-// - Baby Class Penalty = 80% (from adult's chance) ----//
+
if (sd->class_&JOBL_BABY) //if it's a Baby Class
make_per = (make_per * 70) / 100; //Baby penalty is 30%
diff --git a/src/map/unit.c b/src/map/unit.c
index e52d60782b..521907c99a 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -1870,7 +1870,7 @@ int unit_free(struct block_list *bl, int clrtype)
//Tell the script to end, not delete it, it will free itself when necessary [Kevin]
if (sd->st) {
sd->st->rid = 0;
- sd->st->state = 2;
+ sd->st->state = END;
}
} else if( bl->type == BL_PET ) {
struct pet_data *pd = (struct pet_data*)bl;