- Cleaned up the Dev folder.

- bugs.txt should store 'fatal/known' bugs that have been going on for a long time and have not been fixed yet. The forums are the preferred method for day-to-day bug finding/fixing.
- todo-for-stable.txt should list all changes in trunk that need to be merged into stable.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5370 54d463be-8e91-2dee-dedb-b68131a5f0ec

5 files changed, 57 insertions, 435 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index c1de57617..953bbb8f8 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,10 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.  EV
 GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS

 

 2006/02/22

+	* Cleaned up the Dev folder. [Skotlex]

+	- Take note of the file todo-for-stable, which holds all modifications in

+	  trunk that have not yet made it into stable. Be sure to update the file

+	  as needed.

 	* Updated the path searching code with jA's current implementation.

 	  [Skotlex]

 	- There is a slight chance the CELL_NOSTACK mod broke, someone test that.

diff --git a/Dev/Message to Celest.txt b/Dev/Message to Celest.txt
deleted file mode 100644
index 1eeb63e63..000000000
--- a/Dev/Message to Celest.txt
+++ /dev/null
@@ -1,367 +0,0 @@
-Map loading from GRF doesn't work in native Win32 builds. Please take a look at the matter. Thanks.

-

-- Lance

-

-Trying it out, but i'm still not sure what's wrong with it yet o.o

-At which part in grfio.c does the 'Filelist is NULL!' show up?

-

-- Celestia

-

-I added that 'Filelist is NULL!' in filelist_find(char *fname).

-	if (!filelist) {

-		ShowWarning("Dang! Filelist is NULL! PANIC!!\n");

-		return NULL;

-	}

-

-I suppose this forces the server to stop loading from GRF.

-

-- Lance

-

-Log (with added warnings):

-          (=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=)

-          (        (c)2005 eAthena Development Team presents        )

-          (       ______  __    __                                  )

-          (      /\  _  \/\ \__/\ \                     v 1.00.00   )

-          (    __\ \ \_\ \ \ ,_\ \ \___      __    ___      __      )

