Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted 0184671

Browse Source 
This commit broke the "clear" command, which only required 2 columns.
This commit is contained in:
Lemongrass3110 2018-04-25 22:17:52 +02:00
parent d623b1fa11
commit 4ffb1b043a
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/import-tmpl/item_group_db.txt
View File

@ -1,2 +1,4 @@
//import: db/import/item_groupid.txt // Item Group Database
//
// Structure of Database:
// GroupID,ItemID,Rate{,Amount,Random,isAnnounced,Duration,GUID,isBound,isNamed}

4
db/pre-re/item_group_db.txt
View File

@ -0,0 +1,4 @@
// Item Group Database
//
// Structure of Database:
// GroupID,ItemID,Rate{,Amount,Random,isAnnounced,Duration,GUID,isBound,isNamed}

4
db/re/item_group_db.txt
View File

@ -0,0 +1,4 @@
// Item Group Database
//
// Structure of Database:
// GroupID,ItemID,Rate{,Amount,Random,isAnnounced,Duration,GUID,isBound,isNamed}

21
src/map/itemdb.cpp
View File

@ -633,6 +633,11 @@ static bool itemdb_read_group(char* str[], int columns, int current) {
} }
} }
if( columns < 3 ){
ShowError("itemdb_read_group: Insufficient columns (found %d, need at least 3).\n", columns);
return false;
}
// Checking sub group // Checking sub group
prob = atoi(str[2]); prob = atoi(str[2]);
@ -1812,15 +1817,15 @@ static void itemdb_read(void) {
sv_readdb(dbsubpath1, "item_avail.txt", ',', 2, 2, -1, &itemdb_read_itemavail, i > 0); sv_readdb(dbsubpath1, "item_avail.txt", ',', 2, 2, -1, &itemdb_read_itemavail, i > 0);
sv_readdb(dbsubpath2, "item_stack.txt", ',', 3, 3, -1, &itemdb_read_stack, i > 0); sv_readdb(dbsubpath2, "item_stack.txt", ',', 3, 3, -1, &itemdb_read_stack, i > 0);
sv_readdb(dbsubpath1, "item_nouse.txt", ',', 3, 3, -1, &itemdb_read_nouse, i > 0); sv_readdb(dbsubpath1, "item_nouse.txt", ',', 3, 3, -1, &itemdb_read_nouse, i > 0);
sv_readdb(dbsubpath2, "item_group_db.txt", ',', 3, 10, -1, &itemdb_read_group, i > 0); sv_readdb(dbsubpath2, "item_group_db.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
sv_readdb(dbsubpath2, "item_bluebox.txt", ',', 3, 10, -1, &itemdb_read_group, i > 0); sv_readdb(dbsubpath2, "item_bluebox.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
sv_readdb(dbsubpath2, "item_violetbox.txt", ',', 3, 10, -1, &itemdb_read_group, i > 0); sv_readdb(dbsubpath2, "item_violetbox.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
sv_readdb(dbsubpath2, "item_cardalbum.txt", ',', 3, 10, -1, &itemdb_read_group, i > 0); sv_readdb(dbsubpath2, "item_cardalbum.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
sv_readdb(dbsubpath1, "item_findingore.txt", ',', 3, 10, -1, &itemdb_read_group, i > 0); sv_readdb(dbsubpath1, "item_findingore.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
sv_readdb(dbsubpath2, "item_giftbox.txt", ',', 3, 10, -1, &itemdb_read_group, i > 0); sv_readdb(dbsubpath2, "item_giftbox.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
sv_readdb(dbsubpath2, "item_misc.txt", ',', 3, 10, -1, &itemdb_read_group, i > 0); sv_readdb(dbsubpath2, "item_misc.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
#ifdef RENEWAL #ifdef RENEWAL
sv_readdb(dbsubpath2, "item_package.txt", ',', 3, 10, -1, &itemdb_read_group, i > 0); sv_readdb(dbsubpath2, "item_package.txt", ',', 2, 10, -1, &itemdb_read_group, i > 0);
#endif #endif
itemdb_read_combos(dbsubpath2,i > 0); //TODO change this to sv_read ? id#script ? itemdb_read_combos(dbsubpath2,i > 0); //TODO change this to sv_read ? id#script ?
itemdb_read_randomopt(dbsubpath2, i > 0); itemdb_read_randomopt(dbsubpath2, i > 0);