flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

converted commneted paramater names to the unused macro

Browse Source
This commit is contained in:
Tycho Bickerstaff 2013-12-22 13:46:55 +00:00
parent 94ca07cfbf
commit d724241407
17 changed files with 100 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/lua/Makefile
View File

@ -733,54 +733,6 @@ src/ltm.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltm.c.s cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/ltm.c.s
.PHONY : src/ltm.c.s .PHONY : src/ltm.c.s
src/lua.o: src/lua.c.o
.PHONY : src/lua.o
# target to build an object file
src/lua.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lua.c.o
.PHONY : src/lua.c.o
src/lua.i: src/lua.c.i
.PHONY : src/lua.i
# target to preprocess a source file
src/lua.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lua.c.i
.PHONY : src/lua.c.i
src/lua.s: src/lua.c.s
.PHONY : src/lua.s
# target to generate assembly for a file
src/lua.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/lua.c.s
.PHONY : src/lua.c.s
src/luac.o: src/luac.c.o
.PHONY : src/luac.o
# target to build an object file
src/luac.c.o:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/luac.c.o
.PHONY : src/luac.c.o
src/luac.i: src/luac.c.i
.PHONY : src/luac.i
# target to preprocess a source file
src/luac.c.i:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/luac.c.i
.PHONY : src/luac.c.i
src/luac.s: src/luac.c.s
.PHONY : src/luac.s
# target to generate assembly for a file
src/luac.c.s:
cd /home/tycho/MCServer && $(MAKE) -f lib/lua/CMakeFiles/lua.dir/build.make lib/lua/CMakeFiles/lua.dir/src/luac.c.s
.PHONY : src/luac.c.s
src/lundump.o: src/lundump.c.o src/lundump.o: src/lundump.c.o
.PHONY : src/lundump.o .PHONY : src/lundump.o
@ -964,12 +916,6 @@ help:
@echo "... src/ltm.o" @echo "... src/ltm.o"
@echo "... src/ltm.i" @echo "... src/ltm.i"
@echo "... src/ltm.s" @echo "... src/ltm.s"
@echo "... src/lua.o"
@echo "... src/lua.i"
@echo "... src/lua.s"
@echo "... src/luac.o"
@echo "... src/luac.i"
@echo "... src/luac.s"
@echo "... src/lundump.o" @echo "... src/lundump.o"
@echo "... src/lundump.i" @echo "... src/lundump.i"
@echo "... src/lundump.s" @echo "... src/lundump.s"

61
src/Bindings/LuaState.h
View File

