Commit dc2d606

committed

Check for another call to setElementModel

1 parent cdd6178 commit dc2d606Copy full SHA for dc2d606

File tree

1 file changed

+18

-3

lines changed

Server/mods/deathmatch/logic
- CStaticFunctionDefinitions.cpp

1 file changed

+18

-3

lines changed

`‎Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp‎`

Lines changed: 18 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1585,7 +1585,12 @@ bool CStaticFunctionDefinitions::SetElementModel(CElement* pElement, unsigned sh`
`1585`	`1585`	`Arguments.PushNumber(usOldModel);`
`1586`	`1586`	`pPed->SetModel(usModel); // Set the new model`
`1587`	`1587`	`Arguments.PushNumber(usModel); // Get the new model`
`1588`		`- if (!pPed->CallEvent("onElementModelChange", Arguments))`
	`1588`	`+ bool bContinue = pPed->CallEvent("onElementModelChange", Arguments);`
	`1589`	`+ // Check for another call to setElementModel`
	`1590`	`+ if (usModel != pPed->GetModel())`
	`1591`	`+ return false;`
	`1592`	`+`
	`1593`	`+ if (!bContinue)`
`1589`	`1594`	`{`
`1590`	`1595`	`// Change canceled`
`1591`	`1596`	`pPed->SetModel(usOldModel);`
`@@ -1605,7 +1610,12 @@ bool CStaticFunctionDefinitions::SetElementModel(CElement* pElement, unsigned sh`
`1605`	`1610`	`Arguments.PushNumber(usOldModel);`
`1606`	`1611`	`pVehicle->SetModel(usModel); // Set the new model`
`1607`	`1612`	`Arguments.PushNumber(usModel); // Get the new model`
`1608`		`- if (!pVehicle->CallEvent("onElementModelChange", Arguments))`
	`1613`	`+ bool bContinue = pVehicle->CallEvent("onElementModelChange", Arguments);`
	`1614`	`+ // Check for another call to setElementModel`
	`1615`	`+ if (usModel != pVehicle->GetModel())`
	`1616`	`+ return false;`
	`1617`	`+`
	`1618`	`+ if (!bContinue)`
`1609`	`1619`	`{`
`1610`	`1620`	`// Change canceled`
`1611`	`1621`	`pVehicle->SetModel(usOldModel);`
`@@ -1643,7 +1653,12 @@ bool CStaticFunctionDefinitions::SetElementModel(CElement* pElement, unsigned sh`
`1643`	`1653`	`Arguments.PushNumber(usOldModel);`
`1644`	`1654`	`pObject->SetModel(usModel); // Set the new model`
`1645`	`1655`	`Arguments.PushNumber(usModel); // Get the new model`
`1646`		`- if (!pObject->CallEvent("onElementModelChange", Arguments))`
	`1656`	`+ bool bContinue = pObject->CallEvent("onElementModelChange", Arguments);`
	`1657`	`+ // Check for another call to setElementModel`
	`1658`	`+ if (usModel != pObject->GetModel())`
	`1659`	`+ return false;`
	`1660`	`+`
	`1661`	`+ if (!bContinue)`
`1647`	`1662`	`{`
`1648`	`1663`	`// Change canceled`
`1649`	`1664`	`pObject->SetModel(usOldModel);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit dc2d606

File tree

1 file changed

1 file changed

`‎Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp‎`

0 commit comments