a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-11-13 06:09:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'lcs-dev' into lcs

Browse source
This commit is contained in:
Nikolay Korolev 2021-01-10 22:58:43 +03:00
parent ca64363899 75d1715442
commit 642970df95
3 changed files with 302 additions and 329 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

621
src/control/Script.cpp
View file

File diff suppressed because it is too large Load diff

8
src/control/Script.h
View file

@ -47,6 +47,14 @@ void FlushLog();
#define KEY_LENGTH_IN_SCRIPT (8) #define KEY_LENGTH_IN_SCRIPT (8)
#define GET_INTEGER_PARAM(i) (ScriptParams[i])
#define GET_FLOAT_PARAM(i) (*(float*)&ScriptParams[i])
#define GET_VECTOR_PARAM(i) (CVector(GET_FLOAT_PARAM(i), GET_FLOAT_PARAM(i+1), GET_FLOAT_PARAM(i+2)))
#define SET_INTEGER_PARAM(i, x) ScriptParams[i] = x
#define SET_FLOAT_PARAM(i, x) *(float*)&ScriptParams[i] = x
#define SET_VECTOR_PARAM(i, v) { *(float*)&ScriptParams[i] = (v).x; *(float*)&ScriptParams[i+1] = (v).y; *(float*)&ScriptParams[i+2] = (v).z; }
#define GTA_SCRIPT_COLLECTIVE #define GTA_SCRIPT_COLLECTIVE
struct intro_script_rectangle struct intro_script_rectangle

2
src/control/Script4.cpp
View file

@ -1357,11 +1357,13 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
CTxdStore::AddRef(slot); CTxdStore::AddRef(slot);
return 0; return 0;
} }
/*
case COMMAND_REMOVE_TEXTURE_DICTIONARY: case COMMAND_REMOVE_TEXTURE_DICTIONARY:
{ {
CTheScripts::RemoveScriptTextureDictionary(); CTheScripts::RemoveScriptTextureDictionary();
return 0; return 0;
} }
*/
case COMMAND_SET_OBJECT_DYNAMIC: case COMMAND_SET_OBJECT_DYNAMIC:
{ {
CollectParameters(&m_nIp, 2); CollectParameters(&m_nIp, 2);