Commit 778772e7 authored by nanahira's avatar nanahira

Merge branch 'server' into server-develop

parents 47f1ebfc c060b0d4
...@@ -27,6 +27,7 @@ install: ...@@ -27,6 +27,7 @@ install:
before_build: before_build:
- xcopy /E premake\* . - xcopy /E premake\* .
- xcopy /E resource\* .
- premake5 vs2019 --server-zip-support - premake5 vs2019 --server-zip-support
configuration: Release configuration: Release
......
No preview for this file type
...@@ -121,7 +121,7 @@ void SoundManager::PlaySound(char* sound) { ...@@ -121,7 +121,7 @@ void SoundManager::PlaySound(char* sound) {
ma_sound_start(usingSoundEffectPointer); ma_sound_start(usingSoundEffectPointer);
#endif #endif
#ifdef YGOPRO_USE_IRRKLANG #ifdef YGOPRO_USE_IRRKLANG
engineSound->play2D(soundPath); engineSound->play2D(sound);
#endif #endif
#endif #endif
} }
......
Subproject commit ca5bd0f5e1b4113d7e046d8228b70fc2281d08eb Subproject commit c839efc376239d72400ee84c42851d8ad76b5535
...@@ -111,7 +111,8 @@ boolOptions = { ...@@ -111,7 +111,8 @@ boolOptions = {
"no-lua-safe", "no-lua-safe",
"message-debug", "message-debug",
"no-side-check", "no-side-check",
"enable-debug-func" "enable-debug-func",
"log-lua-memory-size",
} }
for _, boolOption in ipairs(boolOptions) do for _, boolOption in ipairs(boolOptions) do
...@@ -124,6 +125,7 @@ numberOptions = { ...@@ -124,6 +125,7 @@ numberOptions = {
"min-deck", "min-deck",
"max-extra", "max-extra",
"max-side", "max-side",
"lua-memory-size",
} }
for _, numberOption in ipairs(numberOptions) do for _, numberOption in ipairs(numberOptions) do
......
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