[Scummvm-cvs-logs] SF.net SVN: scummvm: [20655] scummvm/trunk/engines/sword2
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Sun Feb 12 11:59:01 CET 2006
Revision: 20655
Author: eriktorbjorn
Date: 2006-02-12 11:57:23 -0800 (Sun, 12 Feb 2006)
ViewCVS: http://svn.sourceforge.net/scummvm?rev=20655&view=rev
Log Message:
-----------
Standardized the preprocessor constants used to prevent double inclusion of
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".)
Modified Paths:
--------------
scummvm/trunk/engines/sword2/animation.h
scummvm/trunk/engines/sword2/console.h
scummvm/trunk/engines/sword2/controls.h
scummvm/trunk/engines/sword2/debug.h
scummvm/trunk/engines/sword2/defs.h
scummvm/trunk/engines/sword2/header.h
scummvm/trunk/engines/sword2/icons.h
scummvm/trunk/engines/sword2/interpreter.h
scummvm/trunk/engines/sword2/logic.h
scummvm/trunk/engines/sword2/maketext.h
scummvm/trunk/engines/sword2/memory.h
scummvm/trunk/engines/sword2/mouse.h
scummvm/trunk/engines/sword2/object.h
scummvm/trunk/engines/sword2/resman.h
scummvm/trunk/engines/sword2/router.h
scummvm/trunk/engines/sword2/saveload.h
scummvm/trunk/engines/sword2/screen.h
scummvm/trunk/engines/sword2/sound.h
scummvm/trunk/engines/sword2/sword2.h
Modified: scummvm/trunk/engines/sword2/animation.h
===================================================================
--- scummvm/trunk/engines/sword2/animation.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/animation.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -17,11 +17,10 @@
*
* $URL$
* $Id$
- *
*/
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#ifndef SWORD2_ANIMATION_H
+#define SWORD2_ANIMATION_H
#include "graphics/animation.h"
#include "sound/mixer.h"
Modified: scummvm/trunk/engines/sword2/console.h
===================================================================
--- scummvm/trunk/engines/sword2/console.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/console.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef C_ONSOLE_H
-#define C_ONSOLE_H
+#ifndef SWORD2_CONSOLE_H
+#define SWORD2_CONSOLE_H
#include "common/debugger.h"
#include "sword2/debug.h"
Modified: scummvm/trunk/engines/sword2/controls.h
===================================================================
--- scummvm/trunk/engines/sword2/controls.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/controls.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef _CONTROL_S
-#define _CONTROL_S
+#ifndef SWORD2_CONTROL_H
+#define SWORD2_CONTROL_H
#include "sword2/defs.h"
Modified: scummvm/trunk/engines/sword2/debug.h
===================================================================
--- scummvm/trunk/engines/sword2/debug.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/debug.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef D_DEBUG
-#define D_DEBUG
+#ifndef SWORD2_DEBUG_H
+#define SWORD2_DEBUG_H
// FIXME: I don't know how large this constant used to be
#define MAX_DEBUG_TEXTS 55
Modified: scummvm/trunk/engines/sword2/defs.h
===================================================================
--- scummvm/trunk/engines/sword2/defs.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/defs.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef DEFS
-#define DEFS
+#ifndef SWORD2_DEFS_H
+#define SWORD2_DEFS_H
#define SIZE 0x10000 // 65536 items per section
#define NuSIZE 0xffff // & with this
Modified: scummvm/trunk/engines/sword2/header.h
===================================================================
--- scummvm/trunk/engines/sword2/header.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/header.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef _HEADER
-#define _HEADER
+#ifndef SWORD2_HEADER_H
+#define SWORD2_HEADER_H
#include "common/stream.h"
Modified: scummvm/trunk/engines/sword2/icons.h
===================================================================
--- scummvm/trunk/engines/sword2/icons.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/icons.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef _ICONS
-#define _ICONS
+#ifndef SWORD2_ICONS_H
+#define SWORD2_ICONS_H
#define MENU_MASTER_OBJECT 44
#define TOTAL_subjects (375 - 256 + 1) // the speech subject bar
Modified: scummvm/trunk/engines/sword2/interpreter.h
===================================================================
--- scummvm/trunk/engines/sword2/interpreter.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/interpreter.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef _INTERPRETER
-#define _INTERPRETER
+#ifndef SWORD2_INTERPRETER_H
+#define SWORD2_INTERPRETER_H
namespace Sword2 {
Modified: scummvm/trunk/engines/sword2/logic.h
===================================================================
--- scummvm/trunk/engines/sword2/logic.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/logic.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -21,8 +21,8 @@
// logic management
-#ifndef _LOGIC
-#define _LOGIC
+#ifndef SWORD2_LOGIC_H
+#define SWORD2_LOGIC_H
#include "sword2/memory.h"
Modified: scummvm/trunk/engines/sword2/maketext.h
===================================================================
--- scummvm/trunk/engines/sword2/maketext.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/maketext.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef _MAKETEXT_H
-#define _MAKETEXT_H
+#ifndef SWORD2_MAKETEXT_H
+#define SWORD2_MAKETEXT_H
#include "sword2/debug.h"
Modified: scummvm/trunk/engines/sword2/memory.h
===================================================================
--- scummvm/trunk/engines/sword2/memory.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/memory.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef MEMORY_H
-#define MEMORY_H
+#ifndef SWORD2_MEMORY_H
+#define SWORD2_MEMORY_H
#define MAX_MEMORY_BLOCKS 999
Modified: scummvm/trunk/engines/sword2/mouse.h
===================================================================
--- scummvm/trunk/engines/sword2/mouse.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/mouse.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef MOUSE_H
-#define MOUSE_H
+#ifndef SWORD2_MOUSE_H
+#define SWORD2_MOUSE_H
#define MAX_SUBJECT_LIST 30 // is that enough?
Modified: scummvm/trunk/engines/sword2/object.h
===================================================================
--- scummvm/trunk/engines/sword2/object.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/object.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef _SCRIPT_STRUCTURES
-#define _SCRIPT_STRUCTURES
+#ifndef SWORD2_OBJECT_H
+#define SWORD2_OBJECT_H
#include "common/stream.h"
Modified: scummvm/trunk/engines/sword2/resman.h
===================================================================
--- scummvm/trunk/engines/sword2/resman.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/resman.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef RESMAN_H
-#define RESMAN_H
+#ifndef SWORD2_RESMAN_H
+#define SWORD2_RESMAN_H
namespace Common {
class File;
Modified: scummvm/trunk/engines/sword2/router.h
===================================================================
--- scummvm/trunk/engines/sword2/router.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/router.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef _ROUTER_H
-#define _ROUTER_H
+#ifndef SWORD2_ROUTER_H
+#define SWORD2_ROUTER_H
// This used to be a variable, but it was never set. Actually, it wasn't even
// initialised!
Modified: scummvm/trunk/engines/sword2/saveload.h
===================================================================
--- scummvm/trunk/engines/sword2/saveload.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/saveload.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef SAVE_REST_H
-#define SAVE_REST_H
+#ifndef SWORD2_SAVELOAD_H
+#define SWORD2_SAVELOAD_H
namespace Sword2 {
Modified: scummvm/trunk/engines/sword2/screen.h
===================================================================
--- scummvm/trunk/engines/sword2/screen.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/screen.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef _BUILD_DISPLAY
-#define _BUILD_DISPLAY
+#ifndef SWORD2_SCREEN_H
+#define SWORD2_SCREEN_H
#include "common/rect.h"
#include "common/stream.h"
Modified: scummvm/trunk/engines/sword2/sound.h
===================================================================
--- scummvm/trunk/engines/sword2/sound.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/sound.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -29,8 +29,8 @@
*
****************************************************************************/
-#ifndef SOUND_H
-#define SOUND_H
+#ifndef SWORD2_SOUND_H
+#define SWORD2_SOUND_H
#include "common/file.h"
#include "sound/audiostream.h"
Modified: scummvm/trunk/engines/sword2/sword2.h
===================================================================
--- scummvm/trunk/engines/sword2/sword2.h 2006-02-12 19:50:19 UTC (rev 20654)
+++ scummvm/trunk/engines/sword2/sword2.h 2006-02-12 19:57:23 UTC (rev 20655)
@@ -19,8 +19,8 @@
* $Id$
*/
-#ifndef _SWORD2
-#define _SWORD2
+#ifndef SWORD2_H
+#define SWORD2_H
// 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.
More information about the Scummvm-git-logs
mailing list