[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_font.cpp,1.34,1.35 smush_player.cpp,1.177,1.178

Chris Apers chrilith at users.sourceforge.net
Sat Oct 8 13:55:17 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17619/smush

Modified Files:
	smush_font.cpp smush_player.cpp 
Log Message:
revert previous changes related to #ifdefs

Index: smush_font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_font.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- smush_font.cpp	8 Oct 2005 20:14:41 -0000	1.34
+++ smush_font.cpp	8 Oct 2005 20:54:05 -0000	1.35
@@ -19,8 +19,6 @@
  *
  */
 
-#ifndef DISABLE_SCUMM_7_8
-
 #include "common/stdafx.h"
 #include "common/file.h"
 #include "scumm/scumm.h"
@@ -268,4 +266,3 @@
 
 } // End of namespace Scumm
 
-#endif

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- smush_player.cpp	8 Oct 2005 20:14:41 -0000	1.177
+++ smush_player.cpp	8 Oct 2005 20:54:05 -0000	1.178
@@ -18,8 +18,6 @@
  * $Header$
  *
  */
- 
-#ifndef DISABLE_SCUMM_7_8
 
 #include "common/stdafx.h"
 
@@ -1311,4 +1309,3 @@
 
 } // End of namespace Scumm
 
-#endif





More information about the Scummvm-git-logs mailing list