Przeglądaj źródła

AMD64 fixes

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@1047 54d463be-8e91-2dee-dedb-b68131a5f0ec
(no author) 20 lat temu
rodzic
commit
2f7a32dcb5
3 zmienionych plików z 8 dodań i 6 usunięć
  1. 1 0
      Changelog.txt
  2. 5 5
      src/map/map.c
  3. 2 1
      src/map/mob.c

+ 1 - 0
Changelog.txt

@@ -1,6 +1,7 @@
 Date	Added
 
 02/05
+	* Made eA compile under AMD64 64-bit native [1047: MouseJstr]
         * Changed interface binding to use a bind_ip instead of using
           the login_ip, char_ip, or map_ip.  This lets you still be
           able to set your WAN IP seperate from what interface you

+ 5 - 5
src/map/map.c

@@ -429,9 +429,9 @@ struct skill_unit *map_find_skill_unit_oncell(int m,int x,int y,int skill_id)
  *------------------------------------------
  */
 void map_foreachinarea(int (*func)(struct block_list*,va_list),int m,int x0,int y0,int x1,int y1,int type,...) {
+	va_list ap;
 	int bx,by;
 	struct block_list *bl=NULL;
-	va_list ap=NULL;
 	int blockcount=bl_list_count,i,c;
 
 	if(m < 0)
@@ -494,7 +494,7 @@ void map_foreachinarea(int (*func)(struct block_list*,va_list),int m,int x0,int
 void map_foreachinmovearea(int (*func)(struct block_list*,va_list),int m,int x0,int y0,int x1,int y1,int dx,int dy,int type,...) {
 	int bx,by;
 	struct block_list *bl=NULL;
-	va_list ap=NULL;
+	va_list ap;
 	int blockcount=bl_list_count,i,c;
 
 	va_start(ap,type);
@@ -603,7 +603,7 @@ void map_foreachinmovearea(int (*func)(struct block_list*,va_list),int m,int x0,
 void map_foreachincell(int (*func)(struct block_list*,va_list),int m,int x,int y,int type,...) {
 	int bx,by;
 	struct block_list *bl=NULL;
-	va_list ap=NULL;
+	va_list ap;
 	int blockcount=bl_list_count,i,c;
 
 	va_start(ap,type);
@@ -734,7 +734,7 @@ int map_delobject(int id) {
 void map_foreachobject(int (*func)(struct block_list*,va_list),int type,...) {
 	int i;
 	int blockcount=bl_list_count;
-	va_list ap=NULL;
+	va_list ap;
 
 	va_start(ap,type);
 
@@ -1202,7 +1202,7 @@ struct block_list * map_id2bl(int id)
  *------------------------------------------
  */
 int map_foreachiddb(int (*func)(void*,void*,va_list),...) {
-	va_list ap=NULL;
+	va_list ap;
 
 	va_start(ap,func);
 	numdb_foreach(id_db,func,ap);

+ 2 - 1
src/map/mob.c

@@ -1874,7 +1874,8 @@ static int mob_ai_sub_lazy(void * key,void * data,va_list app)
 
 	nullpo_retr(0, md);
 	nullpo_retr(0, app);
-	nullpo_retr(0, ap=va_arg(app,va_list));
+
+	ap=va_arg(app,va_list);
 
 	if(md->bl.type!=BL_MOB)
 		return 0;