Merge with changes from Zaba999 fork.

1 files changed, 22 insertions, 24 deletions

diff --git a/src/script/cmdtoken.h b/src/script/cmdtoken.h
index 05ff758..911bd55 100644
--- a/src/script/cmdtoken.h
+++ b/src/script/cmdtoken.h
@@ -19,46 +19,44 @@
 #pragma once
 
 
-#include "old/d3denum.h"
-#include "old/d3dengine.h"
-#include "object/object.h"
-#include "old/water.h"
-#include "old/pyro.h"
-#include "old/camera.h"
+// #include "old/d3denum.h"
+// #include "old/d3dengine.h"
+// #include "object/object.h"
+#include "graphics/engine/water.h"
+#include "graphics/engine/engine.h"
+#include "graphics/engine/pyro.h"
 
 
 
 // Procedures.
 
-extern bool Cmd(char *line, char *token);
-extern char* SearchOp(char *line, char *op);
+extern bool Cmd(char *line, const char *token);
+extern char* SearchOp(char *line, const char *op);
 
 extern int GetInt(char *line, int rank, int def);
 extern float GetFloat(char *line, int rank, float def);
 extern void GetString(char *line, int rank, char *buffer);
 extern ObjectType GetTypeObject(char *line, int rank, ObjectType def);
-extern char* GetTypeObject(ObjectType type);
-extern WaterType GetTypeWater(char *line, int rank, WaterType def);
-extern D3DTypeObj GetTypeTerrain(char *line, int rank, D3DTypeObj def);
+extern const char* GetTypeObject(ObjectType type);
+extern Gfx::WaterType GetTypeWater(char *line, int rank, Gfx::WaterType def);
+extern Gfx::EngineObjectType GetTypeTerrain(char *line, int rank, Gfx::EngineObjectType def);
 extern int GetBuild(char *line, int rank);
 extern int GetResearch(char *line, int rank);
-extern PyroType GetPyro(char *line, int rank);
-extern CameraType GetCamera(char *line, int rank);
-extern char* GetCamera(CameraType type);
+extern Gfx::PyroType GetPyro(char *line, int rank);
+extern Gfx::CameraType GetCamera(char *line, int rank);
+extern const char* GetCamera(Gfx::CameraType type);
 
-extern int OpInt(char *line, char *op, int def);
-extern float OpFloat(char *line, char *op, float def);
+extern int OpInt(char *line, const char *op, int def);
+extern float OpFloat(char *line, const char *op, float def);
 extern void OpString(char *line, char *op, char *buffer);
 extern ObjectType OpTypeObject(char *line, char *op, ObjectType def);
-extern WaterType OpTypeWater(char *line, char *op, WaterType def);
-extern D3DTypeObj OpTypeTerrain(char *line, char *op, D3DTypeObj def);
+extern Gfx::WaterType OpTypeWater(char *line, char *op, Gfx::WaterType def);
+extern Gfx::EngineObjectType OpTypeTerrain(char *line, char *op, Gfx::EngineObjectType def);
 extern int OpResearch(char *line, char *op);
-extern PyroType OpPyro(char *line, char *op);
-extern CameraType OpCamera(char *line, char *op);
+extern Gfx::PyroType OpPyro(char *line, char *op);
+extern Gfx::CameraType OpCamera(char *line, const char *op);
 extern int OpBuild(char *line, char *op);
 extern Math::Vector OpPos(char *line, char *op);
-extern Math::Vector OpDir(char *line, char *op);
-extern D3DCOLOR OpColor(char *line, char *op, D3DCOLOR def);
-extern D3DCOLORVALUE OpColorValue(char *line, char *op, D3DCOLORVALUE def);
-
+extern Math::Vector OpDir(char *line, const char *op);
+extern Gfx::Color OpColor(char *line, char *op, Gfx::Color def);