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

Basic cleanup of the SQL charserver homunculus code.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12863 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
ultramage 2008-06-19 20:26:02 +00:00
parent 7173c6123f
commit 801084a7c0
3 changed files with 177 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/char_sql/char.c
View File

@ -1401,7 +1401,7 @@ int delete_char_sql(int char_id)
/* remove homunculus */
if (hom_id)
inter_delete_homunculus(hom_id);
mapif_homunculus_delete(hom_id);
/* delete char's friends list */
if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `char_id` = '%d'", friend_db, char_id) )

341
src/char_sql/int_homun.c
View File

@ -15,62 +15,17 @@
#include <stdlib.h>
#include <string.h>
struct s_homunculus *homun_pt;
int inter_homunculus_sql_init(void){
//memory alloc
homun_pt = (struct s_homunculus*)aCalloc(sizeof(struct s_homunculus), 1);
int inter_homunculus_sql_init(void)
{
return 0;
}
void inter_homunculus_sql_final(void){
if (homun_pt) aFree(homun_pt);
void inter_homunculus_sql_final(void)
{
return;
}
static int mapif_saved_homunculus(int fd, int account_id, bool flag)
{
WFIFOHEAD(fd, 7);
WFIFOW(fd,0) = 0x3892;
WFIFOL(fd,2) = account_id;
WFIFOB(fd,6) = flag; // 1:success, 0:failure
WFIFOSET(fd, 7);
return 0;
}
int mapif_info_homunculus(int fd, int account_id, struct s_homunculus *hd)
{
WFIFOHEAD(fd, sizeof(struct s_homunculus)+9);
WFIFOW(fd,0) = 0x3891;
WFIFOW(fd,2) = sizeof(struct s_homunculus)+9;
WFIFOL(fd,4) = account_id;
WFIFOB(fd,8) = 1; // success
memcpy(WFIFOP(fd,9), hd, sizeof(struct s_homunculus));
WFIFOSET(fd, sizeof(struct s_homunculus)+9);
return 0;
}
int mapif_noinfo_homunculus(int fd, int account_id)
{
WFIFOHEAD(fd, sizeof(struct s_homunculus)+9);
WFIFOW(fd,0) = 0x3891;
WFIFOW(fd,2) = sizeof(struct s_homunculus)+9;
WFIFOL(fd,4) = account_id;
WFIFOB(fd,8) = 0; // not found.
memset(WFIFOP(fd,9), 0, sizeof(struct s_homunculus));
WFIFOSET(fd, sizeof(struct s_homunculus)+9);
return 0;
}
int mapif_homunculus_deleted(int fd, int flag)
{
WFIFOHEAD(fd, 3);
WFIFOW(fd, 0) = 0x3893;
WFIFOB(fd,2) = flag; //Flag 1 = success
WFIFOSET(fd, 3);
return 0;
}
int mapif_homunculus_created(int fd, int account_id, struct s_homunculus *sh, unsigned char flag)
static void mapif_homunculus_created(int fd, int account_id, struct s_homunculus *sh, unsigned char flag)
{
WFIFOHEAD(fd, sizeof(struct s_homunculus)+9);
WFIFOW(fd,0) = 0x3890;
@ -79,38 +34,56 @@ int mapif_homunculus_created(int fd, int account_id, struct s_homunculus *sh, un
WFIFOB(fd,8)= flag;
memcpy(WFIFOP(fd,9),sh,sizeof(struct s_homunculus));
WFIFOSET(fd, WFIFOW(fd,2));
return 0;
}
// Save/Update Homunculus Skills
static bool mapif_save_homunculus_skills(struct s_homunculus *hd)
static void mapif_homunculus_deleted(int fd, int flag)
{
SqlStmt* stmt;
int i;
stmt = SqlStmt_Malloc(sql_handle);
if( SQL_ERROR == SqlStmt_Prepare(stmt, "REPLACE INTO `skill_homunculus` (`homun_id`, `id`, `lv`) VALUES (%d, ?, ?)", hd->hom_id) )
SqlStmt_ShowDebug(stmt);
for( i = 0; i < MAX_HOMUNSKILL; ++i )
{
if( hd->hskill[i].id > 0 && hd->hskill[i].lv != 0 )
{
SqlStmt_BindParam(stmt, 0, SQLDT_USHORT, &hd->hskill[i].id, 0);
SqlStmt_BindParam(stmt, 1, SQLDT_USHORT, &hd->hskill[i].lv, 0);
if( SQL_ERROR == SqlStmt_Execute(stmt) )
{
SqlStmt_ShowDebug(stmt);
SqlStmt_Free(stmt);
return false;
}
}
}
SqlStmt_Free(stmt);
return true;
WFIFOHEAD(fd, 3);
WFIFOW(fd, 0) = 0x3893;
WFIFOB(fd,2) = flag; //Flag 1 = success
WFIFOSET(fd, 3);
}
static bool mapif_save_homunculus(int fd, int account_id, struct s_homunculus *hd)
static void mapif_homunculus_loaded(int fd, int account_id, struct s_homunculus *hd)
{
WFIFOHEAD(fd, sizeof(struct s_homunculus)+9);
WFIFOW(fd,0) = 0x3891;
WFIFOW(fd,2) = sizeof(struct s_homunculus)+9;
WFIFOL(fd,4) = account_id;
if( hd != NULL )
{
WFIFOB(fd,8) = 1; // success
memcpy(WFIFOP(fd,9), hd, sizeof(struct s_homunculus));
}
else
{
WFIFOB(fd,8) = 0; // not found.
memset(WFIFOP(fd,9), 0, sizeof(struct s_homunculus));
}
WFIFOSET(fd, sizeof(struct s_homunculus)+9);
}
static void mapif_homunculus_saved(int fd, int account_id, bool flag)
{
WFIFOHEAD(fd, 7);
WFIFOW(fd,0) = 0x3892;
WFIFOL(fd,2) = account_id;
WFIFOB(fd,6) = flag; // 1:success, 0:failure
WFIFOSET(fd, 7);
}
static void mapif_homunculus_renamed(int fd, int account_id, int char_id, unsigned char flag, char* name)
{
WFIFOHEAD(fd, NAME_LENGTH+12);
WFIFOW(fd, 0) = 0x3894;
WFIFOL(fd, 2) = account_id;
WFIFOL(fd, 6) = char_id;
WFIFOB(fd,10) = flag;
safestrncpy((char*)WFIFOP(fd,11), name, NAME_LENGTH);
WFIFOSET(fd, NAME_LENGTH+12);
}
bool mapif_homunculus_save(struct s_homunculus* hd)
{
bool flag = true;
char esc_name[NAME_LENGTH*2+1];
@ -144,8 +117,28 @@ static bool mapif_save_homunculus(int fd, int account_id, struct s_homunculus *h
}
else
{
flag = mapif_save_homunculus_skills(hd);
mapif_saved_homunculus(fd, account_id, flag);
SqlStmt* stmt;
int i;
stmt = SqlStmt_Malloc(sql_handle);
if( SQL_ERROR == SqlStmt_Prepare(stmt, "REPLACE INTO `skill_homunculus` (`homun_id`, `id`, `lv`) VALUES (%d, ?, ?)", hd->hom_id) )
SqlStmt_ShowDebug(stmt);
for( i = 0; i < MAX_HOMUNSKILL; ++i )
{
if( hd->hskill[i].id > 0 && hd->hskill[i].lv != 0 )
{
SqlStmt_BindParam(stmt, 0, SQLDT_USHORT, &hd->hskill[i].id, 0);
SqlStmt_BindParam(stmt, 1, SQLDT_USHORT, &hd->hskill[i].lv, 0);
if( SQL_ERROR == SqlStmt_Execute(stmt) )
{
SqlStmt_ShowDebug(stmt);
SqlStmt_Free(stmt);
flag = false;
break;
}
}
}
SqlStmt_Free(stmt);
}
}
@ -155,63 +148,63 @@ static bool mapif_save_homunculus(int fd, int account_id, struct s_homunculus *h
// Load an homunculus
int mapif_load_homunculus(int fd)
bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd)
{
int i;
char* data;
size_t len;
memset(homun_pt, 0, sizeof(struct s_homunculus));
RFIFOHEAD(fd);
memset(hd, 0, sizeof(*hd));
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `homun_id`,`char_id`,`class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`,`rename_flag`, `vaporize` FROM `homunculus` WHERE `homun_id`='%u'", RFIFOL(fd,6)) )
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `homun_id`,`char_id`,`class`,`name`,`level`,`exp`,`intimacy`,`hunger`, `str`, `agi`, `vit`, `int`, `dex`, `luk`, `hp`,`max_hp`,`sp`,`max_sp`,`skill_point`,`rename_flag`, `vaporize` FROM `homunculus` WHERE `homun_id`='%u'", homun_id) )
{
Sql_ShowDebug(sql_handle);
return 0;
return false;
}
if( !Sql_NumRows(sql_handle) )
{ //No homunculus found.
mapif_noinfo_homunculus(fd, RFIFOL(fd,2));
Sql_FreeResult(sql_handle);
return 0;
return false;
}
if( SQL_SUCCESS != Sql_NextRow(sql_handle) )
{
Sql_ShowDebug(sql_handle);
Sql_FreeResult(sql_handle);
return 0;
return false;
}
homun_pt->hom_id = RFIFOL(fd,6);
Sql_GetData(sql_handle, 1, &data, NULL); homun_pt->char_id = atoi(data);
Sql_GetData(sql_handle, 2, &data, NULL); homun_pt->class_ = atoi(data);
Sql_GetData(sql_handle, 3, &data, &len); memcpy(homun_pt->name, data, min(len, NAME_LENGTH));
Sql_GetData(sql_handle, 4, &data, NULL); homun_pt->level = atoi(data);
Sql_GetData(sql_handle, 5, &data, NULL); homun_pt->exp = atoi(data);
Sql_GetData(sql_handle, 6, &data, NULL); homun_pt->intimacy = (unsigned int)strtoul(data, NULL, 10);
homun_pt->intimacy = cap_value(homun_pt->intimacy, 0, 100000);
Sql_GetData(sql_handle, 7, &data, NULL); homun_pt->hunger = atoi(data);
homun_pt->hunger = cap_value(homun_pt->hunger, 0, 100);
Sql_GetData(sql_handle, 8, &data, NULL); homun_pt->str = atoi(data);
Sql_GetData(sql_handle, 9, &data, NULL); homun_pt->agi = atoi(data);
Sql_GetData(sql_handle, 10, &data, NULL); homun_pt->vit = atoi(data);
Sql_GetData(sql_handle, 11, &data, NULL); homun_pt->int_ = atoi(data);
Sql_GetData(sql_handle, 12, &data, NULL); homun_pt->dex = atoi(data);
Sql_GetData(sql_handle, 13, &data, NULL); homun_pt->luk = atoi(data);
Sql_GetData(sql_handle, 14, &data, NULL); homun_pt->hp = atoi(data);
Sql_GetData(sql_handle, 15, &data, NULL); homun_pt->max_hp = atoi(data);
Sql_GetData(sql_handle, 16, &data, NULL); homun_pt->sp = atoi(data);
Sql_GetData(sql_handle, 17, &data, NULL); homun_pt->max_sp = atoi(data);
Sql_GetData(sql_handle, 18, &data, NULL); homun_pt->skillpts = atoi(data);
Sql_GetData(sql_handle, 19, &data, NULL); homun_pt->rename_flag = atoi(data);
Sql_GetData(sql_handle, 20, &data, NULL); homun_pt->vaporize = atoi(data);
hd->hom_id = homun_id;
Sql_GetData(sql_handle, 1, &data, NULL); hd->char_id = atoi(data);
Sql_GetData(sql_handle, 2, &data, NULL); hd->class_ = atoi(data);
Sql_GetData(sql_handle, 3, &data, &len); safestrncpy(hd->name, data, sizeof(hd->name));
Sql_GetData(sql_handle, 4, &data, NULL); hd->level = atoi(data);
Sql_GetData(sql_handle, 5, &data, NULL); hd->exp = atoi(data);
Sql_GetData(sql_handle, 6, &data, NULL); hd->intimacy = (unsigned int)strtoul(data, NULL, 10);
Sql_GetData(sql_handle, 7, &data, NULL); hd->hunger = atoi(data);
Sql_GetData(sql_handle, 8, &data, NULL); hd->str = atoi(data);
Sql_GetData(sql_handle, 9, &data, NULL); hd->agi = atoi(data);
Sql_GetData(sql_handle, 10, &data, NULL); hd->vit = atoi(data);
Sql_GetData(sql_handle, 11, &data, NULL); hd->int_ = atoi(data);
Sql_GetData(sql_handle, 12, &data, NULL); hd->dex = atoi(data);
Sql_GetData(sql_handle, 13, &data, NULL); hd->luk = atoi(data);
Sql_GetData(sql_handle, 14, &data, NULL); hd->hp = atoi(data);
Sql_GetData(sql_handle, 15, &data, NULL); hd->max_hp = atoi(data);
Sql_GetData(sql_handle, 16, &data, NULL); hd->sp = atoi(data);
Sql_GetData(sql_handle, 17, &data, NULL); hd->max_sp = atoi(data);
Sql_GetData(sql_handle, 18, &data, NULL); hd->skillpts = atoi(data);
Sql_GetData(sql_handle, 19, &data, NULL); hd->rename_flag = atoi(data);
Sql_GetData(sql_handle, 20, &data, NULL); hd->vaporize = atoi(data);
Sql_FreeResult(sql_handle);
hd->intimacy = cap_value(hd->intimacy, 0, 100000);
hd->hunger = cap_value(hd->hunger, 0, 100);
// Load Homunculus Skill
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `id`,`lv` FROM `skill_homunculus` WHERE `homun_id`=%d", homun_pt->hom_id) )
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `id`,`lv` FROM `skill_homunculus` WHERE `homun_id`=%d", homun_id) )
{
Sql_ShowDebug(sql_handle);
return 0;
return false;
}
while( SQL_SUCCESS == Sql_NextRow(sql_handle) )
{
@ -221,88 +214,96 @@ int mapif_load_homunculus(int fd)
if( i < HM_SKILLBASE || i >= HM_SKILLBASE + MAX_HOMUNSKILL )
continue;// invalid skill id
i = i - HM_SKILLBASE;
homun_pt->hskill[i].id = (unsigned short)atoi(data);
hd->hskill[i].id = (unsigned short)atoi(data);
// lv
Sql_GetData(sql_handle, 1, &data, NULL);
homun_pt->hskill[i].lv = (unsigned short)atoi(data);
hd->hskill[i].lv = (unsigned short)atoi(data);
}
Sql_FreeResult(sql_handle);
if( save_log )
ShowInfo("Homunculus loaded (%d - %s).\n", homun_pt->hom_id, homun_pt->name);
return mapif_info_homunculus(fd, RFIFOL(fd,2), homun_pt);
ShowInfo("Homunculus loaded (%d - %s).\n", hd->hom_id, hd->name);
return true;
}
int inter_delete_homunculus(int hom_id)
bool mapif_homunculus_delete(int homun_id)
{
if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `homunculus` WHERE `homun_id` = '%u'", hom_id) ||
SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `skill_homunculus` WHERE `homun_id` = '%u'", hom_id) )
{
if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `homunculus` WHERE `homun_id` = '%u'", homun_id)
|| SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `skill_homunculus` WHERE `homun_id` = '%u'", homun_id)
) {
Sql_ShowDebug(sql_handle);
return 0;
return false;
}
return 1;
return true;
}
int mapif_delete_homunculus(int fd)
bool mapif_homunculus_rename(char *name)
{
RFIFOHEAD(fd);
mapif_homunculus_deleted(fd, inter_delete_homunculus(RFIFOL(fd,2)));
return 1;
}
int mapif_rename_homun_ack(int fd, int account_id, int char_id, unsigned char flag, char *name){
WFIFOHEAD(fd, NAME_LENGTH+12);
WFIFOW(fd, 0) =0x3894;
WFIFOL(fd, 2) =account_id;
WFIFOL(fd, 6) =char_id;
WFIFOB(fd, 10) =flag;
memcpy(WFIFOP(fd, 11), name, NAME_LENGTH);
WFIFOSET(fd, NAME_LENGTH+12);
return 0;
}
int mapif_rename_homun(int fd, int account_id, int char_id, char *name){
int i;
// Check Authorised letters/symbols in the name of the homun
if (char_name_option == 1) { // only letters/symbols in char_name_letters are authorised
for (i = 0; i < NAME_LENGTH && name[i]; i++)
if (strchr(char_name_letters, name[i]) == NULL) {
mapif_rename_homun_ack(fd, account_id, char_id, 0, name);
return 0;
}
} else if (char_name_option == 2) { // letters/symbols in char_name_letters are forbidden
for (i = 0; i < NAME_LENGTH && name[i]; i++)
if (strchr(char_name_letters, name[i]) != NULL) {
mapif_rename_homun_ack(fd, account_id, char_id, 0, name);
return 0;
}
if( char_name_option == 1 )
{// only letters/symbols in char_name_letters are authorised
for( i = 0; i < NAME_LENGTH && name[i]; i++ )
if( strchr(char_name_letters, name[i]) == NULL )
return false;
} else
if( char_name_option == 2 )
{// letters/symbols in char_name_letters are forbidden
for( i = 0; i < NAME_LENGTH && name[i]; i++ )
if( strchr(char_name_letters, name[i]) != NULL )
return false;
}
mapif_rename_homun_ack(fd, account_id, char_id, 1, name);
return 0;
return true;
}
int mapif_parse_CreateHomunculus(int fd)
static void mapif_parse_homunculus_create(int fd, int len, int account_id, struct s_homunculus* phd)
{
RFIFOHEAD(fd);
memcpy(homun_pt, RFIFOP(fd,8), sizeof(struct s_homunculus));
// Save in sql db
if(mapif_save_homunculus(fd,RFIFOL(fd,4), homun_pt))
return mapif_homunculus_created(fd, RFIFOL(fd,4), homun_pt, 1); // send homun_id
return mapif_homunculus_created(fd, RFIFOL(fd,4), homun_pt, 0); // fail
bool result = mapif_homunculus_save(phd);
mapif_homunculus_created(fd, account_id, phd, result);
}
int inter_homunculus_parse_frommap(int fd){
RFIFOHEAD(fd);
switch(RFIFOW(fd, 0)){
case 0x3090: mapif_parse_CreateHomunculus(fd); break;
case 0x3091: mapif_load_homunculus(fd); break;
case 0x3092: mapif_save_homunculus(fd, RFIFOW(fd,4), (struct s_homunculus*) RFIFOP(fd, 8)); break;
case 0x3093: mapif_delete_homunculus(fd); break; // doesn't need to be parse, very simple packet...
case 0x3094: mapif_rename_homun(fd, RFIFOL(fd, 2), RFIFOL(fd, 6), (char*)RFIFOP(fd, 10)); break;
static void mapif_parse_homunculus_delete(int fd, int homun_id)
{
bool result = mapif_homunculus_delete(homun_id);
mapif_homunculus_deleted(fd, result);
}
static void mapif_parse_homunculus_load(int fd, int account_id, int homun_id)
{
struct s_homunculus hd;
bool result = mapif_homunculus_load(homun_id, &hd);
mapif_homunculus_loaded(fd, account_id, ( result ? &hd : NULL ));
}
static void mapif_parse_homunculus_save(int fd, int len, int account_id, struct s_homunculus* phd)
{
bool result = mapif_homunculus_save(phd);
mapif_homunculus_saved(fd, account_id, result);
}
static void mapif_parse_homunculus_rename(int fd, int account_id, int char_id, char* name)
{
bool result = mapif_homunculus_rename(name);
mapif_homunculus_renamed(fd, account_id, char_id, result, name);
}
int inter_homunculus_parse_frommap(int fd)
{
unsigned short cmd = RFIFOW(fd,0);
switch( cmd )
{
case 0x3090: mapif_parse_homunculus_create(fd, (int)RFIFOW(fd,2), (int)RFIFOL(fd,4), (struct s_homunculus*)RFIFOP(fd,8)); break;
case 0x3091: mapif_parse_homunculus_load (fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6)); break;
case 0x3092: mapif_parse_homunculus_save (fd, (int)RFIFOW(fd,2), (int)RFIFOL(fd,4), (struct s_homunculus*)RFIFOP(fd,8)); break;
case 0x3093: mapif_parse_homunculus_delete(fd, (int)RFIFOL(fd,2)); break;
case 0x3094: mapif_parse_homunculus_rename(fd, (int)RFIFOL(fd,2), (int)RFIFOL(fd,6), (char*)RFIFOP(fd,10)); break;
default:
return 0;
}

9
src/char_sql/int_homun.h
View File

@ -8,10 +8,11 @@ struct s_homunculus;
int inter_homunculus_sql_init(void);
void inter_homunculus_sql_final(void);
int mapif_save_homunculus(struct s_homunculus *hd);
int mapif_load_homunculus(int fd);
int mapif_delete_homunculus(int fd);
int inter_delete_homunculus(int hom_id);
int inter_homunculus_parse_frommap(int fd);
bool mapif_homunculus_save(struct s_homunculus* hd);
bool mapif_homunculus_load(int homun_id, struct s_homunculus* hd);
bool mapif_homunculus_delete(int homun_id);
bool mapif_homunculus_rename(char *name);
#endif /* _INT_HOMUN_SQL_H_ */