Hi, i've a problem when i try to update my repository.
i used git stash && git pull && git stash pop, but i have the following errors:
Spoiler
mmo.h:69: error: expected identifier or ‘(’ before ‘<<’ token
In file included from core.c:4:
mmo.h:76:9: error: invalid suffix "ce2be160492d2cd072d906d1365de5113" on integer constant
mmo.h:325: error: expected identifier or ‘(’ before ‘<<’ token
mmo.h:336: error: redefinition of ‘struct extra_storage_data’
mmo.h:349: error: expected specifier-qualifier-list before ‘==’ token
mmo.h:383:9: error: invalid suffix "ce2be160492d2cd072d906d1365de5113" on integer constant
mmo.h:622:9: error: invalid suffix "ce2be160492d2cd072d906d1365de5113" on integer constant
mmo.h:668:9: error: invalid suffix "ce2be160492d2cd072d906d1365de5113" on integer constant
mmo.h:1152:9: error: invalid suffix "ce2be160492d2cd072d906d1365de5113" on integer constant
<<<<<<< HEAD
#define MAX_STORAGE 600 ///Max number of storage slots a player can have, (up to ~850 tested)
#define MAX_EXTRA_STORAGE 1///eAmod Extra Storage Size
<<<<<<< Updated upstream
<<<<<<< Updated upstream
=======
#define MAX_STORAGE 600 ///Max number of storage slots a player can have
>>>>>>> 9910478ce2be160492d2cd072d906d1365de5113
=======
>>>>>>> Stashed changes
=======
>>>>>>> Stashed changes
=======
enum e_storage_mode {
STOR_MODE_NONE = 0x0,
STOR_MODE_GET = 0x1,
STOR_MODE_PUT = 0x2,
STOR_MODE_ALL = 0x3,
};
struct s_storage {
bool dirty; ///< Dirty status, data needs to be saved
bool status; ///< Current status of storage (opened or closed)
uint16 amount; ///< Amount of items in storage
bool lock; ///< If locked, can't use storage when item bound retrieval
uint32 id; ///< Account ID / Character ID / Guild ID (owner of storage)
enum storage_type type; ///< Type of storage (inventory, cart, storage, guild storage)
uint16 max_amount;
uint8 stor_id; ///< Storage ID
struct {
unsigned get : 1;
unsigned put : 1;
} state;
union { // Max for inventory, storage, cart, and guild storage are 1637 each without changing this struct and struct item [2014/10/27]
struct item items_inventory[MAX_INVENTORY];
struct item items_storage[MAX_STORAGE];
struct item items_cart[MAX_CART];
struct item items_guild[MAX_GUILD_STORAGE];
} u;
};
struct s_storage_table {
char name[NAME_LENGTH];
char table[DB_NAME_LEN];
uint16 max_num;
uint8 id;
>>>>>>> 9910478ce2be160492d2cd072d906d1365de5113
Question
fictionx
Hi, i've a problem when i try to update my repository.
i used git stash && git pull && git stash pop, but i have the following errors:
mmo.h:69: error: expected identifier or ‘(’ before ‘<<’ token
In file included from core.c:4:
mmo.h:76:9: error: invalid suffix "ce2be160492d2cd072d906d1365de5113" on integer constant
mmo.h:325: error: expected identifier or ‘(’ before ‘<<’ token
mmo.h:336: error: redefinition of ‘struct extra_storage_data’
mmo.h:349: error: expected specifier-qualifier-list before ‘==’ token
mmo.h:383:9: error: invalid suffix "ce2be160492d2cd072d906d1365de5113" on integer constant
mmo.h:622:9: error: invalid suffix "ce2be160492d2cd072d906d1365de5113" on integer constant
mmo.h:668:9: error: invalid suffix "ce2be160492d2cd072d906d1365de5113" on integer constant
mmo.h:1152:9: error: invalid suffix "ce2be160492d2cd072d906d1365de5113" on integer constant
<<<<<<< HEAD #define MAX_STORAGE 600 ///Max number of storage slots a player can have, (up to ~850 tested) #define MAX_EXTRA_STORAGE 1///eAmod Extra Storage Size <<<<<<< Updated upstream <<<<<<< Updated upstream ======= #define MAX_STORAGE 600 ///Max number of storage slots a player can have >>>>>>> 9910478ce2be160492d2cd072d906d1365de5113 ======= >>>>>>> Stashed changes ======= >>>>>>> Stashed changes ======= enum e_storage_mode { STOR_MODE_NONE = 0x0, STOR_MODE_GET = 0x1, STOR_MODE_PUT = 0x2, STOR_MODE_ALL = 0x3, }; struct s_storage { bool dirty; ///< Dirty status, data needs to be saved bool status; ///< Current status of storage (opened or closed) uint16 amount; ///< Amount of items in storage bool lock; ///< If locked, can't use storage when item bound retrieval uint32 id; ///< Account ID / Character ID / Guild ID (owner of storage) enum storage_type type; ///< Type of storage (inventory, cart, storage, guild storage) uint16 max_amount; uint8 stor_id; ///< Storage ID struct { unsigned get : 1; unsigned put : 1; } state; union { // Max for inventory, storage, cart, and guild storage are 1637 each without changing this struct and struct item [2014/10/27] struct item items_inventory[MAX_INVENTORY]; struct item items_storage[MAX_STORAGE]; struct item items_cart[MAX_CART]; struct item items_guild[MAX_GUILD_STORAGE]; } u; }; struct s_storage_table { char name[NAME_LENGTH]; char table[DB_NAME_LEN]; uint16 max_num; uint8 id; >>>>>>> 9910478ce2be160492d2cd072d906d1365de5113
how can i fix this?
Greetings.-
Link to comment
Share on other sites
3 answers to this question
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.