@ -246,6 +246,7 @@ public:
> >
bool Call(FnT a_FnName, const cRet & a_Mark, RetT1 & a_Ret1) bool Call(FnT a_FnName, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -263,8 +264,9 @@ public:
template< template<
typename FnT, typename ArgT1, typename RetT1 typename FnT, typename ArgT1, typename RetT1
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, const cRet & /*a_Mark*/, RetT1 & a_Ret1) bool Call(FnT a_FnName, ArgT1 a_Arg1, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -283,8 +285,9 @@ public:
template< template<
typename FnT, typename ArgT1, typename ArgT2, typename RetT1 typename FnT, typename ArgT1, typename ArgT2, typename RetT1
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, const cRet & /*a_Mark*/, RetT1 & a_Ret1) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -304,8 +307,9 @@ public:
template< template<
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename RetT1 typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename RetT1
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, const cRet & /*a_Mark*/, RetT1 & a_Ret1) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -326,8 +330,9 @@ public:
template< template<
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename RetT1 typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename RetT1
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, const cRet & /*a_Mark*/, RetT1 & a_Ret1) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -349,8 +354,9 @@ public:
template< template<
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename RetT1 typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename RetT1
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, const cRet & /*a_Mark*/, RetT1 & a_Ret1) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -374,8 +380,9 @@ public:
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename ArgT6, typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename ArgT6,
typename RetT1 typename RetT1
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, const cRet & /*a_Mark*/, RetT1 & a_Ret1) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -400,8 +407,9 @@ public:
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename ArgT6, typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename ArgT6,
typename ArgT7, typename RetT1 typename ArgT7, typename RetT1
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, const cRet & /*a_Mark*/, RetT1 & a_Ret1) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -427,8 +435,9 @@ public:
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename ArgT6, typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename ArgT6,
typename ArgT7, typename ArgT8, typename RetT1 typename ArgT7, typename ArgT8, typename RetT1
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, ArgT8 a_Arg8, const cRet & /*a_Mark*/, RetT1 & a_Ret1) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, ArgT8 a_Arg8, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -455,8 +464,9 @@ public:
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename ArgT6, typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename ArgT6,
typename ArgT7, typename ArgT8, typename ArgT9, typename RetT1 typename ArgT7, typename ArgT8, typename ArgT9, typename RetT1
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, ArgT8 a_Arg8, ArgT9 a_Arg9, const cRet & /*a_Mark*/, RetT1 & a_Ret1) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, ArgT8 a_Arg8, ArgT9 a_Arg9, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -484,8 +494,9 @@ public:
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename ArgT6, typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename ArgT6,
typename ArgT7, typename ArgT8, typename ArgT9, typename ArgT10, typename RetT1 typename ArgT7, typename ArgT8, typename ArgT9, typename ArgT10, typename RetT1
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, ArgT8 a_Arg8, ArgT9 a_Arg9, ArgT10 a_Arg10, const cRet & /*a_Mark*/, RetT1 & a_Ret1) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, ArgT8 a_Arg8, ArgT9 a_Arg9, ArgT10 a_Arg10, const cRet & a_Mark, RetT1 & a_Ret1)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -513,8 +524,9 @@ public:
template< template<
typename FnT, typename ArgT1, typename RetT1, typename RetT2 typename FnT, typename ArgT1, typename RetT1, typename RetT2
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, const cRet & /*a_Mark*/, RetT1 & a_Ret1, RetT2 & a_Ret2) bool Call(FnT a_FnName, ArgT1 a_Arg1, const cRet & a_Mark, RetT1 & a_Ret1, RetT2 & a_Ret2)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -534,8 +546,9 @@ public:
template< template<
typename FnT, typename ArgT1, typename ArgT2, typename RetT1, typename RetT2 typename FnT, typename ArgT1, typename ArgT2, typename RetT1, typename RetT2
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, const cRet & /*a_Mark*/, RetT1 & a_Ret1, RetT2 & a_Ret2) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, const cRet & a_Mark, RetT1 & a_Ret1, RetT2 & a_Ret2)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -557,8 +570,9 @@ public:
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename FnT, typename ArgT1, typename ArgT2, typename ArgT3,
typename RetT1, typename RetT2 typename RetT1, typename RetT2
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, const cRet & /*a_Mark*/, RetT1 & a_Ret1, RetT2 & a_Ret2) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, const cRet & a_Mark, RetT1 & a_Ret1, RetT2 & a_Ret2)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -581,8 +595,9 @@ public:
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4,
typename RetT1, typename RetT2 typename RetT1, typename RetT2
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, const cRet & /*a_Mark*/, RetT1 & a_Ret1, RetT2 & a_Ret2) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, const cRet & a_Mark, RetT1 & a_Ret1, RetT2 & a_Ret2)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -606,8 +621,9 @@ public:
typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5, typename FnT, typename ArgT1, typename ArgT2, typename ArgT3, typename ArgT4, typename ArgT5,
typename RetT1, typename RetT2 typename RetT1, typename RetT2
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, const cRet & /*a_Mark*/, RetT1 & a_Ret1, RetT2 & a_Ret2) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, const cRet & a_Mark, RetT1 & a_Ret1, RetT2 & a_Ret2)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -633,8 +649,9 @@ public:
typename ArgT6, typename ArgT6,
typename RetT1, typename RetT2 typename RetT1, typename RetT2
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, const cRet & /*a_Mark*/, RetT1 & a_Ret1, RetT2 & a_Ret2) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, const cRet & a_Mark, RetT1 & a_Ret1, RetT2 & a_Ret2)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -661,8 +678,9 @@ public:
typename ArgT6, typename ArgT7, typename ArgT6, typename ArgT7,
typename RetT1, typename RetT2 typename RetT1, typename RetT2
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, const cRet & /*a_Mark*/, RetT1 & a_Ret1, RetT2 & a_Ret2) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, const cRet & a_Mark, RetT1 & a_Ret1, RetT2 & a_Ret2)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -690,8 +708,9 @@ public:
typename ArgT6, typename ArgT7, typename ArgT6, typename ArgT7,
typename RetT1, typename RetT2, typename RetT3 typename RetT1, typename RetT2, typename RetT3
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, const cRet & /*a_Mark*/, RetT1 & a_Ret1, RetT2 & a_Ret2, RetT3 & a_Ret3) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, const cRet & a_Mark, RetT1 & a_Ret1, RetT2 & a_Ret2, RetT3 & a_Ret3)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -720,8 +739,9 @@ public:
typename ArgT6, typename ArgT7, typename ArgT8, typename ArgT6, typename ArgT7, typename ArgT8,
typename RetT1, typename RetT2, typename RetT3 typename RetT1, typename RetT2, typename RetT3
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, ArgT8 a_Arg8, const cRet & /*a_Mark*/, RetT1 & a_Ret1, RetT2 & a_Ret2, RetT3 & a_Ret3) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, ArgT8 a_Arg8, const cRet & a_Mark, RetT1 & a_Ret1, RetT2 & a_Ret2, RetT3 & a_Ret3)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;
@ -751,8 +771,9 @@ public:
typename ArgT6, typename ArgT7, typename ArgT8, typename ArgT9, typename ArgT6, typename ArgT7, typename ArgT8, typename ArgT9,
typename RetT1, typename RetT2, typename RetT3, typename RetT4, typename RetT5 typename RetT1, typename RetT2, typename RetT3, typename RetT4, typename RetT5
> >
bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, ArgT8 a_Arg8, ArgT9 a_Arg9, const cRet & /*a_Mark*/, RetT1 & a_Ret1, RetT2 & a_Ret2, RetT3 & a_Ret3, RetT4 & a_Ret4, RetT5 & a_Ret5) bool Call(FnT a_FnName, ArgT1 a_Arg1, ArgT2 a_Arg2, ArgT3 a_Arg3, ArgT4 a_Arg4, ArgT5 a_Arg5, ArgT6 a_Arg6, ArgT7 a_Arg7, ArgT8 a_Arg8, ArgT9 a_Arg9, const cRet & a_Mark, RetT1 & a_Ret1, RetT2 & a_Ret2, RetT3 & a_Ret3, RetT4 & a_Ret4, RetT5 & a_Ret5)
{ {
UNUSED(a_Mark);
if (!PushFunction(a_FnName)) if (!PushFunction(a_FnName))
{ {
return false; return false;

7
src/BlockEntities/BlockEntity.h
View File

@ -87,7 +87,12 @@ public:
virtual void SendTo(cClientHandle & a_Client) = 0; virtual void SendTo(cClientHandle & a_Client) = 0;
/// Ticks the entity; returns true if the chunk should be marked as dirty as a result of this ticking. By default does nothing. /// Ticks the entity; returns true if the chunk should be marked as dirty as a result of this ticking. By default does nothing.
virtual bool Tick(float /*a_Dt*/, cChunk & /*a_Chunk*/) { return false; } virtual bool Tick(float a_Dt, cChunk & a_Chunk)
{
UNUSED(a_Dt);
UNUSED(a_Chunk);
return false;
}
protected: protected:
/// Position in absolute block coordinates /// Position in absolute block coordinates

3
src/BlockEntities/BlockEntityWithItems.h
View File

@ -71,8 +71,9 @@ protected:
cItemGrid m_Contents; cItemGrid m_Contents;
// cItemGrid::cListener overrides: // cItemGrid::cListener overrides:
virtual void OnSlotChanged(cItemGrid * a_Grid, int /*a_SlotNum*/) virtual void OnSlotChanged(cItemGrid * a_Grid, int a_SlotNum)
{ {
UNUSED(a_SlotNum);
ASSERT(a_Grid == &m_Contents); ASSERT(a_Grid == &m_Contents);
if (m_World != NULL) if (m_World != NULL)
{ {

6
src/Blocks/BlockHandler.h
View File

@ -99,7 +99,11 @@ public:
virtual bool DoesIgnoreBuildCollision(void); virtual bool DoesIgnoreBuildCollision(void);
/// <summary>Similar to DoesIgnoreBuildCollision(void), but is used for cases where block meta/player item-in-hand is needed to determine collision (thin snow)</summary> /// <summary>Similar to DoesIgnoreBuildCollision(void), but is used for cases where block meta/player item-in-hand is needed to determine collision (thin snow)</summary>
virtual bool DoesIgnoreBuildCollision(cPlayer *, NIBBLETYPE /*a_Meta*/) { return DoesIgnoreBuildCollision(); } virtual bool DoesIgnoreBuildCollision(cPlayer *, NIBBLETYPE a_Meta)
{
UNUSED(a_Meta);
return DoesIgnoreBuildCollision();
}
/// <summary>Returns if this block drops if it gets destroyed by an unsuitable situation. Default: true</summary> /// <summary>Returns if this block drops if it gets destroyed by an unsuitable situation. Default: true</summary>
virtual bool DoesDropOnUnsuitable(void); virtual bool DoesDropOnUnsuitable(void);

3
src/ChunkDef.h
View File

@ -180,8 +180,9 @@ public:
/// Converts absolute block coords into relative (chunk + block) coords: /// Converts absolute block coords into relative (chunk + block) coords:
inline static void AbsoluteToRelative(/* in-out */ int & a_X, int& /* a_Y */, int & a_Z, /* out */ int & a_ChunkX, int & a_ChunkZ ) inline static void AbsoluteToRelative(/* in-out */ int & a_X, int& a_Y, int & a_Z, /* out */ int & a_ChunkX, int & a_ChunkZ )
{ {
UNUSED(a_Y);
BlockToChunk(a_X, a_Z, a_ChunkX, a_ChunkZ); BlockToChunk(a_X, a_Z, a_ChunkX, a_ChunkZ);
a_X = a_X - a_ChunkX * Width; a_X = a_X - a_ChunkX * Width;

3
src/CommandOutput.h
View File

@ -35,9 +35,10 @@ class cNullCommandOutputCallback :
public cCommandOutputCallback public cCommandOutputCallback
{ {
// cCommandOutputCallback overrides: // cCommandOutputCallback overrides:
virtual void Out(const AString & /*a_Text*/) override virtual void Out(const AString & a_Text) override
{ {
// Do nothing // Do nothing
UNUSED(a_Text);
} }
} ; } ;

10
src/Entities/Entity.h
View File

@ -354,7 +354,11 @@ public:
virtual void OnRightClicked(cPlayer &) {}; virtual void OnRightClicked(cPlayer &) {};
/// Returns the list of drops for this pawn when it is killed. May check a_Killer for special handling (sword of looting etc.). Called from KilledBy(). /// Returns the list of drops for this pawn when it is killed. May check a_Killer for special handling (sword of looting etc.). Called from KilledBy().
virtual void GetDrops(cItems & /*a_Drops*/, cEntity * /*a_Killer*/ = NULL) {} virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL)
{
UNUSED(a_Drops);
UNUSED(a_Killer);
}
protected: protected:
static cCriticalSection m_CSCount; static cCriticalSection m_CSCount;
@ -420,11 +424,11 @@ protected:
void Dereference( cEntity*& a_EntityPtr ); void Dereference( cEntity*& a_EntityPtr );
private: private:
// Measured in degrees (MAX 360°) // Measured in degrees (MAX 360 degrees)
double m_HeadYaw; double m_HeadYaw;
// Measured in meter/second (m/s) // Measured in meter/second (m/s)
Vector3d m_Speed; Vector3d m_Speed;
// Measured in degrees (MAX 360°) // Measured in degrees (MAX 360 degrees)
Vector3d m_Rot; Vector3d m_Rot;
/// Position of the entity's XZ center and Y bottom /// Position of the entity's XZ center and Y bottom

2
src/Entities/Player.h
View File

@ -45,7 +45,7 @@ public:
virtual void Tick(float a_Dt, cChunk & a_Chunk) override; virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
virtual void HandlePhysics(float /*a_Dt*/, cChunk &) override { }; virtual void HandlePhysics(float a_Dt, cChunk &) override { UNUSED(a_Dt); };
/// Returns the curently equipped weapon; empty item if none /// Returns the curently equipped weapon; empty item if none
virtual cItem GetEquippedWeapon(void) const override { return m_Inventory.GetEquippedItem(); } virtual cItem GetEquippedWeapon(void) const override { return m_Inventory.GetEquippedItem(); }

6
src/Entities/ProjectileEntity.h
View File

@ -52,7 +52,11 @@ public:
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, char a_HitFace); virtual void OnHitSolidBlock(const Vector3d & a_HitPos, char a_HitFace);
/// Called by the physics blocktracer when the entity hits another entity /// Called by the physics blocktracer when the entity hits another entity
virtual void OnHitEntity(cEntity & /*a_EntityHit*/, const Vector3d & /*a_HitPos*/) {} virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
{
UNUSED(a_EntityHit);
UNUSED(a_HitPos);
}
/// Called by Chunk when the projectile is eligible for player collection /// Called by Chunk when the projectile is eligible for player collection
virtual void CollectedBy(cPlayer * a_Dest); virtual void CollectedBy(cPlayer * a_Dest);

8
src/Items/ItemHandler.h
View File

@ -25,7 +25,13 @@ public:
virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir); virtual bool OnItemUse(cWorld * a_World, cPlayer * a_Player, const cItem & a_Item, int a_BlockX, int a_BlockY, int a_BlockZ, char a_Dir);
/// Called when the client sends the SHOOT status in the lclk packet /// Called when the client sends the SHOOT status in the lclk packet
virtual void OnItemShoot(cPlayer *, int /*a_BlockX*/, int /*a_BlockY*/, int /*a_BlockZ*/, char /*a_BlockFace*/) {} virtual void OnItemShoot(cPlayer *, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace)
{
UNUSED(a_BlockX);
UNUSED(a_BlockY);
UNUSED(a_BlockZ);
UNUSED(a_BlockFace);
}
/// Called while the player diggs a block using this item /// Called while the player diggs a block using this item
virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_HeldItem, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace); virtual bool OnDiggingBlock(cWorld * a_World, cPlayer * a_Player, const cItem & a_HeldItem, int a_BlockX, int a_BlockY, int a_BlockZ, char a_BlockFace);

3
src/Piston.cpp
View File

@ -236,8 +236,9 @@ bool cPiston::CanPush(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
bool cPiston::CanBreakPush(BLOCKTYPE a_BlockType, NIBBLETYPE /*a_BlockMeta*/) bool cPiston::CanBreakPush(BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta)
{ {
UNUSED(a_BlockMeta);
return g_BlockPistonBreakable[a_BlockType]; return g_BlockPistonBreakable[a_BlockType];
} }

2
src/Simulator/FireSimulator.h
View File

@ -22,7 +22,7 @@ public:
cFireSimulator(cWorld & a_World, cIniFile & a_IniFile); cFireSimulator(cWorld & a_World, cIniFile & a_IniFile);
~cFireSimulator(); ~cFireSimulator();
virtual void Simulate(float /*a_Dt*/) override {} // not used virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);} // not used
virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override; virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override; virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override;

2
src/Simulator/RedstoneSimulator.h
View File

@ -19,7 +19,7 @@ public:
cRedstoneSimulator(cWorld & a_World); cRedstoneSimulator(cWorld & a_World);
~cRedstoneSimulator(); ~cRedstoneSimulator();
virtual void Simulate(float /*a_Dt*/) override {}; // Not used in this simulator virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);} // not used
virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override; virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
virtual bool IsAllowedBlock( BLOCKTYPE a_BlockType ) override { return IsRedstone(a_BlockType); } virtual bool IsAllowedBlock( BLOCKTYPE a_BlockType ) override { return IsRedstone(a_BlockType); }

2
src/Simulator/SandSimulator.h
View File

@ -15,7 +15,7 @@ public:
cSandSimulator(cWorld & a_World, cIniFile & a_IniFile); cSandSimulator(cWorld & a_World, cIniFile & a_IniFile);
// cSimulator overrides: // cSimulator overrides:
virtual void Simulate(float /*a_Dt*/) override {} // Unused in this simulator virtual void Simulate(float a_Dt) override { UNUSED(a_Dt);} // not used
virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override; virtual void SimulateChunk(float a_Dt, int a_ChunkX, int a_ChunkZ, cChunk * a_Chunk) override;
virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override; virtual bool IsAllowedBlock(BLOCKTYPE a_BlockType) override;

10
src/Simulator/Simulator.h
View File

@ -25,8 +25,14 @@ public:
virtual void Simulate(float a_Dt) = 0; virtual void Simulate(float a_Dt) = 0;
/// Called in each tick for each chunk, a_Dt is the time passed since the last tick, in msec; direct access to chunk data available /// Called in each tick for each chunk, a_Dt is the time passed since the last tick, in msec; direct access to chunk data available
virtual void SimulateChunk(float /*a_Dt*/, int /*a_ChunkX*/, virtual void SimulateChunk(float a_Dt, int a_ChunkX,
int /*a_ChunkZ*/, cChunk * /*a_Chunk*/) {}; int a_ChunkZ, cChunk * a_Chunk)
{
UNUSED(a_Dt);
UNUSED(a_ChunkX);
UNUSED(a_ChunkZ);
UNUSED(a_Chunk);
};
/// Called when a block changes /// Called when a block changes
virtual void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk); virtual void WakeUp(int a_BlockX, int a_BlockY, int a_BlockZ, cChunk * a_Chunk);

11
src/WebAdmin.h
View File

@ -169,8 +169,15 @@ protected:
virtual void OnBody(const char * a_Data, int a_Size) override; virtual void OnBody(const char * a_Data, int a_Size) override;
// cHTTPFormParser::cCallbacks overrides. Files are ignored: // cHTTPFormParser::cCallbacks overrides. Files are ignored:
virtual void OnFileStart(cHTTPFormParser &, const AString & /*a_FileName*/) override {} virtual void OnFileStart(cHTTPFormParser &, const AString & a_FileName) override
virtual void OnFileData(cHTTPFormParser &, const char * /*a_Data*/, int /*a_Size*/) override {} {
UNUSED(a_FileName);
}
virtual void OnFileData(cHTTPFormParser &, const char * a_Data, int a_Size) override
{
UNUSED(a_Data);
UNUSED(a_Size);
}
virtual void OnFileEnd(cHTTPFormParser &) override {} virtual void OnFileEnd(cHTTPFormParser &) override {}
} ; } ;