* Allowed access to player names on the unsynced side of lua scripts

git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@3750 37977431-3df6-0310-b722-df95706aa16b
spring · May 14, 2007 · 66fa657 · 66fa657
1 parent 1f662f9
commit 66fa657
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/rts/Game/WordCompletion.cpp b/rts/Game/WordCompletion.cpp
@@ -1,6 +1,11 @@
 // WordCompletion.cpp: implementation of the CWordCompletion class.
 //
 //////////////////////////////////////////////////////////////////////
+//
+//  TODO: replace 'WordProperties' with regex/glob expressions
+//        ex: '.give [0-9]* armcom'
+//
+
 
 #include "StdAfx.h"
 #include "WordCompletion.h"
@@ -142,8 +147,8 @@ vector<string> CWordCompletion::Complete(string& msg) const
 		if (cmp < 0) continue;
 		if (cmp > 0) break;
 		if ((!it->second.startOfLine || startOfLine) &&
-		    (!it->second.unitName || unitName) &&
-		    (!it->second.minimap || minimap)) {
+		    (!it->second.unitName    || unitName)    &&
+		    (!it->second.minimap     || minimap)) {
 			partials.push_back(it->first);
 		}
 	}

diff --git a/rts/Lua/LuaHandleSynced.cpp b/rts/Lua/LuaHandleSynced.cpp
@@ -886,19 +886,25 @@ int CLuaHandleSynced::UnsyncedXCall(lua_State* srcState, const string& funcName)
 	if (!diffStates) {
 		lua_insert(L, 1); // move the function to the beginning
 		// call the function
+		synced = false;
 		if (!RunCallIn(cmdStr, argCount, LUA_MULTRET)) {
+			synced = true;
 			lua_settop(L, top);
 			return 0;
 		}
+		synced = true;
 		retCount = lua_gettop(L) - top;
 	}
 	else {
 		LuaUtils::CopyData(L, srcState, argCount);
 
 		// call the function
+		synced = false;
 		if (!RunCallIn(cmdStr, argCount, LUA_MULTRET)) {
+			synced = true;
 			return 0;
 		}
+		synced = true;
 		retCount = lua_gettop(L) - top;
 
 		lua_settop(srcState, 0);

diff --git a/rts/Lua/LuaSyncedRead.cpp b/rts/Lua/LuaSyncedRead.cpp
@@ -1077,7 +1077,7 @@ int LuaSyncedRead::GetPlayerInfo(lua_State* L)
 	}
 
 	// no player names for synchronized scripts
-	if (CLuaHandle::GetActiveHandle()->GetUserMode()) {
+	if (!CLuaHandle::GetActiveHandle()->GetSynced()) {
 		lua_pushstring(L, player->playerName.c_str());
 	} else {
 		HSTR_PUSH(L, "SYNCED_NONAME");

diff --git a/rts/Lua/LuaSyncedRead.h b/rts/Lua/LuaSyncedRead.h
@@ -142,6 +142,11 @@ class LuaSyncedRead {
 		static int TestBuildOrder(lua_State* L);
 		static int Pos2BuildPos(lua_State* L);
 
+		static int TraceRay(lua_State* L); // not implemented
+		static int TraceRayUnits(lua_State* L); // not implemented
+		static int TraceRayFeatures(lua_State* L); // not implemented
+		static int TraceRayGround(lua_State* L); // not implemented
+
 		static int GetPositionLosState(lua_State* L);
 };