Changeset 2351 for code/branches/network/src/network/TrafficControl.h

Timestamp:

Dec 7, 2008, 10:57:09 PM (15 years ago)

Author:

scheusso

Message:

some changes. still not working yet, but will correct theese problems after merge with network64

File:

• code/branches/network/src/network/TrafficControl.h (modified) (8 diffs)

code/branches/network/src/network/TrafficControl.h

@@ -37 +37 @@
 #include "NetworkPrereqs.h"
 #include "Synchronisable.h"
+#include "ClientInformation.h"
 #include "util/Integers.h"
 
@@ -48 +49 @@
   uint32_t objID;
   uint32_t objCreatorID;
-  int32_t objCurGS;//current GameState ID
-  int32_t objDiffGS;//difference between current and latest GameState
+  uint32_t objCurGS;//current GameState ID
+  uint32_t objDiffGS;//difference between current and latest GameState
   uint32_t objSize;
   unsigned int objValuePerm;
@@ -55 +56 @@
   objInfo(uint32_t ID, uint32_t creatorID, int32_t curGsID, int32_t diffGsID, uint32_t size, unsigned int prioperm, unsigned int priosched)
     { objID = ID; objCreatorID = creatorID; objCurGS = curGsID; objDiffGS = diffGsID; objSize = size; objValuePerm = prioperm; objValueSched = priosched; }
+  objInfo()
+    { objID = OBJECTID_UNKNOWN; objCreatorID = OBJECTID_UNKNOWN; objCurGS = GAMESTATEID_INITIAL; objDiffGS = objCurGS; objSize = 0; objValuePerm = 0; objValueSched = 0; }
 };
 
@@ -62 +65 @@
 struct obj
 {
-  unsigned int objID;
-  unsigned int objCreatorID;
-  unsigned int objSize;
+  uint32_t objID;
+  uint32_t objCreatorID;
+  uint32_t objSize;
+  uint32_t objDataOffset;
+  obj()
+    { objID = OBJECTID_UNKNOWN; objCreatorID = OBJECTID_UNKNOWN; objSize = 0; objDataOffset = 0; }
+  obj( uint32_t ID, uint32_t creatorID, uint32_t size, uint32_t offset )
+  { objID = ID; objCreatorID = creatorID; objSize = size; objDataOffset = offset; }
 };
 
+
+const unsigned int SCHED_PRIORITY_OFFSET = -5;
 
 
@@ -88 +98 @@
     *creates list (typ map) that contains objids, struct with info concerning object(objid)
     */
-    std::map<unsigned int, objInfo> listToProcess_;//copy of argument, when traffic control tool is being called, the original of this must be returned later on, eg the vector given by GS
+//     std::map<unsigned int, objInfo> listToProcess_;//copy of argument, when traffic control tool is being called, the original of this must be returned later on, eg the vector given by GS
     /**
     *permanent client list: contains client ids, object ids and objectInfos (in this order)
@@ -118 +128 @@
     *copiedVector is a copy of the given Vector by the GSmanager, on this vector all manipulations are performed
     */
-    std::vector<obj> copiedVector;
+//     std::vector<obj> copiedVector;
 
 //     void updateReferenceList(std::map<unsigned int, objInfo> *list);//done
@@ -132 +142 @@
     *evaluates Data given (vector) and produces result(->Data to be updated)
     */
-    void evaluateList(unsigned int clientID, std::vector<obj> *list);//done
+    void evaluateList(unsigned int clientID, std::vector<obj> *list);//done    
 
   protected:
@@ -146 +156 @@
     *Elements of struct i are therefore: *list[i].objID
     */
-    std::vector<obj>* processObjectList(unsigned int clientID, unsigned int gamestateID, std::vector<obj>* list); //gets a pointer to the vector (containing objectIDs) and sorts it
+    void processObjectList(unsigned int clientID, unsigned int gamestateID, std::vector<obj>* list); //gets a pointer to the vector (containing objectIDs) and sorts it
     //done
     void processAck(unsigned int clientID, unsigned int gamestateID);   // this function gets called when the server receives an ack from the client