reemo/mahou
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

can you believe these crazy skills ALSO STATS

Browse source
This commit is contained in:
mallocnull 2017-11-15 16:59:37 -06:00
parent f1b13b2a2f
commit 1a3eaf7133
2 changed files with 94 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/server/user.c
View file

@ -1,25 +1,48 @@
#include "user.h"
const char* _SKILL_NAMES[] = {
"Bare-Handed",
"Melee",
"Ranged",
"White Magic",
"Black Magic",
"Firemaking"
"Woodcutting",
"Firemaking",
"Mining",
"Smithing",
"Fishing",
"Cooking"
};
const char* _SKILL_NAMES_SHORT[] = {
"MELE",
"RANG",
"WMAG",
"BMAG",
"WCUT",
"FIRE",
"MINE",
"SMTH",
"FISH",
"COOK"
};
const char * OFINISH THESE GI
struct {
pthread_mutex_t mx_ctx;
list_t *active_users;
list_t *pending_removals;
user_t **users;
} static ctx;
static user_t* user_init(socket_t*, uint16_t);
static BOOL user_check_flag_nomx(user_t *user, uint64_t flag);
static void user_free(user_t*);
void user_context_init() {
pthread_mutex_init(&ctx.mx_ctx, NULL);
ctx.active_users = list_init();
ctx.pending_removals = list_init();
ctx.users = (user_t**)malloc(MAX_CONNS * sizeof(user_t*));
int i;
@ -46,17 +69,31 @@ BOOL user_context_add(socket_t *sock) {
}
void user_context_remove(user_t *user) {
if(user_check_flag_nomx(user, USER_FLAG_DELETING))
return;
pthread_mutex_lock(&ctx.mx_ctx);
pthread_mutex_lock(&user->mx_user);
user->flags |= USER_FLAG_DELETING;
if(list_find(ctx.pending_removals, user) == -1)
list_append(ctx.pending_removals, user);
pthread_mutex_unlock(&ctx.mx_ctx);
list_remove_item(ctx.active_users, user);
ctx.users[user->user_id] = NULL;
user_free(user);
}
void user_context_purge() {
pthread_mutex_lock(&ctx.mx_ctx);
user_t *ptr;
list_iter_reset(ctx.pending_removals);
while((ptr = list_iter_next(ctx.pending_removals)) != NULL) {
list_remove_item(ctx.active_users, user);
ctx.users[user->user_id] = NULL;
user_free(user);
list_iter_remove(ctx.pending_removals);
}
pthread_mutex_unlock(&ctx.mx_ctx);
}
@ -71,12 +108,12 @@ void user_context_free() {
free(ctx.users);
}
user_t* user_init(socket_t *sock, uint16_t user_id) {
static user_t* user_init(socket_t *sock, uint16_t user_id) {
user_t *user = (user_t*)malloc(sizeof(user_t));
pthread_mutex_init(&user->mx_user, NULL);
user->user_id = user_id;
user->sock = sock;
user->flags = 0;
user->logged_in = FALSE;
user->in_packets = queue_init();
user->out_packets = queue_init();
@ -85,10 +122,9 @@ user_t* user_init(socket_t *sock, uint16_t user_id) {
}
BOOL user_check_flag_nomx(user_t *user, uint64_t flag) {
return (user->flags & flag) != 0;
return (user->data.flags & flag) != 0;
}
BOOL user_check_flag(user_t *user, uint64_t flag) {
pthread_mutex_lock(&user->mx_user);
BOOL retval = user_check_flag_nomx(user, flag);
@ -96,10 +132,17 @@ BOOL user_check_flag(user_t *user, uint64_t flag) {
return retval;
}
void user_free(user_t *user) {
void user_push_in_packet(user_t *user) {
pthread_mutex_lock(&user->mx_user);
pthread_mutex_unlock(&user->mx_user);
}
static void user_free(user_t *user) {
if(user == NULL)
return;
pthread_mutex_lock(&user->mx_user);
packet_t *pck = NULL;
while((pck = (packet_t*)queue_pop(user->in_packets)) != NULL)

53
src/server/user.h
View file

@ -10,19 +10,38 @@
#include "net/packet.h"
#include "common.h"
#define USER_FLAG_LOGGED 1
#define USER_FLAG_DELETING 2
#define USER_FLAG_GENDER 1
#define USER_GENDER_MALE 0
#define USER_GENDER_FEMALE 1
#define USER_FLAG_POISONED 2
#define SKILL_COUNT 6
#define SKILL_BAREHANDS 0
#define SKILL_MELEE 1
#define SKILL_RANGED 2
#define SKILL_WHMAGIC 3
#define SKILL_BLMAGIC 4
#define SKILLS_COUNT 5
#define SKILL_MELEE 0
#define SKILL_RANGED 1
#define SKILL_WHMAGIC 2
#define SKILL_BLMAGIC 3
#define SKILL_WOODCUT 4
#define SKILL_FIREMAKE 5
#define SKILL_MINING 6
#define SKILL_SMITHING 7
#define SKILL_FISHING 8
#define SKILL_COOKING 9
#define STATS_COUNT 9
#define STAT_STRENGTH 0
#define STAT_HEALTH 1
#define STAT_DEFENSE 2
#define STAT_AGILITY 3
#define STAT_INTELLECT 4
#define STAT_WISDOM 5
#define STAT_CHARISMA 6
#define STAT_
#define STAT_LUCK 8
extern const char* _SKILL_NAMES[];
extern const char* _SKILL_NAMES_SHORT[];
extern const char* _STAT_NAMES[];
extern const char* _STAT_NAMES_SHORT[];
typedef struct user_t user_t;
struct user_t {
@ -32,25 +51,31 @@ struct user_t {
queue_t *out_packets;
socket_t *sock;
uint64_t flags;
uint16_t user_id;
BOOL logged_in;
struct {
char name[9];
uint64_t flags;
uint16_t pin, x, y;
uint16_t context_id;
uint32_t skill_exp[SKILL_COUNT];
uint64_t flags;
} data;
uint32_t skills_exp[SKILLS_COUNT];
uint8_t base_stats[STATS_COUNT];
};
void user_context_init(void);
BOOL user_context_add(socket_t*);
user_t* user_context_get(uint16_t id);
void user_context_remove(user_t*);
void user_context_purge(void);
void user_context_free(void);
user_t* user_init(socket_t*, uint16_t);
BOOL user_check_flag(user_t*, uint64_t);
void user_free(user_t*);
void user_push_in_packet(user_t*);
void user_push_out_packet(user_t*);
packet_t* user_pop_in_packet(user_t*);
packet_t* user_pop_out_packet(user_t*);
#endif