[openjk] 103/130: Merge pull request #848 from bibendovsky/fix_load_save_32_64

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit b40ab00561ab66bf7ae551dfdbe8499a001e4760
Merge: abd4b52 0e3c1e6
Author: Alex Lo <alex at acslo.com>
Date:   Sat Oct 8 17:02:14 2016 +0100

    Merge pull request #848 from bibendovsky/fix_load_save_32_64
    
    Fix loading/saving saved games for 64-bit mode

 code/CMakeLists.txt                           |   12 +-
 code/cgame/FxScheduler.cpp                    |   29 +-
 code/cgame/FxScheduler.h                      |   25 +
 code/cgame/cg_main.cpp                        |   31 +-
 code/cgame/cg_players.cpp                     |    6 +-
 code/client/cl_input.cpp                      |    7 +
 code/client/cl_main.cpp                       |    4 +-
 code/game/CMakeLists.txt                      |    6 +-
 code/game/G_Timer.cpp                         |   45 +-
 code/game/NPC_spawn.cpp                       |    2 +-
 code/game/Q3_Interface.cpp                    |  111 ++-
 code/game/Q3_Interface.h                      |    4 +-
 code/game/ai.h                                |   75 +-
 code/game/b_public.h                          |  303 ++++++-
 code/game/bg_public.h                         |   52 +-
 code/game/g_local.h                           |  116 ++-
 code/game/g_main.cpp                          |   41 +-
 code/game/g_objectives.cpp                    |   15 +-
 code/game/g_public.h                          |   16 +-
 code/game/g_roff.cpp                          |   38 +-
 code/game/g_savegame.cpp                      |  510 +++++------
 code/game/g_shared.h                          |  881 +++++++++++++++++-
 code/game/g_vehicles.h                        |  155 ++++
 code/game/g_weapon.cpp                        |    2 +-
 code/game/ghoul2_shared.h                     |  303 ++++++-
 code/icarus/IcarusImplementation.cpp          |   63 +-
 code/icarus/IcarusInterface.h                 |    3 +-
 code/qcommon/cm_load.cpp                      |   24 +-
 code/qcommon/md4.cpp                          |    4 +-
 code/qcommon/msg.cpp                          |   11 +-
 code/qcommon/ojk_i_saved_game.h               |  106 +++
 code/qcommon/ojk_saved_game.cpp               |  972 ++++++++++++++++++++
 code/qcommon/ojk_saved_game.h                 |  193 ++++
 code/qcommon/ojk_saved_game_class_archivers.h |   54 ++
 code/qcommon/ojk_saved_game_helper.h          |  845 +++++++++++++++++
 code/qcommon/ojk_saved_game_helper_fwd.h      |  324 +++++++
 code/qcommon/ojk_scope_guard.h                |   58 ++
 code/qcommon/q_shared.cpp                     |    3 -
 code/qcommon/q_shared.h                       |  905 ++++++++++++++++++-
 code/qcommon/qcommon.h                        |   12 +-
 code/rd-common/mdx_format.h                   |   15 +
 code/rd-common/tr_common.h                    |    2 +-
 code/rd-common/tr_image_jpg.cpp               |   16 +-
 code/rd-common/tr_public.h                    |    6 +-
 code/rd-vanilla/CMakeLists.txt                |    6 +-
 code/rd-vanilla/G2_API.cpp                    |    5 +-
 code/rd-vanilla/G2_bones.cpp                  |    1 -
 code/rd-vanilla/G2_misc.cpp                   |  221 +++--
 code/rd-vanilla/tr_ghoul2.cpp                 |   32 +-
 code/server/sv_game.cpp                       |   19 +-
 code/server/sv_savegame.cpp                   | 1201 ++++++++++---------------
 code/server/sv_snapshot.cpp                   |    6 +
 code/ui/ui_main.cpp                           |   47 +-
 codeJK2/cgame/cg_main.cpp                     |   27 +-
 codeJK2/cgame/cg_players.cpp                  |    4 +-
 codeJK2/game/CMakeLists.txt                   |    6 +-
 codeJK2/game/G_Timer.cpp                      |   46 +-
 codeJK2/game/NPC_spawn.cpp                    |    2 +-
 codeJK2/game/Q3_Interface.cpp                 |    3 +-
 codeJK2/game/Q3_Registers.cpp                 |  102 ++-
 codeJK2/game/ai.h                             |   74 +-
 codeJK2/game/anims.h                          |   26 +-
 codeJK2/game/b_public.h                       |  269 +++++-
 codeJK2/game/bg_public.h                      |   48 +-
 codeJK2/game/g_ICARUS.cpp                     |    2 +-
 codeJK2/game/g_local.h                        |   84 +-
 codeJK2/game/g_main.cpp                       |   36 +-
 codeJK2/game/g_objectives.cpp                 |   15 +-
 codeJK2/game/g_public.h                       |    9 +-
 codeJK2/game/g_roff.cpp                       |   38 +-
 codeJK2/game/g_savegame.cpp                   |  212 +++--
 codeJK2/game/g_shared.h                       |  868 +++++++++++++++++-
 codeJK2/game/ghoul2_shared.h                  |    8 +-
 codeJK2/icarus/Instance.cpp                   |   97 +-
 codeJK2/icarus/Sequence.cpp                   |  132 ++-
 codeJK2/icarus/Sequencer.cpp                  |   84 +-
 codeJK2/icarus/TaskManager.cpp                |  211 ++++-
 codeJK2/icarus/interface.h                    |    3 +-
 codemp/icarus/GameInterface.cpp               |    2 +-
 codemp/icarus/Q3_Interface.cpp                |    2 +-
 codemp/icarus/interface.h                     |    2 +-
 codemp/qcommon/md4.cpp                        |    4 +-
 codemp/qcommon/qcommon.h                      |    2 +-
 shared/qcommon/q_math.h                       |    1 +
 84 files changed, 8837 insertions(+), 1525 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git