1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ExtraMercs

Browse Source
This commit is contained in:
Asdow
2025-09-24 16:14:10 +03:00
parent f3194718e4 4ec012ce7b
commit 82aca548f5
601 changed files with 4005 additions and 10278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
i18n/include/Text.h
+1 -3
View File
@@ -1,7 +1,7 @@
#ifndef __TEXT_H
#define __TEXT_H
#include "items.h"
#include "Items.h"
#include "types.h"
#include "mapscreen.h"
#include "XML_Language.h"
@@ -1803,8 +1803,6 @@ BOOLEAN LoadItemProsAndCons( UINT16 usIndex, STR16 pProsString, STR16 pConsStrin
BOOLEAN LoadBRDesc(UINT16 ubIndex, STR16 pDescString );
BOOLEAN LoadBRName(UINT16 ubIndex, STR16 pNameString );
// sevenfm
inline std::string narrow(std::wstring const& text);
// convert UTF-8 string to wstring
std::wstring utf8_to_wstring(const std::string& str);
// convert wstring to UTF-8 string
i18n/include/language.hpp
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include <Types.h>
#include <types.h>
namespace i18n {
enum class Lang