From a9c6cfc7dc50bb721d6c93bf9966a72634318728 Mon Sep 17 00:00:00 2001
From: d1str4ught <>
Date: Mon, 22 Sep 2025 00:59:25 +0200
Subject: [PATCH] sources moved to C++20

---
 CMakeLists.txt            | 2 +-
 src/game/cube.h           | 5 ++---
 src/game/main.cpp         | 3 ++-
 src/libthecore/hangul.cpp | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc2bc07..7792492 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.15)
 project(m2dev-server-src)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_MODULE_PATH
diff --git a/src/game/cube.h b/src/game/cube.h
index 14270f8..5add212 100644
--- a/src/game/cube.h
+++ b/src/game/cube.h
@@ -18,9 +18,8 @@ struct CUBE_VALUE
 	DWORD	vnum;
 	int		count;
 
-	bool operator == (const CUBE_VALUE& b)
-	{
-		return (this->count == b.count) && (this->vnum == b.vnum);
+	bool operator == (const CUBE_VALUE& b) const {
+		return std::tie(vnum, count) == std::tie(b.vnum, b.count);
 	}
 };
 
diff --git a/src/game/main.cpp b/src/game/main.cpp
index 0abb822..8b473d7 100644
--- a/src/game/main.cpp
+++ b/src/game/main.cpp
@@ -638,7 +638,8 @@ int start(int argc, char **argv)
 	}
 #endif
 
-	while ((ch = getopt(argc, argv, "npverltI")) != -1)
+	char optstring[] = "npverltI";
+	while ((ch = getopt(argc, argv, optstring)) != -1)
 	{
 		char* ep = NULL;
 
diff --git a/src/libthecore/hangul.cpp b/src/libthecore/hangul.cpp
index 3d281a0..9e4fee6 100644
--- a/src/libthecore/hangul.cpp
+++ b/src/libthecore/hangul.cpp
@@ -37,7 +37,7 @@ const char* first_han(const BYTE* str)
 {
     unsigned char high, low;
     int len, i;
-    char* p = "그외";
+    const char* p = "그외";
 
     static const char* wansung[] =
     {