gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Return CTerrain and CUnitManager references from CWorld instead of pointers

Browse Source 
Accepted By: @vladislavbelov
Comments By: @Stan
Differential Revision: https://code.wildfiregames.com/D4739
This was SVN commit r27861.
This commit is contained in:
phosit
2023-09-26 20:10:40 +00:00
parent fcf555b4a8
commit 3fff9df4a0
20 changed files with 152 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/scripting/JSInterface_GameView.cpp
+3 -3
View File
@@ -118,15 +118,15 @@ JS::Value GetCameraPosition(const ScriptRequest& rq)
*/
void CameraMoveTo(entity_pos_t x, entity_pos_t z)
{
if (!g_Game || !g_Game->GetWorld() || !g_Game->GetView() || !g_Game->GetWorld()->GetTerrain())
if (!g_Game || !g_Game->GetWorld() || !g_Game->GetView())
return;
CTerrain* terrain = g_Game->GetWorld()->GetTerrain();
const CTerrain& terrain = g_Game->GetWorld()->GetTerrain();
CVector3D target;
target.X = x.ToFloat();
target.Z = z.ToFloat();
target.Y = terrain->GetExactGroundLevel(target.X, target.Z);
target.Y = terrain.GetExactGroundLevel(target.X, target.Z);
g_Game->GetView()->MoveCameraTarget(target);
}