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

g++: Build fixes

Nicolas Hake 2009-08-13 17:22:03 +02:00
parent 472efc26be
commit 4f18edec4c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/script/C4Script.cpp
View File

@ -245,7 +245,7 @@ struct C4ValueConv<Nillable<T> >
inline static Nillable<T> FromC4V(C4Value &v) { if (v.GetType() == C4V_Any) return C4VNull; else return C4ValueConv<T>::FromC4V(v); }
inline static Nillable<T> _FromC4V(C4Value &v) { if (v.GetType() == C4V_Any) return C4VNull; else return C4ValueConv<T>::_FromC4V(v); }
inline static C4V_Type Type() { return C4ValueConv<T>::Type(); }
inline static C4Value ToC4V(Nillable<T> &v) { if(v.IsNil()) return C4VNull; else return C4ValueConv<T>::ToC4V(v.operator T()); }
inline static C4Value ToC4V(const Nillable<T> &v) { if(v.IsNil()) return C4VNull; else return C4ValueConv<T>::ToC4V(v.operator T()); }
};
template<>
class Nillable<void>
@ -258,7 +258,7 @@ template<>
struct C4ValueConv<Nillable<void> >
{
inline static C4V_Type Type() { return C4VNull.GetType(); }
inline static C4Value ToC4V(Nillable<void> &v) { return C4VNull; }
inline static C4Value ToC4V(const Nillable<void> &) { return C4VNull; }
};
// Some functions require object context.
@ -1346,7 +1346,7 @@ static long FnGetBase(C4AulObjectContext *cthr)
static Nillable<C4ID> FnGetMenu(C4AulObjectContext *cthr)
{
if (cthr->Obj->Menu && cthr->Obj->Menu->IsActive())
return cthr->Obj->Menu->GetIdentification();
return C4ID(cthr->Obj->Menu->GetIdentification());
return C4VNull;
}