TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Enabled multi_do_ranking() for D1X

Browse source
This commit is contained in:
zico 2015-09-29 11:56:37 +02:00
parent 9642a4c31d
commit a96ceb2a46
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
similar/main/multi.cpp
View file

@ -4564,7 +4564,6 @@ void multi_send_ranking ()
multi_send_data<MULTI_RANK>(multibuf,3,2); multi_send_data<MULTI_RANK>(multibuf,3,2);
} }
#if defined(DXX_BUILD_DESCENT_II)
static void multi_do_ranking (const playernum_t pnum, const ubyte *buf) static void multi_do_ranking (const playernum_t pnum, const ubyte *buf)
{ {
char rank=buf[2]; char rank=buf[2];
@ -4580,7 +4579,6 @@ static void multi_do_ranking (const playernum_t pnum, const ubyte *buf)
if (!PlayerCfg.NoRankings) if (!PlayerCfg.NoRankings)
HUD_init_message(HM_MULTI, "%s has been %smoted to %s!",static_cast<const char *>(Players[pnum].callsign), rankstr, RankStrings[rank]); HUD_init_message(HM_MULTI, "%s has been %smoted to %s!",static_cast<const char *>(Players[pnum].callsign), rankstr, RankStrings[rank]);
} }
#endif
// Decide if fire from "killer" is friendly. If yes return 1 (no harm to me) otherwise 0 (damage me) // Decide if fire from "killer" is friendly. If yes return 1 (no harm to me) otherwise 0 (damage me)
int multi_maybe_disable_friendly_fire(const cobjptridx_t killer) int multi_maybe_disable_friendly_fire(const cobjptridx_t killer)
@ -5233,11 +5231,11 @@ static void multi_process_data(const playernum_t pnum, const ubyte *buf, const u
multi_do_got_flag(pnum); break; multi_do_got_flag(pnum); break;
case MULTI_GOT_ORB: case MULTI_GOT_ORB:
multi_do_got_orb(pnum); break; multi_do_got_orb(pnum); break;
case MULTI_RANK:
multi_do_ranking (pnum, buf); break;
case MULTI_FINISH_GAME: case MULTI_FINISH_GAME:
multi_do_finish_game(buf); break; // do this one regardless of endsequence multi_do_finish_game(buf); break; // do this one regardless of endsequence
#endif #endif
case MULTI_RANK:
multi_do_ranking (pnum, buf); break;
case MULTI_ROBOT_CLAIM: case MULTI_ROBOT_CLAIM:
multi_do_claim_robot(pnum, buf); break; multi_do_claim_robot(pnum, buf); break;
case MULTI_ROBOT_POSITION: case MULTI_ROBOT_POSITION: