diff --git a/cleo5_extensions.sbf b/cleo5_extensions.sbf index 3b96260..76bd2e5 100644 --- a/cleo5_extensions.sbf +++ b/cleo5_extensions.sbf @@ -5,4 +5,5 @@ file ini memory text -math \ No newline at end of file +math +input \ No newline at end of file diff --git a/compiler.ini b/compiler.ini index 9e5ab6d..52e47e7 100644 --- a/compiler.ini +++ b/compiler.ini @@ -30,7 +30,7 @@ ;...................... ; RESERVED WORDS ;...................... -;40=OF +40=OF ;;41=TRUE ;;42=FALSE 43=DEFINE diff --git a/config_params.sbf b/config_params.sbf index b3daea9..63d6994 100644 --- a/config_params.sbf +++ b/config_params.sbf @@ -41,6 +41,9 @@ 21 = Compiler::AddExtraInfo 45 = Compiler::StrictIfValidation 46 = Decompiler:UseIfAndOr +47 = Decompiler::Syntax +48 = Compiler::StringCase +49 = Decompiler::NameFormat ;---------------------- ; Formatting/Aliases diff --git a/gta3/mode.xml b/gta3/mode.xml index ebcff8a..634b678 100644 --- a/gta3/mode.xml +++ b/gta3/mode.xml @@ -11,6 +11,7 @@ @sb:\data\gta3\templates.custom.txt @game:\text\american.gxt @game:\data\default.ide + @game:\data\gta3.dat @sb:\data\gta3_sbl\gta3.json @game:\data @game:\CLEO diff --git a/gta3_sbl/classes.db b/gta3_sbl/classes.db index af384ac..200f50e 100644 --- a/gta3_sbl/classes.db +++ b/gta3_sbl/classes.db @@ -894,10 +894,10 @@ $END $Memory $BEGIN Allocate,0AC8,1,0,("size%i" "address%i") -CallFunction,0AA5,0,0,("address%i" "numParams%i" "pop%i" "funcParams: arguments") -CallFunctionReturn,0AA7,0,0,("address%i" "numParams%i" "pop%i" "funcParams: arguments" "funcRet: any") -CallMethod,0AA6,0,0,("address%i" "struct%i" "numParams%i" "pop%i" "funcParams: arguments") -CallMethodReturn,0AA8,0,0,("address%i" "struct%i" "numParams%i" "pop%i" "funcParams: arguments" "funcRet: any") +CallFunction,0AA5,0,0,("address%i" "numArgs%i" "pop%i" "args: arguments") +CallFunctionReturn,0AA7,0,0,("address%i" "numArgs%i" "pop%i" "args: arguments" "funcRet: any") +CallMethod,0AA6,0,0,("address%i" "struct%i" "numArgs%i" "pop%i" "args: arguments") +CallMethodReturn,0AA8,0,0,("address%i" "struct%i" "numArgs%i" "pop%i" "args: arguments" "funcRet: any") Free,0AC9,0,0,("address%i") GetLabelPointer,0AC6,0,0,(": label" "address%i") GetObjectPointer,0A98,0,0,("object: Object" "address%i") @@ -956,7 +956,7 @@ SetDynamic,0392,0,0,("self: Object" "state%b") SetHeading,0177,0,0,("self: Object" "heading%f") SetRotation,0453,0,0,("self: Object" "x%f" "y%f" "z%f") SetVelocity,0381,0,0,("self: Object" "xSpeed%f" "ySpeed%f" "zSpeed%f") -Slide,034E,1,0,("self: Object" "fromX%f" "fromY%f" "fromZ%f" "xSpeed%f" "ySpeed%f" "zSpeed%f" "collisionCheck%b") +Slide,034E,1,0,("self: Object" "posX%f" "posY%f" "posZ%f" "speedX%f" "speedY%f" "speedZ%f" "collisionCheck%b") $END $Pacman @@ -1343,7 +1343,7 @@ SetProportional,0348,0,0,("state%b") SetRightJustify,03E4,0,0,("state%b") SetScale,033F,0,0,("widthScale%f" "heightScale%f") SetWrapX,0343,0,0,("width%f") -StringFormat,0AD3,0,0,("buffer%i" "format%s" "args: arguments") +StringFormat,0AD3,0,0,("result%s" "format%s" "args: arguments") UseCommands,03F0,0,0,("state%b") $END diff --git a/gta3_sbl/mode.xml b/gta3_sbl/mode.xml index b1c9181..37a5496 100644 --- a/gta3_sbl/mode.xml +++ b/gta3_sbl/mode.xml @@ -7,6 +7,7 @@ @sb:\data\gta3_sbl\constants.txt @game:\data\default.ide + @game:\data\gta3.dat @sb:\data\gta3_sbl\keywords.txt diff --git a/lcs_mobile/CustomVariables.ini b/lcs_mobile/CustomVariables.ini new file mode 100644 index 0000000..000a93f --- /dev/null +++ b/lcs_mobile/CustomVariables.ini @@ -0,0 +1,3 @@ +537=PLAYER_CHAR +541=PLAYER_ACTOR +561=ONMISSION diff --git a/lcs_mobile/mode.xml b/lcs_mobile/mode.xml new file mode 100644 index 0000000..eacd7c9 --- /dev/null +++ b/lcs_mobile/mode.xml @@ -0,0 +1,3 @@ + + @sb:\data\lcs_mobile\CustomVariables.ini + \ No newline at end of file diff --git a/sa/mode.xml b/sa/mode.xml index 0716b1d..cb31fe4 100644 --- a/sa/mode.xml +++ b/sa/mode.xml @@ -27,7 +27,7 @@ @sb:\data\sa\templates.custom.txt @game:\text\american.gxt @game:\data\default.dat - @game:\data\maps\veh_mods\veh_mods.ide + @game:\data\gta.dat @sb:\data\sa_sbl\sa.json @game:\data\script @game:\CLEO diff --git a/sa_sbl/classes.db b/sa_sbl/classes.db index 3a06f06..8928d82 100644 --- a/sa_sbl/classes.db +++ b/sa_sbl/classes.db @@ -5,7 +5,6 @@ Attractor Audio AudioStream AudioStream3D -Bitstream Blip Boat Camera @@ -27,7 +26,6 @@ Debugger DecisionMaker DecisionMakerChar DecisionMakerGroup -DxutDialog DynamicLibrary Entity File @@ -44,7 +42,6 @@ ImGui IniFile KillFrenzy List -LocalChatCmd Math Matrix Memory @@ -59,17 +56,33 @@ Path Pickup Plane Player -RakNet Rc -RenderFont RenderObject -RenderTexture Restart Samp +SampBitstream +SampChat +SampChatInput +SampLocalChatCmd +SampMyPlayer +SampPlayer +SampRaknet +SampTextDraw +SampTextLabel3D ScriptFire Searchlight Sequence Sf +SfConsole +SfD3D +SfD3DFont +SfD3DTexture +SfDownload +SfDxutDialog +SfGFunc +SfGVar +SfScript +SfTimer Shopping Skip Sound @@ -81,7 +94,6 @@ Streaming StuckCarCheck Task Text -TextLabel3D Texture Trailer Train @@ -100,6 +112,7 @@ GetDuration,2501,0,0,("self: AudioStream" "seconds%f") GetInternal,0E3B,0,0,("self: AudioStream" "address%i") GetLength,0AAF,0,0,("self: AudioStream" "length%i") GetProgress,2507,0,0,("self: AudioStream" "progress%f") +GetProgressSeconds,250B,0,0,("self: AudioStream" "progress%f") GetSpeed,2502,0,0,("self: AudioStream" "speed%f") GetState,0AB9,0,0,("self: AudioStream" "state: AudioStreamState") GetType,2509,0,0,("self: AudioStream" "type: AudioStreamType") @@ -109,6 +122,7 @@ Load,0AAC,1,0,("audioFileName%s" "handle: AudioStream") Remove,0AAE,0,0,("self: AudioStream") SetLooped,0AC0,0,0,("self: AudioStream" "state%b") SetProgress,2508,0,0,("self: AudioStream" "progress%f") +SetProgressSeconds,250C,0,0,("self: AudioStream" "progress%f") SetSpeed,2503,0,0,("self: AudioStream" "speed%f") SetSpeedWithTransition,2505,0,0,("self: AudioStream" "speed%f" "timeMs%i") SetState,0AAD,0,0,("self: AudioStream" "action: AudioStreamAction") @@ -915,7 +929,7 @@ UnpausePlayback,05EE,0,0,("self: Car") WanderRandomly,00A8,0,0,("self: Car") WinchCanPickUp,08A5,0,0,("self: Car" "state%b") AttackPlayer,070E,0,0,("self: Plane" "handle: Player" "radius%f") -AttackPlayerUsingDogFight,08A2,0,0,("self: Plane" "player: Player" "radius%f") +AttackPlayerUsingDogFight,08A2,0,0,("self: Plane" "player: Player" "altitude%f") FlyInDirection,070F,0,0,("self: Plane" "heading%f" "minAltitude%f" "maxAltitude%f") FollowEntity,0710,0,0,("self: Plane" "char: Char" "vehicle: Car" "altitude%f") GetUndercarriagePosition,091F,0,0,("self: Plane" "position%f") @@ -1215,6 +1229,7 @@ GetDuration,2501,0,0,("self: AudioStream" "seconds%f") GetInternal,0E3B,0,0,("self: AudioStream" "address%i") GetLength,0AAF,0,0,("self: AudioStream" "length%i") GetProgress,2507,0,0,("self: AudioStream" "progress%f") +GetProgressSeconds,250B,0,0,("self: AudioStream" "progress%f") GetSpeed,2502,0,0,("self: AudioStream" "speed%f") GetState,0AB9,0,0,("self: AudioStream" "state: AudioStreamState") GetType,2509,0,0,("self: AudioStream" "type: AudioStreamType") @@ -1224,6 +1239,7 @@ Load,0AAC,1,0,("audioFileName%s" "handle: AudioStream") Remove,0AAE,0,0,("self: AudioStream") SetLooped,0AC0,0,0,("self: AudioStream" "state%b") SetProgress,2508,0,0,("self: AudioStream" "progress%f") +SetProgressSeconds,250C,0,0,("self: AudioStream" "progress%f") SetSpeed,2503,0,0,("self: AudioStream" "speed%f") SetSpeedWithTransition,2505,0,0,("self: AudioStream" "speed%f" "timeMs%i") SetState,0AAD,0,0,("self: AudioStream" "action: AudioStreamAction") @@ -1232,35 +1248,6 @@ SetVolume,0ABC,0,0,("self: AudioStream" "volume%f") SetVolumeWithTransition,2504,0,0,("self: AudioStream" "volume%f" "timeMs%i") $END -$Bitstream -$BEGIN -Create,0B3D,0,0,("handle: Bitstream") -DecodeCString,0BF4,1,0,("self: Bitstream" "buffer%i" "buffersize%i") -Delete,0B3E,1,0,("self: Bitstream") -EmulateAsPacketIn,0BF7,1,0,("id: SampPacket" "self: Bitstream") -EmulateAsRpcIn,0BF6,1,0,("id: SampRpc" "self: Bitstream") -EncodeString,0BF5,1,0,("self: Bitstream" "buffer%i" "bufferSize%i") -GetBitsUsed,0BEE,0,0,("self: Bitstream" "usedBits%i") -GetBytesUsed,0BEF,1,0,("self: Bitstream" "usedBytes%i") -GetDataPtr,0BF3,1,0,("self: Bitstream" "address%i") -GetReadOffset,0BF2,1,0,("self: Bitstream" "offset%i") -GetUnreadBits,0BF0,1,0,("self: Bitstream" "unreadBits%i") -GetWriteOffset,0BF1,1,0,("self: Bitstream" "offset%i") -Read,0BE7,1,0,("self: Bitstream" "dataType: SampBitStreamDataType" "value: any") -ReadArray,0BE8,1,0,("self: Bitstream" "buffer%i" "size%i") -Reset,0B3F,1,0,("self: Bitstream") -ResetReadPtr,0BE9,1,0,("self: Bitstream") -ResetWritePtr,0BEA,1,0,("self: Bitstream") -SendAsPacket,0B8B,1,0,("self: Bitstream") -SendAsPacketWithParams,0B42,1,0,("self: Bitstream" "priority: SampPriority" "reliability: SampReliability" "orderingChannel%i") -SendAsRpc,0B8A,1,0,("rpcId: SampRpc" "self: Bitstream") -SendAsRpcWithParams,0B41,1,0,("rpc: SampRpc" "self: Bitstream" "priority: SampPriority" "reliability: SampReliability" "orderingChannel%i" "shiftTimeStamp%i") -SetReadPtr,0BED,1,0,("self: Bitstream" "offset%i") -SetWriteOffset,0BEC,1,0,("self: Bitstream" "offset%i") -SkipBits,0BEB,1,0,("self: Bitstream" "bitCount%i") -Write,0B40,1,0,("self: Bitstream" "value: any" "dataType: SampBitStreamDataType" "dataSize%i") -$END - $Blip $BEGIN AddForCar,0186,0,0,("vehicle: Car" "handle: Blip") @@ -1692,14 +1679,14 @@ GetPedType,089F,0,0,("self: Char" "pedType: PedType") GetPositionOfEntryExitCharUsed,094C,0,0,("self: Char" "x%f" "y%f" "z%f" "heading%f") GetProofs,0EAC,0,0,("self: Char" "bullet%b" "fire%b" "explosion%b" "collision%b" "melee%b") GetRandomSeed,0EC8,0,0,("self: Char" "randomSeed%i") -GetSampId,0B2B,0,0,("self: Char" "id%i") +GetSampId,0B2B,0,0,("self: Char" "idAsHandle: SampPlayer") GetScriptTaskStatus,062E,0,0,("self: Char" "taskId%i" "status: TaskStatus") GetSequenceProgress,0646,0,0,("self: Char" "progress%i") GetSequenceProgressRecursive,07A4,0,0,("self: Char" "_p2%i" "_p3%i") GetSimplestActiveTask,0EFF,1,0,("self: Char" "taskId: TaskId" "address%i") GetSpeed,06AC,0,0,("self: Char" "speed%f") GetStatId,0EB1,0,0,("self: Char" "pedStat: PedStat") -GetSwimState,0966,0,0,("self: Char" "state%i") +GetSwimState,0966,0,0,("self: Char" "state: SwimState") GetTaskPointerById,0E43,1,0,("self: Char" "taskId: TaskId" "address%i") GetTimeIsDead,0ECE,0,0,("self: Char" "timeIsDead%i") GetVelocity,083D,0,0,("self: Char" "x%f" "y%f" "z%f") @@ -1839,7 +1826,7 @@ LocateStoppedOnFoot3D,0102,1,0,("self: Char" "x%f" "y%f" "z%f" "xRadius%f" "yRad MarkAsNeeded,0E0B,0,0,("self: Char") MarkAsNoLongerNeeded,01C2,0,0,("self: Char") PerformSequence,0618,0,0,("self: Char" "sequence: Sequence") -PerformSequenceFromProgress,07A0,0,0,("self: Char" "sequence: Sequence" "_p3%i" "_p4%i") +PerformSequenceFromProgress,07A0,0,0,("self: Char" "sequence: Sequence" "startTaskIndex%i" "endTaskIndex%i") RemoveAllWeapons,048F,0,0,("self: Char") RemoveElegantly,034F,0,0,("self: Char") RemoveFromCarMaintainPosition,09C9,0,0,("self: Char" "vehicle: Car") @@ -1898,7 +1885,7 @@ SetRelationship,077A,0,0,("self: Char" "relationshipType: RelationshipType" "ped SetRenderObjectAutoHide,0E30,0,0,("self: Char" "dead%b" "weapon%b" "car%b") SetRotation,083E,0,0,("self: Char" "x%f" "y%f" "z%f") SetSayContext,0947,0,0,("self: Char" "phrase: SpeechId" "_p3%i") -SetSayContextImportant,09D5,0,0,("self: Char" "phrase: SpeechId" "_p3%b" "_p4%b" "_p5%b" "_p6%i") +SetSayContextImportant,09D5,0,0,("self: Char" "phrase: SpeechId" "overrideSilence%b" "ignoreMute%b" "frontEnd%b" "saidVariant%i") SetSayScript,09D6,0,0,("self: Char" "_p2%i" "_p3%b" "_p4%b" "_p5%b") SetSecondPlayer,0EA0,0,0,("self: Char" "enableCamera%b" "separateCars%b") SetSenseRange,060F,0,0,("handle: Char" "range%f") @@ -2050,48 +2037,6 @@ DoesExist,09F2,1,0,("handle: any") Remove,065C,0,0,("self: DecisionMaker") $END -$DxutDialog -$BEGIN -AddButton,0B82,0,0,("self: DxutDialog" "id%i" "text%s" "relCoordX%i" "relCoordY%i" "width%i" "height%i") -AddCheckbox,0B83,0,0,("self: DxutDialog" "id%i" "text%s" "relCoordX%i" "relCoordY%i" "width%i" "height%i") -AddEditbox,0B88,0,0,("self: DxutDialog" "id%i" "initialText%s" "coordX%i" "coordY%i" "width%i" "height%i") -AddListbox,0B99,0,0,("self: DxutDialog" "id%i" "relCoordX%i" "relCoordY%i" "width%i" "height%i") -AddSlider,0B96,0,0,("self: DxutDialog" "id%i" "relCoordX%i" "relCoordY%i" "width%i" "height%i" "maxValue%i") -AddStaticText,0B91,0,0,("self: DxutDialog" "id%i" "text%s" "relCoordX%i" "relCoordY%i" "width%i" "height%i") -Create,0B80,0,0,("title%s" "handle: DxutDialog") -Delete,0BA4,0,0,("self: DxutDialog") -DeleteControl,0BA3,0,0,("self: DxutDialog" "id%i") -DeleteListboxElement,0B9C,1,0,("self: DxutDialog" "id%i" "index%i") -DoesExist,0BAB,1,0,("self: DxutDialog") -GetControlCoords,0BA9,0,0,("self: DxutDialog" "id%i" "coordX%i" "coordY%i") -GetControlDims,0BA7,0,0,("self: DxutDialog" "id%i" "width%i" "height%i") -GetControlText,0B89,1,0,("self: DxutDialog" "id%i" "text%i") -GetCoordsAndDims,0B85,0,0,("self: DxutDialog" "coordX%i" "coordY%i" "width%i" "height%i") -GetListboxElement,0B9D,1,0,("self: DxutDialog" "id%i" "index%i" "text%s" "data%i") -GetSelectedListboxElement,0B9B,0,0,("self: DxutDialog" "id%i" "index%i" "count%i") -GetSliderValue,0B97,0,0,("self: DxutDialog" "id%i" "value%i") -InsertListboxElement,0B9A,1,0,("self: DxutDialog" "id%i" "text%i" "data%i" "index%i") -IsCheckBoxChecked,0B92,1,0,("self: DxutDialog" "checkboxId%i") -IsControlVisible,0B95,1,0,("self: DxutDialog" "id%i") -IsMinimized,0BA2,1,0,("self: DxutDialog") -IsTitleVisible,0BA0,1,0,("self: DxutDialog") -IsVisible,0B87,1,0,("self: DxutDialog") -Pop,0B81,1,0,("self: DxutDialog" "eventId%i" "controlId%i") -SetBgColor,0B93,0,0,("self: DxutDialog" "color%i") -SetCheckboxColor,0BAA,0,0,("self: DxutDialog" "id%i" "color%i") -SetCheckboxStatus,0B9E,0,0,("self: DxutDialog" "id%i" "isChecked%b") -SetControlCoords,0BA8,0,0,("self: DxutDialog" "id%i" "relCoordX%i" "relCoordY%i") -SetControlText,0B94,1,0,("self: DxutDialog" "id%i" "text%s") -SetCoordsAndDims,0B84,0,0,("self: DxutDialog" "coordX%i" "coordY%i" "width%i" "height%i") -SetDims,0BA6,0,0,("self: DxutDialog" "id%i" "width%i" "height%i") -SetMinimized,0BA1,0,0,("self: DxutDialog" "isMinimized%b") -SetSliderValue,0B98,0,0,("self: DxutDialog" "id%i" "value%i") -SetTitleVisibility,0B9F,0,0,("self: DxutDialog" "isVisible%b") -SetVisibilityOfControl,0B90,0,0,("self: DxutDialog" "controlId%i" "isVisible%i") -ToggleControlFocus,0BA5,0,0,("self: DxutDialog" "id%i") -Visibility,0B86,0,0,("self: DxutDialog" "isVisible%b") -$END - $DynamicLibrary $BEGIN Free,0AA3,0,0,("self: DynamicLibrary") @@ -2158,7 +2103,7 @@ AddExplosion,020C,0,0,("x%f" "y%f" "z%f" "type: ExplosionType") AddExplosionNoSound,0565,0,0,("x%f" "y%f" "z%f" "type: ExplosionType") AddExplosionVariableShake,0948,0,0,("x%f" "y%f" "z%f" "type%i" "shake%f") AddParticle,0EC0,0,0,("particle: Particle" "posX%f" "posY%f" "posZ%f" "velX%f" "velY%f" "velZ%f" "size%f" "brightness%f" "r%f" "g%f" "b%f" "a%f" "lastFactor%f") -AddSmokeParticle,095C,0,0,("x%f" "y%f" "z%f" "velocityX%f" "velocityY%f" "velocityZ%f" "red%i" "green%i" "blue%i" "alpha%i" "size%f" "lastFactor%f") +AddSmokeParticle,095C,0,0,("x%f" "y%f" "z%f" "velocityX%f" "velocityY%f" "velocityZ%f" "red%f" "green%f" "blue%f" "alpha%f" "size%f" "lastFactor%f") AddSparks,08EB,0,0,("x%f" "y%f" "z%f" "velocityX%f" "velocityY%f" "velocityZ%f" "density%i") DrawCorona,024F,0,0,("x%f" "y%f" "z%f" "size%f" "coronaType: CoronaType" "flareType: FlareType" "r%i" "g%i" "b%i") DrawLightWithRange,09E5,0,0,("x%f" "y%f" "z%f" "red%i" "green%i" "blue%i" "radius%f") @@ -2191,7 +2136,7 @@ FixTwoPlayersSeparatedCars,0EA2,0,0,() ForceAllVehicleLightsOff,0A37,0,0,("state%b") ForceDeathRestart,0970,0,0,() FrameMod,0E45,1,0,("mod%i") -GetCurrentLanguage,09FB,0,0,("languageSlot%i") +GetCurrentLanguage,09FB,0,0,("languageSlot: Language") GetCurrentResolution,0E0E,0,0,("width%i" "height%i") GetCurrentSaveSlot,0E2C,0,0,("slot%i") GetFramerate,2244,0,0,("fps%i") @@ -2474,14 +2419,6 @@ Reset,0E79,0,0,("self: List") Reverse,0E7E,0,0,("self: List") $END -$LocalChatCmd -$BEGIN -Hook,0B34,1,0,("chatCommand%s" "callbackLabel: label") -IsHooked,0C90,1,0,("chatCommand%s") -SetDescription,0C7F,0,0,("chatCommand%s" "decription%s") -Unhook,0B63,1,0,("chatCommand%s") -$END - $Math $BEGIN Abs,0097,0,0,("number%f") @@ -2538,10 +2475,10 @@ $END $Memory $BEGIN Allocate,0AC8,1,0,("size%i" "address%i") -CallFunction,0AA5,0,0,("address%i" "numParams%i" "pop%i" "funcParams: arguments") -CallFunctionReturn,0AA7,0,0,("address%i" "numParams%i" "pop%i" "funcParams: arguments" "funcRet: any") -CallMethod,0AA6,0,0,("address%i" "struct%i" "numParams%i" "pop%i" "funcParams: arguments") -CallMethodReturn,0AA8,0,0,("address%i" "struct%i" "numParams%i" "pop%i" "funcParams: arguments" "funcRet: any") +CallFunction,0AA5,0,0,("address%i" "numArgs%i" "pop%i" "args: arguments") +CallFunctionReturn,0AA7,0,0,("address%i" "numArgs%i" "pop%i" "args: arguments" "funcRet: any") +CallMethod,0AA6,0,0,("address%i" "struct%i" "numArgs%i" "pop%i" "args: arguments") +CallMethodReturn,0AA8,0,0,("address%i" "struct%i" "numArgs%i" "pop%i" "args: arguments" "funcRet: any") Copy,2400,0,0,("src%i" "dest%i" "size%i") Forget,2403,0,0,("address%i") Free,0AC9,0,0,("address%i") @@ -2711,14 +2648,20 @@ SetTurnMass,0908,0,0,("self: Object" "turnMass%f") SetVelocity,0381,0,0,("self: Object" "xSpeed%f" "ySpeed%f" "zSpeed%f") SetVisible,0750,0,0,("self: Object" "state%b") SimulateDamage,0E95,0,0,("self: Object" "damage%f" "weaponType: WeaponType") -Slide,034E,1,0,("self: Object" "fromX%f" "fromY%f" "fromZ%f" "xSpeed%f" "ySpeed%f" "zSpeed%f" "collisionCheck%b") +Slide,034E,1,0,("self: Object" "posX%f" "posY%f" "posZ%f" "speedX%f" "speedY%f" "speedZ%f" "collisionCheck%b") SortOutCollisionWithCar,050E,0,0,("self: Object" "handle: Car") WinchCanPickUp,0916,0,0,("self: Object" "state%b") $END $Pad $BEGIN +EmulateKeyPress,2083,0,0,("keyCode: KeyCode") +EmulateKeyRelease,2084,0,0,("keyCode: KeyCode") +GetControllerKey,2085,1,0,("action: ControllerAction" "altKey: ControllerAltKey" "keyCode: KeyCode") GetControllerMode,0293,0,0,("mode: ControllerMode") +GetKeyJustPressedInRange,2082,1,0,("minKeyCode: KeyCode" "maxKeyCode: KeyCode" "keyCode: KeyCode") +GetKeyName,2086,1,0,("keyCode: KeyCode" "name%s") +GetKeyPressedInRange,2081,1,0,("minKeyCode: KeyCode" "maxKeyCode: KeyCode" "keyCode: KeyCode") GetPositionOfAnalogueSticks,0494,0,0,("pad: PadId" "leftStickX%i" "leftStickY%i" "rightStickX%i" "rightStickY%i") GetState,00E2,0,0,("pad: PadId" "buttonId: Button" "state%i") GetTimeNotTouching,0F13,0,0,("pad: PadId" "timeInMs%i") @@ -2726,7 +2669,7 @@ IsAimButtonPressed,0E67,1,0,("pad: PadId") IsAnyFireButtonPressed,0E8D,1,0,("pad: PadId") IsButtonJustPressed,0E3E,1,0,("pad: PadId" "buttonId: Button") IsButtonPressed,00E1,1,0,("pad: PadId" "buttonId: Button") -IsKeyJustPressed,0E3D,1,0,("keyCode: KeyCode") +IsKeyJustPressed,2080,1,0,("keyCode: KeyCode") IsKeyPressed,0AB0,1,0,("keyCode: KeyCode") IsSkipCutsceneButtonPressed,08D0,1,0,() SetControl,0E68,0,0,("pad: PadId" "enabled%b") @@ -2877,19 +2820,6 @@ TakeOffGoggles,09EB,0,0,("self: Player" "animate%b") UseDetonator,09D9,0,0,() $END -$RakNet -$BEGIN -GetHookParam,0BE5,1,0,("type: SampRakNetHookParam" "value: any") -GetPacketName,0BF9,1,0,("id%i" "name%i") -GetRpcName,0BF8,1,0,("id%i" "name%s") -HookPacketIn,0BE4,1,0,("callbackLabel: label") -HookPacketOut,0BE2,1,0,("callbackLabel: label") -HookRpcIn,0BE3,1,0,("callbackLabel: label") -HookRpcOut,0BE1,1,0,("callbackLabel: label") -Return,0BE0,0,0,("unblockData%b") -SetHookParam,0BE6,1,0,("type: SampRakNetHookParam" "value: any") -$END - $Rc $BEGIN GetCar,0484,0,0,("player: Player" "car: Car") @@ -2900,15 +2830,6 @@ SetEnableDetonateOnContact,04D6,0,0,("state%b") TakeCar,0715,0,0,("player: Player" "vehicle: Car") $END -$RenderFont -$BEGIN -Create,0B6D,0,0,("fontName%s" "size%i" "flags%i" "handle: RenderFont") -Delete,0B6E,1,0,("self: RenderFont") -DrawText,0B6F,0,0,("self: RenderFont" "text%s" "coordX%i" "coordY%i" "color%i") -GetDrawHeight,0B6C,0,0,("self: RenderFont" "height%i") -GetDrawWidth,0B6B,0,0,("self: RenderFont" "text%s" "width%i") -$END - $RenderObject $BEGIN CreateToCharBone,0E2E,0,0,("char: Char" "modelId: model_object" "pedBone: PedBone" "x%f" "y%f" "z%f" "rx%f" "ry%f" "rz%f" "handle: RenderObject") @@ -2920,13 +2841,6 @@ SetScale,0E37,0,0,("self: RenderObject" "x%f" "y%f" "z%f") SetVisible,0E31,0,0,("self: RenderObject" "visible%b") $END -$RenderTexture -$BEGIN -Draw,0B73,0,0,("self: RenderTexture" "coordX%i" "coordY%i" "width%i" "height%i" "heading%f" "contrast%i") -Load,0B71,1,0,("filePath%s" "handle: RenderTexture") -Release,0B72,1,0,("self: RenderTexture") -$END - $Restart $BEGIN AddHospital,016C,0,0,("x%f" "y%f" "z%f" "heading%f" "citiesPassed%i") @@ -2940,29 +2854,22 @@ $END $Samp $BEGIN -AddChatMessage,0AF8,0,0,("format%s" "color%i" "args: arguments") -Available,0AFA,1,0,() -ChatInputVisible,0B21,1,0,() -ChatVisible,0BDB,1,0,() CloseDialog,0B47,1,0,("button: SampDialogButton") -CmdRet,0B43,0,0,() Connect,0B38,0,0,("serverIp%s" "port%i") -CursorActive,0B8C,1,0,() -DialogActive,0B4C,1,0,("id%i") -DialogClientSide,0BDA,1,0,() -DialogResponded,0B3C,1,0,("dialogId%i" "buttonId%i" "listItemId%i" "inputTextBuffer%i") -ForceSpawn,0AF6,0,0,() +ForceAimSync,0C84,0,0,() +ForceDrivingSync,0C81,0,0,("id%i") +ForceOnfootSync,0C83,0,0,() +ForcePassengerSync,0C86,0,0,("carId%i" "seatId: SeatId") +ForceStatsSync,0C87,0,0,() +ForceTrailerSync,0C85,0,0,("id%i") +ForceUnnocupiedSync,0C82,0,0,("carId%i" "seatId: SeatId") +ForceWeaponsSync,0C88,0,0,() GetAnimId,0B59,1,0,("animName%s" "fileName%s" "animId%i") GetAnimName,0B58,1,0,("animId%i" "fileName%i" "animName%i") GetBaseAddress,0AF7,0,0,("pointer%i") GetCar,0AFF,0,0,("id%i" "handle: Car") GetCarPoolPtr,0BB8,0,0,("address%i") -GetChar,0B20,0,0,("id%i" "handle: Char") -GetChatDisplayMode,0BDC,0,0,("mode: SampChatDisplayMode") GetChatInfoPtr,0BAF,0,0,("address%i") -GetChatInputText,0B77,1,0,("buffer%s") -GetChatLine,0B75,1,0,("index%i" "bodyBuffer%s" "prefixBuffer%s" "bodyColor%i" "prefixColor%i") -GetCmdParams,0B35,1,0,("pointer%i") GetCursorMode,0B8E,1,0,("mode: SampCursorMode") GetDialogContent,0BD7,0,0,("buffer%s") GetDialogEditboxText,0B4A,1,0,("buffer%s") @@ -2973,6 +2880,7 @@ GetDialogItemsCount,0B54,1,0,("itemsCount%i") GetDialogSelectedItem,0B48,1,0,("itemId%i") GetDialogStyle,0B4D,1,0,("style: SampDialogStyle") GetDialogTitle,0BD8,0,0,("buffer%s") +GetGamestate,0B4F,0,0,("statusId: SampGameState") GetGangZonePoolPtr,0BB5,0,0,("address%i") GetInfoPtr,0B7F,0,0,("address%i") GetKillInfoPtr,0BB1,0,0,("address%i") @@ -2981,17 +2889,8 @@ GetObject,0B50,1,0,("id%i" "handle: Object") GetObjectPoolPtr,0BB4,0,0,("address%i") GetPickup,0B51,1,0,("id%i" "handle: Pickup") GetPickupPoolPtr,0BB9,0,0,("address%i") -GetPlayerAnim,0B57,1,0,("playerId%i" "animId%i") -GetPlayerArmor,0B26,0,0,("id%i" "armor%i") -GetPlayerColor,0B37,0,0,("id%i" "color%i") -GetPlayerHealth,0B25,0,0,("id%i" "health%i") -GetPlayerName,0B36,0,0,("id%i" "nickname%i") -GetPlayerPing,0B2A,0,0,("id%i" "ping%i") +GetPlayerCount,0C8B,0,0,("streamedOnly%b" "playerCount%i") GetPlayerPoolPtr,0BB7,0,0,("address%i") -GetPlayerPtr,0B24,0,0,("id%i" "address%i") -GetPlayerScore,0B65,1,0,("id%i" "score%i") -GetPlayerSpecialAction,0B62,1,0,("playerId%i" "specialActionId: SampSpecialAction") -GetPlayerStreamedOutCoords,0B2F,0,0,("id%i" "x%f" "y%f" "z%f") GetPoolsPtr,0BAD,0,0,("address%i") GetRakClientFunc,0B7C,0,0,("index%i" "address%i") GetRakClientInterface,0B7A,0,0,("pointer%i") @@ -3003,17 +2902,25 @@ GetServerName,0B3A,0,0,("buffer%s") GetServerSettingsPtr,0BAC,0,0,("address%i") GetTextDrawPoolPtr,0BB3,0,0,("address%i") GetTextLabelPoolPtr,0BB6,0,0,("address%i") -Npc,0B64,1,0,("id%i") -PlayerPaused,0B5C,1,0,("playerId%i") -RemotePlayerConnected,0B23,1,0,("id%i") +HasDialogResponded,0B3C,1,0,("dialogId%i" "buttonId%i" "listItemId%i" "inputTextBuffer%i") +IsAvailable,0AFA,1,0,() +IsCursorActive,0B8C,1,0,() +IsDialogActive,0B4C,1,0,("id%i") +IsDialogClientSide,0BDA,1,0,() +IsScoreboardVisible,0BD5,1,0,() +MaxPlayerId,0C8A,1,0,("streamedOnly%b" "maxPlayerId%i") +ReadSampMemoryWithOffset,0B2E,0,0,("offset%i" "size%i" "value: any") SelectDialogItem,0B49,1,0,("itemId%i") -SendAimData,0BC3,0,0,("stAimData%i") -SendBulletData,0BC4,0,0,("stBulletData%i") -SendChatMsg,0AF9,0,0,("format%s" "args: arguments") -SendInCarData,0BC1,0,0,("stInCarData%i") -SendOnFootData,0BC0,0,0,("stOnFootData%i") -SendPassengerData,0BC2,0,0,("stPassengerData%i") +SendPktAimData,0BC3,0,0,("stAimData%i") +SendPktBulletData,0BC4,0,0,("stBulletData%i") +SendPktDrivingData,0BC1,0,0,("stInCarData%i") +SendPktOnFootData,0BC0,0,0,("stOnFootData%i") +SendPktPassengerData,0BC2,0,0,("stPassengerData%i") +SendPktSpectatorData,0BC7,0,0,("stSpectatorData%i") +SendPktTrailerData,0BC5,0,0,("stTrailerData%i") +SendPktUnoccupiedCarData,0BC6,0,0,("stUnoccupiedData%i") SendRpcCarDestroyed,0BD4,0,0,("id%i") +SendRpcChat,0AF9,0,0,("format%s" "args: arguments") SendRpcClickPlayer,0BC8,0,0,("playerId%i" "clickSourceId%i") SendRpcClickTextDraw,0BCA,0,0,("textDrawId%i") SendRpcDamageCar,0B33,0,0,("carId%i" "bodyFlags%i" "doorFlags%i" "lightFlags%i" "wheelFlags%i") @@ -3025,6 +2932,7 @@ SendRpcEditObject,0BCD,0,0,("isLocalObject%b" "id%i" "response: SampEditObjectRe SendRpcEnterCar,0B30,0,0,("carId%i" "isPassenger%b") SendRpcExitCar,0B31,0,0,("carId%i") SendRpcGiveDamage,0BCB,0,0,("playerId%i" "floatDamage: SampWeaponDamage" "weapon: WeaponType" "bodyPart: BodyPart") +SendRpcMenuSelectRow,0BD2,0,0,("elementId%i") SendRpcPickedupPickup,0BD1,0,0,("id%i") SendRpcQuitMenu,0BD3,0,0,() SendRpcRconCmd,0BBF,0,0,("command%s") @@ -3034,27 +2942,152 @@ SendRpcRequestSpawn,0BD0,0,0,() SendRpcScmEvent,0AFC,0,0,("carId%i" "type: SampScmEvent" "param1%i" "param2%i") SendRpcSpawn,0B32,0,0,() SendRpcTakeDamage,0BCC,0,0,("playerId%i" "floatDamage: SampWeaponDamage" "weapon: WeaponType" "bodyPart: SampBodyPart") -SendSpectatorData,0BC7,0,0,("stSpectatorData%i") -SendTrailerData,0BC5,0,0,("stTrailerData%i") -SendUnoccupiedCarData,0BC6,0,0,("stUnoccupiedData%i") -SetChatDisplayMode,0BDD,0,0,("mode: SampChatDisplayMode") -SetChatInputText,0B76,0,0,("text%s") -SetChatInputVisibility,0B79,0,0,("isVisible%b") -SetChatLine,0B74,1,0,("chatLinIid%i" "body%s" "prefix%s" "bodyColor%i" "prefixColor%i") SetCursorMode,0B8D,0,0,("mode: SampCursorMode") SetCursorVisibility,0B5D,0,0,("isVisible%b") SetDialogEditboxText,0B4B,1,0,("text%s") SetDialogEnv,0BD9,0,0,("isClientSide%b") SetGameState,0B27,0,0,("id: SampGameState") -SetMyName,0B29,0,0,("nickname%s") +SetScoreboardVisibility,0BD6,0,0,("isVisible%b") SetSendRate,0B22,0,0,("type: SampSendRateType" "delay%i") SetSpecialAction,0AFD,0,0,("id: SampSpecialAction") ShowDialog,0B3B,0,0,("id%i" "title%s" "content%s" "leftOrMiddleButtonName%s" "rightButtonName%s" "style: SampDialogStyle") -StoreAimData,0BBE,1,0,("id%i" "buffer%i") -StoreInCarData,0BBB,1,0,("id%i" "buffer%i") -StoreOnFootData,0BBA,1,0,("id%i" "buffer%i") -StorePassengerData,0BBC,1,0,("id%i" "buffer%i") -StoreTrailerData,0BBD,1,0,("id%i" "buffer%i") +WriteSampMemoryWithOffset,0B2D,0,0,("offset%i" "value: any" "size%i") +$END + +$SampBitstream +$BEGIN +Create,0B3D,0,0,("handle: SampBitstream") +DecodeCString,0BF4,1,0,("self: SampBitstream" "buffer%i" "buffersize%i") +Delete,0B3E,1,0,("self: SampBitstream") +EmulateAsPacketIn,0BF7,1,0,("id: SampPacket" "self: SampBitstream") +EmulateAsRpcIn,0BF6,1,0,("id: SampRpc" "self: SampBitstream") +EncodeString,0BF5,1,0,("self: SampBitstream" "buffer%i" "bufferSize%i") +GetBitsUsed,0BEE,0,0,("self: SampBitstream" "usedBits%i") +GetBytesUsed,0BEF,1,0,("self: SampBitstream" "usedBytes%i") +GetDataPtr,0BF3,1,0,("self: SampBitstream" "address%i") +GetReadOffset,0BF2,1,0,("self: SampBitstream" "offset%i") +GetUnreadBits,0BF0,1,0,("self: SampBitstream" "unreadBits%i") +GetWriteOffset,0BF1,1,0,("self: SampBitstream" "offset%i") +Read,0BE7,1,0,("self: SampBitstream" "dataType: SampBitStreamDataType" "value: any") +ReadArray,0BE8,1,0,("self: SampBitstream" "buffer%i" "size%i") +Reset,0B3F,1,0,("self: SampBitstream") +ResetReadPtr,0BE9,1,0,("self: SampBitstream") +ResetWritePtr,0BEA,1,0,("self: SampBitstream") +SendAsPacket,0B8B,1,0,("self: SampBitstream") +SendAsPacketWithParams,0B42,1,0,("self: SampBitstream" "priority: SampPriority" "reliability: SampReliability" "orderingChannel%i") +SendAsRpc,0B8A,1,0,("rpcId: SampRpc" "self: SampBitstream") +SendAsRpcWithParams,0B41,1,0,("rpc: SampRpc" "self: SampBitstream" "priority: SampPriority" "reliability: SampReliability" "orderingChannel%i" "shiftTimeStamp%i") +SetReadPtr,0BED,1,0,("self: SampBitstream" "offset%i") +SetWriteOffset,0BEC,1,0,("self: SampBitstream" "offset%i") +SkipBits,0BEB,1,0,("self: SampBitstream" "bitCount%i") +Write,0B40,1,0,("self: SampBitstream" "value: any" "dataType: SampBitStreamDataType" "dataSize%i") +$END + +$SampChat +$BEGIN +AddMsg,0AF8,0,0,("format%s" "color%i" "args: arguments") +GetDisplayMode,0BDC,0,0,("mode: SampChatDisplayMode") +GetLine,0B75,1,0,("index%i" "bodyBuffer%s" "prefixBuffer%s" "bodyColor%i" "prefixColor%i") +IsVisible,0BDB,1,0,() +SetDisplayMode,0BDD,0,0,("mode: SampChatDisplayMode") +SetLine,0B74,1,0,("chatLineid%i" "body%s" "prefix%s" "bodyColor%i" "prefixColor%i") +$END + +$SampChatInput +$BEGIN +GetText,0B77,1,0,("buffer%s") +IsVisible,0B21,1,0,() +Process,0C8F,0,0,("text%s") +SetText,0B76,0,0,("text%s") +SetVisibility,0B79,0,0,("isVisible%b") +$END + +$SampLocalChatCmd +$BEGIN +Hook,0B34,1,0,("chatCommand%s" "callback: label") +IsHooked,0C90,1,0,("chatCommand%s") +SetDescription,0C7F,0,0,("chatCommand%s" "decription%s") +Unhook,0B63,1,0,("chatCommand%s") +$END + +$SampMyPlayer +$BEGIN +ForceSpawn,0AF6,0,0,() +IsSpawned,0B61,1,0,() +SetNickname,0B29,0,0,("nickname%s") +$END + +$SampPlayer +$BEGIN +GetAnim,0B57,1,0,("self: SampPlayer" "animId%i") +GetArmor,0B26,0,0,("self: SampPlayer" "armor%i") +GetChar,0B20,0,0,("self: SampPlayer" "handle: Char") +GetColor,0B37,0,0,("self: SampPlayer" "color%i") +GetHealth,0B25,0,0,("self: SampPlayer" "health%i") +GetName,0B36,0,0,("self: SampPlayer" "nickname%i") +GetPing,0B2A,0,0,("self: SampPlayer" "ping%i") +GetPtr,0B24,0,0,("self: SampPlayer" "address%i") +GetScore,0B65,1,0,("self: SampPlayer" "score%i") +GetSpecialAction,0B62,1,0,("self: SampPlayer" "specialActionId: SampSpecialAction") +GetStreamedOutCoords,0B2F,0,0,("self: SampPlayer" "x%f" "y%f" "z%f") +IsNpc,0B64,1,0,("self: SampPlayer") +IsPaused,0B5C,1,0,("self: SampPlayer") +IsRemotelyConnected,0B23,1,0,("self: SampPlayer") +StoreAimData,0BBE,1,0,("self: SampPlayer" "buffer%i") +StoreDrivingData,0BBB,1,0,("self: SampPlayer" "buffer%i") +StoreOnFootData,0BBA,1,0,("self: SampPlayer" "buffer%i") +StorePassengerData,0BBC,1,0,("self: SampPlayer" "buffer%i") +StoreTrailerData,0BBD,1,0,("self: SampPlayer" "buffer%i") +$END + +$SampRaknet +$BEGIN +GetHookParam,0BE5,1,0,("type: SampRakNetHookParam" "value: any") +GetPacketName,0BF9,1,0,("id%i" "name%i") +GetRpcName,0BF8,1,0,("id%i" "name%s") +HookPacketIn,0BE4,1,0,("callback: label") +HookPacketOut,0BE2,1,0,("callback: label") +HookRpcIn,0BE3,1,0,("callback: label") +HookRpcOut,0BE1,1,0,("callback: label") +Return,0BE0,0,0,("processData%b") +SetHookParam,0BE6,1,0,("type: SampRakNetHookParam" "value: any") +$END + +$SampTextDraw +$BEGIN +Create,0C48,1,0,("id: SampTextDraw" "text%s" "coordX%f" "coordY%f") +Delete,0C5E,1,0,("self: SampTextDraw") +DoesExist,0C5D,1,0,("self: SampTextDraw") +GetAlignment,0C54,1,0,("self: SampTextDraw" "alignment: SampTextDrawAlignment") +GetBox,0C53,1,0,("self: SampTextDraw" "isVisible%b" "color%i" "width%f" "height%f") +GetCharProps,0C5C,1,0,("self: SampTextDraw" "width%f" "height%f" "color%i") +GetCoords,0C5B,1,0,("self: SampTextDraw" "coordX%f" "coordY%f") +GetModel,0C59,1,0,("self: SampTextDraw" "model: model_any" "rotPitch%f" "rotRoll%f" "rotYaw%f" "camZoomRange%f" "primaryColor%i" "secondaryColor%i") +GetOutline,0C58,1,0,("self: SampTextDraw" "tickness%i" "color%i") +GetProportionality,0C55,1,0,("self: SampTextDraw" "isProportional%b") +GetShadow,0C57,1,0,("self: SampTextDraw" "tickness%i" "color%i") +GetStyle,0C56,1,0,("self: SampTextDraw" "style%i") +SetAlignment,0C4A,1,0,("self: SampTextDraw" "alignment: SampTextDrawAlignment") +SetBox,0C49,1,0,("self: SampTextDraw" "isVisible%b" "color%i" "width%f" "height%f") +SetCharProps,0C52,1,0,("self: SampTextDraw" "width%f" "height%f" "color%i") +SetCoords,0C51,1,0,("self: SampTextDraw" "coordX%f" "coordY%f") +SetModel,0C4F,1,0,("self: SampTextDraw" "model: model_any" "rotPitch%f" "rotRoll%f" "rotYaw%f" "camZoomRange%f" "primaryColor%i" "secondaryColor%i") +SetOutline,0C4E,1,0,("self: SampTextDraw" "tickness%i" "color%i") +SetProportionality,0C4B,1,0,("self: SampTextDraw" "isProportional%b") +SetShadow,0C4D,1,0,("self: SampTextDraw" "tickness%i" "color%i") +SetStyle,0C4C,1,0,("self: SampTextDraw" "style%i") +SetText,0C50,1,0,("self: SampTextDraw" "text%s") +StoreText,0C5A,1,0,("self: SampTextDraw" "stringBuffer%s") +$END + +$SampTextLabel3D +$BEGIN +Create,0B44,1,0,("text%s" "color%i" "coordX%f" "coordY%f" "coordZ%f" "visibilityRadius%f" "showBehindWalls%b" "attachedPlayerId%i" "attachedCarId%i" "handle: SampTextLabel3D") +CreateWithId,0C45,0,0,("idAsHandle: SampTextLabel3D" "text%i" "color%i" "coordX%f" "coordY%f" "coordZ%f" "visibilityRadius%f" "showBehindWalls%b" "attachedPlayerId%i" "attachedCarId%i") +Delete,0B45,1,0,("self: SampTextLabel3D") +DoesExist,0B46,1,0,("self: SampTextLabel3D") +GetParams,0C46,1,0,("self: SampTextLabel3D" "text%s" "color%i" "coordX%f" "coordY%f" "coordZ%f" "visibilityRadius%f" "showBehindWalls%b" "attachedPlayerId%i" "attachedCarId%i") +SetText,0C47,1,0,("self: SampTextLabel3D" "text%s") $END $ScriptFire @@ -3095,48 +3128,220 @@ $END $Sf $BEGIN +ACos,0C06,0,0,("ratio%f" "radians%f") +ASin,0C04,0,0,("ratio%f" "radians%f") +ATan,0C08,0,0,("ratio%f" "radians%f") +Abs,0C00,0,0,("number: any" "result: any") +AnsiToUnicode,0C69,1,0,("ansiString%s" "unicodeStringBuffer%i" "buffersize%i") ArgbToHex,0B67,0,0,("alpha%i" "red%i" "green%i" "blue%i" "color%i") +AtoF,0C1B,0,0,("ascii%s" "float%f") +AtoI,0C1A,0,0,("ascii%s" "integer%i") +AxesToQuat,0C32,0,0,("pitchVectorX%f" "pitchVectorY%f" "pitchVectorZ%f" "rollVectorX%f" "rollVectorY%f" "rollVectorZ%f" "yawVectorX%f" "yawVectorY%f" "yawVectorZ%f" "quaternionW%f" "quaternionX%f" "quaternionY%f" "quaternionZ%f") +BintoHex,0C22,1,0,("binaryString%s" "stringBuffer%s" "bufferSize%i") +Ceil,0C0A,0,0,("number%f" "result%f") ClipboardReadData,0C8E,1,0,("buffer%i" "size%i") ClipboardWriteText,0C8D,0,0,("text%s") -ConsoleLog,0B78,0,0,("format%s" "args: arguments") -From2Dto3D,0B8F,0,0,("screenCoordX%i" "screenCoordY%i" "depth%f" "worldCoordX%f" "worldCoordY%f" "worldCoordZ%f") -From3DTo2D,0B55,1,0,("worldCoordX%f" "worldCoordY%f" "worldCoordZ%f" "screenCoordX%i" "screenCoordY%i") -FromGameToWinScreen,0B60,0,0,("gameScreenCoordX%f" "gameScreenCoordY%f" "windowScreenCoordX%i" "windowScreenCoordY%i") -FromWinToGameScreen,0B5F,0,0,("windowScreenCoordX%i" "windowScreenCoordY%i" "gameScreenCoordX%f" "gameScreenCoordY%f") +CmdRet,0B43,0,0,() +Cos,0C05,0,0,("radians%f" "ratio%f") +DegToRad,0C02,0,0,("degrees%f" "radians%f") +Floor,0C0B,0,0,("number%f" "result%f") +From2DTo3DCoords,0B8F,0,0,("screenCoordX%i" "screenCoordY%i" "depth%f" "worldCoordX%f" "worldCoordY%f" "worldCoordZ%f") +From3DTo2DCoords,0B55,1,0,("worldCoordX%f" "worldCoordY%f" "worldCoordZ%f" "screenCoordX%i" "screenCoordY%i") +FromGameToWindowScreenCoords,0B60,0,0,("gameScreenCoordX%f" "gameScreenCoordY%f" "windowScreenCoordX%i" "windowScreenCoordY%i") +FromWindowToGameScreenCoords,0B5F,0,0,("windowScreenCoordX%i" "windowScreenCoordY%i" "gameScreenCoordX%f" "gameScreenCoordY%f") +GetCleoLibVer,0C92,0,0,("version%i") +GetCmdParams,0B35,1,0,("pointer%i") GetCursorCoord,0B5E,0,0,("windowScreenCoordX%i" "windowScreenCoordY%i") -GetCustomGlobalVar,0BFD,1,0,("name%s" "value: any") +GetElementPointerOfBufferArray,0C1F,0,0,("array%i" "index%i" "size%i" "address%i") +GetModule,0C70,1,0,("moduleName%s" "handle%i") +GetModuleProc,0C71,1,0,("moduleHandle%i" "functionName%s" "functionPtr%i") +GetOsEnv,0C67,1,0,("varName%s" "stringBuffer%s" "buffersize%i") GetScreenRes,0B5A,0,0,("width%i" "height%i") GetTickCount,0BFE,0,0,("tickCount%i") HexToArgb,0B66,0,0,("color%i" "alpha%i" "red%i" "green%i" "blue%i") -ImSpawned,0B61,1,0,() -MathCeil,0C0A,0,0,("number%f" "result%f") -MathCos,0C05,0,0,("radians%f" "ratio%f") -MathDegToRad,0C02,0,0,("degrees%f" "radians%f") -MathFloor,0C0B,0,0,("number%f" "result%f") -MathModulus,0C00,0,0,("number: any" "modulus: any") -MathPow,0C09,0,0,("coefficient%f" "exponent%f" "power%f") -MathRadToDeg,0C01,0,0,("radians%f" "degrees%f") -MathSin,0C03,0,0,("radians%f" "ratio%f") -MathTan,0C07,0,0,("radians%f" "ratio%f") -MathaCos,0C06,0,0,("ratio%f" "radians%f") -MathaSin,0C04,0,0,("ratio%f" "radians%f") -MathaTan,0C08,0,0,("ratio%f" "radians%f") -PauseThread,0BDE,0,0,("threadId%i") +HextoBin,0C23,1,0,("hexString%s" "stringBuffer%s" "bufferSize%i") +ItoA,0C1C,0,0,("integer%i" "radix%i" "stringBuffer%s") +KeyJustPressed,0C89,1,0,("keyCode: KeyCode") +MakeScriptPrivate,1337,0,0,("isPrivate%i") +MathQuatToMatrixVectors,0C33,0,0,("quaternionW%f" "quaternionX%f" "quaternionY%f" "pitchVectorZ%f" "pitchVectorX%f" "pitchVectorY%f" "pitchVectorZ%f" "rollVectorX%f" "rollVectorY%f" "rollVectorZ%f" "yawVectorX%f" "yawVectorY%f" "yawVectorZ%f") +MatrixToQuat,0C30,0,0,("matrix%i" "quaternionBuffer%i") +MemCpy,0C10,1,0,("destination%i" "source%i" "size%i") +MemEq,0C12,1,0,("addressA%i" "addressB%i" "size%i") +MemFill,0C11,1,0,("address%i" "byteValue%i" "size%i") +PauseScript,0BDE,0,0,("scriptId%i") PopLocalVars,0BFB,0,0,() +Pow,0C09,0,0,("coefficient%f" "exponent%f" "power%f") ProcessLineOfSight,0BFF,1,0,("fromCoordX%f" "fromCoordY%f" "fromCoordZ%f" "toCoordX%f" "toCoordY%f" "toCoordZ%f" "checkBuildings%b" "checkCars%b" "checkChars%b" "checkObjects%b" "checkParticles%b" "seeThrough%b" "ignoreCameras%b" "colPointPtr: any" "entityPtr: any") PushLocalVars,0BFA,0,0,() -RenderDrawBorderedBox,0B6A,0,0,("coordX%i" "coordY%i" "width%i" "height%i" "color%i" "borderSize%i" "borderColor%i") -RenderDrawBorderlessBox,0B69,0,0,("coordX%i" "coordY%i" "width%i" "height%i" "color%i") -RenderDrawLine,0B68,0,0,("fromCoordX%i" "fromCoordY%i" "toCoordX%i" "toCoordY%i" "tickness%i" "color%i") -RenderDrawPolygon,0B70,0,0,("coordX%i" "coordY%i" "width%i" "height%i" "cornerCount%i" "heading%f" "color%i") -ResumeThread,0BDF,0,0,("threadId%i") +QuatToMatrix,0C31,0,0,("quaternion%i" "matrixBuffer%i") +RadToDeg,0C01,0,0,("radians%f" "degrees%f") +ReadElementOf4BytesArray,0C0E,1,0,("array%i" "index%i" "value: any") +ReadElementOfSizedArray,0C1D,1,0,("array%i" "index%i" "size%i" "value: any") +ReadMemoryWithOffset,0C0C,1,0,("address%i" "offset%i" "size%i" "value: any") +ResumeScript,0BDF,0,0,("scriptId%i") SetButton,0B56,0,0,("buttonId: Button" "behaviorValue%i") -SetCustomGlobalVar,0BFC,1,0,("name%s" "value: any") +SetCharKeyStatus,0C73,0,0,("ascii%i" "isPressed%b") +SetKeyStatus,0C72,0,0,("keyCode: KeyCode" "isPressed%b") +Sin,0C03,0,0,("radians%f" "ratio%f") +StrCat,0C15,0,0,("stringBuffer%s" "appendedString%s") +StrChr,0C2A,1,0,("source%s" "character%i" "matchAddress%i") +StrCpy,0C13,0,0,("destination%s" "source%s") +StrCspn,0C19,1,0,("source%s" "characterList%s" "index%i") +StrEq,0C14,1,0,("stringA%s" "stringB%s") +StrLen,0C17,0,0,("string%s" "length%i") +StrLwr,0C28,0,0,("source%s" "destination%s") +StrPBrk,0C2B,1,0,("source%s" "characterList%s" "matchAddress%s") +StrPtr,0C3A,0,0,("var%i" "string%s" "unused: arguments") +StrRChr,0C2C,1,0,("source%s" "character%i" "matchAddress%s") +StrRev,0C2D,0,0,("source%s" "destination%s") +StrSpn,0C2E,1,0,("source%s" "characterList%s" "index%i") +StrStr,0C18,1,0,("source%s" "subString%s" "matchAddress%s") +StrTok,0C16,1,0,("stringBuffer%s" "delimiters%s" "token%s") +StrTol,0C2F,0,0,("source%i" "radix%i" "unscannedAddress%i" "longInteger%i") +StrUpr,0C26,0,0,("source%s" "destination%s") +StriEq,0C21,1,0,("stringA%s" "stringB%s") +StriStr,0C29,1,0,("source%s" "subString%s" "matchAddress%s") +StrnCat,0C27,0,0,("stringBuffer%s" "appendedString%s" "bufferSize%i") +StrnCpy,0C24,0,0,("stringBuffer%i" "source%i" "bufferSize%i") +StrnEq,0C25,1,0,("stringA%s" "stringB%s" "length%i") +Tan,0C07,0,0,("radians%f" "ratio%f") +UnicodeToAnsi,0C68,1,0,("unicodeString%i" "ansiStringBuffer%s" "bufferSize%i") +WriteElementOf4BytesArray,0C0F,1,0,("array%i" "index%i" "value: any") +WriteElementOfSizedArray,0C1E,1,0,("array%i" "index%i" "size%i" "value: any") +WriteMemoryWithOffset,0C0D,1,0,("address%i" "offset%i" "size%i" "value: any") +WriteStringToElementOfBufferArray,0C20,0,0,("array%i" "index%i" "size%i" "string%s") +$END + +$SfConsole +$BEGIN +ExecCmd,0C62,0,0,("command%s") +IsCmdRegistered,0C91,1,0,("command%s") +IsOpen,0C7E,1,0,() +Log,0B78,0,0,("format%s" "args: arguments") +RegisterCmd,0C63,1,0,("command%s" "callback: label") +SetCmdDesc,0C80,0,0,("command%s" "description%s") +UnregisterCmd,0C64,1,0,("command%s") +$END + +$SfD3D +$BEGIN +DrawBorderedBox,0B6A,0,0,("coordX%i" "coordY%i" "width%i" "height%i" "color%i" "borderSize%i" "borderColor%i") +DrawBorderlessBox,0B69,0,0,("coordX%i" "coordY%i" "width%i" "height%i" "color%i") +DrawLine,0B68,0,0,("fromCoordX%i" "fromCoordY%i" "toCoordX%i" "toCoordY%i" "tickness%i" "color%i") +DrawPolygon,0B70,0,0,("coordX%i" "coordY%i" "width%i" "height%i" "cornerCount%i" "heading%f" "color%i") +$END + +$SfD3DFont +$BEGIN +Create,0B6D,0,0,("fontName%s" "size%i" "flags%i" "handle: SfD3DFont") +Delete,0B6E,1,0,("self: SfD3DFont") +DrawText,0B6F,0,0,("self: SfD3DFont" "text%s" "coordX%i" "coordY%i" "color%i") +GetDrawHeight,0B6C,0,0,("self: SfD3DFont" "height%i") +GetDrawWidth,0B6B,0,0,("self: SfD3DFont" "text%s" "width%i") +$END + +$SfD3DTexture +$BEGIN +Draw,0B73,0,0,("self: SfD3DTexture" "coordX%i" "coordY%i" "width%i" "height%i" "heading%f" "contrast%i") +Load,0B71,1,0,("filePath%s" "handle: SfD3DTexture") +LoadTextureFromFileMemory,0C8C,1,0,("buffer%i" "bufferSize%i" "handle: SfD3DTexture") +Release,0B72,1,0,("self: SfD3DTexture") +$END + +$SfDownload +$BEGIN +File,0C65,0,0,("url%s" "filePath%s" "handle: SfDownload") +GetState,0C66,1,0,("self: SfDownload" "state: SfDownloadState") +Release,0C7D,1,0,("self: SfDownload") +$END + +$SfDxutDialog +$BEGIN +AddButton,0B82,0,0,("self: SfDxutDialog" "id%i" "text%s" "relCoordX%i" "relCoordY%i" "width%i" "height%i") +AddCheckbox,0B83,0,0,("self: SfDxutDialog" "id%i" "text%s" "relCoordX%i" "relCoordY%i" "width%i" "height%i") +AddEditbox,0B88,0,0,("self: SfDxutDialog" "id%i" "initialText%s" "coordX%i" "coordY%i" "width%i" "height%i") +AddListbox,0B99,0,0,("self: SfDxutDialog" "id%i" "relCoordX%i" "relCoordY%i" "width%i" "height%i") +AddSlider,0B96,0,0,("self: SfDxutDialog" "id%i" "relCoordX%i" "relCoordY%i" "width%i" "height%i" "maxValue%i") +AddStaticText,0B91,0,0,("self: SfDxutDialog" "id%i" "text%s" "relCoordX%i" "relCoordY%i" "width%i" "height%i") +Create,0B80,0,0,("title%s" "handle: SfDxutDialog") +Delete,0BA4,0,0,("self: SfDxutDialog") +DeleteControl,0BA3,0,0,("self: SfDxutDialog" "id%i") +DeleteListboxElement,0B9C,1,0,("self: SfDxutDialog" "id%i" "index%i") +DoesExist,0BAB,1,0,("self: SfDxutDialog") +GetControlCoords,0BA9,0,0,("self: SfDxutDialog" "id%i" "coordX%i" "coordY%i") +GetControlDims,0BA7,0,0,("self: SfDxutDialog" "id%i" "width%i" "height%i") +GetControlText,0B89,1,0,("self: SfDxutDialog" "id%i" "text%i") +GetCoordsAndDims,0B85,0,0,("self: SfDxutDialog" "coordX%i" "coordY%i" "width%i" "height%i") +GetListboxElement,0B9D,1,0,("self: SfDxutDialog" "id%i" "index%i" "text%s" "data%i") +GetSelectedListboxElement,0B9B,0,0,("self: SfDxutDialog" "id%i" "index%i" "count%i") +GetSliderValue,0B97,0,0,("self: SfDxutDialog" "id%i" "value%i") +InsertListboxElement,0B9A,1,0,("self: SfDxutDialog" "id%i" "text%i" "data%i" "index%i") +IsCheckBoxChecked,0B92,1,0,("self: SfDxutDialog" "checkboxId%i") +IsControlVisible,0B95,1,0,("self: SfDxutDialog" "id%i") +IsMinimized,0BA2,1,0,("self: SfDxutDialog") +IsTitleVisible,0BA0,1,0,("self: SfDxutDialog") +IsVisible,0B87,1,0,("self: SfDxutDialog") +Pop,0B81,1,0,("self: SfDxutDialog" "eventId%i" "controlId%i") +SetBgColor,0B93,0,0,("self: SfDxutDialog" "color%i") +SetCheckboxColor,0BAA,0,0,("self: SfDxutDialog" "id%i" "color%i") +SetCheckboxStatus,0B9E,0,0,("self: SfDxutDialog" "id%i" "isChecked%b") +SetControlCoords,0BA8,0,0,("self: SfDxutDialog" "id%i" "relCoordX%i" "relCoordY%i") +SetControlText,0B94,1,0,("self: SfDxutDialog" "id%i" "text%s") +SetCoordsAndDims,0B84,0,0,("self: SfDxutDialog" "coordX%i" "coordY%i" "width%i" "height%i") +SetDims,0BA6,0,0,("self: SfDxutDialog" "id%i" "width%i" "height%i") +SetMinimized,0BA1,0,0,("self: SfDxutDialog" "isMinimized%b") +SetSliderValue,0B98,0,0,("self: SfDxutDialog" "id%i" "value%i") +SetTitleVisibility,0B9F,0,0,("self: SfDxutDialog" "isVisible%b") +SetVisibilityOfControl,0B90,0,0,("self: SfDxutDialog" "controlId%i" "isVisible%i") +ToggleControlFocus,0BA5,0,0,("self: SfDxutDialog" "id%i") +Visibility,0B86,0,0,("self: SfDxutDialog" "isVisible%b") +$END + +$SfGFunc +$BEGIN +Call,0C35,1,0,("name%s" "numArgs%i" "args: arguments") +GetOrigin,0C38,1,0,("name%s" "hostThreadAddress%i" "functionAddress%i") +IsRegistered,0C37,1,0,("name%s") +Register,0C34,1,0,("name%s" "label: label") +Return,0C36,1,0,("numRet%i" "retParams: arguments") +Unregister,0C39,0,0,("name%s") +$END + +$SfGVar +$BEGIN +DoesExist,0C5F,1,0,("name%s") +Get,0BFD,1,0,("name%s" "value: any") +GetScope,0C61,1,0,("gVarName%i" "scriptPtr%i" "canRead%b" "canWrite%b") +Set,0BFC,1,0,("name%s" "value: any") +SetScope,0C60,1,0,("gVarName%s" "scriptPtr%i" "canRead%b" "canWrite%b") +$END + +$SfScript +$BEGIN +GetLVar,0C6D,0,0,("self: SfScript" "varIndex%i" "value: any") +Restart,0C6F,0,0,("self: SfScript" "passedValues: arguments") +RunFromLabel,0C6A,0,0,("scriptLabel: label" "newScriptPtrTo: SfScript" "passedValues: arguments") +RunFromPtr,0C6B,0,0,("scriptBin%i" "newScriptPtrTo: SfScript" "passedValues: arguments") +SetLVar,0C6C,0,0,("self: SfScript" "varIndex%i" "value: any") +Terminate,0C6E,0,0,("self: SfScript") +$END + +$SfTimer +$BEGIN +Create,0C74,1,0,("interval%i" "callback: label" "handle: SfTimer") +Delete,0C75,1,0,("self: SfTimer") +GetElapsedTime,0C7B,1,0,("self: SfTimer" "elapsedTime%i") +GetInterval,0C7A,1,0,("self: SfTimer" "interval%i") +GetTimeLeft,0C7C,1,0,("self: SfTimer" "timeLeft%i") +IsActive,0C79,1,0,("self: SfTimer") +Reset,0C76,1,0,("self: SfTimer") +SetInterval,0C77,1,0,("self: SfTimer" "interval%i") +SetStatus,0C78,1,0,("self: SfTimer" "isActive%b") $END $Shopping $BEGIN -AddPriceModifier,08C8,0,0,("itemId%i" "modifier%i") +AddPriceModifier,08C8,0,0,("itemId%i" "price%i") BuyItem,0790,0,0,("itemId%i") ClearLoaded,087C,0,0,() GetExtraInfo,0783,0,0,("itemId%i" "flag%i" "value%i") @@ -3283,7 +3488,7 @@ $END $StuckCarCheck $BEGIN Add,03CC,0,0,("vehicle: Car" "distance%f" "time%i") -AddWithWarp,072F,0,0,("vehicle: Car" "distance%f" "time%i" "stuck%b" "flipped%b" "warp%b" "pathId%i") +AddWithWarp,072F,0,0,("vehicle: Car" "distance%f" "time%i" "stuck%b" "flipped%b" "inWater%b" "numNodesToCheck%i") IsCarStuck,03CE,1,0,("vehicle: Car") Remove,03CD,0,0,("vehicle: Car") $END @@ -3321,8 +3526,8 @@ FleeChar,05DB,0,0,("handle: Char" "threat: Char" "radius%f" "time%i") FleeCharAnyMeans,0751,0,0,("handle: Char" "threat: Char" "safeDist%f" "time%i" "shoot%b" "shootTime%i" "shootCooldownTime%i" "stealCarDist%f") FleePoint,05DA,0,0,("handle: Char" "x%f" "y%f" "z%f" "radius%f" "time%i") FollowFootsteps,0850,0,0,("handle: Char" "target: Char") -FollowPathNodesToCoord,05F5,0,0,("handle: Char" "x%f" "y%f" "z%f" "walkSpeed%i" "time%i") -FollowPathNodesToCoordWithRadius,0A2E,0,0,("handle: Char" "x%f" "y%f" "z%f" "mode%i" "time%i" "radius%f") +FollowPathNodesToCoord,05F5,0,0,("handle: Char" "x%f" "y%f" "z%f" "speed: MoveState" "time%i") +FollowPathNodesToCoordWithRadius,0A2E,0,0,("handle: Char" "x%f" "y%f" "z%f" "speed: MoveState" "time%i" "radius%f") FollowPatrolRoute,0817,0,0,("handle: Char" "speed: MoveState" "mode: RouteMode") FollowPointRoute,05D8,0,0,("handle: Char" "speed: MoveState" "mode: RouteMode") GoStraightToCoord,05D3,0,0,("handle: Char" "x%f" "y%f" "z%f" "speed: MoveState" "time%i") @@ -3353,8 +3558,8 @@ LookAtCoord,06A9,0,0,("handle: Char" "x%f" "y%f" "z%f" "time%i") LookAtObject,0655,0,0,("char: Char" "object: Object" "time: any") LookAtVehicle,05C0,0,0,("char: Char" "vehicle: Car" "time%i") Pause,05B9,0,0,("handle: Char" "time%i") -PickUpObject,070A,0,0,("char: Char" "object: Object" "xOffset%f" "yOffset%f" "zOffset%f" "boneId%i" "_p7%i" "animationName%s" "animationFile%s" "time%i") -PickUpSecondObject,09A0,0,0,("char: Char" "object: Object" "xOffset%f" "yOffset%f" "zOffset%f" "boneId%i" "_p7%i" "animationName%s" "animationFile%s" "time%i") +PickUpObject,070A,0,0,("char: Char" "object: Object" "xOffset%f" "yOffset%f" "zOffset%f" "bone: PedBoneId" "orientation: HoldOrientation" "animationName%s" "animationFile%s" "time%i") +PickUpSecondObject,09A0,0,0,("char: Char" "object: Object" "xOffset%f" "yOffset%f" "zOffset%f" "boneId: PedBoneId" "orientation: HoldOrientation" "animationName%s" "animationFile%s" "time%i") PlayAnim,0605,0,0,("handle: Char" "animationName%s" "animationFile%s" "blendSpeed%f" "loop%b" "lockX%b" "lockY%b" "keepLastFrame%b" "time%i") PlayAnimNonInterruptable,0812,0,0,("handle: Char" "animationName%s" "animationFile%s" "blendSpeed%f" "loop%b" "lockX%b" "lockY%b" "keepLastFrame%b" "time%i") PlayAnimSecondary,0A1A,0,0,("handle: Char" "animationName%s" "animationFile%s" "blendSpeed%f" "loop%b" "lockX%b" "lockY%b" "keepLastFrame%b" "time%i") @@ -3392,7 +3597,7 @@ $END $Text $BEGIN AddLabel,0ADF,0,0,("dynamicKey: gxt_key" "text%s") -AddLabelFromatted,2609,0,0,("dynamicKey%s" "format%s" "args: arguments") +AddLabelFormatted,2609,0,0,("dynamicKey%s" "format%s" "args: arguments") AddNextMessageToPreviousBriefs,09C1,0,0,("state%b") ClearHelp,03E6,0,0,() ClearPrints,00BE,0,0,() @@ -3478,21 +3683,11 @@ SetWrapX,0343,0,0,("width%f") StartsWith,2603,1,0,("text%s" "prefix%s" "ignoreCase%b") StringFind,0EC4,1,0,("stringFind: StringFind" "stringOrigin%s" "strFind%s" "index%i") StringFloatFormat,0AED,0,0,("number%f" "format%s" "text%s") -StringFormat,0AD3,0,0,("buffer%i" "format%s" "args: arguments") +StringFormat,0AD3,0,0,("result%s" "format%s" "args: arguments") UnloadFxt,2607,1,0,("filepath%s") UseCommands,03F0,0,0,("state%b") $END -$TextLabel3D -$BEGIN -Create,0B44,1,0,("text%s" "color%i" "coordX%f" "coordY%f" "coordZ%f" "visibilityRadius%f" "showBehindWalls%b" "attachedPlayerId%i" "attachedCarId%i" "handle: TextLabel3D") -CreateWithId,0C45,0,0,("idAsHandle: TextLabel3D" "text%i" "color%i" "coordX%f" "coordY%f" "coordZ%f" "visibilityRadius%f" "showBehindWalls%b" "attachedPlayerId%i" "attachedCarId%i") -Delete,0B45,1,0,("self: TextLabel3D") -DoesExist,0B46,1,0,("self: TextLabel3D") -GetParams,0C46,1,0,("self: TextLabel3D" "text%s" "color%i" "coordX%f" "coordY%f" "coordZ%f" "visibilityRadius%f" "showBehindWalls%b" "attachedPlayerId%i" "attachedCarId%i") -SetText,0C47,1,0,("self: TextLabel3D" "text%s") -$END - $Texture $BEGIN CleanLoaded,0D7D,0,0,("self: Texture") @@ -3611,7 +3806,7 @@ GetRandomCarOfTypeInAreaNoSave,053E,0,0,("leftBottomX%f" "leftBottomY%f" "rightT GetRandomCharInAreaOffsetNoSave,0A3E,0,0,("x%f" "y%f" "z%f" "radiusX%f" "radiusY%f" "radiusZ%f" "handle: Char") GetRandomCharInSphere,073F,0,0,("x%f" "y%f" "z%f" "radius%f" "civilian%b" "gang%b" "criminal%b" "handle: Char") GetRandomCharInSphereNoBrain,08E5,0,0,("x%f" "y%f" "z%f" "radius%f" "handle: Char") -GetRandomCharInSphereNoSaveRecursive,0AE1,1,0,("x%f" "y%f" "z%f" "radius%f" "findNext%b" "skipDead%b" "handle: Char") +GetRandomCharInSphereNoSaveRecursive,0AE1,1,0,("x%f" "y%f" "z%f" "radius%f" "findNext%b" "filter: CharSearchFilter" "handle: Char") GetRandomCharInSphereOnlyDrugsBuyers,089E,0,0,("x%f" "y%f" "z%f" "radius%f" "handle: Char") GetRandomObjectInSphereNoSaveRecursive,0AE3,1,0,("x%f" "y%f" "z%f" "radius%f" "findNext%b" "handle: Object") GetSoundLevelAtCoords,0855,0,0,("handle: Char" "x%f" "y%f" "z%f" "level%f") diff --git a/sa_sbl/enums.txt b/sa_sbl/enums.txt index 4f666ea..f855355 100644 --- a/sa_sbl/enums.txt +++ b/sa_sbl/enums.txt @@ -1004,6 +1004,7 @@ enum BombType end enum RadioChannel + NoRadio=-1 PlaybackFM=0 KRose=1 KDST=2 @@ -1020,15 +1021,13 @@ enum RadioChannel end enum CoronaType - Star=0 - Normal=1 - Moon=2 - Reflect=3 - Headlight=4 - Hex=5 - Circle=6 - Ring=7 - Streak=8 + Normal=0 + Star + Moon + Reflect + Headlight + None + Ring=9 end enum PlayerMood @@ -1067,6 +1066,9 @@ enum DefaultTaskAllocator end enum KeyCode + Min=1 + Max=254 + None=-1 LeftButton=1 RightButton=2 Cancel=3 @@ -3134,362 +3136,366 @@ enum WheelId end enum SpeechId - NoSpeech=0 - AbuseGangBallas=1 - AbuseGangLsv=2 - AbuseGangVla=3 - AbuseGangFamilies=4 - AbuseTriad=5 - AbuseMafia=6 - AbuseRifa=7 - AbuseDaNang=8 - AcceptDateCall=9 - AcceptDateRequest=10 - AfterSex=11 - Apology=12 - Arrest=13 - ArrestCrim=14 - Arrested=15 - AttackByPlayerLike=16 - AttackGangBallas=17 - AttackGangLsv=18 - AttackGangVla=19 - AttackPlayer=20 - BarChat=21 - Blocked=22 - BoozeReceive=23 - BoozeRequest=24 - BumBackOff=25 - BumBackOff2=26 - BumLatch=27 - Bump=28 - CarCrash=29 - CarDrivebyBurnRubber=30 - CarDrivebyTooFast=31 - CarFast=32 - CarFire=33 - CarFlipped=34 - CarGetIn=35 - CarHitPed=36 - CarJump=37 - CarPolicePursuit=38 - CarSlow=39 - CarWaitForMe=40 - CarSingalong=41 - CbChat=42 - ChaseFoot=43 - Chased=44 - Chat=45 - CoffeeAccept=46 - CoffeeDecline=47 - ConvDislCar=48 - ConvDislClothes=49 - ConvDislHair=50 - ConvDislPhys=51 - ConvDislShoes=52 - ConvDislSmell=53 - ConvDislTattoo=54 - ConvDislWeather=55 - ConvIgnored=56 - ConvLikeCar=57 - ConvLikeClothes=58 - ConvLikeHair=59 - ConvLikePhys=60 - ConvLikeShoes=61 - ConvLikeSmell=62 - ConvLikeTattoo=63 - ConvLikeWeather=64 - CoverMe=65 - CrashBike=66 - CrashCar=67 - CrashGeneric=68 - CriminalPlead=69 - DanceImprHigh=70 - DanceImprLow=71 - DanceImprMed=72 - DanceImprNot=73 - Dodge=74 - DrugAggressiveHigh=75 - DrugAggressiveLow=76 - DrugDealerDislike=77 - DrugDealerHate=78 - DrugReasonableHigh=79 - DrugReasonableLow=80 - DruggedChat=81 - DruggedIgnore=82 - DrugsBuy=83 - DrugsSell=84 - Duck=85 - EyeingPed=86 - EyeingPedThreat=87 - EyeingPlayer=88 - Fight=89 - FollowArrive=90 - FollowConstant=91 - FollowReply=92 - GambBjHit=93 - GambBjLose=94 - GambBjStay=95 - GambBjWin=96 - GambBjStick=97 - GambBjDouble=98 - GambBjSplit=99 - GambCasinoWin=100 - GambCasinoLose=101 - GambCongrats=102 - GambRoulChat=103 - GambSlotWin=104 - GangFull=105 - GangbangNo=106 - GangbangYes=107 - GenericHiMale=108 - GenericHiFemale=109 - GenericInsultMale=110 - GenericInsultFemale=111 - GivingHead=112 - GoodCitizen=113 - GunCool=114 - GunRun=115 - HavingSex=116 - JackedCar=117 - JackedGeneric=118 - JackedOnStreet=119 - JackingBike=120 - JackingCarFem=121 - JackingCarMale=122 - JackingGeneric=123 - JoinGangNo=124 - JoinGangYes=125 - JoinMeAsk=126 - JoinMeRejected=127 - LikeCarReply=128 - LikeClothesReply=129 - LikeDismissFemale=130 - LikeDismissMale=131 - LikeDismissReply=132 - LikeHairReply=133 - LikeNegativeFemale=134 - LikeNegativeMale=135 - LikePhysReply=136 - LikeShoesReply=137 - LikeSmellReply=138 - LikeTattooReply=139 - MeetGfriendAgainMaybe=140 - MeetGfriendAgainNo=141 - MeetGfriendAgainYes=142 - MoveIn=143 - Mugged=144 - Mugging=145 - OrderAttackMany=146 - OrderAttackSingle=147 - OrderDisbandMany=148 - OrderDisbandOne=149 - OrderFollowFarMany=150 - OrderFollowFarOne=151 - OrderFollowNearMany=152 - OrderFollowNearOne=153 - OrderFollowVnearMany=154 - OrderFollowVnearOne=155 - OrderKeepUpMany=156 - OrderKeepUpOne=157 - OrderWaitMany=158 - OrderWaitOne=159 - PconvAgreeBad=160 - PconvAgreeGood=161 - PconvAnsNo=162 - PconvDismiss=163 - PconvGreetFem=164 - PconvGreetMale=165 - PconvPartFem=166 - PconvPartMale=167 - PconvQuestion=168 - PconvStateBad=169 - PconvStateGood=170 - PickupCash=171 - PoliceBoat=172 - PoliceHelicopter=173 - PoliceOverboard=174 - PullGun=175 - Rope=176 - RunFromFight=177 - Saved=178 - Search=179 - Shocked=180 - Shoot=181 - ShootBallas=182 - ShootGeneric=183 - ShootLsv=184 - ShootVla=185 - ShootFamilies=186 - ShopBrowse=187 - ShopBuy=188 - ShopSell=189 - ShopLeave=190 - Solicit=191 - SolicitGenNo=192 - SolicitGenYes=193 - SolicitProNo=194 - SolicitProYes=195 - SolicitThanks=196 - SolicitUnreasonable=197 - Solo=198 - SpliffReceive=199 - SpliffRequest=200 - StealthAlertSound=201 - StealthAlertSight=202 - StealthAlertGeneric=203 - StealthDefSighting=204 - StealthNothingThere=205 - Surrounded=206 - TakeTurfLasColinas=207 - TakeTurfLosFlores=208 - TakeTurfEastBeach=209 - TakeTurfEastLs=210 - TakeTurfJefferson=211 - TakeTurfGlenPark=212 - TakeTurfIdlewood=213 - TakeTurfGanton=214 - TakeTurfLittleMexico=215 - TakeTurfWillowfield=216 - TakeTurfPlayaDelSeville=217 - TakeTurfTemple=218 - Target=219 - TaxiBail=220 - TaxiHail=221 - TaxiHitPed=222 - TaxiStart=223 - TaxiSuccess=224 - TaxiTip=225 - Trapped=226 - ValetBad=227 - ValetGood=228 - ValetParkCar=229 - Van=230 - Victim=231 - WeatherDislReply=232 - WeatherLikeReply=233 - WhereYouFromNeg=234 - WhereYouFromPos=235 - Spanked=236 - Spanking=237 - GreetingGfriend=238 - PartingGfriend=239 - UhHuh=240 - ClearAttachedPeds=241 - AgreeToDoDriveby=242 - AgreeToLetDrive=243 - MichelleTakeCar=244 - AcceptSex=245 - DeclineSex=246 - GiveNumberYes=247 - GiveNumberNo=248 - WhereYouFrom=249 - Gangbang=250 - WhereYouFromPosReply=251 - DriveThroughTaunt=252 - AttackCar=253 - TipCar=254 - ChaseCar=255 - EnemyGangWasted=256 - PlayerWasted=257 - Chase=258 - GfriendReqDateDesperate=259 - GfriendReqDateNormal=260 - GfriendReqMealDesperate=261 - GfriendReqMealNormal=262 - GfriendReqDriveDesperate=263 - GfriendReqDriveNormal=264 - GfriendReqDanceDesperate=265 - GfriendReqDanceNormal=266 - GfriendReqSexDesperate=267 - GfriendReqSexNormal=268 - GfriendBored1=269 - GfriendBored2=270 - GfriendStory=271 - GfriendLikeMealDest=272 - GfriendLikeClubDest=273 - GfriendOfferDance=274 - GfriendEnjoyedMealHigh=275 - GfriendEnjoyedEventLow=276 - GfriendEnjoyedClubHigh=277 - GfriendTakeHomeHappy=278 - GfriendTakeHomeAngry=279 - GfriendCoffee=280 - GfriendMoan=281 - GfriendHead=282 - GfriendClimaxHigh=283 - GfriendClimaxLow=284 - GfriendSexGood=285 - GfriendSexBad=286 - GfriendMeetAgain=287 - GfriendJealous=288 - GfriendJealousReply=289 - GfriendGoodbyeHappy=290 - GfriendGoodbyeAngry=291 - GfriendLeftBehind=292 - GfriendHello=293 - GfriendGoodbye=294 - GfriendPickupLocation=295 - GfriendParkUp=296 - GfriendParkLocationHate=297 - GfriendGiftLike=298 - GfriendChangeRadioFave=299 - GfriendChangeRadioBack=300 - GfriendDoADriveby=301 - GfriendStartAFight=302 - GfriendRejectDate=303 - GfriendRequestToDriveCar=304 - GfriendDropPlayerDriveAway=305 - GfriendDislikeCurrentZone=306 - GfriendLikeCurrentZone=307 - GfriendHitByPlayerWarning=308 - GfriendDumpPlayerLive=309 - GfriendDumpPlayerPhone=310 - GfriendSexAppealTooLow=311 - GfriendPhysiqueCritique=312 - GfriendIntro=313 - GfriendNegResponse=314 - GfriendPosResponse=315 - BoxingCheer=316 - BoughtEnough=317 - GiveProduct=318 - NoMoney=319 - PlayerSick=320 - RemoveTattoo=321 - ShopClosed=322 - ShowChangingroom=323 - ShopChat=324 - TakeASeat=325 - ThanksForCustom=326 - WelcomeToShop=327 - WhatWant=328 - PhotoCarl=329 - PhotoCheese=330 - Singing=331 - StomachRumble=332 - Breathing=333 - PainStart=334 - PainCough335 - PainDeathDrown=336 - PainDeathHigh=337 - PainDeathLow=338 - PainHigh=339 - PainLow=340 - PainOnFire=341 - PainPanic=342 - PainSprayed=343 - PainCjBoxing=344 - PainCjGrunt=345 - PainCjPantIn=346 - PainCjPantOut=347 - PainCjPuke=348 - PainCjStrain=349 - PainCjStrainExhale=350 - PainCjSwimGasp=351 - PainCjDrowning=352 - PainCjHighFall=353 - PainEnd=354 - End=355 + Unknown=-1 + NoSpeech + AbuseGangBallas + AbuseGangLsv + AbuseGangVla + AbuseGangFamilies + AbuseTriad + AbuseMafia + AbuseRifa + AbuseDaNang + AcceptDateCall + AcceptDateRequest + AfterSex + Apology + Arrest + ArrestCrim + Arrested + AttackByPlayerLike + AttackGangBallas + AttackGangLsv + AttackGangVla + AttackPlayer + BarChat + Blocked + BoozeReceive + BoozeRequest + BumBackOff + BumBackOff2 + BumLatch + Bump + CarCrash + CarDrivebyBurnRubber + CarDrivebyTooFast + CarFast + CarFire + CarFlipped + CarGetIn + CarHitPed + CarJump + CarPolicePursuit + CarSlow + CarWaitForMe + CarSingalong + CbChat + ChaseFoot + Chased + Chat + CoffeeAccept + CoffeeDecline + ConvDislCar + ConvDislClothes + ConvDislHair + ConvDislPhys + ConvDislShoes + ConvDislSmell + ConvDislTattoo + ConvDislWeather + ConvIgnored + ConvLikeCar + ConvLikeClothes + ConvLikeHair + ConvLikePhys + ConvLikeShoes + ConvLikeSmell + ConvLikeTattoo + ConvLikeWeather + CoverMe + CrashBike + CrashCar + CrashGeneric + CriminalPlead + DanceImprHigh + DanceImprLow + DanceImprMed + DanceImprNot + Dodge + DrugAggressiveHigh + DrugAggressiveLow + DrugDealerDislike + DrugDealerHate + DrugReasonableHigh + DrugReasonableLow + DruggedChat + DruggedIgnore + DrugsBuy + DrugsSell + Duck + EyeingPed + EyeingPedThreat + EyeingPlayer + Fight + FollowArrive + FollowConstant + FollowReply + GambBjHit + GambBjLose + GambBjStay + GambBjWin + GambBjStick + GambBjDouble + GambBjSplit + GambCasinoWin + GambCasinoLose + GambCongrats + GambRoulChat + GambSlotWin + GangFull + GangbangNo + GangbangYes + GenericHiMale + GenericHiFemale + GenericInsultMale + GenericInsultFemale + GivingHead + GoodCitizen + GunCool + GunRun + HavingSex + HavingSexMuffled + JackedCar + JackedGeneric + JackedOnStreet + JackingBike + JackingCarFem + JackingCarMale + JackingGeneric + JoinGangNo + JoinGangYes + JoinMeAsk + JoinMeRejected + LikeCarReply + LikeClothesReply + LikeDismissFemale + LikeDismissMale + LikeDismissReply + LikeHairReply + LikeNegativeFemale + LikeNegativeMale + LikePhysReply + LikeShoesReply + LikeSmellReply + LikeTattooReply + MeetGfriendAgainMaybe + MeetGfriendAgainNo + MeetGfriendAgainYes + MoveIn + Mugged + Mugging + OrderAttackMany + OrderAttackSingle + OrderDisbandMany + OrderDisbandOne + OrderFollowFarMany + OrderFollowFarOne + OrderFollowNearMany + OrderFollowNearOne + OrderFollowVnearMany + OrderFollowVnearOne + OrderKeepUpMany + OrderKeepUpOne + OrderWaitMany + OrderWaitOne + PconvAgreeBad + PconvAgreeGood + PconvAnsNo + PconvDismiss + PconvGreetFem + PconvGreetMale + PconvPartFem + PconvPartMale + PconvQuestion + PconvStateBad + PconvStateGood + PickupCash + PoliceBoat + PoliceHelicopter + PoliceOverboard + PullGun + Rope + RunFromFight + Saved + Search + Shocked + Shoot + ShootBallas + ShootGeneric + ShootLsv + ShootVla + ShootFamilies + ShopBrowse + ShopBuy + ShopSell + ShopLeave + Solicit + SolicitGenNo + SolicitGenYes + SolicitProNo + SolicitProYes + SolicitThanks + SolicitUnreasonable + Solo + SpliffReceive + SpliffRequest + StealthAlertSound + StealthAlertSight + StealthAlertGeneric + StealthDefSighting + StealthNothingThere + Surrounded + TakeTurfLasColinas + TakeTurfLosFlores + TakeTurfEastBeach + TakeTurfEastLs + TakeTurfJefferson + TakeTurfGlenPark + TakeTurfIdlewood + TakeTurfGanton + TakeTurfLittleMexico + TakeTurfWillowfield + TakeTurfPlayaDelSeville + TakeTurfTemple + Target + TaxiBail + TaxiHail + TaxiHitPed + TaxiStart + TaxiSuccess + TaxiTip + Trapped + ValetBad + ValetGood + ValetParkCar + Van + Victim + WeatherDislReply + WeatherLikeReply + WhereYouFromNeg + WhereYouFromPos + Spanked + Spanking + SpankingMuffled + GreetingGfriend + PartingGfriend + UhHuh + ClearAttachedPeds + AgreeToDoDriveby + AgreeToLetDrive + MichelleTakeCar + AcceptSex + DeclineSex + GiveNumberYes + GiveNumberNo + WhereYouFrom + Gangbang + WhereYouFromPosReply + DriveThroughTaunt + AttackCar + TipCar + ChaseCar + EnemyGangWasted + PlayerWasted + Chase + GfriendReqDateDesperate + GfriendReqDateNormal + GfriendReqMealDesperate + GfriendReqMealNormal + GfriendReqDriveDesperate + GfriendReqDriveNormal + GfriendReqDanceDesperate + GfriendReqDanceNormal + GfriendReqSexDesperate + GfriendReqSexNormal + GfriendBored1 + GfriendBored2 + GfriendStory + GfriendLikeMealDest + GfriendLikeClubDest + GfriendOfferDance + GfriendEnjoyedMealHigh + GfriendEnjoyedEventLow + GfriendEnjoyedClubHigh + GfriendTakeHomeHappy + GfriendTakeHomeAngry + GfriendCoffee + GfriendMoan + GfriendMoanMuffled + GfriendHead + GfriendClimaxHigh + GfriendClimaxHighMuffled + GfriendClimaxLow + GfriendSexGood + GfriendSexGoodMuffled + GfriendSexBad + GfriendMeetAgain + GfriendJealous + GfriendJealousReply + GfriendGoodbyeHappy + GfriendGoodbyeAngry + GfriendLeftBehind + GfriendHello + GfriendGoodbye + GfriendPickupLocation + GfriendParkUp + GfriendParkLocationHate + GfriendGiftLike + GfriendChangeRadioFave + GfriendChangeRadioBack + GfriendDoADriveby + GfriendStartAFight + GfriendRejectDate + GfriendRequestToDriveCar + GfriendDropPlayerDriveAway + GfriendDislikeCurrentZone + GfriendLikeCurrentZone + GfriendHitByPlayerWarning + GfriendDumpPlayerLive + GfriendDumpPlayerPhone + GfriendSexAppealTooLow + GfriendPhysiqueCritique + GfriendIntro + GfriendNegResponse + GfriendPosResponse + BoxingCheer + BoughtEnough + GiveProduct + NoMoney + PlayerSick + RemoveTattoo + ShopClosed + ShowChangingroom + ShopChat + TakeASeat + ThanksForCustom + WelcomeToShop + WhatWant + PhotoCarl + PhotoCheese + Singing + StomachRumble + Breathing + PainStart + PainCough + PainDeathDrown + PainDeathHigh + PainDeathLow + PainHigh + PainLow + PainOnFire + PainPanic + PainSprayed + PainCjBoxing + PainCjGrunt + PainCjPantIn + PainCjPantOut + PainCjPuke + PainCjStrain + PainCjStrainExhale + PainCjSwimGasp + PainCjDrowning + PainCjHighFall end enum CarDoorState @@ -4074,3 +4080,135 @@ enum SampChatDisplayMode Standard end +enum SampTextDrawAlignment + Left + Center + Right +end + +enum SfDownloadState + InProgress=-1 + Complete + OutOfMemory=-2147024882 + DownloadFailure=-2146697208 +end + +enum Language + English=0 + French=1 + German=2 + Italian=3 + Spanish=4 +end + +enum CharSearchFilter + Any=-1 + AnyNPC=0 + AnyAliveNPC=1 +end + +enum SwimState + Idle + Breast + Crawl + Dive + Underwater + Jump + JustEnteredWater +end + +enum ControllerAction + PedFireWeapon + PedFireWeaponAlt + PedCycleWeaponRight + PedCycleWeaponLeft + GoForward + GoBack + GoLeft + GoRight + PedSniperZoomIn + PedSniperZoomOut + VehicleEnterExit + CameraChange + PedJump + PedSprint + PedLookBehind + PedDuck + PedAnswerPhone + PedSneak + VehicleFireWeapon + VehicleFireWeaponAlt + VehicleSteerLeft + VehicleSteerRight + VehicleSteerUp + VehicleSteerDown + VehicleAccelerate + VehicleBrake + VehicleRadioStationUp + VehicleRadioStationDown + Unknown28 + VehicleHorn + ToggleSubmission + VehicleHandbrake + Ped1stPersonLookLeft + Ped1stPersonLookRight + VehicleLookLeft + VehicleLookRight + VehicleLookBehind + VehicleMouseLook + VehicleTurretLeft + VehicleTurretRight + VehicleTurretUp + VehicleTurretDown + PedCycleTargetLeft + PedCycleTargetRight + PedCenterCamera + PedLockTarget + NetworkTalk + ConversationYes + ConversationNo + GroupControlForward + GroupControlBack + Ped1stPersonLookUp + Ped1stPersonLookDown + Unknown53 + ToggleDpad + SwitchDebugCamOn + TakeScreenShot + ShowMousePointer +end + +enum ControllerAltKey + Primary + Secondary + Tertiary + Quaternary +end + +enum HoldOrientation + PedHeading=1 + Bone=16 +end + +enum PedBoneId + Null=0 + Torso=1 + Head=2 + UpperArmL=3 + UpperArmR=4 + HandL=5 + HandR=6 + UpperLegL=7 + UpperLegR=8 + FootL=9 + FootR=10 + KneeR=11 + KneeL=12 + LowerArmL=13 + LowerArmR=14 + UpperClavicleL=15 + UpperClavicleR=16 + Neck=17 + Jaw=18 +end + diff --git a/sa_sbl/mode.xml b/sa_sbl/mode.xml index 595db8d..2d638ff 100644 --- a/sa_sbl/mode.xml +++ b/sa_sbl/mode.xml @@ -16,7 +16,7 @@ @sb:\data\sa_sbl\enums.txt @sb:\data\sa_sbl\constants.txt @game:\data\default.dat - @game:\data\maps\veh_mods\veh_mods.ide + @game:\data\gta.dat @sb:\data\sa_sbl\keywords.txt @sb:\data\cleo5_extensions.sbf diff --git a/vc/mode.xml b/vc/mode.xml index 42277a9..d308a6f 100644 --- a/vc/mode.xml +++ b/vc/mode.xml @@ -13,6 +13,7 @@ @sb:\data\vc\templates.custom.txt @game:\text\american.gxt @game:\data\default.ide + @game:\data\gta_vc.dat @sb:\data\vc_sbl\vc.json @game:\data @game:\CLEO diff --git a/vc_sbl/classes.db b/vc_sbl/classes.db index 81aabe1..9247590 100644 --- a/vc_sbl/classes.db +++ b/vc_sbl/classes.db @@ -1144,10 +1144,10 @@ $END $Memory $BEGIN Allocate,0AC8,1,0,("size%i" "address%i") -CallFunction,0AA5,0,0,("address%i" "numParams%i" "pop%i" "funcParams: arguments") -CallFunctionReturn,0AA7,0,0,("address%i" "numParams%i" "pop%i" "funcParams: arguments" "funcRet: any") -CallMethod,0AA6,0,0,("address%i" "struct%i" "numParams%i" "pop%i" "funcParams: arguments") -CallMethodReturn,0AA8,0,0,("address%i" "struct%i" "numParams%i" "pop%i" "funcParams: arguments" "funcRet: any") +CallFunction,0AA5,0,0,("address%i" "numArgs%i" "pop%i" "args: arguments") +CallFunctionReturn,0AA7,0,0,("address%i" "numArgs%i" "pop%i" "args: arguments" "funcRet: any") +CallMethod,0AA6,0,0,("address%i" "struct%i" "numArgs%i" "pop%i" "args: arguments") +CallMethodReturn,0AA8,0,0,("address%i" "struct%i" "numArgs%i" "pop%i" "args: arguments" "funcRet: any") Free,0AC9,0,0,("address%i") GetLabelPointer,0AC6,0,0,(": label" "address%i") GetObjectPointer,0A98,0,0,("object: Object" "address%i") @@ -1212,7 +1212,7 @@ SetHeading,0177,0,0,("self: Object" "heading%f") SetRecordsCollisions,04D9,0,0,("self: Object" "state%b") SetRotation,0453,0,0,("self: Object" "x%f" "y%f" "z%f") SetVelocity,0381,0,0,("self: Object" "xSpeed%f" "ySpeed%f" "zSpeed%f") -Slide,034E,1,0,("self: Object" "fromX%f" "fromY%f" "fromZ%f" "xSpeed%f" "ySpeed%f" "zSpeed%f" "collisionCheck%b") +Slide,034E,1,0,("self: Object" "posX%f" "posY%f" "posZ%f" "speedX%f" "speedY%f" "speedZ%f" "collisionCheck%b") SortOutCollisionWithCar,050E,0,0,("self: Object" "handle: Car") $END @@ -1576,7 +1576,7 @@ SetProportional,0348,0,0,("state%b") SetRightJustify,03E4,0,0,("state%b") SetScale,033F,0,0,("widthScale%f" "heightScale%f") SetWrapX,0343,0,0,("width%f") -StringFormat,0AD3,0,0,("buffer%i" "format%s" "args: arguments") +StringFormat,0AD3,0,0,("result%s" "format%s" "args: arguments") UseCommands,03F0,0,0,("state%b") $END diff --git a/vc_sbl/mode.xml b/vc_sbl/mode.xml index 7fe4be7..acbc565 100644 --- a/vc_sbl/mode.xml +++ b/vc_sbl/mode.xml @@ -7,6 +7,7 @@ @sb:\data\vc_sbl\constants.txt @game:\data\default.ide + @game:\data\gta_vc.dat @sb:\data\vc_sbl\keywords.txt