[Scummvm-cvs-logs] SF.net SVN: scummvm: [25751] scummvm/trunk/engines/sword1
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Tue Feb 20 19:04:13 CET 2007
Revision: 25751
http://scummvm.svn.sourceforge.net/scummvm/?rev=25751&view=rev
Author: eriktorbjorn
Date: 2007-02-20 10:04:13 -0800 (Tue, 20 Feb 2007)
Log Message:
-----------
Last batch of header consistency fixes. At least for the game engines.
Modified Paths:
--------------
scummvm/trunk/engines/sword1/animation.h
scummvm/trunk/engines/sword1/collision.h
scummvm/trunk/engines/sword1/control.h
scummvm/trunk/engines/sword1/credits.h
scummvm/trunk/engines/sword1/debug.h
scummvm/trunk/engines/sword1/eventman.h
scummvm/trunk/engines/sword1/logic.h
scummvm/trunk/engines/sword1/memman.h
scummvm/trunk/engines/sword1/menu.h
scummvm/trunk/engines/sword1/mouse.h
scummvm/trunk/engines/sword1/music.h
scummvm/trunk/engines/sword1/objectman.h
scummvm/trunk/engines/sword1/resman.h
scummvm/trunk/engines/sword1/screen.h
scummvm/trunk/engines/sword1/sound.h
scummvm/trunk/engines/sword1/sword1.h
scummvm/trunk/engines/sword1/sworddefs.h
scummvm/trunk/engines/sword1/swordres.h
scummvm/trunk/engines/sword1/text.h
Modified: scummvm/trunk/engines/sword1/animation.h
===================================================================
--- scummvm/trunk/engines/sword1/animation.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/animation.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef ANIMATION_H
-#define ANIMATION_H
+#ifndef SWORD1_ANIMATION_H
+#define SWORD1_ANIMATION_H
#include "graphics/dxa_player.h"
#include "graphics/mpeg_player.h"
Modified: scummvm/trunk/engines/sword1/collision.h
===================================================================
--- scummvm/trunk/engines/sword1/collision.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/collision.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSCOLLISION_H
-#define BSCOLLISION_H
+#ifndef SWORD1_COLLISION_H
+#define SWORD1_COLLISION_H
/*#include "objectman.h"
Modified: scummvm/trunk/engines/sword1/control.h
===================================================================
--- scummvm/trunk/engines/sword1/control.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/control.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSCONTROL_H
-#define BSCONTROL_H
+#ifndef SWORD1_CONTROL_H
+#define SWORD1_CONTROL_H
#include "common/scummsys.h"
#include "sword1/sworddefs.h"
Modified: scummvm/trunk/engines/sword1/credits.h
===================================================================
--- scummvm/trunk/engines/sword1/credits.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/credits.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BS1CREDITS_H
-#define BS1CREDITS_H
+#ifndef SWORD1_CREDITS_H
+#define SWORD1_CREDITS_H
#include "common/util.h"
Modified: scummvm/trunk/engines/sword1/debug.h
===================================================================
--- scummvm/trunk/engines/sword1/debug.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/debug.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSDEBUG_H
-#define BSDEBUG_H
+#ifndef SWORD1_DEBUG_H
+#define SWORD1_DEBUG_H
#include "common/scummsys.h"
Modified: scummvm/trunk/engines/sword1/eventman.h
===================================================================
--- scummvm/trunk/engines/sword1/eventman.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/eventman.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSEVENTMAN_H
-#define BSEVENTMAN_H
+#ifndef SWORD1_EVENTMAN_H
+#define SWORD1_EVENTMAN_H
#include "sword1/object.h"
Modified: scummvm/trunk/engines/sword1/logic.h
===================================================================
--- scummvm/trunk/engines/sword1/logic.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/logic.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSLOGIC_H
-#define BSLOGIC_H
+#ifndef SWORD1_LOGIC_H
+#define SWORD1_LOGIC_H
// combination of logic.c and scr_int.c
#include "sword1/sworddefs.h"
Modified: scummvm/trunk/engines/sword1/memman.h
===================================================================
--- scummvm/trunk/engines/sword1/memman.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/memman.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef MEMMAN_H
-#define MEMMAN_H
+#ifndef SWORD1_MEMMAN_H
+#define SWORD1_MEMMAN_H
#include "common/scummsys.h"
Modified: scummvm/trunk/engines/sword1/menu.h
===================================================================
--- scummvm/trunk/engines/sword1/menu.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/menu.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSMENU_H
-#define BSMENU_H
+#ifndef SWORD1_MENU_H
+#define SWORD1_MENU_H
#include "sword1/sworddefs.h"
#include "sword1/object.h"
Modified: scummvm/trunk/engines/sword1/mouse.h
===================================================================
--- scummvm/trunk/engines/sword1/mouse.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/mouse.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSMOUSE_H
-#define BSMOUSE_H
+#ifndef SWORD1_MOUSE_H
+#define SWORD1_MOUSE_H
#include "common/scummsys.h"
#include "sword1/sworddefs.h"
Modified: scummvm/trunk/engines/sword1/music.h
===================================================================
--- scummvm/trunk/engines/sword1/music.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/music.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSMUSIC_H
-#define BSMUSIC_H
+#ifndef SWORD1_MUSIC_H
+#define SWORD1_MUSIC_H
#include "common/scummsys.h"
#include "common/mutex.h"
Modified: scummvm/trunk/engines/sword1/objectman.h
===================================================================
--- scummvm/trunk/engines/sword1/objectman.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/objectman.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -22,8 +22,8 @@
// this is the object manager. our equivalent to protocol.c and coredata.c
-#ifndef OBJECTMAN_H
-#define OBJECTMAN_H
+#ifndef SWORD1_OBJECTMAN_H
+#define SWORD1_OBJECTMAN_H
#include "sword1/resman.h"
#include "sword1/sworddefs.h"
Modified: scummvm/trunk/engines/sword1/resman.h
===================================================================
--- scummvm/trunk/engines/sword1/resman.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/resman.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef RESMAN_H
-#define RESMAN_H
+#ifndef SWORD1_RESMAN_H
+#define SWORD1_RESMAN_H
#include "sword1/memman.h"
#include "common/file.h"
Modified: scummvm/trunk/engines/sword1/screen.h
===================================================================
--- scummvm/trunk/engines/sword1/screen.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/screen.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSSCREEN_H
-#define BSSCREEN_H
+#ifndef SWORD1_SCREEN_H
+#define SWORD1_SCREEN_H
#include "sword1/sworddefs.h"
Modified: scummvm/trunk/engines/sword1/sound.h
===================================================================
--- scummvm/trunk/engines/sword1/sound.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/sound.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSSOUND_H
-#define BSSOUND_H
+#ifndef SWORD1_SOUND_H
+#define SWORD1_SOUND_H
#include "sword1/object.h"
#include "sword1/sworddefs.h"
Modified: scummvm/trunk/engines/sword1/sword1.h
===================================================================
--- scummvm/trunk/engines/sword1/sword1.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/sword1.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSSWORD1_H
-#define BSSWORD1_H
+#ifndef SWORD1_H
+#define SWORD1_H
#include "engines/engine.h"
#include "common/util.h"
Modified: scummvm/trunk/engines/sword1/sworddefs.h
===================================================================
--- scummvm/trunk/engines/sword1/sworddefs.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/sworddefs.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef SWORDDEFS_H
-#define SWORDDEFS_H
+#ifndef SWORD1_SWORDDEFS_H
+#define SWORD1_SWORDDEFS_H
#include "common/scummsys.h"
Modified: scummvm/trunk/engines/sword1/swordres.h
===================================================================
--- scummvm/trunk/engines/sword1/swordres.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/swordres.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef SWORDRES_H
-#define SWORDRES_H
+#ifndef SWORD1_SWORDRES_H
+#define SWORD1_SWORDRES_H
namespace Sword1 {
Modified: scummvm/trunk/engines/sword1/text.h
===================================================================
--- scummvm/trunk/engines/sword1/text.h 2007-02-20 17:57:49 UTC (rev 25750)
+++ scummvm/trunk/engines/sword1/text.h 2007-02-20 18:04:13 UTC (rev 25751)
@@ -20,8 +20,8 @@
*
*/
-#ifndef BSTEXT_H
-#define BSTEXT_H
+#ifndef SWORD1_TEXT_H
+#define SWORD1_TEXT_H
#include "sword1/object.h"
#include "sword1/sworddefs.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list