-          (  /'__`\ \  __ \ \ \/\ \  _ `\  /'__`\/' _ `\  /'__`\    )

-          ( /\  __/\ \ \/\ \ \ \_\ \ \ \ \/\  __//\ \/\ \/\ \_\.\_  )

-          ( \ \____\\ \_\ \_\ \__\\ \_\ \_\ \____\ \_\ \_\ \__/.\_\ )

-          (  \/____/ \/_/\/_/\/__/ \/_/\/_/\/____/\/_/\/_/\/__/\/_/ )

-          (   _   _   _   _   _   _   _     _   _   _   _   _   _   )

-          (  / \ / \ / \ / \ / \ / \ / \   / \ / \ / \ / \ / \ / \  )

-          ( ( e | n | g | l | i | s | h ) ( A | t | h | e | n | a ) )

-          (  \_/ \_/ \_/ \_/ \_/ \_/ \_/   \_/ \_/ \_/ \_/ \_/ \_/  )

-          (                                                         )

-          (  Advanced Fusion Maps (c) 2003-2005 The Fusion Project  )

-          (=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=)

-

-SVN Revision: '4343'.

-Memory manager initialised: log/map-server_sql.exe.leaks

-Done loading plugin 'UPnP'

-Char Server IP Address : '127.0.0.1' -> '127.0.0.1'.

-Map Server IP Address : '127.0.0.1' -> '127.0.0.1'.

-Server running in 'Debug Mode'.

-Using SQL dbs: no

-Logging GM Level 40 Commands to table `atcommandlog`

-Logging GM Level 40 Commands to file `log/atcommandlog.log`.txt

-Connecting to the Map DB Server....

-connect success! (Map Server Connection)

-Connecting to the Login DB Server....

-connect success! (Login Server Connection)

-Connect Mapreg DB Server....

-Connect success! (Mapreg DB Connection)

-Dang! Filelist is NULL! PANIC!!

-Done reading 'conf/grf-files.txt'.

-[Status]: Loading Maps with... [afm] [af2] [gat] 

-Progress: [data\force_1-1.gat not found (grfio_reads - local file)

-Removing map [ force_1-1.gat ] from maplist

-data\force_1-2.gat not found (grfio_reads - local file)

-Removing map [ force_1-2.gat ] from maplist

-data\force_1-3.gat not found (grfio_reads - local file)

-Removing map [ force_1-3.gat ] from maplist

-data\force_2-1.gat not found (grfio_reads - local file)

-Removing map [ force_2-1.gat ] from maplist

-data\force_2-2.gat not found (grfio_reads - local file)

-Removing map [ force_2-2.gat ] from maplist

-data\force_2-3.gat not found (grfio_reads - local file)

-Removing map [ force_2-3.gat ] from maplist

-data\force_3-1.gat not found (grfio_reads - local file)

-Removing map [ force_3-1.gat ] from maplist

-data\force_3-2.gat not found (grfio_reads - local file)

-Removing map [ force_3-2.gat ] from maplist

-data\force_3-3.gat not found (grfio_reads - local file)

-Removing map [ force_3-3.gat ] from maplist

-Progress: [Progress: [data\hunter_1-1.gat not found (grfio_reads - local file)

-Removing map [ hunter_1-1.gat ] from maplist

-data\hunter_2-1.gat not found (grfio_reads - local file)

-Removing map [ hunter_2-1.gat ] from maplist

-data\hunter_3-1.gat not found (grfio_reads - local file)

-Removing map [ hunter_3-1.gat ] from maplist

-data\knight_1-1.gat not found (grfio_reads - local file)

-Removing map [ knight_1-1.gat ] from maplist

-data\knight_2-1.gat not found (grfio_reads - local file)

-Removing map [ knight_2-1.gat ] from maplist

-data\knight_3-1.gat not found (grfio_reads - local file)

-Removing map [ knight_3-1.gat ] from maplist

-Progress: [Progress: [data\new_1-1.gat not found (grfio_reads - local file)

-Removing map [ new_1-1.gat ] from maplist

-data\new_1-2.gat not found (grfio_reads - local file)

-Removing map [ new_1-2.gat ] from maplist

-data\new_1-3.gat not found (grfio_reads - local file)

-Removing map [ new_1-3.gat ] from maplist

-data\new_1-4.gat not found (grfio_reads - local file)

-Removing map [ new_1-4.gat ] from maplist

-data\ordeal_1-1.gat not found (grfio_reads - local file)

-Removing map [ ordeal_1-1.gat ] from maplist

-data\ordeal_1-2.gat not found (grfio_reads - local file)

-Removing map [ ordeal_1-2.gat ] from maplist

-data\ordeal_2-1.gat not found (grfio_reads - local file)

-Removing map [ ordeal_2-1.gat ] from maplist

-data\ordeal_2-2.gat not found (grfio_reads - local file)

-Removing map [ ordeal_2-2.gat ] from maplist

-data\ordeal_3-1.gat not found (grfio_reads - local file)

-Removing map [ ordeal_3-1.gat ] from maplist

-data\ordeal_3-2.gat not found (grfio_reads - local file)

-Removing map [ ordeal_3-2.gat ] from maplist

-Progress: [data\priest_1-1.gat not found (grfio_reads - local file)

-Removing map [ priest_1-1.gat ] from maplist

-data\priest_2-1.gat not found (grfio_reads - local file)

-Removing map [ priest_2-1.gat ] from maplist

-data\priest_3-1.gat not found (grfio_reads - local file)

-Removing map [ priest_3-1.gat ] from maplist

-Progress: [data\pvp_n_1-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_1-1.gat ] from maplist

-data\pvp_n_1-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_1-2.gat ] from maplist

-data\pvp_n_1-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_1-3.gat ] from maplist

-data\pvp_n_1-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_1-4.gat ] from maplist

-data\pvp_n_1-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_1-5.gat ] from maplist

-data\pvp_n_2-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_2-1.gat ] from maplist

-data\pvp_n_2-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_2-2.gat ] from maplist

-data\pvp_n_2-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_2-3.gat ] from maplist

-data\pvp_n_2-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_2-4.gat ] from maplist

-data\pvp_n_2-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_2-5.gat ] from maplist

-data\pvp_n_3-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_3-1.gat ] from maplist

-data\pvp_n_3-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_3-2.gat ] from maplist

-data\pvp_n_3-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_3-3.gat ] from maplist

-data\pvp_n_3-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_3-4.gat ] from maplist

