[colobot] 149/377: Merge pull request #690 from Grunaka/dev
Didier Raboud
odyx at moszumanska.debian.org
Wed Mar 30 13:34:09 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 95eee3a3403fd4e8ca9797c2c17b6c4dfb166139
Merge: aa2e142 30c3d03
Author: krzys-h <krzys_h at interia.pl>
Date: Sat Dec 19 14:14:41 2015 +0100
Merge pull request #690 from Grunaka/dev
Clean CBot Interface
src/CBot/CBot.cpp | 3964 --------------------
src/CBot/CBot.h | 1671 +--------
src/CBot/CBotCStack.cpp | 405 ++
src/CBot/CBotCStack.h | 266 ++
src/CBot/CBotCall.cpp | 314 ++
src/CBot/CBotCall.h | 149 +
src/CBot/CBotCallMethode.cpp | 182 +
src/CBot/CBotCallMethode.h | 119 +
src/CBot/CBotClass.cpp | 701 ++--
src/CBot/CBotClass.h | 475 +++
src/CBot/CBotDefParam.cpp | 208 +
src/CBot/CBotDefParam.h | 114 +
src/CBot/CBotDefines.h | 184 +
src/CBot/CBotDll.h | 1233 ------
src/CBot/CBotEnums.h | 155 +
src/CBot/CBotFileUtils.cpp | 175 +
src/CBot/CBotFileUtils.h | 156 +
src/CBot/CBotInstr/CBotBlock.cpp | 73 +
src/CBot/CBotInstr/CBotBlock.h | 64 +
.../{CBotToken.h => CBotInstr/CBotBoolExpr.cpp} | 54 +-
src/CBot/{CBotToken.h => CBotInstr/CBotBoolExpr.h} | 43 +-
src/CBot/CBotInstr/CBotBoolean.cpp | 178 +
src/CBot/CBotInstr/CBotBoolean.h | 76 +
src/CBot/CBotInstr/CBotBreak.cpp | 96 +
src/CBot/{CBotToken.h => CBotInstr/CBotBreak.h} | 71 +-
src/CBot/CBotInstr/CBotCase.cpp | 92 +
src/CBot/CBotInstr/CBotCase.h | 83 +
src/CBot/CBotInstr/CBotCatch.cpp | 114 +
src/CBot/CBotInstr/CBotCatch.h | 93 +
.../{CBotClass.cpp => CBotInstr/CBotClassInst.cpp} | 491 +--
src/CBot/CBotInstr/CBotClassInst.h | 85 +
.../{CBotToken.h => CBotInstr/CBotCondition.cpp} | 56 +-
.../{CBotToken.h => CBotInstr/CBotCondition.h} | 42 +-
src/CBot/CBotInstr/CBotDo.cpp | 159 +
src/CBot/CBotInstr/CBotDo.h | 73 +
src/CBot/{CBotToken.h => CBotInstr/CBotEmpty.cpp} | 46 +-
src/CBot/{CBotToken.h => CBotInstr/CBotEmpty.h} | 43 +-
src/CBot/CBotInstr/CBotExprAlpha.cpp | 82 +
.../{CBotToken.h => CBotInstr/CBotExprAlpha.h} | 63 +-
src/CBot/CBotInstr/CBotExprBool.cpp | 84 +
src/CBot/{CBotToken.h => CBotInstr/CBotExprBool.h} | 64 +-
src/CBot/CBotInstr/CBotExprNan.cpp | 59 +
src/CBot/{CBotToken.h => CBotInstr/CBotExprNan.h} | 55 +-
src/CBot/CBotInstr/CBotExprNull.cpp | 60 +
src/CBot/{CBotToken.h => CBotInstr/CBotExprNull.h} | 56 +-
src/CBot/CBotInstr/CBotExprNum.cpp | 117 +
src/CBot/CBotInstr/CBotExprNum.h | 78 +
src/CBot/CBotInstr/CBotExprUnaire.cpp | 124 +
src/CBot/CBotInstr/CBotExprUnaire.h | 73 +
src/CBot/CBotInstr/CBotExprVar.cpp | 310 ++
src/CBot/CBotInstr/CBotExprVar.h | 103 +
src/CBot/CBotInstr/CBotExpression.cpp | 298 ++
src/CBot/CBotInstr/CBotExpression.h | 87 +
src/CBot/CBotInstr/CBotFieldExpr.cpp | 130 +
src/CBot/CBotInstr/CBotFieldExpr.h | 83 +
src/CBot/CBotInstr/CBotFloat.cpp | 176 +
src/CBot/CBotInstr/CBotFloat.h | 76 +
src/CBot/CBotInstr/CBotFor.cpp | 214 ++
src/CBot/CBotInstr/CBotFor.h | 81 +
src/CBot/{ => CBotInstr}/CBotFunction.cpp | 866 +----
src/CBot/CBotInstr/CBotFunction.h | 282 ++
src/CBot/CBotInstr/CBotIString.cpp | 161 +
src/CBot/CBotInstr/CBotIString.h | 76 +
src/CBot/{ => CBotInstr}/CBotIf.cpp | 27 +-
src/CBot/CBotInstr/CBotIf.h | 77 +
src/CBot/CBotInstr/CBotIndexExpr.cpp | 120 +
src/CBot/CBotInstr/CBotIndexExpr.h | 81 +
src/CBot/CBotInstr/CBotInstArray.cpp | 231 ++
src/CBot/CBotInstr/CBotInstArray.h | 82 +
src/CBot/CBotInstr/CBotInstr.cpp | 374 ++
src/CBot/CBotInstr/CBotInstr.h | 266 ++
src/CBot/CBotInstr/CBotInstrCall.cpp | 207 +
src/CBot/CBotInstr/CBotInstrCall.h | 76 +
src/CBot/CBotInstr/CBotInstrMethode.cpp | 281 ++
src/CBot/CBotInstr/CBotInstrMethode.h | 92 +
src/CBot/CBotInstr/CBotInstrUtils.cpp | 165 +
.../{CBotToken.h => CBotInstr/CBotInstrUtils.h} | 55 +-
src/CBot/CBotInstr/CBotInt.cpp | 190 +
src/CBot/CBotInstr/CBotInt.h | 78 +
src/CBot/CBotInstr/CBotLeftExpr.cpp | 248 ++
src/CBot/CBotInstr/CBotLeftExpr.h | 101 +
src/CBot/CBotInstr/CBotLeftExprVar.cpp | 88 +
src/CBot/CBotInstr/CBotLeftExprVar.h | 75 +
src/CBot/CBotInstr/CBotListArray.cpp | 182 +
src/CBot/CBotInstr/CBotListArray.h | 76 +
src/CBot/CBotInstr/CBotListExpression.cpp | 131 +
src/CBot/CBotInstr/CBotListExpression.h | 72 +
src/CBot/CBotInstr/CBotListInstr.cpp | 121 +
src/CBot/CBotInstr/CBotListInstr.h | 74 +
src/CBot/CBotInstr/CBotLogicExpr.cpp | 94 +
.../{CBotToken.h => CBotInstr/CBotLogicExpr.h} | 66 +-
src/CBot/CBotInstr/CBotNew.cpp | 249 ++
src/CBot/CBotInstr/CBotNew.h | 75 +
src/CBot/CBotInstr/CBotParExpr.cpp | 193 +
src/CBot/CBotInstr/CBotParExpr.h | 62 +
src/CBot/CBotInstr/CBotPostIncExpr.cpp | 90 +
src/CBot/CBotInstr/CBotPostIncExpr.h | 69 +
src/CBot/CBotInstr/CBotPreIncExpr.cpp | 97 +
.../{CBotToken.h => CBotInstr/CBotPreIncExpr.h} | 61 +-
src/CBot/CBotInstr/CBotReturn.cpp | 116 +
src/CBot/{CBotToken.h => CBotInstr/CBotReturn.h} | 68 +-
src/CBot/CBotInstr/CBotSwitch.cpp | 220 ++
src/CBot/CBotInstr/CBotSwitch.h | 76 +
src/CBot/CBotInstr/CBotThrow.cpp | 103 +
src/CBot/{CBotToken.h => CBotInstr/CBotThrow.h} | 69 +-
src/CBot/CBotInstr/CBotTry.cpp | 227 ++
src/CBot/CBotInstr/CBotTry.h | 78 +
src/CBot/{ => CBotInstr}/CBotTwoOpExpr.cpp | 126 +-
src/CBot/CBotInstr/CBotTwoOpExpr.h | 78 +
src/CBot/CBotInstr/CBotWhile.cpp | 153 +
src/CBot/CBotInstr/CBotWhile.h | 79 +
src/CBot/CBotProgram.cpp | 660 +---
src/CBot/CBotProgram.h | 315 ++
src/CBot/CBotStack.cpp | 511 +--
src/CBot/CBotStack.h | 281 ++
src/CBot/CBotString.cpp | 149 +-
src/CBot/CBotString.h | 216 ++
src/CBot/CBotStringArray.cpp | 138 +
src/CBot/CBotStringArray.h | 85 +
src/CBot/CBotToken.cpp | 76 +-
src/CBot/CBotToken.h | 274 +-
src/CBot/CBotTypResult.cpp | 208 +
src/CBot/CBotTypResult.h | 112 +
src/CBot/CBotUtils.cpp | 274 ++
src/CBot/CBotUtils.h | 133 +
src/CBot/CBotVar.cpp | 2257 -----------
src/CBot/CBotVar/CBotVar.cpp | 763 ++++
src/CBot/CBotVar/CBotVar.h | 627 ++++
src/CBot/CBotVar/CBotVarArray.cpp | 145 +
src/CBot/CBotVar/CBotVarArray.h | 103 +
src/CBot/CBotVar/CBotVarBoolean.cpp | 157 +
src/CBot/CBotVar/CBotVarBoolean.h | 135 +
src/CBot/CBotVar/CBotVarClass.cpp | 503 +++
src/CBot/CBotVar/CBotVarClass.h | 195 +
src/CBot/CBotVar/CBotVarFloat.cpp | 228 ++
src/CBot/CBotVar/CBotVarFloat.h | 198 +
src/CBot/CBotVar/CBotVarInt.cpp | 297 ++
src/CBot/CBotVar/CBotVarInt.h | 255 ++
src/CBot/CBotVar/CBotVarPointer.cpp | 246 ++
src/CBot/CBotVar/CBotVarPointer.h | 160 +
src/CBot/CBotVar/CBotVarString.cpp | 141 +
src/CBot/CBotVar/CBotVarString.h | 127 +
src/CBot/CBotWhile.cpp | 1261 -------
src/CBot/CMakeLists.txt | 88 +-
src/CBot/StringFunctions.cpp | 71 +-
src/CBot/StringFunctions.h | 137 +
src/CBot/resource.h | 175 -
src/common/restext.cpp | 2 +-
src/level/robotmain.cpp | 2 +-
src/object/implementation/programmable_impl.cpp | 2 +
src/object/old_object.cpp | 2 -
src/script/script.cpp | 1 +
src/script/script.h | 2 +-
src/script/scriptfunc.cpp | 2 +
src/script/scriptfunc.h | 3 +-
src/ui/studio.cpp | 2 -
test/cbot/console/main.cpp | 5 +-
test/unit/CBot/CBotString_test.cpp | 2 +-
158 files changed, 20128 insertions(+), 13978 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