Skip to content

Y
ygopro
You need to sign in or sign up before continuing.
Commit 4ce1e99c authored by wind2009's avatar wind2009
Browse files
Options

Merge branch 'server' of https://github.com/purerosefallen/ygopro into 2pick

parents 08b774f1 692922ea
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1771 additions and 972 deletions
cards.cdb
View file @ 4ce1e99c
No preview for this file type
gframe/duelclient.cpp
View file @ 4ce1e99c
......@@ -1318,21 +1318,22 @@ int DuelClient::ClientAnalyze(char * msg, unsigned int len) {
wchar_t vic_buf[256];
if(player == 2)
mainGame->showcardcode = 3;
else if(mainGame->LocalPlayer(player) == 0) {
mainGame->showcardcode = 1;
if(match_kill)
myswprintf(vic_buf, dataManager.GetVictoryString(0xffff), dataManager.GetName(match_kill));
else if(type < 0x10)
myswprintf(vic_buf, L"[%ls] %ls", mainGame->dInfo.clientname, dataManager.GetVictoryString(type));
else
myswprintf(vic_buf, L"%ls", dataManager.GetVictoryString(type));
mainGame->dInfo.vic_string = vic_buf;
} else {
mainGame->showcardcode = 2;
else {
wchar_t vic_name[20];
if(mainGame->LocalPlayer(player) == 0) {
mainGame->showcardcode = 1;
myswprintf(vic_name, L"%ls", mainGame->dInfo.clientname);
}
else {
mainGame->showcardcode = 2;
myswprintf(vic_name, L"%ls", mainGame->dInfo.hostname);
}
if(mainGame->gameConf.hide_player_name)
myswprintf(vic_name, L"********");
if(match_kill)
myswprintf(vic_buf, dataManager.GetVictoryString(0xffff), dataManager.GetName(match_kill));
else if(type < 0x10)
myswprintf(vic_buf, L"[%ls] %ls", mainGame->dInfo.hostname, dataManager.GetVictoryString(type));
myswprintf(vic_buf, L"[%ls] %ls", vic_name, dataManager.GetVictoryString(type));
else
myswprintf(vic_buf, L"%ls", dataManager.GetVictoryString(type));
mainGame->dInfo.vic_string = vic_buf;
......
gframe/game.cpp
View file @ 4ce1e99c
......@@ -229,7 +229,7 @@ bool Game::Initialize() {
SetWindowsIcon();
//main menu
wchar_t strbuf[256];
myswprintf(strbuf, L"KoishiPro %X.0%X.%X Ulysses", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
myswprintf(strbuf, L"KoishiPro %X.0%X.%X Tempestissimo", PRO_VERSION >> 12, (PRO_VERSION >> 4) & 0xff, PRO_VERSION & 0xf);
wMainMenu = env->addWindow(rect<s32>(370, 200, 650, 415), false, strbuf);
wMainMenu->getCloseButton()->setVisible(false);
btnLanMode = env->addButton(rect<s32>(10, 30, 270, 60), wMainMenu, BUTTON_LAN_MODE, dataManager.GetSysString(1200));
......
gframe/irrUString.h
View file @ 4ce1e99c
......@@ -111,9 +111,9 @@ inline uchar16_t swapEndian16(const uchar16_t& c) {
//! \return The new value.
inline uchar32_t swapEndian32(const uchar32_t& c) {
return ((c >> 24) & 0x000000FF) |
((c >> 8) & 0x0000FF00) |
((c << 8) & 0x00FF0000) |
((c << 24) & 0xFF000000);
((c >> 8) & 0x0000FF00) |
((c << 8) & 0x00FF0000) |
((c << 24) & 0xFF000000);
}
//! The Unicode byte order mark.
......@@ -138,21 +138,21 @@ const u8 BOM_ENCODE_UTF32_LEN = 4;
//! Unicode encoding type.
enum EUTF_ENCODE {
EUTFE_NONE = 0,
EUTFE_UTF8,
EUTFE_UTF16,
EUTFE_UTF16_LE,
EUTFE_UTF16_BE,
EUTFE_UTF32,
EUTFE_UTF32_LE,
EUTFE_UTF32_BE
EUTFE_NONE = 0,
EUTFE_UTF8,
EUTFE_UTF16,
EUTFE_UTF16_LE,
EUTFE_UTF16_BE,
EUTFE_UTF32,
EUTFE_UTF32_LE,
EUTFE_UTF32_BE
};
//! Unicode endianness.
enum EUTF_ENDIAN {
EUTFEE_NATIVE = 0,
EUTFEE_LITTLE,
EUTFEE_BIG
EUTFEE_NATIVE = 0,
EUTFEE_LITTLE,
EUTFEE_BIG
};
//! Returns the specified unicode byte order mark in a byte array.
......@@ -2234,7 +2234,7 @@ public:
for (u32 j = 0; j < count; ++j) {
if (ch == c[j]) {
if ((!ignoreEmptyTokens || pos - lastpos != 0) &&
!lastWasSeparator)
!lastWasSeparator)
ret.push_back(ustring16<TAlloc>(&array[lastpospos], pos - lastpos));
foundSeparator = true;
lastpos = (keepSeparators ? pos : pos + 1);
......@@ -2836,7 +2836,7 @@ public:
//! \return An enum describing the endianness of this string.
const unicode::EUTF_ENDIAN getEndianness() const {
if (encoding == unicode::EUTFE_UTF16_LE ||
encoding == unicode::EUTFE_UTF32_LE)
encoding == unicode::EUTFE_UTF32_LE)
return unicode::EUTFEE_LITTLE;
else return unicode::EUTFEE_BIG;
}
......@@ -2964,7 +2964,7 @@ template <typename TAlloc>
inline ustring16<TAlloc> && operator+(ustring16<TAlloc> && left, ustring16<TAlloc> && right) {
//std::cout << "MOVE operator+(&&, &&)" << std::endl;
if ((right.size_raw() <= left.capacity() - left.size_raw()) ||
(right.capacity() - right.size_raw() < left.size_raw())) {
(right.capacity() - right.size_raw() < left.size_raw())) {
left.append(right);
return std::move(left);
} else {
......@@ -3052,7 +3052,7 @@ namespace unicode {
//! Hashing algorithm for hashing a ustring. Used for things like unordered_maps.
//! Algorithm taken from std::hash<std::string>.
class hash : public std::unary_function<core::ustring, size_t> {
class uhash {
public:
size_t operator()(const core::ustring& s) const {
size_t ret = 2166136261U;
......
lflist.conf
View file @ 4ce1e99c
This diff is collapsed.
ocgcore @ dd4322d6
Subproject commit 8857f68841b4507752235e26e2506923913d90ef
Subproject commit dd4322d6ebd8850defa34e6128559c4f7e2bd96b
script @ 52e79efa
Subproject commit d5747ceb983d601d117a838139fe13b0ec502057
Subproject commit 52e79efa0da5294cf5218c107de224a0af264965
strings.conf
View file @ 4ce1e99c
......@@ -661,6 +661,10 @@
!counter 0x64 G石人指示物
!counter 0x1065 兔耳指示物
!counter 0x66 指示物（推荐捏军贯）
!counter 0x67 指示物（战斗车轮）
!counter 0x68 指示物（图腾柱）
!counter 0x69 指示物（吠陀-优婆尼沙昙）
!counter 0x6a 响鸣指示物
#setnames, using tab for comment
!setname 0x1 正义盟军 A・O・J
!setname 0x2 次世代 ジェネクス
......@@ -782,7 +786,7 @@
!setname 0x1050 凶饿毒|蛇毒 スターヴ・ヴェノム
!setname 0x51 零件 ガジェット
!setname 0x52 守护者 ガーディアン
!setname 0x1052 门之守护神|守护者 Gate Guardian
!setname 0x1052 门之守护神|守护者 ゲート・ガーディアン
!setname 0x53 星圣 セイクリッド
!setname 0x54 我我我 ガガガ
!setname 0x55 光子 フォトン
......@@ -824,6 +828,7 @@
!setname 0x73 超量 エクシーズ
!setname 0x1073 混沌超量 CX（カオスエクシーズ）
!setname 0x2073 超量龙 エクシーズ・ドラゴン
!setname 0x4073 铠装超量 アーマード・エクシーズ
!setname 0x74 水精鳞 水精鱗
!setname 0x75 深渊 アビス
!setname 0x76 纹章兽 紋章獣
......@@ -1176,7 +1181,7 @@
!setname 0x187 桥梁 架け橋
!setname 0x188 深渊之兽 ビーステッド
!setname 0x189 俱舍怒威族 クシャトリラ
!setname 0x18a 魊影 Ghoti
!setname 0x18a 魊影 ゴーティス
!setname 0x18b 救援ACE队 R－ACE
!setname 0x18c 纯爱妖精 ピュアリィ
!setname 0x18d 御巫
......@@ -1184,11 +1189,22 @@
!setname 0x18f 防火 ファイアウォール
!setname 0x190 末那愚子族 マナドゥム
!setname 0x191 妮穆蕾莉娅 ネムレリア
!setname 0x192 黄金荣耀 Gold Pride
!setname 0x193 迷宫壁 Labyrinth Wall
!setname 0x192 金傲大奖赛 GP（ゴールド・プライド）
!setname 0x193 迷宫壁 ラビリンス・ウォール
!setname 0x194 至爱 フェイバリット
!setname 0x195 征服斗魂 VS（ヴァンキッシュ・ソウル）
!setname 0x196 新式魔厨 ヌーベルズ
!setname 0x197 食谱 レシピ
!setname 0x198 维萨斯 ヴィサス
!setname 0x199 反击 カウンター
!setname 0x19a 吠陀 ヴェーダ
!setname 0x19b 迪亚贝尔斯塔尔 ディアベルスター
!setname 0x19c 蛇眼 スネークアイ
!setname 0x19d 荷鲁斯 ホルス
!setname 0x19e 罪宝
!setname 0x19f 圣菓使 聖菓使
!setname 0x1a0 哈特 ハート
!setname 0x1a1 莫忘 メメント
!setname 0x1a2 百夫长骑士 センチュリオン
!setname 0x1a3 异响鸣 ヴァルモニカ
!setname 0x1a4 蒂斯蒂娜 Tistina
system.conf
View file @ 4ce1e99c
......@@ -2,7 +2,7 @@
#nickname & gamename should be less than 20 characters
use_d3d = 0
use_image_scale = 1
pro_version = 4948
pro_version = 4960
antialias = 2
errorlog = 3
nickname = Komeiji Koishi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment