pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge conflict fixes...

Browse Source
This commit is contained in:
Alex 2020-04-06 18:57:13 -04:00
parent f8735cf9ba
commit cbd1f42a08
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/embparser_api.cpp
View File

@ -3358,7 +3358,7 @@ XS(XS__getcurrencyid) {
dXSTARG; dXSTARG;
int RETVAL; int RETVAL;
uint32 item_id = (int) SvUV(ST(0));; uint32 item_id = (int) SvUV(ST(0));
RETVAL = quest_manager.getcurrencyid(item_id); RETVAL = quest_manager.getcurrencyid(item_id);
XSprePUSH; XSprePUSH;

1
zone/questmgr.cpp
View File

@ -2986,6 +2986,7 @@ int QuestManager::getcurrencyitemid(int currency_id) {
} }
++iter; ++iter;
} }
}
return 0; return 0;
} }