diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 1698616c4..c52d5b243 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -451,30 +451,6 @@
RelativePath="..\source\cSimulatorManager.h"
>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1466,6 +1442,22 @@
RelativePath="..\source\cSleep.h"
>
+
+
+
+
+
+
+
+
@@ -1474,6 +1466,14 @@
RelativePath="..\source\cThread.h"
>
+
+
+
+
Kick(a_Reason);
+ self->Kick(*a_Reason);
}
}
return 0;
@@ -5444,20 +5445,20 @@ static int tolua_AllToLua_cPlayer_GetName00(lua_State* tolua_S)
#ifndef TOLUA_RELEASE
tolua_Error tolua_err;
if (
- !tolua_isusertype(tolua_S,1,"cPlayer",0,&tolua_err) ||
+ !tolua_isusertype(tolua_S,1,"const cPlayer",0,&tolua_err) ||
!tolua_isnoobj(tolua_S,2,&tolua_err)
)
goto tolua_lerror;
else
#endif
{
- cPlayer* self = (cPlayer*) tolua_tousertype(tolua_S,1,0);
+ const cPlayer* self = (const cPlayer*) tolua_tousertype(tolua_S,1,0);
#ifndef TOLUA_RELEASE
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'GetName'", NULL);
#endif
{
- const char* tolua_ret = (const char*) self->GetName();
- tolua_pushstring(tolua_S,(const char*)tolua_ret);
+ const AString& tolua_ret = (const AString&) self->GetName();
+ tolua_pushusertype(tolua_S,(void*)&tolua_ret,"const AString");
}
}
return 1;
diff --git a/source/Bindings.h b/source/Bindings.h
index 45e35709e..76a4e453d 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 02/01/12 20:13:33.
+** Generated automatically by tolua++-1.0.92 on 02/01/12 21:13:19.
*/
/* Exported function */
diff --git a/source/Globals.h b/source/Globals.h
index 8d42d6341..2b37c6df4 100644
--- a/source/Globals.h
+++ b/source/Globals.h
@@ -8,6 +8,16 @@
+// Compiler-dependent stuff:
+#ifndef _MSC_VER
+ // Non-MS compilers don't know the override keyword
+ #define override
+#endif // _MSC_VER
+
+
+
+
+
// OS-dependent stuff:
#ifdef _WIN32
#define WIN32_LEAN_AND_MEAN
@@ -52,6 +62,7 @@
// STL stuff:
#include
#include
+#include
#include
#include