mirror of
https://github.com/halpz/re3.git
synced 2024-12-23 17:45:28 +00:00
script until 1497
This commit is contained in:
Nikolay Korolev
parent
e99cd8052c
commit
e5af1edcb9
|
|
@ -1592,24 +1592,24 @@ const tScriptCommandData commands[] = {
|
|||
REGISTER_COMMAND(COMMAND_IS_AUSTRALIAN_GAME, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), true, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_DISARM_CAR_BOMB, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_IS_JAPANESE_GAME, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), true, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1442, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1442, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT, ARGTYPE_INT, ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1443, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1444, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1445, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1446, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1447, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1448, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1449, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1450, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1451, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1452, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1453, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_GET_DISTANCE_BETWEEN_2D_POINTS, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(ARGTYPE_FLOAT, ), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_GET_DISTANCE_BETWEEN_3D_POINTS, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(ARGTYPE_FLOAT, ), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_DOT_PRODUCT_2D, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(ARGTYPE_FLOAT, ), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_DOT_PRODUCT_3D, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(ARGTYPE_FLOAT, ), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_DEBUG_PRINT_WITH_1_FLOAT, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_DEBUG_PRINT_WITH_2_FLOATS, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_DEBUG_PRINT_WITH_3_FLOATS, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_GET_PAD_BUTTON_STATE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(ARGTYPE_INT, ), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_SET_NAVIGATION_ARROW, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_CLEAR_NAVIGATION_ARROW, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_CALL, INPUT_ARGUMENTS(ARGTYPE_FUNCTION, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_NOTCALL, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1456, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1457, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1458, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1459, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_CALLNOT, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_IS_CAR_AUTOMOBILE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), true, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_IS_CAR_BIKE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), true, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_IS_CAR_PLANE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), true, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_IS_CAR_HELI, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), true, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1460, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1461, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1462, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
|
|
@ -1627,26 +1627,26 @@ const tScriptCommandData commands[] = {
|
|||
REGISTER_COMMAND(COMMAND_1474, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1475, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1476, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1477, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1478, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1479, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1480, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1481, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1482, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1483, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1484, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1485, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1486, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1487, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1488, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_RETURN_IF_TRUE, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_RETURN_TRUE_IF_TRUE, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_SET_CHAR_ONLY_ALLOWED_TO_SIT_BEHIND, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_SET_RC_HELI_HEIGHT_LIMIT, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_CREATE_SCRIPT_CORONA, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_INT, ARGTYPE_INT, ARGTYPE_INT, ARGTYPE_INT, ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_REMOVE_SCRIPT_CORONA, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_IS_BOAT_IN_WATER, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), true, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_IS_CAR_DRIVER_BEING_JACKED, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), true, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_SET_CHAR_ONLY_ALLOWED_TO_SIT_IN_FRONT, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_SET_CAR_TILTED_BY_CHAR, INPUT_ARGUMENTS(ARGTYPE_INT, ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_GET_WEAPON_TYPE_FOR_PICKUP_IN_AREA, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(ARGTYPE_INT, ), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_IS_USING_FIRST_PERSON_WEAPON_CAMERA, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), true, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1489, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1490, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1491, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1492, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1493, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1494, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1495, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1496, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1491, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_SET_DEBUG_MENU_ACTUVE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_SET_DRAW_HUD, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_GET_RANDOM_CHAR_IN_AREA_NO_CHECKS, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_GET_RANDOM_CAR_IN_AREA_NO_CHECKS_NO_SAVE, INPUT_ARGUMENTS(ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ARGTYPE_FLOAT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_STORE_CAR_COLLIDED_WITH_NO_SAVE, INPUT_ARGUMENTS(ARGTYPE_INT, ), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1497, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1498, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
REGISTER_COMMAND(COMMAND_1499, INPUT_ARGUMENTS(), OUTPUT_ARGUMENTS(), false, -1, ""),
|
||||
|
|
|
|||
213
src/control/Script10.cpp
Normal file
213
src/control/Script10.cpp
Normal file
|
|
@ -0,0 +1,213 @@
|
|||
#include "common.h"
|
||||
|
||||
#include "Script.h"
|
||||
#include "ScriptCommands.h"
|
||||
|
||||
#include "PlayerPed.h"
|
||||
#include "World.h"
|
||||
|
||||
int8 CRunningScript::ProcessCommands1600To1699(int32 command)
|
||||
{
|
||||
switch (command) {
|
||||
case COMMAND_1600:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1601:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1602:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1603:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1604:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1605:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1606:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1607:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
// TODO (SET_TOTAL_CARS_FOR_EXPORT)
|
||||
return 0;
|
||||
case COMMAND_1608:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1609:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1610:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1611:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1612:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1613:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1614:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1615:
|
||||
// TODO (GET_DEVELOPER_FLAG?)
|
||||
UpdateCompareFlag(false);
|
||||
return 0;
|
||||
case COMMAND_1616:
|
||||
// TODO (SET_DEVELOPER_FLAG)
|
||||
return 0;
|
||||
case COMMAND_1617:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1618:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1619:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1620:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1621:
|
||||
{
|
||||
wchar* key = CTheScripts::GetTextByKeyFromScript(&m_nIp);
|
||||
CollectParameters(&m_nIp, 2);
|
||||
// TODO (SET_SUBTITLE_TEXT)
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_1622:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1623:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1624:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1625:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1626:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1627:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1628:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1629:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1630:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1631:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1632:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1633:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1634:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1635:
|
||||
{
|
||||
char tmp[12]; // TODO
|
||||
CTheScripts::ReadTextLabelFromScript(&m_nIp, tmp);
|
||||
m_nIp += KEY_LENGTH_IN_SCRIPT;
|
||||
// TODO (CHANGE_STORED_PLAYER_OUTFIT?)
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_1636:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1637:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1638:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1639:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1640:
|
||||
CollectParameters(&m_nIp, 2);
|
||||
// TODO (LOCK_GARAGE?)
|
||||
return 0;
|
||||
case COMMAND_1641:
|
||||
// TODO
|
||||
UpdateCompareFlag(true);
|
||||
return 0;
|
||||
case COMMAND_1642:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1643:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1644:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1645:
|
||||
{
|
||||
CollectParameters(&m_nIp, 1);
|
||||
// TODO (GET_STORED_WEAPON?)
|
||||
CPed* pPed = CWorld::Players[ScriptParams[0]].m_pPed;
|
||||
script_assert(pPed);
|
||||
ScriptParams[0] = pPed->m_storedWeapon;
|
||||
StoreParameters(&m_nIp, 1);
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_1646:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
// TODO (DISABLE_PAUSE_MENU?)
|
||||
return 0;
|
||||
case COMMAND_1647:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
// TODO (IS_CHANNEL_PLAYING?)
|
||||
UpdateCompareFlag(false);
|
||||
return 0;
|
||||
case COMMAND_1648:
|
||||
CollectParameters(&m_nIp, 3);
|
||||
// TODO (SET_CLOCK_EVENT_WARNING);
|
||||
return 0;
|
||||
case COMMAND_1649:
|
||||
CollectParameters(&m_nIp, 3);
|
||||
// TODO (SET_EXTRA_COLOUR_DIRECTION)
|
||||
return 0;
|
||||
case COMMAND_1650:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1651:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1652:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1653:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1654:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1655:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1656:
|
||||
CollectParameters(&m_nIp, 2);
|
||||
// TODO (?)
|
||||
return 0;
|
||||
default:
|
||||
script_assert(0);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -2278,6 +2278,7 @@ INITSAVEBUF
|
|||
uint32 runningScripts = ReadSaveBuf<uint32>(buf);
|
||||
for (uint32 i = 0; i < runningScripts; i++)
|
||||
StartNewScript(0)->Load(buf);
|
||||
return true;
|
||||
VALIDATESAVEBUF(size)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@
|
|||
#include "World.h"
|
||||
#include "Zones.h"
|
||||
|
||||
// LCS: file done except TODOs
|
||||
|
||||
int8 CRunningScript::ProcessCommands1200To1299(int32 command)
|
||||
{
|
||||
switch (command) {
|
||||
|
|
@ -856,14 +858,68 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
|
|||
UpdateCompareFlag(result);
|
||||
return 0;
|
||||
}
|
||||
//case COMMAND_HAS_CHAR_BEEN_DAMAGED_BY_CAR:
|
||||
//case COMMAND_HAS_CAR_BEEN_DAMAGED_BY_CHAR:
|
||||
//case COMMAND_HAS_CAR_BEEN_DAMAGED_BY_CAR:
|
||||
case COMMAND_HAS_CHAR_BEEN_DAMAGED_BY_CAR:
|
||||
{
|
||||
CollectParameters(&m_nIp, 2);
|
||||
CPed* pPed = CPools::GetPedPool()->GetAt(GET_INTEGER_PARAM(0));
|
||||
CVehicle* pTestedVehicle = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(1));
|
||||
bool result = false;
|
||||
if (pPed) {
|
||||
if (pPed->m_lastDamEntity) {
|
||||
if (pPed->m_lastDamEntity == pTestedVehicle)
|
||||
result = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
debug("HAS_CHAR_BEEN_DAMAGED_BY_CAR - Character doesn't exist\n");
|
||||
UpdateCompareFlag(result);
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_HAS_CAR_BEEN_DAMAGED_BY_CHAR:
|
||||
{
|
||||
CollectParameters(&m_nIp, 2);
|
||||
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(0));
|
||||
CPed* pTestedPed = CPools::GetPedPool()->GetAt(GET_INTEGER_PARAM(1));
|
||||
bool result = false;
|
||||
if (pVehicle) {
|
||||
if (pVehicle->m_pLastDamageEntity) {
|
||||
if (pVehicle->m_pLastDamageEntity == pTestedPed)
|
||||
result = true;
|
||||
if (pTestedPed->bInVehicle && pVehicle->m_pLastDamageEntity == pTestedPed->m_pMyVehicle)
|
||||
result = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
debug("HAS_CAR_BEEN_DAMAGED_BY_CHAR - Car doesn't exist\n");
|
||||
UpdateCompareFlag(result);
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_HAS_CAR_BEEN_DAMAGED_BY_CAR:
|
||||
{
|
||||
CollectParameters(&m_nIp, 2);
|
||||
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(0));
|
||||
CVehicle* pTestedVehicle = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(1));
|
||||
bool result = false;
|
||||
if (pVehicle) {
|
||||
if (pVehicle->m_pLastDamageEntity) {
|
||||
if (pVehicle->m_pLastDamageEntity == pTestedVehicle)
|
||||
result = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
debug("HAS_CAR_BEEN_DAMAGED_BY_CAR - First car doesn't exist\n");
|
||||
UpdateCompareFlag(result);
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_GET_RADIO_CHANNEL:
|
||||
{
|
||||
// TODO
|
||||
SET_INTEGER_PARAM(0, -1);
|
||||
uint8 radio = DMAudio.GetRadioInCar();
|
||||
if (radio < NUM_RADIOS || radio == STREAMED_SOUND_MISSION_COMPLETED)
|
||||
SET_INTEGER_PARAM(0, radio);
|
||||
else
|
||||
SET_INTEGER_PARAM(0, -1);
|
||||
StoreParameters(&m_nIp, 1);
|
||||
return 0;
|
||||
}
|
||||
//case COMMAND_DISPLAY_TEXT_WITH_3_NUMBERS:
|
||||
//case COMMAND_IS_CAR_DROWNING_IN_WATER:
|
||||
|
|
@ -924,7 +980,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
|
|||
return 0;
|
||||
case COMMAND_ADD_MONEY_SPENT_ON_PROPERTY:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
CStats::MoneySpentOnProperty(GET_INTEGER_PARAM(0));
|
||||
//CStats::MoneySpentOnProperty(GET_INTEGER_PARAM(0));
|
||||
return 0;
|
||||
//case COMMAND_ADD_MONEY_SPENT_ON_AUTO_PAINTING:
|
||||
case COMMAND_SET_CHAR_ANSWERING_MOBILE:
|
||||
|
|
@ -953,12 +1009,12 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
|
|||
//case COMMAND_ADD_LOAN_SHARK_VISITS:
|
||||
case COMMAND_ADD_STORES_KNOCKED_OFF:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
CStats::NumOfStoresKnockedOff(GET_INTEGER_PARAM(0));
|
||||
//CStats::NumOfStoresKnockedOff(GET_INTEGER_PARAM(0));
|
||||
return 0;
|
||||
//case COMMAND_ADD_MOVIE_STUNTS:
|
||||
case COMMAND_ADD_NUMBER_OF_ASSASSINATIONS:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
CStats::NumOfAssassinations(GET_INTEGER_PARAM(0));
|
||||
//CStats::NumOfAssassinations(GET_INTEGER_PARAM(0));
|
||||
return 0;
|
||||
case COMMAND_ADD_PIZZAS_DELIVERED:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
|
|
@ -1145,7 +1201,16 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
|
|||
debug("CLEAR_CHAR_LAST_DAMAGE_ENTITY - Character doesn't exist\n");
|
||||
return 0;
|
||||
}
|
||||
//case COMMAND_CLEAR_CAR_LAST_DAMAGE_ENTITY:
|
||||
case COMMAND_CLEAR_CAR_LAST_DAMAGE_ENTITY:
|
||||
{
|
||||
CollectParameters(&m_nIp, 1);
|
||||
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(0));
|
||||
if (pVehicle)
|
||||
pVehicle->m_pLastDamageEntity = nil;
|
||||
else
|
||||
debug("CLEAR_CAR_LAST_DAMAGE_ENTITY - Car doesn't exist\n");
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_FREEZE_OBJECT_POSITION:
|
||||
{
|
||||
CollectParameters(&m_nIp, 2);
|
||||
|
|
@ -1180,6 +1245,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
|
|||
}
|
||||
case COMMAND_CLEAR_TAXI_SHORTCUT:
|
||||
CGameLogic::ClearShortCut();
|
||||
CGameLogic::RemoveShortCutDropOffPointForMission();
|
||||
return 0;
|
||||
//case COMMAND_SET_CHAR_OBJ_GOTO_CAR_ON_FOOT:
|
||||
//case COMMAND_GET_CLOSEST_WATER_NODE:
|
||||
|
|
@ -1194,7 +1260,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
|
|||
if (pos.z <= MAP_Z_LOW_LIMIT)
|
||||
pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y) + PICKUP_PLACEMENT_OFFSET;
|
||||
CPickups::GetActualPickupIndex(CollectNextParameterWithoutIncreasingPC(m_nIp));
|
||||
SET_INTEGER_PARAM(0, CPickups::GenerateNewOne(pos, MI_PICKUP_CLOTHES, PICKUP_ON_STREET, GET_INTEGER_PARAM(3)));
|
||||
SET_INTEGER_PARAM(0, CPickups::GenerateNewOne(pos, MI_PICKUP_CLOTHES, PICKUP_ON_STREET, GET_INTEGER_PARAM(3))); // TODO: gpModelIndices
|
||||
StoreParameters(&m_nIp, 1);
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1212,6 +1278,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
|
|||
CPlayerInfo* pPlayerInfo = &CWorld::Players[GET_INTEGER_PARAM(0)];
|
||||
pPlayerInfo->m_nMaxHealth += GET_INTEGER_PARAM(1);
|
||||
pPlayerInfo->m_pPed->m_fHealth = pPlayerInfo->m_nMaxHealth;
|
||||
CHud::m_ItemToFlash = ITEM_HEALTH;
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_INCREASE_PLAYER_MAX_ARMOUR:
|
||||
|
|
@ -1220,6 +1287,7 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
|
|||
CPlayerInfo* pPlayerInfo = &CWorld::Players[GET_INTEGER_PARAM(0)];
|
||||
pPlayerInfo->m_nMaxArmour += GET_INTEGER_PARAM(1);
|
||||
pPlayerInfo->m_pPed->m_fArmour = pPlayerInfo->m_nMaxArmour;
|
||||
CHud::m_ItemToFlash = ITEM_ARMOUR;
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_CREATE_RANDOM_CHAR_AS_DRIVER:
|
||||
|
|
@ -1378,13 +1446,16 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
|
|||
return 0;
|
||||
case COMMAND_DOES_VEHICLE_EXIST:
|
||||
{
|
||||
// TODO
|
||||
CollectParameters(&m_nIp, 1);
|
||||
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(GET_INTEGER_PARAM(0));
|
||||
bool bExist = false;
|
||||
if (pVehicle) {
|
||||
int index = CPools::GetVehiclePool()->GetJustIndex_NoFreeAssert(pVehicle);
|
||||
bExist = (index >= 0 && index <= NUMVEHICLES); // TODO: FIX_BUGS
|
||||
int index = GET_INTEGER_PARAM(0) >> 8;
|
||||
#ifdef FIX_BUGS
|
||||
bExist = (index >= 0 && index < NUMVEHICLES); // epic fail
|
||||
#else
|
||||
bExist = (index > 0 && index < NUMVEHICLES);
|
||||
#endif
|
||||
}
|
||||
UpdateCompareFlag(bExist);
|
||||
return 0;
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
338
src/control/Script9.cpp
Normal file
338
src/control/Script9.cpp
Normal file
|
|
@ -0,0 +1,338 @@
|
|||
#include "common.h"
|
||||
|
||||
#include "Script.h"
|
||||
#include "ScriptCommands.h"
|
||||
|
||||
int8 CRunningScript::ProcessCommands1500To1599(int32 command)
|
||||
{
|
||||
switch (command) {
|
||||
case COMMAND_1497:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1498:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1499:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1500:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1501:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1502:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1503:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1504:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1505:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1506:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1507:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1508:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1509:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1510:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1511:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1512:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1513:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1514:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1515:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1516:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1517:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1518:
|
||||
// TODO (?)
|
||||
UpdateCompareFlag(true);
|
||||
return 0;
|
||||
case COMMAND_1519:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
// TODO (SET_NUMBER_USJ_FOUND?)
|
||||
return 0;
|
||||
case COMMAND_1520:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
// TODO (SET_TOTAL_HIDDEN_PACKAGES?)
|
||||
return 0;
|
||||
case COMMAND_1521:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1522:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1523:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1524:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1525:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1526:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1527:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1528:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1529:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1530:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1531:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1532:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1533:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1534:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1535:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1536:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1537:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1538:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1539:
|
||||
//TODO (REGISTER_OUTFIT_CHANGE)
|
||||
return 0;
|
||||
case COMMAND_1540:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1541:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1542:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1543:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1544:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1545:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1546:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1547:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1548:
|
||||
// TODO (GET_ONFOOT_CAMERA_MODE)
|
||||
ScriptParams[0] = 0;
|
||||
StoreParameters(&m_nIp, 1);
|
||||
return 0;
|
||||
case COMMAND_1549:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
// TODO (SET_ONFOOT_CAMERA_MODE?)
|
||||
return 0;
|
||||
case COMMAND_1550:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1551:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1552:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1553:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1554:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1555:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
// TODO (FREEZE_ONFOOT_CAMERA_MODE?)
|
||||
return 0;
|
||||
case COMMAND_1556:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1557:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1558:
|
||||
UpdateCompareFlag(false);
|
||||
// TODO
|
||||
return 0;
|
||||
case COMMAND_1559:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1560:
|
||||
// TODO (IS_E3_BUILD?)
|
||||
UpdateCompareFlag(false);
|
||||
return 0;
|
||||
case COMMAND_1561:
|
||||
// TODO (check, SET_FS_DESTROYED_FLAG)
|
||||
CTheScripts::FSDestroyedFlag = GetPointerToScriptVariable(&m_nIp, VAR_GLOBAL) - (int32*)CTheScripts::ScriptSpace;
|
||||
return 0;
|
||||
case COMMAND_1562:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1563:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1564:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1565:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1566:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1567:
|
||||
CollectParameters(&m_nIp, 1);
|
||||
// TODO (BUILD_WORLD_GEOMETRY)
|
||||
return 0;
|
||||
case COMMAND_1568:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1569:
|
||||
// TODO (IS_MULTIPLAYER_ACTIVE?)
|
||||
UpdateCompareFlag(false);
|
||||
return 0;
|
||||
case COMMAND_1570:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1571:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1572:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1573:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1574:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1575:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1576:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1577:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1578:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1579:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1580:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1581:
|
||||
{
|
||||
// TODO (SET_HELP_MESSAGE?)
|
||||
wchar* key = CTheScripts::GetTextByKeyFromScript(&m_nIp);
|
||||
return 0;
|
||||
}
|
||||
case COMMAND_1582:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1583:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1584:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1585:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1586:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1587:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1588:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1589:
|
||||
CollectParameters(&m_nIp, 2);
|
||||
// TODO (SWAP_BUILDING?)
|
||||
return 0;
|
||||
case COMMAND_1590:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1591:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1592:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1593:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1594:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1595:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1596:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1597:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1598:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
case COMMAND_1599:
|
||||
script_assert(false);
|
||||
return 0;
|
||||
default:
|
||||
script_assert(0);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
|
@ -1445,22 +1445,22 @@ enum {
|
|||
COMMAND_IS_JAPANESE_GAME,
|
||||
COMMAND_1442,
|
||||
COMMAND_1443,
|
||||
COMMAND_1444,
|
||||
COMMAND_1445,
|
||||
COMMAND_1446,
|
||||
COMMAND_1447,
|
||||
COMMAND_1448,
|
||||
COMMAND_1449,
|
||||
COMMAND_1450,
|
||||
COMMAND_1451,
|
||||
COMMAND_1452,
|
||||
COMMAND_1453,
|
||||
COMMAND_GET_DISTANCE_BETWEEN_2D_POINTS,
|
||||
COMMAND_GET_DISTANCE_BETWEEN_3D_POINTS,
|
||||
COMMAND_DOT_PRODUCT_2D,
|
||||
COMMAND_DOT_PRODUCT_3D,
|
||||
COMMAND_DEBUG_PRINT_WITH_1_FLOAT,
|
||||
COMMAND_DEBUG_PRINT_WITH_2_FLOATS,
|
||||
COMMAND_DEBUG_PRINT_WITH_3_FLOATS,
|
||||
COMMAND_GET_PAD_BUTTON_STATE,
|
||||
COMMAND_SET_NAVIGATION_ARROW,
|
||||
COMMAND_CLEAR_NAVIGATION_ARROW,
|
||||
COMMAND_CALL,
|
||||
COMMAND_NOTCALL,
|
||||
COMMAND_1456,
|
||||
COMMAND_1457,
|
||||
COMMAND_1458,
|
||||
COMMAND_1459,
|
||||
COMMAND_CALLNOT,
|
||||
COMMAND_IS_CAR_AUTOMOBILE,
|
||||
COMMAND_IS_CAR_BIKE,
|
||||
COMMAND_IS_CAR_PLANE,
|
||||
COMMAND_IS_CAR_HELI,
|
||||
COMMAND_1460,
|
||||
COMMAND_1461,
|
||||
COMMAND_1462,
|
||||
|
|
@ -1478,26 +1478,26 @@ enum {
|
|||
COMMAND_1474,
|
||||
COMMAND_1475,
|
||||
COMMAND_1476,
|
||||
COMMAND_1477,
|
||||
COMMAND_1478,
|
||||
COMMAND_1479,
|
||||
COMMAND_1480,
|
||||
COMMAND_1481,
|
||||
COMMAND_1482,
|
||||
COMMAND_1483,
|
||||
COMMAND_1484,
|
||||
COMMAND_1485,
|
||||
COMMAND_1486,
|
||||
COMMAND_1487,
|
||||
COMMAND_1488,
|
||||
COMMAND_RETURN_IF_TRUE,
|
||||
COMMAND_RETURN_TRUE_IF_TRUE,
|
||||
COMMAND_SET_CHAR_ONLY_ALLOWED_TO_SIT_BEHIND,
|
||||
COMMAND_SET_RC_HELI_HEIGHT_LIMIT,
|
||||
COMMAND_CREATE_SCRIPT_CORONA,
|
||||
COMMAND_REMOVE_SCRIPT_CORONA,
|
||||
COMMAND_IS_BOAT_IN_WATER,
|
||||
COMMAND_IS_CAR_DRIVER_BEING_JACKED,
|
||||
COMMAND_SET_CHAR_ONLY_ALLOWED_TO_SIT_IN_FRONT,
|
||||
COMMAND_SET_CAR_TILTED_BY_CHAR,
|
||||
COMMAND_GET_WEAPON_TYPE_FOR_PICKUP_IN_AREA,
|
||||
COMMAND_IS_USING_FIRST_PERSON_WEAPON_CAMERA,
|
||||
COMMAND_1489,
|
||||
COMMAND_1490,
|
||||
COMMAND_1491,
|
||||
COMMAND_1492,
|
||||
COMMAND_1493,
|
||||
COMMAND_1494,
|
||||
COMMAND_1495,
|
||||
COMMAND_1496,
|
||||
COMMAND_SET_DEBUG_MENU_ACTUVE,
|
||||
COMMAND_SET_DRAW_HUD,
|
||||
COMMAND_GET_RANDOM_CHAR_IN_AREA_NO_CHECKS,
|
||||
COMMAND_GET_RANDOM_CAR_IN_AREA_NO_CHECKS_NO_SAVE,
|
||||
COMMAND_STORE_CAR_COLLIDED_WITH_NO_SAVE,
|
||||
COMMAND_1497,
|
||||
COMMAND_1498,
|
||||
COMMAND_1499,
|
||||
|
|
|
|||
|
|
@ -277,6 +277,16 @@ public:
|
|||
uint32 InputHowLongAgo(void);
|
||||
void SetDrunkInputDelay(int32 delay) { DrunkDrivingBufferUsed = delay; }
|
||||
|
||||
// TODO(LCS): properly, this is just to get some estimation for script
|
||||
int16 GetOddJobTrigger() { return GetRightShockJustDown(); }
|
||||
int16 GuiLeft() { return GetAnaloguePadLeft() || GetDPadLeftJustDown(); }
|
||||
int16 GuiRight() { return GetAnaloguePadRight() || GetDPadRightJustDown(); }
|
||||
int16 GuiUp() { return GetAnaloguePadUp() || GetDPadUpJustDown(); }
|
||||
int16 GuiDown() { return GetAnaloguePadDown() || GetDPadDownJustDown(); }
|
||||
int16 GuiSelect() { return GetSelect(); }
|
||||
int16 GuiBack() { return GetStart(); }
|
||||
int16 GetSkipCutscene() { return GetCrossJustDown(); }
|
||||
|
||||
#ifdef XINPUT
|
||||
void AffectFromXinput(uint32 pad);
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -499,7 +499,7 @@ public:
|
|||
uint32 bIsDrowning : 1;
|
||||
uint32 bDrownsInWater : 1;
|
||||
uint32 bWaitForLeaderToComeCloser : 1;
|
||||
uint32 bHeldHostageInCar : 1;
|
||||
uint32 bHeldHostageInCar : 1; // one flag was added somewhere after this one (TODO: figure out where and which)
|
||||
uint32 bIsPlayerFriend : 1;
|
||||
uint32 bHeadStuckInCollision : 1;
|
||||
uint32 bDeadPedInFrontOfCar : 1;
|
||||
|
|
@ -512,7 +512,7 @@ public:
|
|||
uint32 bMakeFleeScream : 1;
|
||||
uint32 bPushedAlongByCar : 1;
|
||||
uint32 bRemoveMeWhenIGotIntoCar : 1;
|
||||
uint32 bIgnoreThreatsBehindObjects : 1;
|
||||
uint32 bIgnoreThreatsBehindObjects : 1; // one flag was added somewhere before this one (TODO: figure out where and which)
|
||||
|
||||
uint32 bNeverEverTargetThisPed : 1;
|
||||
uint32 bCrouchWhenScared : 1;
|
||||
|
|
@ -523,8 +523,8 @@ public:
|
|||
uint32 bDonePositionOutOfCollision : 1;
|
||||
|
||||
uint32 bCanAttackPlayerWithCops : 1; // 1A1_1 on PS2
|
||||
uint32 b1A1_2 : 1;
|
||||
uint32 b1A1_4 : 1;
|
||||
uint32 bOnlyAllowedToSitBehind : 1;
|
||||
uint32 bOnlyAllowedToSitInFront : 1;
|
||||
uint32 b1A1_8 : 1;
|
||||
uint32 b1A1_10 : 1;
|
||||
uint32 b1A1_20 : 1;
|
||||
|
|
@ -534,11 +534,29 @@ public:
|
|||
uint32 m_ped_flagI80 : 1; // KANGAROO_CHEAT define makes use of this as cheat toggle
|
||||
#endif
|
||||
|
||||
uint8 m_gangFlags;
|
||||
uint8 m_unused15D; // these 3 can't be padding but had to actually have been members ...
|
||||
uint8 m_unused15E;
|
||||
uint8 m_unused15F;
|
||||
uint8 CharCreatedBy;
|
||||
uint16 m_gangFlags; // <- this one is uint16
|
||||
|
||||
uint8 b1A4_1 : 1;
|
||||
uint8 b1A4_2 : 1;
|
||||
uint8 b1A4_4 : 1;
|
||||
uint8 b1A4_8 : 1;
|
||||
uint8 b1A4_10 : 1;
|
||||
uint8 b1A4_20 : 1;
|
||||
uint8 b1A4_40 : 1;
|
||||
uint8 b1A4_80 : 1;
|
||||
|
||||
uint8 b1A5_1 : 1;
|
||||
uint8 b1A5_2 : 1;
|
||||
uint8 b1A5_4 : 1;
|
||||
uint8 b1A5_8 : 1;
|
||||
uint8 b1A5_10 : 1;
|
||||
uint8 b1A5_20 : 1;
|
||||
uint8 b1A5_40 : 1;
|
||||
uint8 b1A5_80 : 1;
|
||||
|
||||
uint8 unk_1A6; // <- init with 100 in constructor
|
||||
|
||||
uint8 CharCreatedBy; // 1AC
|
||||
eObjective m_objective;
|
||||
eObjective m_prevObjective;
|
||||
CPed *m_pedInObjective;
|
||||
|
|
|
|||
|
|
@ -130,6 +130,8 @@ uint32 CHud::m_LastTimeEnergyLost;
|
|||
|
||||
CSprite2d CHud::Sprites[NUM_HUD_SPRITES];
|
||||
|
||||
wchar* CHud::gLastPrintForeverString;
|
||||
|
||||
struct
|
||||
{
|
||||
const char *name;
|
||||
|
|
|
|||
Loading…
Reference in a new issue