diff --git a/RP_L4/RPL4LOBBY.cpp b/RP_L4/RPL4LOBBY.cpp index fd03b60..eac5427 100644 --- a/RP_L4/RPL4LOBBY.cpp +++ b/RP_L4/RPL4LOBBY.cpp @@ -724,13 +724,6 @@ namespace // names, so nobody reads "bttlbrg". //----------------------------------------------------------- // - // A Live Cam host brings no vehicle, so its row says the role - // instead of a loadout. Only the owner's row: the host writes - // the egg, so only the host's pick is acted on, and a member - // who set Live Cam is still going to race - saying otherwise - // here would be the room screen lying about the grid. - // - // // A build the room cannot race with is worth saying before // anything about loadouts. A joiner is now turned away at the // door, so this should only ever show for a member who was @@ -744,11 +737,14 @@ namespace DrawTextA(mem, text, -1, &row, DT_RIGHT | DT_VCENTER | DT_SINGLELINE); } - else if (member->camera && is_owner_row) - { - DrawTextA(mem, "LIVE CAM", -1, &row, - DT_RIGHT | DT_VCENTER | DT_SINGLELINE); - } + // + // A Live Cam brings no vehicle, so the row says the role where + // the loadout would go - ANY row now, since the egg honours a + // member's pick the same as the host's. Football first, though: + // there are no cameras in football (the egg builder strips the + // pick), so a football room shows the team sheet and saying + // LIVE CAM there would be the room lying about the grid. + // else if (FootballLobby()) { if (member->team[0] != '\0') @@ -760,6 +756,11 @@ namespace DrawTextA(mem, text, -1, &row, DT_RIGHT | DT_VCENTER | DT_SINGLELINE); } } + else if (member->camera) + { + DrawTextA(mem, "LIVE CAM", -1, &row, + DT_RIGHT | DT_VCENTER | DT_SINGLELINE); + } else if (member->vehicle[0] != '\0') { sprintf(text, "%s - %s", @@ -1216,22 +1217,24 @@ int for (int i = 0; i < count && written < max_lines; ++i) { const char *name = members[i].name[0] ? members[i].name : "(joining...)"; + + // + // What they are bringing. A camera brings no vehicle - the pick + // replaces it outright, in the egg and so on this line. + // + const char *bring = + members[i].camera ? "LIVE CAM" : members[i].vehicle; const char *note = ""; if (strcmp(members[i].build, RP412_VERSION) != 0) { note = " WRONG BUILD"; } - else if (members[i].camera) - { - note = " cam"; - } else if (!members[i].published) { note = " ..."; } - _snprintf(lines[written], 47, "%-14s %s%s", - name, members[i].vehicle, note); + _snprintf(lines[written], 47, "%-14s %s%s", name, bring, note); lines[written][47] = '\0'; ++written; }