[Scummvm-cvs-logs] CVS: scummvm/gob dataio.cpp,1.5,1.6 draw.cpp,1.5,1.6 game.cpp,1.11,1.12 goblin.cpp,1.5,1.6 init.cpp,1.4,1.5 inter.cpp,1.8,1.9 map.cpp,1.3,1.4 module.mk,1.1,1.2 mult.cpp,1.6,1.7 pack.cpp,1.3,1.4 palanim.cpp,1.5,1.6 parse.cpp,1.3,1.4 resource.cpp,1.3,1.4 scenery.cpp,1.7,1.8 sound.cpp,1.4,1.5 timer.cpp,1.4,1.5 util.cpp,1.8,1.9 video.cpp,1.7,1.8 debug.cpp,1.5,NONE debug.h,1.4,NONE
Max Horn
fingolfin at users.sourceforge.net
Sat Apr 9 12:32:51 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob anim.cpp,1.2,1.3 anim.h,1.3,1.4 dataio.cpp,1.4,1.5 dataio.h,1.3,1.4 debug.cpp,1.4,1.5 debug.h,1.3,1.4 draw.cpp,1.4,1.5 draw.h,1.3,1.4 driver_vga.cpp,1.4,1.5 driver_vga.h,1.3,1.4 game.cpp,1.10,1.11 game.h,1.4,1.5 global.cpp,1.3,1.4 global.h,1.3,1.4 gob.cpp,1.3,1.4 goblin.cpp,1.4,1.5 goblin.h,1.2,1.3 init.cpp,1.3,1.4 init.h,1.2,1.3 inter.cpp,1.7,1.8 inter.h,1.2,1.3 map.cpp,1.2,1.3 map.h,1.2,1.3 mult.cpp,1.5,1.6 mult.h,1.2,1.3 pack.cpp,1.2,1.3 pack.h,1.2,1.3 palanim.cpp,1.4,1.5 palanim.h,1.2,1.3 parse.cpp,1.2,1.3 parse.h,1.2,1.3 resource.cpp,1.2,1.3 resource.h,1.2,1.3 scenery.cpp,1.6,1.7 scenery.h,1.2,1.3 sound.cpp,1.3,1.4 sound.h,1.3,1.4 timer.cpp,1.3,1.4 timer.h,1.2,1.3 util.cpp,1.7,1.8 util.h,1.3,1.4 video.cpp,1.6,1.7 video.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: web downloads.php,1.125,1.126
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32477
Modified Files:
dataio.cpp draw.cpp game.cpp goblin.cpp init.cpp inter.cpp
map.cpp module.mk mult.cpp pack.cpp palanim.cpp parse.cpp
resource.cpp scenery.cpp sound.cpp timer.cpp util.cpp
video.cpp
Removed Files:
debug.cpp debug.h
Log Message:
Get rid of debug.cpp/.h -- it wasn't used anyway, and contained bad code (open/write/close to access a log file? yuck)
Index: dataio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/dataio.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dataio.cpp 9 Apr 2005 19:19:53 -0000 1.5
+++ dataio.cpp 9 Apr 2005 19:32:28 -0000 1.6
@@ -22,7 +22,6 @@
#include "gob/gob.h"
#include "gob/global.h"
#include "gob/dataio.h"
-#include "gob/debug.h"
#include "gob/pack.h"
namespace Gob {
Index: draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/draw.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- draw.cpp 9 Apr 2005 19:19:53 -0000 1.5
+++ draw.cpp 9 Apr 2005 19:32:28 -0000 1.6
@@ -25,7 +25,7 @@
#include "gob/video.h"
#include "gob/game.h"
#include "gob/util.h"
-#include "gob/debug.h"
+#include "gob/scenery.h"
#include "gob/inter.h"
#include "gob/video.h"
#include "gob/palanim.h"
Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/game.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- game.cpp 9 Apr 2005 19:19:53 -0000 1.11
+++ game.cpp 9 Apr 2005 19:32:28 -0000 1.12
@@ -25,7 +25,7 @@
#include "gob/video.h"
#include "gob/dataio.h"
#include "gob/pack.h"
-#include "gob/debug.h"
+#include "gob/scenery.h"
#include "gob/inter.h"
#include "gob/parse.h"
#include "gob/draw.h"
Index: goblin.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/goblin.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- goblin.cpp 9 Apr 2005 19:19:53 -0000 1.5
+++ goblin.cpp 9 Apr 2005 19:32:28 -0000 1.6
@@ -21,7 +21,6 @@
*/
#include "gob/gob.h"
#include "gob/goblin.h"
-#include "gob/debug.h"
#include "gob/inter.h"
#include "gob/global.h"
#include "gob/draw.h"
Index: init.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/init.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- init.cpp 9 Apr 2005 19:19:53 -0000 1.4
+++ init.cpp 9 Apr 2005 19:32:28 -0000 1.5
@@ -25,7 +25,6 @@
#include "gob/global.h"
#include "gob/init.h"
#include "gob/video.h"
-#include "gob/debug.h"
#include "gob/sound.h"
#include "gob/timer.h"
#include "gob/sound.h"
Index: inter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/inter.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- inter.cpp 9 Apr 2005 19:19:54 -0000 1.8
+++ inter.cpp 9 Apr 2005 19:32:28 -0000 1.9
@@ -23,7 +23,7 @@
#include "gob/global.h"
#include "gob/inter.h"
#include "gob/util.h"
-#include "gob/debug.h"
+#include "gob/scenery.h"
#include "gob/parse.h"
#include "gob/game.h"
#include "gob/draw.h"
Index: map.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/map.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- map.cpp 9 Apr 2005 19:19:54 -0000 1.3
+++ map.cpp 9 Apr 2005 19:32:28 -0000 1.4
@@ -27,7 +27,7 @@
#include "gob/inter.h"
#include "gob/goblin.h"
#include "gob/sound.h"
-#include "gob/debug.h"
+#include "gob/scenery.h"
namespace Gob {
Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/module.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- module.mk 5 Apr 2005 15:07:39 -0000 1.1
+++ module.mk 9 Apr 2005 19:32:28 -0000 1.2
@@ -3,7 +3,6 @@
MODULE_OBJS := \
gob/anim.o \
gob/dataio.o \
- gob/debug.o \
gob/draw.o \
gob/driver_vga.o \
gob/game.o \
Index: mult.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/mult.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mult.cpp 9 Apr 2005 19:19:54 -0000 1.6
+++ mult.cpp 9 Apr 2005 19:32:28 -0000 1.7
@@ -29,7 +29,6 @@
#include "gob/inter.h"
#include "gob/parse.h"
#include "gob/global.h"
-#include "gob/debug.h"
#include "gob/sound.h"
#include "gob/palanim.h"
#include "gob/game.h"
Index: pack.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/pack.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pack.cpp 9 Apr 2005 19:19:54 -0000 1.3
+++ pack.cpp 9 Apr 2005 19:32:28 -0000 1.4
@@ -21,7 +21,6 @@
*/
#include "gob/gob.h"
#include "gob/pack.h"
-#include "gob/debug.h"
namespace Gob {
Index: palanim.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/palanim.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- palanim.cpp 9 Apr 2005 19:19:54 -0000 1.5
+++ palanim.cpp 9 Apr 2005 19:32:28 -0000 1.6
@@ -24,7 +24,6 @@
#include "gob/util.h"
#include "gob/global.h"
#include "gob/palanim.h"
-#include "gob/debug.h"
namespace Gob {
Index: parse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/parse.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- parse.cpp 9 Apr 2005 19:19:54 -0000 1.3
+++ parse.cpp 9 Apr 2005 19:32:29 -0000 1.4
@@ -23,7 +23,6 @@
#include "gob/global.h"
#include "gob/parse.h"
#include "gob/util.h"
-#include "gob/debug.h"
#include "gob/inter.h"
namespace Gob {
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/resource.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- resource.cpp 9 Apr 2005 19:19:54 -0000 1.3
+++ resource.cpp 9 Apr 2005 19:32:29 -0000 1.4
@@ -23,7 +23,6 @@
#include "gob/global.h"
#include "gob/video.h"
#include "gob/resource.h"
-#include "gob/debug.h"
namespace Gob {
Index: scenery.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/scenery.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- scenery.cpp 9 Apr 2005 19:19:54 -0000 1.7
+++ scenery.cpp 9 Apr 2005 19:32:29 -0000 1.8
@@ -21,7 +21,6 @@
*/
#include "gob/gob.h"
#include "gob/scenery.h"
-#include "gob/debug.h"
#include "gob/inter.h"
#include "gob/video.h"
#include "gob/draw.h"
@@ -729,7 +728,7 @@
int16 layer;
int16 var;
- log_write("scen_interStoreParams: Storing...\n");
+ warning("scen_interStoreParams: Storing...");
inter_evalExpr(&animation);
inter_evalExpr(&layer);
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/sound.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sound.cpp 9 Apr 2005 19:19:54 -0000 1.4
+++ sound.cpp 9 Apr 2005 19:32:29 -0000 1.5
@@ -21,7 +21,6 @@
*/
#include "gob/gob.h"
#include "gob/global.h"
-#include "gob/debug.h"
#include "gob/sound.h"
namespace Gob {
int16 snd_checkProAudio(void) {return 0;}
Index: timer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/timer.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- timer.cpp 9 Apr 2005 19:19:54 -0000 1.4
+++ timer.cpp 9 Apr 2005 19:32:29 -0000 1.5
@@ -21,7 +21,6 @@
*/
#include "gob/gob.h"
#include "gob/global.h"
-#include "gob/debug.h"
#include "gob/sound.h"
namespace Gob {
Index: util.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/util.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- util.cpp 9 Apr 2005 19:19:54 -0000 1.8
+++ util.cpp 9 Apr 2005 19:32:29 -0000 1.9
@@ -23,7 +23,6 @@
#include "gob/global.h"
#include "gob/timer.h"
#include "gob/util.h"
-#include "gob/debug.h"
#include "gob/draw.h"
#include "gob/game.h"
@@ -315,13 +314,13 @@
int16 len;
int16 i;
- log_write("util_cutFromStr: str = %s, ", str);
+ //log_write("util_cutFromStr: str = %s, ", str);
len = strlen(str);
if (from >= len)
return;
if (from + cutlen > len) {
str[from] = 0;
- log_write("res = %s\n", str);
+ //log_write("res = %s\n", str);
return;
}
@@ -330,7 +329,7 @@
str[i] = str[i + cutlen];
i++;
} while (str[i] != 0);
- log_write("res = %s\n", str);
+ //log_write("res = %s\n", str);
}
int16 util_strstr(const char *str1, char *str2) {
@@ -338,7 +337,7 @@
uint16 len1;
uint16 i;
- log_write("util_strstr: str1 = %s, str2 = %s\n", str1, str2);
+ //log_write("util_strstr: str1 = %s, str2 = %s\n", str1, str2);
for (i = 0, len1 = strlen(str1); strlen(str2 + i) >= len1; i++) {
c = str2[i + len1];
@@ -377,7 +376,7 @@
if (list->pHead != 0) {
if (list->pTail == 0) {
list->pTail = list->pHead;
- log_write("util_listInsertBack: Broken list!");
+ warning("util_listInsertBack: Broken list!");
}
node =
Index: video.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/video.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- video.cpp 9 Apr 2005 19:19:54 -0000 1.7
+++ video.cpp 9 Apr 2005 19:32:29 -0000 1.8
@@ -22,7 +22,6 @@
#include "gob/gob.h"
#include "gob/global.h"
#include "gob/video.h"
-#include "gob/debug.h"
#include "gob/dataio.h"
#include "gob/driver_vga.h"
@@ -63,8 +62,8 @@
int32 size;
if ((mode & 0x7f) != 0x13)
- log_write
- ("vid_getRectSize: Warning! Video mode %d is not fully supported!\n",
+ warning
+ ("vid_getRectSize: Video mode %d is not fully supported!",
mode & 0x7f);
switch (mode & 0x7f) {
case 5:
--- debug.cpp DELETED ---
--- debug.h DELETED ---
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/gob anim.cpp,1.2,1.3 anim.h,1.3,1.4 dataio.cpp,1.4,1.5 dataio.h,1.3,1.4 debug.cpp,1.4,1.5 debug.h,1.3,1.4 draw.cpp,1.4,1.5 draw.h,1.3,1.4 driver_vga.cpp,1.4,1.5 driver_vga.h,1.3,1.4 game.cpp,1.10,1.11 game.h,1.4,1.5 global.cpp,1.3,1.4 global.h,1.3,1.4 gob.cpp,1.3,1.4 goblin.cpp,1.4,1.5 goblin.h,1.2,1.3 init.cpp,1.3,1.4 init.h,1.2,1.3 inter.cpp,1.7,1.8 inter.h,1.2,1.3 map.cpp,1.2,1.3 map.h,1.2,1.3 mult.cpp,1.5,1.6 mult.h,1.2,1.3 pack.cpp,1.2,1.3 pack.h,1.2,1.3 palanim.cpp,1.4,1.5 palanim.h,1.2,1.3 parse.cpp,1.2,1.3 parse.h,1.2,1.3 resource.cpp,1.2,1.3 resource.h,1.2,1.3 scenery.cpp,1.6,1.7 scenery.h,1.2,1.3 sound.cpp,1.3,1.4 sound.h,1.3,1.4 timer.cpp,1.3,1.4 timer.h,1.2,1.3 util.cpp,1.7,1.8 util.h,1.3,1.4 video.cpp,1.6,1.7 video.h,1.2,1.3
- Next message: [Scummvm-cvs-logs] CVS: web downloads.php,1.125,1.126
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list