summaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorSteven Fuller <relnev@icculus.org>2001-11-05 03:31:21 +0000
committerPatryk Obara <dreamer.tan@gmail.com>2019-08-20 02:22:36 +0200
commitf0647dd7c8db89aa972e7d5eadbc6bc041a14594 (patch)
treee43be27e22fd235aef9c8cae6f5aed912d116e94 /src/main.c
parent06371ecc4597b34bf5f9ac3cd9bfa3c835c528f3 (diff)
Added missing netcode from main.c -- now skirmish (including Jockey) works
correctly.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c
index 232a5e0..3e75810 100644
--- a/src/main.c
+++ b/src/main.c
@@ -758,18 +758,19 @@ int main(int argc, char *argv[])
// SetLevelToLoad(AVP_ENVIRONMENT_TEMPLE); /* starting alien level */
// SetLevelToLoad(AVP_ENVIRONMENT_INVASION_A);
-// AvP.PlayerType = I_Marine;
+ AvP.PlayerType = I_Marine;
// SetLevelToLoad(AVP_ENVIRONMENT_DERELICT); /* starting marine level */
// SetLevelToLoad(AVP_ENVIRONMENT_COLONY);
- AvP.PlayerType = I_Predator;
- SetLevelToLoad(AVP_ENVIRONMENT_WATERFALL); /* starting predator level */
+// AvP.PlayerType = I_Predator;
+// SetLevelToLoad(AVP_ENVIRONMENT_WATERFALL); /* starting predator level */
// SetLevelToLoad(AVP_ENVIRONMENT_TEMPLE_P);
// SetLevelToLoad(AVP_ENVIRONMENT_LEADWORKS_MP); /* multiplayer */
// SetLevelToLoad(AVP_ENVIRONMENT_SUBWAY_MP);
// SetLevelToLoad(AVP_ENVIRONMENT_LEADWORKS_COOP); /* coop/skirmish */
+ SetLevelToLoad(AVP_ENVIRONMENT_JOCKEY_COOP);
// SetLevelToLoad(AVP_ENVIRONMENT_E3DEMOSP); /* demo level */
#endif
@@ -810,6 +811,15 @@ while(AvP_MainMenus())
ResetFrameCounter();
+ if(AvP.Network!=I_No_Network)
+ {
+ /*Need to choose a starting position for the player , but first we must look
+ through the network messages to find out which generator spots are currently clear*/
+ netGameData.myGameState = NGS_Playing;
+ MinimalNetCollectMessages();
+ TeleportNetPlayerToAStartingPosition(Player->ObStrategyBlock,1);
+ }
+
/* IngameKeyboardInput_ClearBuffer(); NOT YET */
while(AvP.MainLoopRunning) {