marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed unneccessary CnvF2I/CnvI2F defs

floating-point
Nicolas Hake 2011-01-06 19:02:06 +01:00
parent 66e2078b21
commit 3a280bcb4f
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/script/C4Value.cpp
View File

@ -135,8 +135,6 @@ bool C4Value::FnCnvObject() const
#define CnvOK0 C4VCnvFn::CnvOK0, true
#define CnvError C4VCnvFn::CnvError, true
#define CnvObject C4VCnvFn::CnvObject, false
#define CnvI2F C4VCnvFn::CnvI2F, false // convert int->C4Real
#define CnvF2I C4VCnvFn::CnvF2I, false // convert C4Real->int
C4VCnvFn C4Value::C4ScriptCnvMap[C4V_Last+1][C4V_Last+1] =
{
@ -153,7 +151,7 @@ C4VCnvFn C4Value::C4ScriptCnvMap[C4V_Last+1][C4V_Last+1] =
{ // C4V_Int
{ CnvOK }, // any
{ CnvOK }, // int same
{ CnvI2F }, // float
{ CnvOK }, // float
{ CnvOK }, // Bool
{ CnvOK0 }, // PropList only if 0
{ CnvOK0 }, // C4Object only if 0
@ -162,9 +160,9 @@ C4VCnvFn C4Value::C4ScriptCnvMap[C4V_Last+1][C4V_Last+1] =
},
{ // C4V_Float
{ CnvOK }, // any
{ CnvF2I }, // int
{ CnvOK }, // int
{ CnvOK }, // float same
{ CnvF2I }, // Bool
{ CnvOK }, // Bool
{ CnvOK0 }, // PropList only if 0
{ CnvOK0 }, // C4Object only if 0
{ CnvOK0 }, // String only if 0
@ -173,7 +171,7 @@ C4VCnvFn C4Value::C4ScriptCnvMap[C4V_Last+1][C4V_Last+1] =
{ // C4V_Bool
{ CnvOK }, // any
{ CnvOK }, // int might be used
{ CnvI2F }, // float
{ CnvOK }, // float
{ CnvOK }, // Bool same
{ CnvError }, // PropList NEVER!
{ CnvError }, // C4Object NEVER!
@ -224,8 +222,6 @@ C4VCnvFn C4Value::C4ScriptCnvMap[C4V_Last+1][C4V_Last+1] =
#undef CnvOK
#undef CnvOK0
#undef CnvI2F
#undef CnvF2I
#undef CnvError
#undef CnvObject

4
src/script/C4Value.h
View File

@ -67,7 +67,7 @@ union C4V_Data
// converter function, used in converter table
struct C4VCnvFn
{
enum { CnvOK, CnvOK0, CnvError, CnvObject, CnvF2I, CnvI2F } Function;
enum { CnvOK, CnvOK0, CnvError, CnvObject } Function;
bool Warn;
};
@ -255,8 +255,6 @@ public:
switch (C4ScriptCnvMap[Type][vtToType].Function)
{
case C4VCnvFn::CnvOK:
case C4VCnvFn::CnvF2I:
case C4VCnvFn::CnvI2F:
return true;
case C4VCnvFn::CnvOK0: return !*this;
case C4VCnvFn::CnvError: return false;