removed ponintless ENABLE_PORT_SECURITY define & reorganized config loading

This commit is contained in:
d1str4ught
2025-08-22 17:36:28 +02:00
parent b63c35bd53
commit 5c9ae80bcd
13 changed files with 441 additions and 457 deletions

View File

@@ -1,5 +1,5 @@
#ifndef __INC_METIN_II_LENGTH_H__
#define __INC_METIN_II_LENGTH_H__
#pragma once
#include <cstdint>
#define WORD_MAX 0xffff
enum EMisc
@@ -708,15 +708,15 @@ enum EMisc2
typedef struct SItemPos
{
BYTE window_type;
WORD cell;
uint8_t window_type;
uint16_t cell;
SItemPos ()
{
window_type = INVENTORY;
cell = WORD_MAX;
}
SItemPos (BYTE _window_type, WORD _cell)
SItemPos (uint8_t _window_type, WORD _cell)
{
window_type = _window_type;
cell = _cell;
@@ -792,5 +792,3 @@ typedef enum
} EShopCoinType;
#pragma pack(pop)
#endif

View File

@@ -3,7 +3,6 @@
#define ENABLE_AUTODETECT_INTERNAL_IP
#define ENABLE_PROXY_IP
#define ENABLE_PORT_SECURITY
#define _IMPROVED_PACKET_ENCRYPTION_ // 패킷 암호화 개선
//#define __AUCTION__
#define __PET_SYSTEM__

View File

@@ -11,8 +11,8 @@ template <typename T> class singleton
singleton()
{
assert(!ms_singleton);
long offset = (long) (T*) 1 - (long) (singleton <T>*) (T*) 1;
ms_singleton = (T*) ((long) this + offset);
intptr_t offset = (intptr_t) (T*) 1 - (intptr_t) (singleton <T>*) (T*) 1;
ms_singleton = (T*) ((intptr_t) this + offset);
}
virtual ~singleton()