From 5193aa762ab15f3cbaf91fdaa3e4e02096264e0a Mon Sep 17 00:00:00 2001 From: skotlex Date: Mon, 27 Mar 2006 22:44:44 +0000 Subject: - Fixed the infinite warp looping between Lutie and Lutie field 01 - Removed the limits.h file which just breaks compilation on *nix systems T.T git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5777 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 + npc/Changelog.txt | 2 + npc/warps/cities/lutie.txt | 2 +- npc/warps/fields/lutie_fild.txt | 4 +- src/common/limits.h | 122 ---------------------------------------- src/common/malloc.h | 2 - 6 files changed, 7 insertions(+), 127 deletions(-) delete mode 100644 src/common/limits.h diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 421c963d5..5e3a2cb52 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -6,6 +6,8 @@ GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALAR 2006/03/27 + * Removed the limits.h file which just breaks compilation on *nix systems + [Skotlex] * Updated some DB work from jA [Vicious] * HW_GANBANTEIN now also removes traps. [Skotlex] * PF_DOUBLECASTING takes effect amotion time after the initial cast instead diff --git a/npc/Changelog.txt b/npc/Changelog.txt index cc8ff5f82..b2d561946 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -26,6 +26,8 @@ Nexon == Changelog == Date Added +03/27 + * Fixed the infinite warp looping between Lutie and Lutie field 01 [Skotlex] 03/23 * Updated Rebirth NPC/functions to use constant. Might have broken it, so do report [Vicious] 03/21 diff --git a/npc/warps/cities/lutie.txt b/npc/warps/cities/lutie.txt index f582a217d..be2c5803f 100644 --- a/npc/warps/cities/lutie.txt +++ b/npc/warps/cities/lutie.txt @@ -21,7 +21,7 @@ xmas.gat,142,256,0 warp xmas11 3,3,xmas_in.gat,95,115 xmas.gat,143,313,0 warp xmas14 3,3,xmas_dun01.gat,205,17 xmas.gat,149,240,0 warp xmas9 3,3,xmas_in.gat,105,85 xmas.gat,149,256,0 warp xmas10 3,3,xmas_in.gat,105,115 -xmas.gat,150,41,0 warp xmas2-1 3,3,xmas_fild01.gat,80,249 +xmas.gat,150,41,0 warp xmas2-1 2,2,xmas_fild01.gat,80,246 xmas.gat,174,161,0 warp xmas6 3,3,xmas_in.gat,165,95 xmas.gat,175,132,0 warp xmas5 3,3,xmas_in.gat,155,31 xmas.gat,182,169,0 warp xmas7 3,3,xmas_in.gat,177,107 diff --git a/npc/warps/fields/lutie_fild.txt b/npc/warps/fields/lutie_fild.txt index b7e2a73df..45e52bc6f 100644 --- a/npc/warps/fields/lutie_fild.txt +++ b/npc/warps/fields/lutie_fild.txt @@ -13,5 +13,5 @@ //============================================================ //= Lutie Field ============================================== -xmas_fild01.gat,80,251,0 warp xmas2 3,3,xmas.gat,150,43 -xmas_fild01.gat,85,49,0 warp xmas001 10,3,aldebaran.gat,140,240 \ No newline at end of file +xmas_fild01.gat,80,251,0 warp xmas2 2,2,xmas.gat,150,45 +xmas_fild01.gat,85,49,0 warp xmas001 10,3,aldebaran.gat,140,240 diff --git a/src/common/limits.h b/src/common/limits.h deleted file mode 100644 index 1a56da259..000000000 --- a/src/common/limits.h +++ /dev/null @@ -1,122 +0,0 @@ -/*** -*limits.h - implementation dependent values -* -* Copyright (c) Microsoft Corporation. All rights reserved. -* -*Purpose: -* Contains defines for a number of implementation dependent values -* which are commonly used in C programs. -* [ANSI] -* -* [Public] -* -****/ - -#if _MSC_VER > 1000 -#pragma once -#endif - -#ifndef _INC_LIMITS -#define _INC_LIMITS - -#if defined(_WIN32) || defined(CYGWIN) - #define CHAR_BIT 8 /* number of bits in a char */ - #define SCHAR_MIN (-128) /* minimum signed char value */ - #define SCHAR_MAX 127 /* maximum signed char value */ - #define UCHAR_MAX 0xff /* maximum unsigned char value */ - - #ifndef _CHAR_UNSIGNED - #define CHAR_MIN SCHAR_MIN /* mimimum char value */ - #define CHAR_MAX SCHAR_MAX /* maximum char value */ - #else - #define CHAR_MIN 0 - #define CHAR_MAX UCHAR_MAX - #endif /* _CHAR_UNSIGNED */ - - #define MB_LEN_MAX 5 /* max. # bytes in multibyte char */ - #define SHRT_MIN (-32768) /* minimum (signed) short value */ - #define SHRT_MAX 32767 /* maximum (signed) short value */ - #define USHRT_MAX 0xffff /* maximum unsigned short value */ - #define INT_MIN (-2147483647 - 1) /* minimum (signed) int value */ - #define INT_MAX 2147483647 /* maximum (signed) int value */ - #define UINT_MAX 0xffffffff /* maximum unsigned int value */ - #define LONG_MIN (-2147483647L - 1) /* minimum (signed) long value */ - #define LONG_MAX 2147483647L /* maximum (signed) long value */ - #define ULONG_MAX 0xffffffffUL /* maximum unsigned long value */ - - /* Make sure these macros don't show up in ANSI C++ code */ - #if !defined(__cplusplus) || defined(_MSC_EXTENSIONS) - #define LLONG_MAX 0x7fffffffffffffff /*maximum signed __int64 value */ - #define LLONG_MIN 0x8000000000000000 /*minimum signed __int64 value */ - #define ULLONG_MAX 0xffffffffffffffff /*maximum unsigned __int64 value */ - #endif - - #if _INTEGRAL_MAX_BITS >= 8 - #define _I8_MIN (-127i8 - 1) /* minimum signed 8 bit value */ - #define _I8_MAX 127i8 /* maximum signed 8 bit value */ - #define _UI8_MAX 0xffui8 /* maximum unsigned 8 bit value */ - #endif - - #if _INTEGRAL_MAX_BITS >= 16 - #define _I16_MIN (-32767i16 - 1) /* minimum signed 16 bit value */ - #define _I16_MAX 32767i16 /* maximum signed 16 bit value */ - #define _UI16_MAX 0xffffui16 /* maximum unsigned 16 bit value */ - #endif - - #if _INTEGRAL_MAX_BITS >= 32 - #define _I32_MIN (-2147483647i32 - 1) /* minimum signed 32 bit value */ - #define _I32_MAX 2147483647i32 /* maximum signed 32 bit value */ - #define _UI32_MAX 0xffffffffui32 /* maximum unsigned 32 bit value */ - #endif - - #if _INTEGRAL_MAX_BITS >= 64 - /* minimum signed 64 bit value */ - #define _I64_MIN (-9223372036854775807i64 - 1) - /* maximum signed 64 bit value */ - #define _I64_MAX 9223372036854775807i64 - /* maximum unsigned 64 bit value */ - #define _UI64_MAX 0xffffffffffffffffui64 - #endif - - #if _INTEGRAL_MAX_BITS >= 128 - /* minimum signed 128 bit value */ - #define _I128_MIN (-170141183460469231731687303715884105727i128 - 1) - /* maximum signed 128 bit value */ - #define _I128_MAX 170141183460469231731687303715884105727i128 - /* maximum unsigned 128 bit value */ - #define _UI128_MAX 0xffffffffffffffffffffffffffffffffui128 - #endif - - #ifdef _POSIX_ - - #define _POSIX_ARG_MAX 4096 - #define _POSIX_CHILD_MAX 6 - #define _POSIX_LINK_MAX 8 - #define _POSIX_MAX_CANON 255 - #define _POSIX_MAX_INPUT 255 - #define _POSIX_NAME_MAX 14 - #define _POSIX_NGROUPS_MAX 0 - #define _POSIX_OPEN_MAX 16 - #define _POSIX_PATH_MAX 255 - #define _POSIX_PIPE_BUF 512 - #define _POSIX_SSIZE_MAX 32767 - #define _POSIX_STREAM_MAX 8 - #define _POSIX_TZNAME_MAX 3 - - #define ARG_MAX 14500 /* 16k heap, minus overhead */ - #define LINK_MAX 1024 - #define MAX_CANON _POSIX_MAX_CANON - #define MAX_INPUT _POSIX_MAX_INPUT - #define NAME_MAX 255 - #define NGROUPS_MAX 16 - #define OPEN_MAX 32 - #define PATH_MAX 512 - #define PIPE_BUF _POSIX_PIPE_BUF - #define SSIZE_MAX _POSIX_SSIZE_MAX - #define STREAM_MAX 20 - #define TZNAME_MAX 10 - - #endif /* POSIX */ - - #endif /* _INC_LIMITS */ -#endif diff --git a/src/common/malloc.h b/src/common/malloc.h index d6c6e50c4..e9dbb9d44 100644 --- a/src/common/malloc.h +++ b/src/common/malloc.h @@ -15,8 +15,6 @@ #endif #define ALC_MARK __FILE__, __LINE__, __func__ -#include "limits.h" - ////////////////////////////////////////////////////////////////////// // Whether to use Athena's built-in Memory Manager (enabled by default) // To disable just comment the following line -- cgit v1.2.3-70-g09d2