thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Standardized the preprocessor constants used to prevent double inclusion of

Browse source 
header files. Each now begins with "SWORD2_" and ends with "_H". (Well, except
for "SWORD2_H", since I didn't want to name it "SWORD2_SWORD2_H".)

svn-id: r20655
This commit is contained in:
Torbjörn Andersson 2006-02-12 19:57:23 +00:00
parent ff25c5c90a
commit 8935cac6da
19 changed files with 38 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/sword2/animation.h
View file

@ -17,11 +17,10 @@
* *
* $URL$ * $URL$
* $Id$ * $Id$
*
*/ */
#ifndef ANIMATION_H #ifndef SWORD2_ANIMATION_H
#define ANIMATION_H #define SWORD2_ANIMATION_H
#include "graphics/animation.h" #include "graphics/animation.h"
#include "sound/mixer.h" #include "sound/mixer.h"

4
engines/sword2/console.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef C_ONSOLE_H #ifndef SWORD2_CONSOLE_H
#define C_ONSOLE_H #define SWORD2_CONSOLE_H
#include "common/debugger.h" #include "common/debugger.h"
#include "sword2/debug.h" #include "sword2/debug.h"

4
engines/sword2/controls.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef _CONTROL_S #ifndef SWORD2_CONTROL_H
#define _CONTROL_S #define SWORD2_CONTROL_H
#include "sword2/defs.h" #include "sword2/defs.h"

4
engines/sword2/debug.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef D_DEBUG #ifndef SWORD2_DEBUG_H
#define D_DEBUG #define SWORD2_DEBUG_H
// FIXME: I don't know how large this constant used to be // FIXME: I don't know how large this constant used to be
#define MAX_DEBUG_TEXTS 55 #define MAX_DEBUG_TEXTS 55

4
engines/sword2/defs.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef DEFS #ifndef SWORD2_DEFS_H
#define DEFS #define SWORD2_DEFS_H
#define SIZE 0x10000 // 65536 items per section #define SIZE 0x10000 // 65536 items per section
#define NuSIZE 0xffff // & with this #define NuSIZE 0xffff // & with this

4
engines/sword2/header.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef _HEADER #ifndef SWORD2_HEADER_H
#define _HEADER #define SWORD2_HEADER_H
#include "common/stream.h" #include "common/stream.h"

4
engines/sword2/icons.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef _ICONS #ifndef SWORD2_ICONS_H
#define _ICONS #define SWORD2_ICONS_H
#define MENU_MASTER_OBJECT 44 #define MENU_MASTER_OBJECT 44
#define TOTAL_subjects (375 - 256 + 1) // the speech subject bar #define TOTAL_subjects (375 - 256 + 1) // the speech subject bar

4
engines/sword2/interpreter.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef _INTERPRETER #ifndef SWORD2_INTERPRETER_H
#define _INTERPRETER #define SWORD2_INTERPRETER_H
namespace Sword2 { namespace Sword2 {

4
engines/sword2/logic.h
View file

@ -21,8 +21,8 @@
// logic management // logic management
#ifndef _LOGIC #ifndef SWORD2_LOGIC_H
#define _LOGIC #define SWORD2_LOGIC_H
#include "sword2/memory.h" #include "sword2/memory.h"

4
engines/sword2/maketext.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef _MAKETEXT_H #ifndef SWORD2_MAKETEXT_H
#define _MAKETEXT_H #define SWORD2_MAKETEXT_H
#include "sword2/debug.h" #include "sword2/debug.h"

4
engines/sword2/memory.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef MEMORY_H #ifndef SWORD2_MEMORY_H
#define MEMORY_H #define SWORD2_MEMORY_H
#define MAX_MEMORY_BLOCKS 999 #define MAX_MEMORY_BLOCKS 999

4
engines/sword2/mouse.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef MOUSE_H #ifndef SWORD2_MOUSE_H
#define MOUSE_H #define SWORD2_MOUSE_H
#define MAX_SUBJECT_LIST 30 // is that enough? #define MAX_SUBJECT_LIST 30 // is that enough?

4
engines/sword2/object.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef _SCRIPT_STRUCTURES #ifndef SWORD2_OBJECT_H
#define _SCRIPT_STRUCTURES #define SWORD2_OBJECT_H
#include "common/stream.h" #include "common/stream.h"

4
engines/sword2/resman.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef RESMAN_H #ifndef SWORD2_RESMAN_H
#define RESMAN_H #define SWORD2_RESMAN_H
namespace Common { namespace Common {
class File; class File;

4
engines/sword2/router.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef _ROUTER_H #ifndef SWORD2_ROUTER_H
#define _ROUTER_H #define SWORD2_ROUTER_H
// This used to be a variable, but it was never set. Actually, it wasn't even // This used to be a variable, but it was never set. Actually, it wasn't even
// initialised! // initialised!

4
engines/sword2/saveload.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef SAVE_REST_H #ifndef SWORD2_SAVELOAD_H
#define SAVE_REST_H #define SWORD2_SAVELOAD_H
namespace Sword2 { namespace Sword2 {

4
engines/sword2/screen.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef _BUILD_DISPLAY #ifndef SWORD2_SCREEN_H
#define _BUILD_DISPLAY #define SWORD2_SCREEN_H
#include "common/rect.h" #include "common/rect.h"
#include "common/stream.h" #include "common/stream.h"

4
engines/sword2/sound.h
View file

@ -29,8 +29,8 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef SOUND_H #ifndef SWORD2_SOUND_H
#define SOUND_H #define SWORD2_SOUND_H
#include "common/file.h" #include "common/file.h"
#include "sound/audiostream.h" #include "sound/audiostream.h"

4
engines/sword2/sword2.h
View file

@ -19,8 +19,8 @@
* $Id$ * $Id$
*/ */
#ifndef _SWORD2 #ifndef SWORD2_H
#define _SWORD2 #define SWORD2_H
// Enable this to make it possible to clear the mouse cursor luggage by // Enable this to make it possible to clear the mouse cursor luggage by
// right-clicking. The original didn't do this, but it feels natural to me. // right-clicking. The original didn't do this, but it feels natural to me.