diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/core.c | 2 | ||||
| -rw-r--r-- | src/common/malloc.c | 2 | ||||
| -rw-r--r-- | src/common/mmo.h | 2 | ||||
| -rw-r--r-- | src/common/showmsg.c | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/src/common/core.c b/src/common/core.c index 3cde639f6..15cc90228 100644 --- a/src/common/core.c +++ b/src/common/core.c @@ -134,7 +134,7 @@ const char* get_svn_revision(void) if(*eA_svn_version) return eA_svn_version; - if ((fp = fopen(".svn/entries", "r"))) + if ((fp = fopen(".svn/entries", "r")) != NULL) { char line[1024]; int rev; diff --git a/src/common/malloc.c b/src/common/malloc.c index eda8c3fdb..ff71a2c5e 100644 --- a/src/common/malloc.c +++ b/src/common/malloc.c @@ -289,7 +289,7 @@ void* _mmalloc(size_t size, const char *file, int line, const char *func ) ShowFatalError("Memory manager::memmgr_malloc() serious error (allocating %d+%d bytes at %s:%d)\n", sizeof(struct unit_head_large), size, file, line); memmgr_info(); exit(1); - return NULL; + //return NULL; }; void* _mcalloc(size_t num, size_t size, const char *file, int line, const char *func ) diff --git a/src/common/mmo.h b/src/common/mmo.h index bd5a067d9..6012ebbcb 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -97,8 +97,6 @@ //Room for initial 100k characters #define DEFAULT_MAX_CHAR_ID 250000 -#define CHAR_CONF_NAME "conf/char_athena.conf" - //Base Homun skill. #define HM_SKILLBASE 8000 #define MAX_HOMUNSKILL 16 diff --git a/src/common/showmsg.c b/src/common/showmsg.c index 34338da4b..728bc0c9f 100644 --- a/src/common/showmsg.c +++ b/src/common/showmsg.c @@ -376,7 +376,7 @@ int VFPRINTF(HANDLE handle, const char *fmt, va_list argptr) // \033[2K - Clears all characters of the whole line. uint8 num = (numbers[numpoint]>>4)*10+(numbers[numpoint]&0x0F); - COORD origin = {0,info.dwCursorPosition.Y}; + COORD origin = {0,info.dwCursorPosition.Y}; //warning C4204 SHORT cnt; DWORD tmp; if(num==1) |