← Back to branch summary

~widelands-dev/widelands/bug-1390793

« back to all changes in this revision

Viewing changes to src/game_io/game_preload_packet.cc

  • Committer: fios at foramnagaidhlig
  • Date: 2015-06-07 09:37:12 UTC
  • mfrom: (7384.1.87 trunk)
  • Revision ID: fios@foramnagaidhlig.net-20150607093712-37kh4fkvv9mueh6v
Merged trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/game_io/game_preload_packet.cc
25
25
#include <boost/format.hpp>
26
26
 
27
27
#include "base/time_string.h"
 
28
#include "build_info.h"
28
29
#include "graphic/graphic.h"
29
30
#include "graphic/minimap_renderer.h"
30
31
#include "logic/game.h"
42
43
 
43
44
namespace Widelands {
44
45
 
45
 
#define CURRENT_PACKET_VERSION 5
 
46
#define CURRENT_PACKET_VERSION 6
46
47
#define PLAYERS_AMOUNT_KEY_V4 "player_amount"
47
48
#define MINIMAP_FILENAME "minimap.png"
48
49
 
64
65
                        m_player_nr = s.get_safe_int("player_nr");
65
66
                        m_win_condition = s.get_safe_string("win_condition");
66
67
                        m_number_of_players = s.get_safe_int(PLAYERS_AMOUNT_KEY_V4);
 
68
                        m_version = s.get_safe_string("widelands_version");
 
69
 
67
70
                        if (fs.file_exists(MINIMAP_FILENAME)) {
68
71
                                m_minimap_path = MINIMAP_FILENAME;
69
72
                        }
108
111
                }
109
112
        }
110
113
        s.set_int(PLAYERS_AMOUNT_KEY_V4, game.player_manager()->get_number_of_players());
 
114
        s.set_string("widelands_version", build_id());
111
115
 
112
116
        s.set_string("background", map.get_background());
113
117
        s.set_string("win_condition", game.get_win_condition_displayname());