1 files changed, 218 insertions, 33 deletions

diff --git a/src/control/ScriptCommands.h b/src/control/ScriptCommands.h
index 8cf73abd..105fa82f 100644
--- a/src/control/ScriptCommands.h
+++ b/src/control/ScriptCommands.h
@@ -1442,39 +1442,222 @@ enum {
 	COMMAND_REGISTER_FIRE_LEVEL,
 	COMMAND_IS_AUSTRALIAN_GAME,
 	COMMAND_DISARM_CAR_BOMB,
-#if (defined GTAVC_JP_PATCH || defined SUPPORT_JAPANESE_SCRIPT)
 	COMMAND_IS_JAPANESE_GAME,
-#elif (!defined GTA_PS2)
-	COMMAND_SET_ONSCREEN_COUNTER_FLASH_WHEN_FIRST_DISPLAYED,
-#endif
-#if (defined GTA_PC && !defined GTAVC_JP_PATCH || defined GTA_XBOX || defined SUPPORT_XBOX_SCRIPT || defined GTA_MOBILE || defined SUPPORT_MOBILE_SCRIPT)
-	COMMAND_SHUFFLE_CARD_DECKS,
-	COMMAND_FETCH_NEXT_CARD,
-	COMMAND_GET_OBJECT_VELOCITY,
-	COMMAND_IS_DEBUG_CAMERA_ON,
-	COMMAND_ADD_TO_OBJECT_ROTATION_VELOCITY,
-	COMMAND_SET_OBJECT_ROTATION_VELOCITY,
-	COMMAND_IS_OBJECT_STATIC,
-	COMMAND_GET_ANGLE_BETWEEN_2D_VECTORS,
-	COMMAND_DO_2D_RECTANGLES_COLLIDE,
-	COMMAND_GET_OBJECT_ROTATION_VELOCITY,
-	COMMAND_ADD_VELOCITY_RELATIVE_TO_OBJECT_VELOCITY,
-	COMMAND_GET_OBJECT_SPEED,
-#endif
-#if (defined GTA_XBOX || defined SUPPORT_XBOX_SCRIPT)
-	COMMAND_MARK_CUTSCENE_START,
-	COMMAND_MARK_CUTSCENE_END,
-	COMMAND_CUTSCENE_SCROLL,
-#elif (defined GTA_MOBILE || defined SUPPORT_MOBILE_SCRIPT)
-	COMMAND_IS_MISSION_SKIP,
-	COMMAND_SET_IN_AMMUNATION,
-	COMMAND_DO_SAVE_GAME,
-	COMMAND_IS_RETRY,
-	COMMAND_DUMMY,
-	COMMAND_MARK_CUTSCENE_START,
-	COMMAND_MARK_CUTSCENE_END,
-	COMMAND_CUTSCENE_SCROLL,
-#endif
+	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_CALL,
+	COMMAND_NOTCALL,
+	COMMAND_1456,
+	COMMAND_1457,
+	COMMAND_1458,
+	COMMAND_1459,
+	COMMAND_1460,
+	COMMAND_1461,
+	COMMAND_1462,
+	COMMAND_1463,
+	COMMAND_1464,
+	COMMAND_1465,
+	COMMAND_1466,
+	COMMAND_1467,
+	COMMAND_1468,
+	COMMAND_1469,
+	COMMAND_1470,
+	COMMAND_1471,
+	COMMAND_1472,
+	COMMAND_1473,
+	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_1489,
+	COMMAND_1490,
+	COMMAND_1491,
+	COMMAND_1492,
+	COMMAND_1493,
+	COMMAND_1494,
+	COMMAND_1495,
+	COMMAND_1496,
+	COMMAND_1497,
+	COMMAND_1498,
+	COMMAND_1499,
+	COMMAND_1500,
+	COMMAND_1501,
+	COMMAND_1502,
+	COMMAND_1503,
+	COMMAND_1504,
+	COMMAND_1505,
+	COMMAND_1506,
+	COMMAND_1507,
+	COMMAND_1508,
+	COMMAND_1509,
+	COMMAND_1510,
+	COMMAND_1511,
+	COMMAND_1512,
+	COMMAND_1513,
+	COMMAND_1514,
+	COMMAND_1515,
+	COMMAND_1516,
+	COMMAND_1517,
+	COMMAND_1518,
+	COMMAND_1519,
+	COMMAND_1520,
+	COMMAND_1521,
+	COMMAND_1522,
+	COMMAND_1523,
+	COMMAND_1524,
+	COMMAND_1525,
+	COMMAND_1526,
+	COMMAND_1527,
+	COMMAND_1528,
+	COMMAND_1529,
+	COMMAND_1530,
+	COMMAND_1531,
+	COMMAND_1532,
+	COMMAND_1533,
+	COMMAND_1534,
+	COMMAND_1535,
+	COMMAND_1536,
+	COMMAND_1537,
+	COMMAND_1538,
+	COMMAND_1539,
+	COMMAND_1540,
+	COMMAND_1541,
+	COMMAND_1542,
+	COMMAND_1543,
+	COMMAND_1544,
+	COMMAND_1545,
+	COMMAND_1546,
+	COMMAND_1547,
+	COMMAND_1548,
+	COMMAND_1549,
+	COMMAND_1550,
+	COMMAND_1551,
+	COMMAND_1552,
+	COMMAND_1553,
+	COMMAND_1554,
+	COMMAND_1555,
+	COMMAND_1556,
+	COMMAND_1557,
+	COMMAND_1558,
+	COMMAND_1559,
+	COMMAND_1560,
+	COMMAND_1561,
+	COMMAND_1562,
+	COMMAND_1563,
+	COMMAND_1564,
+	COMMAND_1565,
+	COMMAND_1566,
+	COMMAND_1567,
+	COMMAND_1568,
+	COMMAND_1569,
+	COMMAND_1570,
+	COMMAND_1571,
+	COMMAND_1572,
+	COMMAND_1573,
+	COMMAND_1574,
+	COMMAND_1575,
+	COMMAND_1576,
+	COMMAND_1577,
+	COMMAND_1578,
+	COMMAND_1579,
+	COMMAND_1580,
+	COMMAND_1581,
+	COMMAND_1582,
+	COMMAND_1583,
+	COMMAND_1584,
+	COMMAND_1585,
+	COMMAND_1586,
+	COMMAND_1587,
+	COMMAND_1588,
+	COMMAND_1589,
+	COMMAND_1590,
+	COMMAND_1591,
+	COMMAND_1592,
+	COMMAND_1593,
+	COMMAND_1594,
+	COMMAND_1595,
+	COMMAND_1596,
+	COMMAND_1597,
+	COMMAND_1598,
+	COMMAND_1599,
+	COMMAND_1600,
+	COMMAND_1601,
+	COMMAND_1602,
+	COMMAND_1603,
+	COMMAND_1604,
+	COMMAND_1605,
+	COMMAND_1606,
+	COMMAND_1607,
+	COMMAND_1608,
+	COMMAND_1609,
+	COMMAND_1610,
+	COMMAND_1611,
+	COMMAND_1612,
+	COMMAND_1613,
+	COMMAND_1614,
+	COMMAND_1615,
+	COMMAND_1616,
+	COMMAND_1617,
+	COMMAND_1618,
+	COMMAND_1619,
+	COMMAND_1620,
+	COMMAND_1621,
+	COMMAND_1622,
+	COMMAND_1623,
+	COMMAND_1624,
+	COMMAND_1625,
+	COMMAND_1626,
+	COMMAND_1627,
+	COMMAND_1628,
+	COMMAND_1629,
+	COMMAND_1630,
+	COMMAND_1631,
+	COMMAND_1632,
+	COMMAND_1633,
+	COMMAND_1634,
+	COMMAND_1635,
+	COMMAND_1636,
+	COMMAND_1637,
+	COMMAND_1638,
+	COMMAND_1639,
+	COMMAND_1640,
+	COMMAND_1641,
+	COMMAND_1642,
+	COMMAND_1643,
+	COMMAND_1644,
+	COMMAND_1645,
+	COMMAND_1646,
+	COMMAND_1647,
+	COMMAND_1648,
+	COMMAND_1649,
+	COMMAND_1650,
+	COMMAND_1651,
+	COMMAND_1652,
+	COMMAND_1653,
+	COMMAND_1654,
+	COMMAND_1655,
+	COMMAND_1656,
 #ifdef USE_ADVANCED_SCRIPT_DEBUG_OUTPUT
 	LAST_SCRIPT_COMMAND
 #endif
@@ -1493,7 +1676,9 @@ enum eScriptArgument
 	ARGTYPE_PED_HANDLE,
 	ARGTYPE_VEHICLE_HANDLE,
 	ARGTYPE_OBJECT_HANDLE,
-	ARGTYPE_ANDOR
+	ARGTYPE_ANDOR,
+	ARGTYPE_LIST,
+	ARGTYPE_FUNCTION
 };
 
 struct tScriptCommandData