Merge remote-tracking branch 'origin/master' into MoreLanguages

This commit is contained in:
Sergeanur 2020-04-15 10:54:15 +03:00
commit 27c9f7bc88
3 changed files with 5 additions and 1 deletions

View File

@ -43,3 +43,5 @@ after_build:
artifacts: artifacts:
- path: bin/%CONFIGURATION%/re3.dll - path: bin/%CONFIGURATION%/re3.dll
name: re3.dll name: re3.dll
- path: bin/%CONFIGURATION%/re3.pdb
name: re3.pdb

View File

@ -94,13 +94,14 @@ project "re3"
filter "configurations:Debug" filter "configurations:Debug"
defines { "DEBUG" } defines { "DEBUG" }
staticruntime "on" staticruntime "on"
symbols "On" symbols "Full"
setpaths("$(GTA_III_RE_DIR)/", "gta3.exe", "plugins/") setpaths("$(GTA_III_RE_DIR)/", "gta3.exe", "plugins/")
filter "configurations:Release" filter "configurations:Release"
defines { "NDEBUG" } defines { "NDEBUG" }
optimize "On" optimize "On"
staticruntime "on" staticruntime "on"
symbols "Full"
setpaths("$(GTA_III_RE_DIR)/", "gta3.exe", "plugins/") setpaths("$(GTA_III_RE_DIR)/", "gta3.exe", "plugins/")
filter "configurations:ReleaseFH" filter "configurations:ReleaseFH"

View File

@ -8921,6 +8921,7 @@ int8 CRunningScript::ProcessCommands1000To1099(int32 command)
UpdateCompareFlag(CCredits::AreCreditsDone()); UpdateCompareFlag(CCredits::AreCreditsDone());
return 0; return 0;
case COMMAND_CREATE_SINGLE_PARTICLE: case COMMAND_CREATE_SINGLE_PARTICLE:
CollectParameters(&m_nIp, 8);
CParticle::AddParticle((tParticleType)ScriptParams[0], *(CVector*)&ScriptParams[1], CParticle::AddParticle((tParticleType)ScriptParams[0], *(CVector*)&ScriptParams[1],
*(CVector*)&ScriptParams[4], nil, *(float*)&ScriptParams[7], 0, 0, 0, 0); *(CVector*)&ScriptParams[4], nil, *(float*)&ScriptParams[7], 0, 0, 0, 0);
return 0; return 0;