From cb779c54e8239eeb0a84fce84eb4dbfd86a89fb6 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 29 Jul 2020 03:46:16 +0200 Subject: [PATCH] remove iengine.hh --- src/engine/octaedit.cc | 1 + src/shared/command.hh | 65 ++++++++++++++++++++++++++++++++++++++++++ src/shared/cube.hh | 1 - src/shared/iengine.hh | 65 ------------------------------------------ 4 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 src/shared/iengine.hh diff --git a/src/engine/octaedit.cc b/src/engine/octaedit.cc index cbc5e43..39769c3 100644 --- a/src/engine/octaedit.cc +++ b/src/engine/octaedit.cc @@ -1,6 +1,7 @@ #include "octaedit.hh" #include "blend.hh" +#include "command.hh" #include "console.hh" /* conoutf */ #include "light.hh" #include "main.hh" diff --git a/src/shared/command.hh b/src/shared/command.hh index c72d16a..a7f1462 100644 --- a/src/shared/command.hh +++ b/src/shared/command.hh @@ -411,4 +411,69 @@ inline void ident::getcval(tagval &v) const #define ICOMMAND(name, nargs, proto, b) ICOMMANDN(name, ICOMMANDNAME(name), nargs, proto, b) #define ICOMMANDS(name, nargs, proto, b) ICOMMANDNS(name, ICOMMANDSNAME, nargs, proto, b) +extern int variable(const char *name, int min, int cur, int max, int *storage, identfun fun, int flags); +extern float fvariable(const char *name, float min, float cur, float max, float *storage, identfun fun, int flags); +extern char *svariable(const char *name, const char *cur, char **storage, identfun fun, int flags); +extern void setvar(const char *name, int i, bool dofunc = true, bool doclamp = true); +extern void setfvar(const char *name, float f, bool dofunc = true, bool doclamp = true); +extern void setsvar(const char *name, const char *str, bool dofunc = true); +extern void setvarchecked(ident *id, int val); +extern void setfvarchecked(ident *id, float val); +extern void setsvarchecked(ident *id, const char *val); +extern void touchvar(const char *name); +extern int getvar(const char *name); +extern int getvarmin(const char *name); +extern int getvarmax(const char *name); +extern bool identexists(const char *name); +extern ident *getident(const char *name); +extern ident *newident(const char *name, int flags = 0); +extern ident *readident(const char *name); +extern ident *writeident(const char *name, int flags = 0); +extern bool addcommand(const char *name, identfun fun, const char *narg, int type = ID_COMMAND); +extern uint *compilecode(const char *p); +extern void keepcode(uint *p); +extern void freecode(uint *p); +extern void executeret(const uint *code, tagval &result = *commandret); +extern void executeret(const char *p, tagval &result = *commandret); +extern void executeret(ident *id, tagval *args, int numargs, bool lookup = false, tagval &result = *commandret); +extern char *executestr(const uint *code); +extern char *executestr(const char *p); +extern char *executestr(ident *id, tagval *args, int numargs, bool lookup = false); +extern char *execidentstr(const char *name, bool lookup = false); +extern int execute(const uint *code); +extern int execute(const char *p); +extern int execute(ident *id, tagval *args, int numargs, bool lookup = false); +extern int execident(const char *name, int noid = 0, bool lookup = false); +extern float executefloat(const uint *code); +extern float executefloat(const char *p); +extern float executefloat(ident *id, tagval *args, int numargs, bool lookup = false); +extern float execidentfloat(const char *name, float noid = 0, bool lookup = false); +extern bool executebool(const uint *code); +extern bool executebool(const char *p); +extern bool executebool(ident *id, tagval *args, int numargs, bool lookup = false); +extern bool execidentbool(const char *name, bool noid = false, bool lookup = false); +extern bool execfile(const char *cfgfile, bool msg = true); +extern void alias(const char *name, const char *action); +extern void alias(const char *name, tagval &v); +extern const char *getalias(const char *name); +extern const char *escapestring(const char *s); +extern const char *escapeid(const char *s); +static inline const char *escapeid(ident &id) { return escapeid(id.name); } +extern bool validateblock(const char *s); +extern void explodelist(const char *s, vector &elems, int limit = -1); +extern char *indexlist(const char *s, int pos); +extern int listlen(const char *s); +extern void printvar(ident *id); +extern void printvar(ident *id, int i); +extern void printfvar(ident *id, float f); +extern void printsvar(ident *id, const char *s); +extern int clampvar(ident *id, int i, int minval, int maxval); +extern float clampfvar(ident *id, float f, float minval, float maxval); +extern void loopiter(ident *id, identstack &stack, const tagval &v); +extern void loopend(ident *id, identstack &stack); + +#define loopstart(id, stack) if((id)->type != ID_ALIAS) return; identstack stack; +static inline void loopiter(ident *id, identstack &stack, int i) { tagval v; v.setint(i); loopiter(id, stack, v); } +static inline void loopiter(ident *id, identstack &stack, float f) { tagval v; v.setfloat(f); loopiter(id, stack, v); } + #endif diff --git a/src/shared/cube.hh b/src/shared/cube.hh index b2cc825..d4de315 100644 --- a/src/shared/cube.hh +++ b/src/shared/cube.hh @@ -50,7 +50,6 @@ #include "glemu.hh" #endif -#include "iengine.hh" #include "igame.hh" #endif diff --git a/src/shared/iengine.hh b/src/shared/iengine.hh deleted file mode 100644 index 589aad4..0000000 --- a/src/shared/iengine.hh +++ /dev/null @@ -1,65 +0,0 @@ -// command -extern int variable(const char *name, int min, int cur, int max, int *storage, identfun fun, int flags); -extern float fvariable(const char *name, float min, float cur, float max, float *storage, identfun fun, int flags); -extern char *svariable(const char *name, const char *cur, char **storage, identfun fun, int flags); -extern void setvar(const char *name, int i, bool dofunc = true, bool doclamp = true); -extern void setfvar(const char *name, float f, bool dofunc = true, bool doclamp = true); -extern void setsvar(const char *name, const char *str, bool dofunc = true); -extern void setvarchecked(ident *id, int val); -extern void setfvarchecked(ident *id, float val); -extern void setsvarchecked(ident *id, const char *val); -extern void touchvar(const char *name); -extern int getvar(const char *name); -extern int getvarmin(const char *name); -extern int getvarmax(const char *name); -extern bool identexists(const char *name); -extern ident *getident(const char *name); -extern ident *newident(const char *name, int flags = 0); -extern ident *readident(const char *name); -extern ident *writeident(const char *name, int flags = 0); -extern bool addcommand(const char *name, identfun fun, const char *narg, int type = ID_COMMAND); -extern uint *compilecode(const char *p); -extern void keepcode(uint *p); -extern void freecode(uint *p); -extern void executeret(const uint *code, tagval &result = *commandret); -extern void executeret(const char *p, tagval &result = *commandret); -extern void executeret(ident *id, tagval *args, int numargs, bool lookup = false, tagval &result = *commandret); -extern char *executestr(const uint *code); -extern char *executestr(const char *p); -extern char *executestr(ident *id, tagval *args, int numargs, bool lookup = false); -extern char *execidentstr(const char *name, bool lookup = false); -extern int execute(const uint *code); -extern int execute(const char *p); -extern int execute(ident *id, tagval *args, int numargs, bool lookup = false); -extern int execident(const char *name, int noid = 0, bool lookup = false); -extern float executefloat(const uint *code); -extern float executefloat(const char *p); -extern float executefloat(ident *id, tagval *args, int numargs, bool lookup = false); -extern float execidentfloat(const char *name, float noid = 0, bool lookup = false); -extern bool executebool(const uint *code); -extern bool executebool(const char *p); -extern bool executebool(ident *id, tagval *args, int numargs, bool lookup = false); -extern bool execidentbool(const char *name, bool noid = false, bool lookup = false); -extern bool execfile(const char *cfgfile, bool msg = true); -extern void alias(const char *name, const char *action); -extern void alias(const char *name, tagval &v); -extern const char *getalias(const char *name); -extern const char *escapestring(const char *s); -extern const char *escapeid(const char *s); -static inline const char *escapeid(ident &id) { return escapeid(id.name); } -extern bool validateblock(const char *s); -extern void explodelist(const char *s, vector &elems, int limit = -1); -extern char *indexlist(const char *s, int pos); -extern int listlen(const char *s); -extern void printvar(ident *id); -extern void printvar(ident *id, int i); -extern void printfvar(ident *id, float f); -extern void printsvar(ident *id, const char *s); -extern int clampvar(ident *id, int i, int minval, int maxval); -extern float clampfvar(ident *id, float f, float minval, float maxval); -extern void loopiter(ident *id, identstack &stack, const tagval &v); -extern void loopend(ident *id, identstack &stack); - -#define loopstart(id, stack) if((id)->type != ID_ALIAS) return; identstack stack; -static inline void loopiter(ident *id, identstack &stack, int i) { tagval v; v.setint(i); loopiter(id, stack, v); } -static inline void loopiter(ident *id, identstack &stack, float f) { tagval v; v.setfloat(f); loopiter(id, stack, v); }