diff options
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | db/Changelog.txt | 2 | ||||
| -rw-r--r-- | db/mob_avail.txt | 2 | ||||
| -rw-r--r-- | src/map/mob.c | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index d1768b113..908bfb555 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2010/12/01 + * Reverted change from r14533 and restored the 3rd field of mob_avail.txt being optional (bugreport:4599, since r14532). [Ai4rei] * Monster database reading now utilizes sv_readdb. [Ai4rei] 2010/11/30 * Fixed out-of-bound access to percentrefinery array causing refine bonuses stop working (bugreport:4598, since r14526). [Ai4rei] diff --git a/db/Changelog.txt b/db/Changelog.txt index 968c8d005..e77a5e8b3 100644 --- a/db/Changelog.txt +++ b/db/Changelog.txt @@ -8,8 +8,6 @@ 1475 Equestrian's Spear: NEED INFO. 13005 Angelic Wing Dagger: NEED INFO. ======================= -2010/12/01 - * Rev. 14532 Updated example in mob_avail.txt to match the format description and actual implementation (bugreport:4599, follow up to r14532). [Ai4rei] 2010/11/30 * Rev. 14529 Fixed a mistake (excess dummy name) in dead branch list fallback value (since r32). [Ai4rei] * Rev. 14524 Updated comments for skill Berserk in skill_tree.txt, among others because they would cause errors the way they are read now. [Ai4rei] diff --git a/db/mob_avail.txt b/db/mob_avail.txt index 3b5b0e394..4b2e57b34 100644 --- a/db/mob_avail.txt +++ b/db/mob_avail.txt @@ -6,7 +6,7 @@ // MobID,SpriteID,Sex,Hair,Hair_Color,Weapon,Shield,Head_Top,Head_Middle,Head_Bottom,Option,Dye_Color // Use Item ID for weapons and shields, not View ID. -//1002,1039,0 //Poring,Baphomet (Make Porings look like Baphomet) +//1002,1039 //Poring,Baphomet (Make Porings look like Baphomet) //1970,1002,10013 // new mob that looks like a Poring with a backpack // Easter Event Monsters diff --git a/src/map/mob.c b/src/map/mob.c index 3b14bc6a7..56a9f1961 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -3752,7 +3752,7 @@ static bool mob_readdb_mobavail(char* str[], int columns, int current) } else if(columns==3) mob_db_data[class_]->vd.head_bottom=atoi(str[2]); // mob equipment [Valaris] - else + else if( columns != 2 ) return false; return true; @@ -4246,7 +4246,7 @@ static void mob_load(void) #endif /* TXT_ONLY */ mob_readdb(); - sv_readdb(db_path, "mob_avail.txt", ',', 3, 12, -1, &mob_readdb_mobavail); + sv_readdb(db_path, "mob_avail.txt", ',', 2, 12, -1, &mob_readdb_mobavail); mob_read_randommonster(); mob_readchatdb(); mob_readskilldb(); |