-data\pvp_n_3-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_3-5.gat ] from maplist

-Progress: [data\pvp_n_4-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_4-1.gat ] from maplist

-data\pvp_n_4-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_4-2.gat ] from maplist

-data\pvp_n_4-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_4-3.gat ] from maplist

-data\pvp_n_4-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_4-4.gat ] from maplist

-data\pvp_n_4-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_4-5.gat ] from maplist

-data\pvp_n_5-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_5-1.gat ] from maplist

-data\pvp_n_5-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_5-2.gat ] from maplist

-data\pvp_n_5-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_5-3.gat ] from maplist

-data\pvp_n_5-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_5-4.gat ] from maplist

-data\pvp_n_5-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_5-5.gat ] from maplist

-data\pvp_n_6-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_6-1.gat ] from maplist

-data\pvp_n_6-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_6-2.gat ] from maplist

-data\pvp_n_6-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_6-3.gat ] from maplist

-data\pvp_n_6-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_6-4.gat ] from maplist

-data\pvp_n_6-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_6-5.gat ] from maplist

-data\pvp_n_7-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_7-1.gat ] from maplist

-data\pvp_n_7-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_7-2.gat ] from maplist

-Progress: [data\pvp_n_7-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_7-3.gat ] from maplist

-data\pvp_n_7-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_7-4.gat ] from maplist

-data\pvp_n_7-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_7-5.gat ] from maplist

-data\pvp_n_8-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_8-1.gat ] from maplist

-data\pvp_n_8-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_8-2.gat ] from maplist

-data\pvp_n_8-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_8-3.gat ] from maplist

-data\pvp_n_8-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_8-4.gat ] from maplist

-data\pvp_n_8-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_8-5.gat ] from maplist

-data\pvp_n_room.gat not found (grfio_reads - local file)

-Removing map [ pvp_n_room.gat ] from maplist

-data\pvp_y_1-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_1-1.gat ] from maplist

-data\pvp_y_1-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_1-2.gat ] from maplist

-data\pvp_y_1-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_1-3.gat ] from maplist

-data\pvp_y_1-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_1-4.gat ] from maplist

-data\pvp_y_1-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_1-5.gat ] from maplist

-data\pvp_y_2-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_2-1.gat ] from maplist

-data\pvp_y_2-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_2-2.gat ] from maplist

-data\pvp_y_2-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_2-3.gat ] from maplist

-data\pvp_y_2-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_2-4.gat ] from maplist

-data\pvp_y_2-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_2-5.gat ] from maplist

-data\pvp_y_3-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_3-1.gat ] from maplist

-data\pvp_y_3-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_3-2.gat ] from maplist

-data\pvp_y_3-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_3-3.gat ] from maplist

-data\pvp_y_3-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_3-4.gat ] from maplist

-data\pvp_y_3-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_3-5.gat ] from maplist

-data\pvp_y_4-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_4-1.gat ] from maplist

-data\pvp_y_4-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_4-2.gat ] from maplist

-data\pvp_y_4-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_4-3.gat ] from maplist

-data\pvp_y_4-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_4-4.gat ] from maplist

-data\pvp_y_4-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_4-5.gat ] from maplist

-data\pvp_y_5-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_5-1.gat ] from maplist

-data\pvp_y_5-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_5-2.gat ] from maplist

-data\pvp_y_5-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_5-3.gat ] from maplist

-data\pvp_y_5-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_5-4.gat ] from maplist

-data\pvp_y_5-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_5-5.gat ] from maplist

-data\pvp_y_6-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_6-1.gat ] from maplist

-data\pvp_y_6-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_6-2.gat ] from maplist

-data\pvp_y_6-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_6-3.gat ] from maplist

-data\pvp_y_6-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_6-4.gat ] from maplist

-data\pvp_y_6-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_6-5.gat ] from maplist

-data\pvp_y_7-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_7-1.gat ] from maplist

-Progress: [data\pvp_y_7-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_7-2.gat ] from maplist

-data\pvp_y_7-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_7-3.gat ] from maplist

-data\pvp_y_7-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_7-4.gat ] from maplist

-data\pvp_y_7-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_7-5.gat ] from maplist

-data\pvp_y_8-1.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_8-1.gat ] from maplist

-data\pvp_y_8-2.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_8-2.gat ] from maplist

