pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge git://github.com/EQEmu/Server into Development

Browse Source 
Conflicts:
	changelog.txt
This commit is contained in:
KayenEQ
2014-11-29 03:22:11 -05:00
parent 3d83f647bf 8cd19670ab
commit ca3b5a3221
6 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/database.cpp
+5 -2
View File
@@ -768,7 +768,10 @@ uint32 Database::GetCharacterID(const char *name) {
std::string query = StringFormat("SELECT `id` FROM `character_data` WHERE `name` = '%s'", name);
auto results = QueryDatabase(query);
auto row = results.begin();
if (row[0]){ return atoi(row[0]); }
if (results.RowCount() == 1)
{
return atoi(row[0]);
}
return 0;
}
@@ -3277,7 +3280,7 @@ char* Database::GetGroupLeaderForLogin(const char* name, char* leaderbuf) {
if (group_id == 0)
return leaderbuf;
query = StringFormat("SELECT `leadername` FROM `group_leader` WHERE `gid` = '%u' AND `groupid` = %u LIMIT 1", group_id);
query = StringFormat("SELECT `leadername` FROM `group_leaders` WHERE `gid` = '%u' LIMIT 1", group_id);
results = QueryDatabase(query);
for (auto row = results.begin(); row != results.end(); ++row)
common/patches/rof_structs.h
+2 -1
View File
@@ -4169,7 +4169,8 @@ struct Arrow_Struct {
/*070*/ uint8 unknown070;
/*071*/ uint8 item_type;
/*072*/ uint8 skill;
/*073*/ char model_name[43];
/*073*/ uint8 unknown073[16];
/*089*/ char model_name[27];
/*116*/
};