mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 12:40:00 +00:00
Merge remote-tracking branch 'origin/master' into MoreLanguages
This commit is contained in:
commit
27c9f7bc88
|
@ -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
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue