summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-03-07 02:58:28 +0100
committerHaru <haru@dotalux.com>2014-03-07 06:41:01 +0100
commit60fcda1dc90a071a04438335461178983748ba20 (patch)
tree51a8d7e8e4c3f622cfd06540dc3ed3586bf87bbd
parent3289aad8bd6a9b8b8e9f9491234c66160fbf6164 (diff)
downloadhercules-60fcda1dc90a071a04438335461178983748ba20.tar.gz
hercules-60fcda1dc90a071a04438335461178983748ba20.tar.bz2
hercules-60fcda1dc90a071a04438335461178983748ba20.tar.xz
hercules-60fcda1dc90a071a04438335461178983748ba20.zip
Fixed some warnings on ARM
Now Hercules is officially able to compile and run on a Raspberry Pi. Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--src/common/grfio.c18
-rw-r--r--src/common/mmo.h15
2 files changed, 16 insertions, 17 deletions
diff --git a/src/common/grfio.c b/src/common/grfio.c
index 57e8a5187..bde0ed720 100644
--- a/src/common/grfio.c
+++ b/src/common/grfio.c
@@ -21,15 +21,15 @@
// file entry table struct
//----------------------------
typedef struct _FILELIST {
- int srclen; // compressed size
- int srclen_aligned;
- int declen; // original size
- int srcpos; // position of entry in grf
- int next; // index of next filelist entry with same hash (-1: end of entry chain)
- char type;
- char fn[128-4*5]; // file name
- char* fnd; // if the file was cloned, contains name of original file
- char gentry; // read grf file select
+ int srclen; ///< compressed size
+ int srclen_aligned;
+ int declen; ///< original size
+ int srcpos; ///< position of entry in grf
+ int next; ///< index of next filelist entry with same hash (-1: end of entry chain)
+ char type;
+ char fn[128-4*5]; ///< file name
+ char *fnd; ///< if the file was cloned, contains name of original file
+ int8 gentry; ///< read grf file select
} FILELIST;
#define FILELIST_TYPE_FILE 0x01 // entry is a file
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 2b66c516c..cf3933d40 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -334,14 +334,13 @@ struct s_homunculus { //[orn]
unsigned int exp;
short rename_flag;
short vaporize; //albator
- int str ;
- int agi ;
- int vit ;
- int int_ ;
- int dex ;
- int luk ;
-
- char spiritball; //for homun S [lighta]
+ int str;
+ int agi;
+ int vit;
+ int int_;
+ int dex;
+ int luk;
+ int8 spiritball; //for homun S [lighta]
};
struct s_mercenary {