immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving macro MAX from CBot.h to CBotTwoOpExpr.cpp.

dev-time-step
Grunaka 2015-11-22 14:36:50 +01:00
parent 3b0561056a
commit 51f0675e41
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CBot/CBot.h
View File

@ -54,8 +54,6 @@ class CBotDefParam; // paramerer list of a function
extern bool SaveVar(FILE* pf, CBotVar* pVar); extern bool SaveVar(FILE* pf, CBotVar* pVar);
#define MAX(a,b) ((a>b) ? a : b)
extern CBotInstr* CompileParams(CBotToken* &p, CBotCStack* pStack, CBotVar** ppVars); extern CBotInstr* CompileParams(CBotToken* &p, CBotCStack* pStack, CBotVar** ppVars);
extern bool TypeCompatible( CBotTypResult& type1, CBotTypResult& type2, int op = 0 ); extern bool TypeCompatible( CBotTypResult& type1, CBotTypResult& type2, int op = 0 );

2
src/CBot/CBotInstr/CBotTwoOpExpr.cpp
View File

@ -33,6 +33,8 @@
// Global include // Global include
#include <cassert> #include <cassert>
#define MAX(a,b) ((a>b) ? a : b)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
CBotTwoOpExpr::CBotTwoOpExpr() CBotTwoOpExpr::CBotTwoOpExpr()
{ {