[colobot] 51/74: Merge pull request #834 from melex750/dev

Didier Raboud odyx at moszumanska.debian.org
Mon Nov 7 07:50:04 UTC 2016


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

odyx pushed a commit to branch debian/master
in repository colobot.

commit 89bf0da30cbb0343f99c2565f35fb9c947af23ee
Merge: 6b6eca6 ca548e2
Author: krzys_h <krzys_h at interia.pl>
Date:   Sat Sep 24 17:13:17 2016 +0200

    Merge pull request #834 from melex750/dev
    
    Implicit cast and null when passing arguments

 po/colobot.pot                        |   3 +
 po/de.po                              |   3 +
 po/fr.po                              |   3 +
 po/pl.po                              |   3 +
 po/ru.po                              |   3 +
 src/CBot/CBotClass.cpp                |  11 +-
 src/CBot/CBotEnums.h                  |   1 +
 src/CBot/CBotInstr/CBotExprRetVar.cpp |   4 +-
 src/CBot/CBotInstr/CBotExprVar.cpp    |   7 +-
 src/CBot/CBotInstr/CBotFieldExpr.cpp  |  53 +++++++
 src/CBot/CBotInstr/CBotFieldExpr.h    |  15 ++
 src/CBot/CBotInstr/CBotFunction.cpp   | 111 ++++++++------
 src/CBot/CBotInstr/CBotInstrUtils.cpp |  10 +-
 src/CBot/CBotInstr/CBotLeftExpr.cpp   |   8 +-
 src/CBot/CBotProgram.cpp              |   3 +-
 src/CBot/CBotProgram.h                |   7 -
 src/CBot/CBotTypResult.h              |   2 +-
 src/common/restext.cpp                |   1 +
 test/unit/CBot/CBot_test.cpp          | 267 ++++++++++++++++++++++++++++++++++
 19 files changed, 440 insertions(+), 75 deletions(-)

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



More information about the Pkg-games-commits mailing list