Index: src/client/cl_team.c =================================================================== --- src/client/cl_team.c (Revision 10458) +++ src/client/cl_team.c (Arbeitskopie) @@ -40,7 +40,7 @@ static void CL_MultiplayerEnvironment_f (void) { base_t *base = &gd.bases[0]; - + baseCurrent = base; cls.missionaircraft = AIR_AircraftGetFromIdx(0); baseCurrent->aircraftCurrent = cls.missionaircraft->idxInBase; @@ -511,13 +511,13 @@ for (container = 0; container < csi.numIDs; container++) { for (p= 0; p < aircraft->size; p++) { - if (aircraft->teamIdxs[p] != -1) { + if (aircraft->teamIdxs[p] != -1) { chr = &gd.employees[aircraft->teamTypes[p]][aircraft->teamIdxs[p]].chr; ic = chr->inv->c[container]; while (ic) { item_t item = ic->item; int type = item.t; - + next = ic->next; ed->num[type]++; if (item.a) { @@ -1421,7 +1421,7 @@ character_t *team; employee_t *employee; base_t *base = NULL; - + base = CP_GetMissionBase(); if (!base) { @@ -1699,19 +1699,6 @@ gd.bases[0].storage.num_loose[num] = MSG_ReadByte(&sb); } } - -#if 0 - for (i = 0, p = 0; i < num; i++) - if (CL_SoldierInAircraft(i, EMPL_SOLDIER, 0)) - gd.bases[0].curTeam[p++] = E_GetHiredCharacter(&gd.bases[0], EMPL_SOLDIER, i); - - /* gd.bases[0].numHired = p; */ - - Com_DPrintf("Load team with %i members and %i slots\n", p, num); - - for (;p < MAX_ACTIVETEAM; p++) - gd.bases[0].curTeam[p] = NULL; -#endif } /** Index: src/client/cl_parse.c =================================================================== --- src/client/cl_parse.c (Revision 10466) +++ src/client/cl_parse.c (Arbeitskopie) @@ -601,8 +601,7 @@ /* center on first actor */ cl_worldlevel->modified = qtrue; if (cl.numTeamList) { - le_t *le; - le = cl.teamList[0]; + le_t *le = cl.teamList[0]; VectorCopy(le->origin, cl.cam.reforg); Cvar_SetValue("cl_worldlevel", le->pos[2]); } Index: src/client/cl_campaign.c =================================================================== --- src/client/cl_campaign.c (Revision 10458) +++ src/client/cl_campaign.c (Arbeitskopie) @@ -2274,16 +2274,6 @@ /* but can be done via the map assembling part of the random map assembly */ Cvar_Set("map_dropship", aircraft->id); - /* retrieve the correct team */ - for (i = 0, p = 0; i < aircraft->size; i++) { - if (aircraft->teamIdxs[i] != -1) { - Com_DPrintf("CL_GameGo: team-member - idx:%i size:%i\n", aircraft->teamIdxs[i], aircraft->teamTypes[i]); - assert(p < MAX_ACTIVETEAM); - base->curTeam[p] = E_GetHiredCharacter(base, aircraft->teamTypes[i], aircraft->teamIdxs[i]); - p++; - } - } - /* manage inventory */ ccs.eMission = base->storage; /* copied, including arrays inside! */ CL_CleanTempInventory(base);