[Scummvm-cvs-logs] CVS: scummvm/common config-file.cpp,1.14,1.14.2.1 config-file.h,1.8,1.8.4.1 engine.cpp,1.23.2.1,1.23.2.2 engine.h,1.29,1.29.2.1 file.cpp,1.38,1.38.2.1 file.h,1.14,1.14.2.1 gameDetector.cpp,1.121.2.3,1.121.2.4 list.h,1.5,1.5.4.1 main.cpp,1.35,1.35.2.1 map.h,1.8,1.8.4.1 rect.h,1.11,1.11.2.1 scaler.cpp,1.35,1.35.2.1 scaler.h,1.13,1.13.2.1 scummsys.h,1.30,1.30.2.1 stdafx.h,1.6,1.6.2.1 str.cpp,1.16,1.16.2.1 str.h,1.11,1.11.2.1 system.h,1.37,1.37.2.1 timer.cpp,1.11,1.11.2.1 timer.h,1.8,1.8.2.1 util.cpp,1.17,1.17.2.1 util.h,1.22,1.22.2.1
Max Horn
fingolfin at users.sourceforge.net
Tue Aug 5 05:45:01 CEST 2003
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv1014
Modified Files:
Tag: branch-0-5-0
config-file.cpp config-file.h engine.cpp engine.h file.cpp
file.h gameDetector.cpp list.h main.cpp map.h rect.h
scaler.cpp scaler.h scummsys.h stdafx.h str.cpp str.h system.h
timer.cpp timer.h util.cpp util.h
Log Message:
sync minor header changes from trunk
Index: config-file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.cpp,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- config-file.cpp 21 May 2003 16:48:25 -0000 1.14
+++ config-file.cpp 5 Aug 2003 12:44:14 -0000 1.14.2.1
@@ -21,11 +21,8 @@
*/
#include "stdafx.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "config-file.h"
-#include "engine.h" // for debug()
+#include "common/config-file.h"
+#include "common/engine.h" // for debug()
#define MAXLINELEN 256
Index: config-file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/config-file.h,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -d -r1.8 -r1.8.4.1
--- config-file.h 6 Mar 2003 21:45:17 -0000 1.8
+++ config-file.h 5 Aug 2003 12:44:14 -0000 1.8.4.1
@@ -23,10 +23,10 @@
#ifndef CONFIG_FILE_H
#define CONFIG_FILE_H
-#include "common/util.h"
-#include "common/map.h"
#include "common/list.h"
+#include "common/map.h"
#include "common/str.h"
+#include "common/util.h"
class Config {
public:
Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.cpp,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -d -r1.23.2.1 -r1.23.2.2
--- engine.cpp 1 Aug 2003 16:26:51 -0000 1.23.2.1
+++ engine.cpp 5 Aug 2003 12:44:14 -0000 1.23.2.2
@@ -18,11 +18,14 @@
* $Header$
*/
+#if defined(_MSC_VER)
+#include <malloc.h>
+#endif
#include "stdafx.h"
-#include "engine.h"
-#include "config-file.h"
-#include "gameDetector.h"
-#include "timer.h"
+#include "common/config-file.h"
+#include "common/engine.h"
+#include "common/gameDetector.h"
+#include "common/timer.h"
#include "sound/mixer.h"
/*
@@ -260,7 +263,7 @@
}
void checkHeap() {
-#if defined(WIN32)
+#if defined(_MSC_VER)
if (_heapchk() != _HEAPOK) {
error("Heap is invalid!");
}
Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/engine.h,v
retrieving revision 1.29
retrieving revision 1.29.2.1
diff -u -d -r1.29 -r1.29.2.1
--- engine.h 15 Jul 2003 02:16:33 -0000 1.29
+++ engine.h 5 Aug 2003 12:44:14 -0000 1.29.2.1
@@ -21,8 +21,8 @@
#ifndef ENGINE_H
#define ENGINE_H
-#include "scummsys.h"
-#include "system.h"
+#include "common/scummsys.h"
+#include "common/system.h"
extern const char *gScummVMVersion; // e.g. "0.4.1"
extern const char *gScummVMBuildDate; // e.g. "2003-06-24"
@@ -39,8 +39,8 @@
// Beneath a Steel Sky
GID_SKY_FIRST,
GID_SKY_LAST = GID_SKY_FIRST + 49
-};
+};
class SoundMixer;
class GameDetector;
Index: file.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.cpp,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -d -r1.38 -r1.38.2.1
--- file.cpp 3 Jul 2003 07:03:18 -0000 1.38
+++ file.cpp 5 Aug 2003 12:44:14 -0000 1.38.2.1
@@ -19,9 +19,9 @@
*
*/
-#include "file.h"
-#include "util.h"
-#include "engine.h" // For debug/warning/error
+#include "common/file.h"
+#include "common/util.h"
+#include "common/engine.h" // For debug/warning/error
FILE *File::fopenNoCase(const char *filename, const char *directory, const char *mode) {
FILE *file;
Index: file.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/file.h,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- file.h 21 Jun 2003 20:21:40 -0000 1.14
+++ file.h 5 Aug 2003 12:44:14 -0000 1.14.2.1
@@ -22,9 +22,8 @@
#ifndef COMMON_FILE_H
#define COMMON_FILE_H
-#include <stdio.h>
#include "stdafx.h"
-#include "scummsys.h"
+#include "common/scummsys.h"
class File {
private:
Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/gameDetector.cpp,v
retrieving revision 1.121.2.3
retrieving revision 1.121.2.4
diff -u -d -r1.121.2.3 -r1.121.2.4
--- gameDetector.cpp 4 Aug 2003 14:20:40 -0000 1.121.2.3
+++ gameDetector.cpp 5 Aug 2003 12:44:14 -0000 1.121.2.4
@@ -21,11 +21,11 @@
*/
#include "stdafx.h"
+#include "common/config-file.h"
+#include "common/engine.h"
+#include "common/gameDetector.h"
+#include "common/scaler.h" // Only for gfx_modes
#include "sound/mididrv.h"
-#include "engine.h"
-#include "gameDetector.h"
-#include "config-file.h"
-#include "scaler.h" // Only for gfx_modes
#if defined(HAVE_CONFIG_H)
#include "config.h"
Index: list.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/list.h,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -d -r1.5 -r1.5.4.1
--- list.h 6 Mar 2003 21:45:23 -0000 1.5
+++ list.h 5 Aug 2003 12:44:14 -0000 1.5.4.1
@@ -21,7 +21,7 @@
#ifndef COMMON_LIST_H
#define COMMON_LIST_H
-#include "scummsys.h"
+#include "common/scummsys.h"
#include <assert.h>
namespace ScummVM {
Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/main.cpp,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -d -r1.35 -r1.35.2.1
--- main.cpp 15 Jul 2003 02:16:33 -0000 1.35
+++ main.cpp 5 Aug 2003 12:44:14 -0000 1.35.2.1
@@ -29,10 +29,10 @@
*/
#include "stdafx.h"
-#include "engine.h"
-#include "gameDetector.h"
-#include "config-file.h"
-#include "scaler.h" // For GFX_NORMAL
+#include "common/config-file.h"
+#include "common/engine.h"
+#include "common/gameDetector.h"
+#include "common/scaler.h" // For GFX_NORMAL
#include "gui/newgui.h"
#include "gui/launcher.h"
#include "gui/message.h"
Index: map.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/map.h,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -u -d -r1.8 -r1.8.4.1
--- map.h 6 Mar 2003 21:45:24 -0000 1.8
+++ map.h 5 Aug 2003 12:44:14 -0000 1.8.4.1
@@ -21,7 +21,7 @@
#ifndef COMMON_MAP_H
#define COMMON_MAP_H
-#include "scummsys.h"
+#include "common/scummsys.h"
namespace ScummVM {
Index: rect.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/rect.h,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- rect.h 1 Jun 2003 17:06:07 -0000 1.11
+++ rect.h 5 Aug 2003 12:44:14 -0000 1.11.2.1
@@ -22,8 +22,8 @@
#ifndef COMMON_RECT_H
#define COMMON_RECT_H
-#include "scummsys.h"
-#include "util.h"
+#include "common/scummsys.h"
+#include "common/util.h"
namespace ScummVM {
Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.35
retrieving revision 1.35.2.1
diff -u -d -r1.35 -r1.35.2.1
--- scaler.cpp 21 Jul 2003 00:07:27 -0000 1.35
+++ scaler.cpp 5 Aug 2003 12:44:14 -0000 1.35.2.1
@@ -21,8 +21,8 @@
*/
#include "stdafx.h"
-#include "scummsys.h"
-#include "scaler.h"
+#include "common/scummsys.h"
+#include "common/scaler.h"
// TODO: get rid of the colorMask etc. variables and instead use templates.
// This should give a respectable boost, since variable access (i.e. memory reads)
Index: scaler.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.h,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -d -r1.13 -r1.13.2.1
--- scaler.h 22 Jun 2003 14:59:21 -0000 1.13
+++ scaler.h 5 Aug 2003 12:44:14 -0000 1.13.2.1
@@ -18,8 +18,8 @@
* $Header$
*/
-#ifndef SCALER_H
-#define SCALER_H
+#ifndef COMMON_SCALER_H
+#define COMMON_SCALER_H
extern int Init_2xSaI (uint32 BitFormat);
Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -d -r1.30 -r1.30.2.1
--- scummsys.h 13 Jul 2003 12:15:43 -0000 1.30
+++ scummsys.h 5 Aug 2003 12:44:14 -0000 1.30.2.1
@@ -36,10 +36,8 @@
#if defined(_MSC_VER)
- //#pragma warning (disable: 4244)
- //#pragma warning (disable: 4101)
-
#define scumm_stricmp stricmp
+ #define scumm_strnicmp strnicmp
#define snprintf _snprintf
#if defined(CHECK_HEAP)
@@ -76,6 +74,7 @@
#elif defined(__MINGW32__)
#define scumm_stricmp stricmp
+ #define scumm_strnicmp strnicmp
#define CHECK_HEAP
#define SCUMM_LITTLE_ENDIAN
@@ -99,6 +98,7 @@
#elif defined(UNIX)
#define scumm_stricmp strcasecmp
+ #define scumm_strnicmp strncasecmp
#define CHECK_HEAP
@@ -160,7 +160,8 @@
#include "extend.h"
#define __PALM_OS__
- #define scumm_stricmp stricmp// FIXME - this is definitly wrong. Try strcasecmp?
+ #define scumm_stricmp stricmp
+ #define scumm_strnicmp strnicmp
#define CHECK_HEAP
#define SCUMM_BIG_ENDIAN
@@ -219,6 +220,7 @@
#elif defined(__MORPHOS__)
#define scumm_stricmp stricmp
+ #define scumm_strnicmp strnicmp
#define CHECK_HEAP
#define SCUMM_BIG_ENDIAN
@@ -252,6 +254,7 @@
#elif defined(__DC__)
#define scumm_stricmp strcasecmp
+ #define scumm_strnicmp strncasecmp
#define CHECK_HEAP
#define SCUMM_LITTLE_ENDIAN
#define SCUMM_NEED_ALIGNMENT
@@ -279,6 +282,7 @@
#define SCUMM_LITTLE_ENDIAN
#define scumm_stricmp stricmp
+ #define scumm_strnicmp strnicmp
#define CHECK_HEAP
#define FORCEINLINE inline
Index: stdafx.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/stdafx.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -d -r1.6 -r1.6.2.1
--- stdafx.h 13 Jul 2003 13:57:19 -0000 1.6
+++ stdafx.h 5 Aug 2003 12:44:14 -0000 1.6.2.1
@@ -35,10 +35,12 @@
#elif defined(WIN32)
-#if _MSC_VER > 1000
+#ifdef _MSC_VER
#pragma once
-#endif // _MSC_VER > 1000
-
+#pragma warning( disable : 4068 ) // turn off "unknown pragma" warning
+#pragma warning( disable : 4244 ) // turn off "conversion type" warning
+#pragma warning( disable : 4390 ) // turn oof "empty statement" warning for BS2 code
+#endif
#if !defined(_WIN32_WCE)
@@ -79,7 +81,6 @@
#include <stdarg.h>
#include <fcntl.h>
#include <conio.h>
-#include <malloc.h>
#include <assert.h>
#include <mmsystem.h>
#include <ctype.h>
Index: str.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- str.cpp 21 May 2003 16:56:45 -0000 1.16
+++ str.cpp 5 Aug 2003 12:44:14 -0000 1.16.2.1
@@ -19,14 +19,9 @@
*/
#include "stdafx.h"
-#include "str.h"
+#include "common/str.h"
#include <ctype.h>
-
-#ifdef _MSC_VER
-# pragma warning( disable : 4068 ) // unknown pragmas
-#endif
-
namespace ScummVM {
Index: str.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/str.h,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- str.h 21 May 2003 16:56:45 -0000 1.11
+++ str.h 5 Aug 2003 12:44:14 -0000 1.11.2.1
@@ -21,7 +21,7 @@
#ifndef COMMON_STRING_H
#define COMMON_STRING_H
-#include "scummsys.h"
+#include "common/scummsys.h"
#include "common/list.h"
#include <assert.h>
Index: system.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/system.h,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -d -r1.37 -r1.37.2.1
--- system.h 22 Jul 2003 23:27:41 -0000 1.37
+++ system.h 5 Aug 2003 12:44:14 -0000 1.37.2.1
@@ -23,8 +23,8 @@
#ifndef COMMON_SYSTEM_H
#define COMMON_SYSTEM_H
-#include "scummsys.h"
-#include "savefile.h"
+#include "common/scummsys.h"
+#include "common/savefile.h"
/**
* Interface for ScummVM backends. If you want to port ScummVM to a system
Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.cpp,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- timer.cpp 3 Jul 2003 11:18:07 -0000 1.11
+++ timer.cpp 5 Aug 2003 12:44:14 -0000 1.11.2.1
@@ -21,8 +21,8 @@
#ifndef __MORPHOS__
#include "stdafx.h"
-#include "scummsys.h"
-#include "timer.h"
+#include "common/scummsys.h"
+#include "common/timer.h"
static Timer *g_timer = NULL;
Index: timer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/timer.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -d -r1.8 -r1.8.2.1
--- timer.h 5 Jul 2003 15:19:11 -0000 1.8
+++ timer.h 5 Aug 2003 12:44:14 -0000 1.8.2.1
@@ -18,11 +18,11 @@
* $Header$
*/
-#ifndef TIMER_H
-#define TIMER_H
+#ifndef COMMON_TIMER_H
+#define COMMON_TIMER_H
-#include "scummsys.h"
-#include "engine.h"
+#include "common/scummsys.h"
+#include "common/engine.h"
#define MAX_TIMERS 5
Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.cpp,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- util.cpp 5 Jul 2003 15:37:23 -0000 1.17
+++ util.cpp 5 Aug 2003 12:44:14 -0000 1.17.2.1
@@ -19,8 +19,8 @@
*/
#include "stdafx.h"
-#include "engine.h"
-#include "util.h"
+#include "common/engine.h"
+#include "common/util.h"
//
// 8-bit alpha blending routines
Index: util.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/util.h,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -u -d -r1.22 -r1.22.2.1
--- util.h 5 Jul 2003 15:28:27 -0000 1.22
+++ util.h 5 Aug 2003 12:44:14 -0000 1.22.2.1
@@ -21,8 +21,8 @@
#ifndef COMMON_UTIL_H
#define COMMON_UTIL_H
-#include "scummsys.h"
-#include "system.h"
+#include "common/scummsys.h"
+#include "common/system.h"
template<typename T> inline T ABS (T x) { return (x>=0) ? x : -x; }
template<typename T> inline T MIN (T a, T b) { return (a<b) ? a : b; }
More information about the Scummvm-git-logs
mailing list