-data\pvp_y_8-3.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_8-3.gat ] from maplist

-data\pvp_y_8-4.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_8-4.gat ] from maplist

-data\pvp_y_8-5.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_8-5.gat ] from maplist

-data\pvp_y_room.gat not found (grfio_reads - local file)

-Removing map [ pvp_y_room.gat ] from maplist

-data\sword_1-1.gat not found (grfio_reads - local file)

-Removing map [ sword_1-1.gat ] from maplist

-data\sword_2-1.gat not found (grfio_reads - local file)

-Removing map [ sword_2-1.gat ] from maplist

-data\sword_3-1.gat not found (grfio_reads - local file)

-Removing map [ sword_3-1.gat ] from maplist

-data\wizard_1-1.gat not found (grfio_reads - local file)

-Removing map [ wizard_1-1.gat ] from maplist

-data\wizard_2-1.gat not found (grfio_reads - local file)

-Removing map [ wizard_2-1.gat ] from maplist

-data\wizard_3-1.gat not found (grfio_reads - local file)

-Removing map [ wizard_3-1.gat ] from maplist

-Progress: [Progress: [Progress: [Progress: [Progress: [Progress: [data\nguild_gef.gat not found (grfio_reads - local file)

-Removing map [ nguild_gef.gat ] from maplist

-data\nguild_prt.gat not found (grfio_reads - local file)

-Removing map [ nguild_prt.gat ] from maplist

-data\nguild_pay.gat not found (grfio_reads - local file)

-Removing map [ nguild_pay.gat ] from maplist

-Progress: [data\nguild_alde.gat not found (grfio_reads - local file)

-Removing map [ nguild_alde.gat ] from maplist

-Progress: [Progress: [Progress: [Progress: [data\y_airport.gat not found (grfio_reads - local file)

-Removing map [ y_airport.gat ] from maplist

-data\lhz_airport.gat not found (grfio_reads - local file)

-Removing map [ lhz_airport.gat ] from maplist

-data\airplane_01.gat not found (grfio_reads - local file)

-Removing map [ airplane_01.gat ] from maplist

-Progress: [Successfully loaded '382' maps.                              

-Maps Removed: '123'

-Done reading packet database from 'packet_db.txt'. Using default packet version: 18.

-Open listen port on 0.0.0.0:5121

-Done reading '2233' entries in 'item_db.txt'.

-Done reading '19' entries in 'item_group_db.txt'.

-Done reading '441' entries in 'item_bluebox.txt'.

-Done reading '291' entries in 'item_violetbox.txt'.

-Done reading '305' entries in 'item_cardalbum.txt'.

-Done reading '75' entries in 'item_giftbox.txt'.

-Done reading '20' entries in 'item_findingore.txt'.

-Done reading '5' entries in 'item_avail.txt'.

-Done reading '5' entries in 'item_trade.txt'.

-Done reading 'data\num2cardillustnametable.txt'.

-Done reading 'mob_db.txt'.

-Done reading 'mob_db2.txt'.

-Done reading '36' entries in 'mob_avail.txt'.

-Done reading 'mob_branch.txt'.

-Done reading 'mob_poring.txt'.

-Done reading 'mob_boss.txt'.

-Done reading 'mob_skill_db.txt'.

-Done reading 'mob_race2_db.txt'.

-Querying script_load_mapreg ...

-Success! Returning results ...

-Freeing results...

-SQL Mapreg Loading Completed Under 0 Seconds.

-Done reading 'exp.txt'.

-Done reading 'skill_tree.txt'.

-Done reading 'attr_fix.txt'.

-Done reading 'statpoint.txt'.

-GM account: 704554 -> level 99

-Done reading 'job_db1.txt'.

-Done reading 'db/job_db2.txt'.

-Done reading 'db/size_fix.txt'.

-Done reading 'db/refine_db.txt'.

-Done reading '24' entries in 'castle_db.txt'.

-Done reading 'db/skill_db.txt'.

-Done reading 'db/skill_require_db.txt'.

-Done reading 'db/skill_cast_db.txt'.

-Done reading 'db/skill_unit_db.txt'.

-Done reading '143' entries in 'db/produce_db.txt'.

-Done reading '98' entries in 'db/create_arrow_db.txt'.

-Done reading '266' entries in 'db/abra_db.txt'.

-Done reading 'db/skill_castnodex_db.txt'.

-Done reading 'db/skill_nocast_db.txt'.

-Done reading '27' pets in 'pet_db.txt'.

-Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Loading NPCs... Working: Done loading '5' NPCs:                              

-	-'0' Warps

-	-'0' Shops

-	-'5' Scripts

-	-'0' Mobs

-	-'0' Mobs Cached

-	-'0' Mobs Not Cached

-Event 'OnInit' executed with '2' NPCs.

-Server is 'ready' and listening on port '5121'.

-

-Attempting to connect to Char Server. Please wait.

-Connecting to 127.0.0.1:6121

-Logging in to char server...

-Successfully logged on to Char Server (Connection: '1544').

-Sending maps to char server...

-Event 'OnCharIfInit' executed with '0' NPCs.

-Event 'OnInterIfInit' executed with '0' NPCs.

-Event 'OnInterIfInitOnce' executed with '0' NPCs.

-Map sending complete. Map Server is now online.

-Received Fame List of '0' characters.

diff --git a/Dev/bugs.txt b/Dev/bugs.txt
index 4b60ac09d..da12c2bac 100644
--- a/Dev/bugs.txt
+++ b/Dev/bugs.txt
@@ -1,8 +1,19 @@
-Reported Bug: It seems cards (somehow) aren't working properly. For instance, 

-		the doppelganger card does not stack properly anymore (although 

-		I think that might be a "fix") and previously I created a 

-		custom card that added 255 to all stats (after checking if the 

-		person was a GM) and this card, as well, has problems: I used 

-		to be able to do 999999 damage with Jupital Thunder and now it 

-		does approximaetly 19000 (perhaps this, too, is a stacking 

-		problem).
\ No newline at end of file
+- NOTE: Use this file to place BIG BAD BUGS that have been going on for a good

+  while and it seems noone can fix them (Use the forums for common everyday

+  bugs). Bugs in this file are not meant to be "fixed" as much as they are a

+  "reminder" of big bugs that have not been fixed yet. An good example would

+  be "the matrix bug" from the good old days.

+

+BUG: grf loading is broken.

+DESC: Specifying multiple grfs is badly broken, as the 'checksum' applied to

+files usually returns the wrong index, thus looking the file up on the wrong

+grf file. Users have also reported that reading from the data/ dir is messed

+up. See link for all details. 

+LINKS:

+- http://www.eathena.ws/board/index.php?showtopic=78372

+

+BUG: @reloadscript causes a crash

+DESC: Do a @reloadscript, and it will inmediately crash on the

+skill_unit_timer function. Apparently the global objects array gets messed up

+when cleaning the npcs. Valgrind doesn't seems to point at any particular

+cause. I suspect it may have to do with NPC shops.

diff --git a/Dev/todo-for-stable.txt b/Dev/todo-for-stable.txt
new file mode 100644
index 000000000..823dffe33
--- /dev/null
+++ b/Dev/todo-for-stable.txt
@@ -0,0 +1,34 @@
+Place in this file any updates you did on trunk that should be merged into
+stable. Remove it from the list once merged.
+
+- restricted mapflag (which restricts equipment/cards from being used in
+  certain maps)
+- function battle_calc_return_damage which encapsulates damage return
+  cards/status.
+- The update to the status change structure which unifies opt values in the
+  same structure as sc_data ones. Also includes a rewrite of
+  status_change_start as well as battle options for adjusting sc-def and
+  max-sc-def.
+- Improved npc timers which enable multiple characters to be attached to a
+  timer, and each one will be executed with the attached player accordingly.
+- irc bot system (which isn't even finished yet on trunk)
+- The new implementation of NPC_POWERUP which uses SC_INKATK rather than
+  Explosion Spirits.
+- Stat window showing the added damage of both weapons for dual-wielding
+  assassins.
+- Deleting pet eggs from inventory after the pet data has arrived, not upon
+  hatching request.
+- Updated the char-SQL server to use auto-incremental IDs and retrieve them
+  from code.
+- Battle option pk_level_range, allow_es_magic_player
+- Cleanup of pc_useitem code
+- Autocasted Teleport should now show a menu.
+- Skill system update, usage of the new splash area range column in the db.
+  Code-wise lots of code cleanup.
+- Skill SG_MIRACLE
+- Gangster's Paradise behaviour update.
+- Menu-based skill update to allow menu skills to be precasted.
+- Cleanup of the global chat function.
+- Revert the map-sql handling of the gm-list retrieval.
+- Send the guild/party mini-dots on map-login.
+- Updated the path-finding routines from jA
diff --git a/Dev/trunk_vs_branch.txt b/Dev/trunk_vs_branch.txt
deleted file mode 100644
index 750f239a9..000000000
--- a/Dev/trunk_vs_branch.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-- This is a small summary of the roles of trunk vs a branch, as well as their

-  current state in eA. 

-

-- Trunk: This should be the base source-codebase, well all the flashy lights

-  and new enhacements get added. It gets updated a lot, breaks often.

-

-- Current situation: Noone works on trunk anymore and it's seriously outdated.

-

-

-- Branch: This should be a snapshot of the trunk at some given time, and

-  receives no enhancements at all, only bug fixes. Once the branch becomes

-  stable enough, it is "released" to the public with an appropiate version

-  number, and the next branch is created from a new snapshot from the trunk.

-

-- Current situation: Everyone is working on branches/stable s if it were a

-  stable + development source.

-

-As Akaru has pointed out, we need to sort this out inmediately:

-- branches/stable must be moved and become the new trunk/

-- We should probably make a branch snapshot from a few days ago (before the

-  latest feature additions like string permanent variables?) for next release

-  base.

-- All devs should stick to the roles of branch/trunk.

-- It appears most devs who have heard of this agree with Akaru, however the

-  initial steps to clean up the SVN repository have yet to be taken. This task

-  seems assigned to Kayla, maintainer of said repository.

-

-Post your thoughts/ideas about here...

-- [Skotlex] I think fixing skills counts as bug fixing, and goes to branch.

-  But implementing missing skills should go to trunk.

-

-- [Vicious Pucca]

-* Have you read this? http://eathena.ws/board/index.php?showtopic=65827

-At least one of dev seems to agree with me(on irc) that we don't have enough resources(on devs or testers) to do trunk/stable.

-simply.

-1. who's going to test trunk? if no one is gonna test it, and bugs slips into stable... what's the point. good example would be whole guild cache. i'm sure it worked fine on kevin's setting. but when lots of people tested, in various settings, we found out how broke it was.

-2. who's gonna manage trunk->stable transfer? and when? as you know, there always will be some bug... it's like whole eA 1.0 thing. There is always something to fix. It was never quite "stable" enough to do "stable" release. so trunk is gonna be our current stable branch, except even more broken... great. :o

-imo, eA is fine as is.

-and if you REALLY want to dev, should be 3 branches.

-dev: where you commit things. broken often. do-whatever-dev-wants

-trunk/"testing": things that are "complete," but needs testing. primary bug fixes

-stable: the release. should be almost no bugs. shouldn't need update, unless it's critical update.

-

-- [Lance] Now who's in charge of merging back fixes from the stable -> trunk and vise versa

-

-- [Skotlex] From what I heard Akaru explain, after there's a release, the next

-  stage should be merging all the bugfixes that went into stable to trunk.

-  There's no viceversa since the bug fixes in trunk are for features in trunk

-  itself that haven't gone into the branch yet. So to answer yer question,

-  everyone who codes would be in charge. :X

-

-- [Kayla] I was speaking with Devi, do we have the OK from Mass to do this? If so we should reset to

-  revision 0, wipe the trunk, dump stable into the trunk and toss the Preview Release inside of Stable 

-  (or youngest version). 

-

-- [Vicious_Pucca] We should talk about this in dev forum.=p

-Anyway, if this trunk/stable DOES happen, it should happen AFTER TK/SL/SG are DONE-done. really, no half-assed classes please. :o (well, more like 3/4-assed classes right now)

-Another thing. how would DB/NPC update would work? let's say, new npc that are missing, such as Swordie class quest. Is it required? no. Is it official? yes. Is it a bug? not really. Is it a feature? to some, appearantly is... so. what about that?

-and fixes for stable means probably fixes for trunk as well. :o

-If trunk/stable happens, i'm breaking trunk so bad. XD
\ No newline at end of file