Jelajahi Sumber

Added Steam Architecture Flag

own3mall 8 tahun lalu
induk
melakukan
323e4cb9a8

+ 4 - 4
includes/lib_remote.php

@@ -328,9 +328,9 @@ class OGPRemoteLibrary
 	/// \return 1 If update started successfully
 	/// \return 0 If error
 	/// \return -1 In case of connection error.
-	public function steam_cmd($home_id,$game_home,$mod,$modname,$betaname,$betapwd,$user,$pass,$guard,$exec_folder_path,$exec_path,$precmd,$postcmd,$cfg_os,$lockFiles = "")
+	public function steam_cmd($home_id,$game_home,$mod,$modname,$betaname,$betapwd,$user,$pass,$guard,$exec_folder_path,$exec_path,$precmd,$postcmd,$cfg_os,$lockFiles,$archBits)
 	{
-		$params = $this->encrypt_params($home_id,$game_home,$mod,$modname,$betaname,$betapwd,$user,$pass,$guard,$exec_folder_path,$exec_path,$precmd,$postcmd,$cfg_os,$lockFiles);
+		$params = $this->encrypt_params($home_id,$game_home,$mod,$modname,$betaname,$betapwd,$user,$pass,$guard,$exec_folder_path,$exec_path,$precmd,$postcmd,$cfg_os,$lockFiles,$archBits);
 		$this->add_enc_chk($params);
 		$request = xmlrpc_encode_request("steam_cmd", $params);
 		$response = $this->sendRequest($request);
@@ -381,13 +381,13 @@ class OGPRemoteLibrary
 						$home_id, $home_path, $server_ip, $server_port, $exec_path, $exec_folder_path,
 						$control_protocol, $control_password, $control_type,
 						$appId, $modname, $betaname, $betapwd, $user, $pass, $guard, $precmd, $postcmd, $cfg_os, $filesToLockUnlock,
-						$startup_cmd, $cpu, $nice, $preStart, $envVars, $game_key
+						$startup_cmd, $cpu, $nice, $preStart, $envVars, $game_key, $archBits
 	)
 	{
 		$params = $this->encrypt_params($home_id, $home_path, $server_ip, $server_port, $exec_path, $exec_folder_path,
 						$control_protocol, $control_password, $control_type,
 						$appId, $modname, $betaname, $betapwd, $user, $pass, $guard, $precmd, $postcmd, $cfg_os, $filesToLockUnlock,
-						$startup_cmd, $cpu, $nice, $preStart, $envVars, $game_key);
+						$startup_cmd, $cpu, $nice, $preStart, $envVars, $game_key, $archBits);
 
 		$this->add_enc_chk($params);
 		$request = xmlrpc_encode_request("automatic_steam_update", $params);

+ 1 - 0
modules/config_games/schema_server_config.xml

@@ -84,6 +84,7 @@
       <xs:element name="installer_login" type="xs:string" minOccurs="0" />
       <xs:element name="betaname" type="xs:string" minOccurs="0" />
       <xs:element name="betapwd" type="xs:string" minOccurs="0" />
+      <xs:element name="steam_bitness" type="xs:positiveInteger" minOccurs="0" />
     </xs:sequence>
     <xs:attribute name="key" type="xs:string" />
   </xs:complexType>

+ 2 - 1
modules/gamemanager/update_server.php

@@ -155,6 +155,7 @@ function exec_ogp_module() {
 				$modname = ( $installer_name == '90' ) ? $modkey : '';
 				$betaname = isset($mod_xml->betaname) ? $mod_xml->betaname : '';
 				$betapwd = isset($mod_xml->betapwd) ? $mod_xml->betapwd : '';
+				$arch = isset($mod_xml->steam_bitness) ? $mod_xml->steam_bitness : '';
 				
 				// Additional files to lock
 				if(isset($server_xml->lock_files) && !empty($server_xml->lock_files)){
@@ -165,7 +166,7 @@ function exec_ogp_module() {
 				
 				$steam_out = $remote->steam_cmd( $home_id,$home_info['home_path'],$installer_name,$modname,
 												 $betaname,$betapwd,$login,$pass,$settings['steam_guard'],
-												 $exec_folder_path,$exec_path,$precmd,$postcmd,$cfg_os,$lockFiles);
+												 $exec_folder_path,$exec_path,$precmd,$postcmd,$cfg_os,$lockFiles,$arch);
 			}
 			
 			if( $steam_out === 0 )

+ 2 - 1
ogp_api.php

@@ -46,6 +46,7 @@ function runRemoteAction($action){
 	$betapwd = isset($mod_xml->betapwd) ? $mod_xml->betapwd : '';
 	$login = $mod_xml->installer_login ? $mod_xml->installer_login : $settings['steam_user'];
 	$pass = $mod_xml->installer_login ? '' : $settings['steam_pass'];
+	$arch = isset($mod_xml->steam_bitness) ? $mod_xml->steam_bitness : '';
 	$exec_folder_path = $server_xml->exe_location;
 	$exec_path = $server_xml->server_exec_name;
 
@@ -72,7 +73,7 @@ function runRemoteAction($action){
 				$appId, $modname, $betaname, $betapwd, $login, $pass, $settings['steam_guard'], $precmd, $postcmd, $cfg_os, $lockFiles,
 									  
 				//start
-				$startup_cmd, $server_home['mods'][$mod_id]['cpu_affinity'], $server_home['mods'][$mod_id]['nice'], $preStart, $envVars, $server_xml->game_key
+				$startup_cmd, $server_home['mods'][$mod_id]['cpu_affinity'], $server_home['mods'][$mod_id]['nice'], $preStart, $envVars, $server_xml->game_key, $arch
 			);
 			break;
 		case "restart_server":