Changeset 11858 for code/branches/Masterserver_FS18

Timestamp:

Apr 12, 2018, 4:10:00 PM (7 years ago)

Author:

varyo

Message:

added 2nd multiplayer test map (Basically Last Team Standing, but all asteroids removed), fixed first one(removed comments in lua file, seemed to have messed with SpawnPoints), added few comments in Gamestate.cc

Location:

code/branches/Masterserver_FS18

Files:

• data/levels/testMultiplayerLevel.oxw (modified) (3 diffs)
• data/levels/testMultiplayerLevelLTS.oxw (added)
• src/libraries/network/packet/Gamestate.cc (modified) (4 diffs)

code/branches/Masterserver_FS18/data/levels/testMultiplayerLevel.oxw

@@ -1 +1 @@
 <LevelInfo
- name = "Test Multiplayer level"
- description = "A level to test the multiplayer."
+ name = "00 Test Multiplayer level"
+ description = "A level to test the multiplayer"
  tags = "test"
  screenshot = "emptylevel.png"
@@ -12 +12 @@
   include("templates/spaceshipEscort.oxt")
   include("templates/spaceshipPirate.oxt")
-  include("templates/spaceshipH2.oxt")
   include("templates/spaceshipAssff.oxt")
 ?>
@@ -31 +30 @@
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
 
-<! Standard Spawnpoints, seems to be necessary in order to start the server, eventhough TeamSpawnPoints should replace these >
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-    <SpawnPoint team=1 position="-400,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
-
-<! TeamSpawnPoints, probably only works for gametype teamDeathMatch >
-    <TeamSpawnPoint team=0 position="0,  0,0" direction="1,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
-    <TeamSpawnPoint team=1 position="2000,  0,0" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshippirate />
-
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
     
   </Scene>

code/branches/Masterserver_FS18/src/libraries/network/packet/Gamestate.cc

@@ -102 +102 @@
 }
 
-
+//AV: This takes all synchronisables and packs it in a GameState, to be sent over the network
 bool Gamestate::collectData(int id, uint8_t mode)
 {
@@ -173 +173 @@
 }
 
-
+//AV: This takes the Gamestate received from the network and "unpacks" it back to a list of Objects/Synchronisables, thus updating the data
 bool Gamestate::spreadData(uint8_t mode)
 {
@@ -276 +276 @@
 }
 
-
+//AV: This function takes the Gamestate and compresses it for transmission over the network
 bool Gamestate::compressData()
 {
@@ -313 +313 @@
 }
 
-
+//AV: This function takes the compressed Gamestate received from the network and decompresses it for further unpacking
 bool Gamestate::decompressData()
 {