summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--athena-start13
-rw-r--r--sql-files/upgrade_svn11915.sql (renamed from sql-files/upgrade_svn11914.sql)0
3 files changed, 2 insertions, 13 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2f0b87e40..58351e828 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -6,7 +6,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/12/14
* Guardian hp handling code removal (see bugreport:342)
- removed guardian hp from the castle data structure, database,
- savefiles and various script functions (use upgrade_svn11914.sql)
+ savefiles and various script functions (use upgrade_svn11915.sql)
- removed guardian hp calculation and manipulation from the castle
manager npc, now the hp values are updated by the server itself
(glitch: when castle defense changes, all guardians are healed to full)
diff --git a/athena-start b/athena-start
index 742145604..ab5ac3de0 100644
--- a/athena-start
+++ b/athena-start
@@ -21,16 +21,6 @@ echo "checking..."
#EOF
}
-#check_account() {
-# if [ ! -f ./save/account.txt ]; then
-# echo "0 s1 p1 - S 0" > save/account.txt
-# echo "1 s2 p2 - S 0" >>save/account.txt
-# echo "2 s3 p3 - S 0" >>save/account.txt
-# echo "3 s4 p4 - S 0" >>save/account.txt
-# echo "4 s5 p5 - S 0" >>save/account.txt
-# fi
-#}
-
check_files() {
for i in ${L_SRV} ${C_SRV} ${M_SRV}
@@ -52,7 +42,6 @@ echo "Looks good, a nice Athena!"
case $1 in
'start')
print_start
-# check_account
check_files
exec ./${L_SRV}&
@@ -62,7 +51,7 @@ case $1 in
echo "Now Started Athena."
;;
'stop')
- ps ax | grep -E "${L_SRV}|${C_SRV}|${M_SRV}" | awk '{print $1}' | xargs kill -9
+ ps ax | grep -E "${L_SRV}|${C_SRV}|${M_SRV}" | awk '{print $1}' | xargs kill
;;
'restart')
$0 stop
diff --git a/sql-files/upgrade_svn11914.sql b/sql-files/upgrade_svn11915.sql
index ddf06957d..ddf06957d 100644
--- a/sql-files/upgrade_svn11914.sql
+++ b/sql-files/upgrade_svn11915.sql