Skip to content

Include a basic .gitattributes file and renormalize all line endings according to it #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
majcosta wants to merge 2 commits into from
Closed

Include a basic .gitattributes file and renormalize all line endings according to it #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7253048
Add a .gitattributes file
majcosta Jan 3, 2023
d236227
Renormalize files
majcosta Jan 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 8 additions & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
* text=auto

*.sln text eol=crlf
*.vsprops text eol=crlf
*.vcproj text eol=crlf
*.vcxproj text eol=crlf
*.vcxproj.filters text eol=crlf

48 changes: 24 additions & 24 deletions Cheats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
#ifndef _CHEATS__H_
#define _CHEATS__H_
#include "Language Defines.h"
extern UINT8 gubCheatLevel;
// GLOBALS FOR CHEAT MODE......
#ifdef JA2TESTVERSION
#define STARTING_CHEAT_LEVEL 6
#elif defined JA2BETAVERSION
#define STARTING_CHEAT_LEVEL 3
#else
#define STARTING_CHEAT_LEVEL 0
#endif
// ATE: remove cheats unless we're doing a debug build
#define INFORMATION_CHEAT_LEVEL( ) ( gubCheatLevel >= 3 )
#define CHEATER_CHEAT_LEVEL( ) ( gubCheatLevel >= 5 )
#define DEBUG_CHEAT_LEVEL( ) ( gubCheatLevel >= 6 )
#define RESET_CHEAT_LEVEL( ) ( gubCheatLevel = 0 )
#define ACTIVATE_CHEAT_LEVEL() ( gubCheatLevel = 6 )
#ifndef _CHEATS__H_
#define _CHEATS__H_

#include "Language Defines.h"

extern UINT8 gubCheatLevel;

// GLOBALS FOR CHEAT MODE......
#ifdef JA2TESTVERSION
#define STARTING_CHEAT_LEVEL 6
#elif defined JA2BETAVERSION
#define STARTING_CHEAT_LEVEL 3
#else
#define STARTING_CHEAT_LEVEL 0
#endif

// ATE: remove cheats unless we're doing a debug build
#define INFORMATION_CHEAT_LEVEL( ) ( gubCheatLevel >= 3 )
#define CHEATER_CHEAT_LEVEL( ) ( gubCheatLevel >= 5 )
#define DEBUG_CHEAT_LEVEL( ) ( gubCheatLevel >= 6 )

#define RESET_CHEAT_LEVEL( ) ( gubCheatLevel = 0 )
#define ACTIVATE_CHEAT_LEVEL() ( gubCheatLevel = 6 )

#endif
160 changes: 80 additions & 80 deletions Console/ComBSTROut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,81 +1,81 @@
/////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2001-2004 by Marko Bozikovic
// All rights reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// Send bug reports, bug fixes, enhancements, requests, flames, etc., and
// I'll try to keep a version up to date. I can be reached as follows:
// marko.bozikovic@alterbox.net
// bozho@kset.org
/////////////////////////////////////////////////////////////////////////////
#ifndef _COMBSTROUT_H_
#define _COMBSTROUT_H_
/////////////////////////////////////////////////////////////////////////////
// CComBSTROut - a class that inherits from CComBSTR and adds Out() method
// that should be used instead of & operator for 'out'
// function parameters
class CComBSTROut : public CComBSTR
{
public:
CComBSTROut()
{
}
/*explicit*/ CComBSTROut(int nSize) : CComBSTR(nSize)
{
}
/*explicit*/ CComBSTROut(int nSize, LPCOLESTR sz) : CComBSTR(nSize, sz)
{
}
/*explicit*/ CComBSTROut(LPCOLESTR pSrc) : CComBSTR(pSrc)
{
}
/*explicit*/ CComBSTROut(const CComBSTROut& src) : CComBSTR(src)
{
}
/*explicit*/ CComBSTROut(REFGUID src) : CComBSTR(src)
{
}
#ifndef OLE2ANSI
CComBSTROut(LPCSTR pSrc) : CComBSTR(pSrc)
{
}
CComBSTROut(int nSize, LPCSTR sz) : CComBSTR(nSize, sz)
{
}
#endif
~CComBSTROut()
{
CComBSTR::~CComBSTR();
}
BSTR* Out()
{
Empty();
return &m_str;
}
};
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2001-2004 by Marko Bozikovic
// All rights reserved
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
// Send bug reports, bug fixes, enhancements, requests, flames, etc., and
// I'll try to keep a version up to date. I can be reached as follows:
// marko.bozikovic@alterbox.net
// bozho@kset.org
/////////////////////////////////////////////////////////////////////////////

#ifndef _COMBSTROUT_H_
#define _COMBSTROUT_H_

/////////////////////////////////////////////////////////////////////////////
// CComBSTROut - a class that inherits from CComBSTR and adds Out() method
// that should be used instead of & operator for 'out'
// function parameters

class CComBSTROut : public CComBSTR
{
public:

CComBSTROut()
{
}
/*explicit*/ CComBSTROut(int nSize) : CComBSTR(nSize)
{
}
/*explicit*/ CComBSTROut(int nSize, LPCOLESTR sz) : CComBSTR(nSize, sz)
{
}
/*explicit*/ CComBSTROut(LPCOLESTR pSrc) : CComBSTR(pSrc)
{
}
/*explicit*/ CComBSTROut(const CComBSTROut& src) : CComBSTR(src)
{
}
/*explicit*/ CComBSTROut(REFGUID src) : CComBSTR(src)
{
}

#ifndef OLE2ANSI
CComBSTROut(LPCSTR pSrc) : CComBSTR(pSrc)
{
}

CComBSTROut(int nSize, LPCSTR sz) : CComBSTR(nSize, sz)
{
}
#endif

~CComBSTROut()
{
CComBSTR::~CComBSTR();
}

BSTR* Out()
{
Empty();
return &m_str;
}
};

/////////////////////////////////////////////////////////////////////////////


#endif // _COMBSTROUT_H_
Loading