Skip to content

Commit

Permalink
Merge pull request #810 from cazfi/srvup
Browse files Browse the repository at this point in the history
Update to Freeciv server freeciv/freeciv@4b2872e579
  • Loading branch information
cazfi authored Feb 16, 2024
2 parents 37d15f1 + 88869cb commit 19fefca
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
8 changes: 4 additions & 4 deletions freeciv-web/src/main/webapp/javascript/intel_dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@


/**************************************************************************
Show the intelligence report dialog, with data depending on the
stablishment of an embassy.
Show the intelligence report dialog, with data depending on the
establishment of an embassy.
**************************************************************************/
function show_intelligence_report_dialog()
{
if (selected_player == -1) return;
var pplayer = players[selected_player];

if (client_is_observer()
|| client.conn.playing.real_embassy[selected_player]) {
|| client.conn.playing['real_embassy'].isSet(selected_player)) {
show_intelligence_report_embassy(pplayer);
} else {
show_intelligence_report_hearsay(pplayer);
}
}

/**************************************************************************
Show the intelligence report dialog when there's no embassy.
Show the intelligence report dialog when there's no embassy.
**************************************************************************/
function show_intelligence_report_hearsay(pplayer)
{
Expand Down
1 change: 1 addition & 0 deletions freeciv-web/src/main/webapp/javascript/packhand.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,6 +486,7 @@ function handle_player_info(packet)
/* Interpret player flags. */
packet['flags'] = new BitVector(packet['flags']);
packet['gives_shared_vision'] = new BitVector(packet['gives_shared_vision']);
packet['real_embassy'] = new BitVector(packet['real_embassy']);

players[packet['playerno']] = $.extend(players[packet['playerno']], packet);
}
Expand Down
4 changes: 2 additions & 2 deletions freeciv-web/src/main/webapp/javascript/player.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ function get_embassy_text(player_id)
const them = players[player_id];
if (them == null) return NO_INFO;

const embassy_with = me.real_embassy[player_id];
const embassy_from = them.real_embassy[my_id];
const embassy_with = me['real_embassy'].isSet(player_id);
const embassy_from = them['real_embassy'].isSet(my_id);

if (embassy_with && embassy_from) {
return "Both";
Expand Down
4 changes: 2 additions & 2 deletions freeciv/version.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# The Git SHA hash for the commit to checkout from
# https://github.com/freeciv/freeciv

FCREV=0cecc7a57d54e5d0bde01e168420887be26b3f2b
FCREV=4b2872e5796bfdecb3169cf46cf1a8d6cd8e379b

ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Jan.07"
ORIGCAPSTR="+Freeciv.Devel-\${MAIN_VERSION}-2024.Jan.08"

# There's no need to bump this constantly as current freeciv-web
# makes no connections to outside world - all connections are
Expand Down

0 comments on commit 19fefca

Please sign in to comment.