Merge pull request #10 from nwn2dev/feature/name-change-next

Updated names to reflect "next" iterator, not "pull" like from a stack

Author: ihatemundays

include/nwnx_rpc.nss

@@ -6,7 +6,7 @@ const string RPC_PLUGIN_SEPARATOR = "!";
 const string RPC_RESET_GENERIC = "RPC_RESET_GENERIC_";
 const string RPC_BUILD_GENERIC = "RPC_BUILD_GENERIC_";
 const string RPC_BUILD_GENERIC_STREAM = "RPC_BUILD_GENERIC_STREAM_";
-const string RPC_PULL_GENERIC_STREAM = "RPC_PULL_GENERIC_STREAM_";
+const string RPC_NEXT_GENERIC_STREAM = "RPC_NEXT_GENERIC_STREAM_";
 
 const string RPC_GET_INT = "RPC_GET_INT_";
 const string RPC_SET_INT = "RPC_SET_INT_";
@@ -27,7 +27,7 @@ const int RPC_END_BUILD_GENERIC = 2;
 void RPCResetBuildGenericEx();
 void RPCBuildGenericEx(string sClient, string sAction);
 void RPCBuildGenericStreamEx(string sClient, string sAction);
-int RPCPullGenericStreamEx();
+int RPCNextGenericStreamEx();
 int RPCGetIntEx(string sParam1, int nParam2 = RPC_PARAM_2_DEFAULT);
 void RPCSetIntEx(string sParam1, int nValue, int nParam2 = RPC_PARAM_2_DEFAULT);
 int RPCGetBoolEx(string sParam1, int nParam2 = RPC_PARAM_2_DEFAULT);
@@ -51,8 +51,8 @@ void RPCBuildGenericStreamEx(string sClient, string sAction) {
 	NWNXSetString(RPC_PLUGIN_ID, RPC_BUILD_GENERIC_STREAM, sClient, RPC_PARAM_2_DEFAULT, sAction);
 }
 
-int RPCPullGenericStreamEx() {
-	return NWNXGetInt(RPC_PLUGIN_ID, RPC_PULL_GENERIC_STREAM, "", RPC_PARAM_2_DEFAULT);
+int RPCNextGenericStreamEx() {
+	return NWNXGetInt(RPC_PLUGIN_ID, RPC_NEXT_GENERIC_STREAM, "", RPC_PARAM_2_DEFAULT);
 }
 
 int RPCGetIntEx(string sParam1, int nParam2 = RPC_PARAM_2_DEFAULT) {

plugin/rpc_plugin.go

@@ -24,7 +24,7 @@ import (
 const rpcResetGeneric string = "RPC_RESET_GENERIC_"
 const rpcBuildGeneric string = "RPC_BUILD_GENERIC_"
 const rpcBuildGenericStream string = "RPC_BUILD_GENERIC_STREAM_"
-const rpcPullGenericStream string = "RPC_PULL_GENERIC_STREAM_"
+const rpcNextGenericStream string = "RPC_NEXT_GENERIC_STREAM_"
 
 const rpcGetInt string = "RPC_GET_INT_"
 const rpcSetInt string = "RPC_SET_INT_"
@@ -104,7 +104,7 @@ func (p *rpcPlugin) buildExBuildGenericStream(client *rpcClient, request *pb.ExB
 	return nil
 }
 
-func (p *rpcPlugin) pullExGenericStreamClient() (*pb.ExBuildGenericResponse, error) {
+func (p *rpcPlugin) nextExGenericStreamClient() (*pb.ExBuildGenericResponse, error) {
 	if p.globalExGenericStreamClient == nil {
 		return nil, errors.New("stream client not available")
 	}
@@ -298,9 +298,9 @@ func (p *rpcPlugin) getInt(sFunction, sParam1 string, nParam2 int32) int32 {
 		}
 
 		return value
-	case rpcPullGenericStream:
+	case rpcNextGenericStream:
 		p.resetBuildGeneric()
-		response, err := p.pullExGenericStreamClient()
+		response, err := p.nextExGenericStreamClient()
 		p.globalExGenericResponse = response
 
 		if response == nil || err != nil {