From fa9dc0dace1824661e8ef6199d457a50aacf4462 Mon Sep 17 00:00:00 2001 From: Grunaka Date: Sun, 22 Nov 2015 18:59:01 +0100 Subject: [PATCH] Start cleaning of files CBotFileUtils.h and CBotFileUtils.cpp. Pass CBotTypResult parameter as reference. --- src/CBot/CBotFileUtils.cpp | 4 ++-- src/CBot/CBotFileUtils.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CBot/CBotFileUtils.cpp b/src/CBot/CBotFileUtils.cpp index bb561bdf..79a1240a 100644 --- a/src/CBot/CBotFileUtils.cpp +++ b/src/CBot/CBotFileUtils.cpp @@ -124,7 +124,7 @@ bool ReadString(FILE* pf, CBotString& s) } //////////////////////////////////////////////////////////////////////////////// -bool WriteType(FILE* pf, CBotTypResult type) +bool WriteType(FILE* pf, const CBotTypResult &type) { int typ = type.GetType(); if ( typ == CBotTypIntrinsic ) typ = CBotTypClass; @@ -144,7 +144,7 @@ bool WriteType(FILE* pf, CBotTypResult type) } //////////////////////////////////////////////////////////////////////////////// -bool ReadType(FILE* pf, CBotTypResult& type) +bool ReadType(FILE* pf, CBotTypResult &type) { unsigned short w, ww; if ( !ReadWord(pf, w) ) return false; diff --git a/src/CBot/CBotFileUtils.h b/src/CBot/CBotFileUtils.h index 1ac1664b..75bfa434 100644 --- a/src/CBot/CBotFileUtils.h +++ b/src/CBot/CBotFileUtils.h @@ -20,7 +20,6 @@ #pragma once // Modules inlcude -#include "CBotTypResult.h" // Local include @@ -30,6 +29,7 @@ // Forward declaration class CBotVar; class CBotString; +class CBotTypResult; /////////////////////////////////////////////////////////////////////////////// // routines for file management (* FILE) @@ -145,7 +145,7 @@ bool ReadString(FILE* pf, CBotString& s); * \param type * \return */ -bool WriteType(FILE* pf, CBotTypResult type); +bool WriteType(FILE* pf, const CBotTypResult &type); /*! * \brief ReadType @@ -153,4 +153,4 @@ bool WriteType(FILE* pf, CBotTypResult type); * \param type * \return */ -bool ReadType(FILE* pf, CBotTypResult& type); +bool ReadType(FILE* pf, CBotTypResult &type);