Fixed a compilation problem and warning (maybe).
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11611 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
1150699a75
commit
dc6254185a
@ -8527,7 +8527,6 @@ bool is_atcommand_sub(const int fd, struct map_session_data* sd, const char* str
|
|||||||
bool is_atcommand(const int fd, struct map_session_data* sd, const char* message)
|
bool is_atcommand(const int fd, struct map_session_data* sd, const char* message)
|
||||||
{
|
{
|
||||||
int gmlvl = pc_isGM(sd);
|
int gmlvl = pc_isGM(sd);
|
||||||
int s_flag = 0;
|
|
||||||
|
|
||||||
nullpo_retr(false, sd);
|
nullpo_retr(false, sd);
|
||||||
|
|
||||||
|
@ -2432,7 +2432,7 @@ struct Damage battle_calc_magic_attack(struct block_list *src,struct block_list
|
|||||||
/*==========================================
|
/*==========================================
|
||||||
* ‚»‚Ì‘¼ƒ_ƒ??[ƒWŒvŽZ
|
* ‚»‚Ì‘¼ƒ_ƒ??[ƒWŒvŽZ
|
||||||
*------------------------------------------*/
|
*------------------------------------------*/
|
||||||
struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int mflag)
|
struct Damage battle_calc_misc_attack(struct block_list *src,struct block_list *target,int skill_num,int skill_lv,int mflag)
|
||||||
{
|
{
|
||||||
int skill;
|
int skill;
|
||||||
short i, nk;
|
short i, nk;
|
||||||
|
@ -3853,7 +3853,6 @@ bool is_charcommand_sub(const int fd, struct map_session_data* sd, const char* s
|
|||||||
bool is_charcommand(const int fd, struct map_session_data* sd, const char* message)
|
bool is_charcommand(const int fd, struct map_session_data* sd, const char* message)
|
||||||
{
|
{
|
||||||
int gmlvl = pc_isGM(sd);
|
int gmlvl = pc_isGM(sd);
|
||||||
int s_flag = 0;
|
|
||||||
|
|
||||||
nullpo_retr(false, sd);
|
nullpo_retr(false, sd);
|
||||||
|
|
||||||
|
@ -4,6 +4,9 @@
|
|||||||
#ifndef _CHRIF_H_
|
#ifndef _CHRIF_H_
|
||||||
#define _CHRIF_H_
|
#define _CHRIF_H_
|
||||||
|
|
||||||
|
#include "../common/cbasetypes.h"
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
struct auth_node{
|
struct auth_node{
|
||||||
int account_id, login_id1, login_id2, sex, fd;
|
int account_id, login_id1, login_id2, sex, fd;
|
||||||
time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
|
time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited)
|
||||||
|
@ -71,7 +71,7 @@ struct item_data {
|
|||||||
//Lupus: I rearranged order of these fields due to compatibility with ITEMINFO script command
|
//Lupus: I rearranged order of these fields due to compatibility with ITEMINFO script command
|
||||||
// some script commands should be revised as well...
|
// some script commands should be revised as well...
|
||||||
unsigned int class_base[3]; //Specifies if the base can wear this item (split in 3 indexes per type: 1-1, 2-1, 2-2)
|
unsigned int class_base[3]; //Specifies if the base can wear this item (split in 3 indexes per type: 1-1, 2-1, 2-2)
|
||||||
unsigned class_upper : 3; //Specifies if the upper-type can equip it (1: normal, 2: upper, 3: baby)
|
unsigned class_upper : 3; //Specifies if the upper-type can equip it (bitfield, 1: normal, 2: upper, 3: baby)
|
||||||
struct {
|
struct {
|
||||||
unsigned short chance;
|
unsigned short chance;
|
||||||
int id;
|
int id;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user