[Scummvm-cvs-logs] CVS: scummvm/saga events.cpp,1.10,1.11 game.cpp,1.14,1.15 gfx.cpp,1.18,1.19 ihnm_introproc.cpp,1.6,1.7 image.cpp,1.8,1.9 interface.cpp,1.8,1.9 ite_introproc.cpp,1.9,1.10 music.cpp,1.18,1.19 render.cpp,1.12,1.13 scene.cpp,1.9,1.10 sceneproc.cpp,1.8,1.9 sdata.cpp,1.5,1.6 sfuncs.cpp,1.4,1.5 sound.cpp,1.7,1.8 sstack.cpp,1.2,1.3 transitions.cpp,1.4,1.5 yslib.h,1.6,1.7
Jonathan Gray
khalek at users.sourceforge.net
Sat Jul 31 05:38:03 CEST 2004
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15561
Modified Files:
events.cpp game.cpp gfx.cpp ihnm_introproc.cpp image.cpp
interface.cpp ite_introproc.cpp music.cpp render.cpp scene.cpp
sceneproc.cpp sdata.cpp sfuncs.cpp sound.cpp sstack.cpp
transitions.cpp yslib.h
Log Message:
remove YS_IGNORE_PARAM macro and some uneeded yslib.h includes
Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/events.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- events.cpp 5 May 2004 13:05:30 -0000 1.10
+++ events.cpp 31 Jul 2004 12:37:36 -0000 1.11
@@ -315,7 +315,6 @@
}
static int HandleInterval(R_EVENT *event) {
- YS_IGNORE_PARAM(event);
return R_EVENT_DELETE;
}
Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- game.cpp 5 May 2004 13:05:30 -0000 1.14
+++ game.cpp 31 Jul 2004 12:37:36 -0000 1.15
@@ -25,7 +25,6 @@
#include "reinherit.h"
-#include "yslib.h"
#include "common/file.h"
#include "base/gameDetector.h"
#include "base/plugins.h"
@@ -393,8 +392,6 @@
R_RSCFILE_CONTEXT *found_ctxt = NULL;
uint16 i;
- YS_IGNORE_PARAM(param);
-
if (ctxt_p == NULL) {
return R_FAILURE;
}
Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/gfx.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gfx.cpp 25 Jun 2004 21:47:37 -0000 1.18
+++ gfx.cpp 31 Jul 2004 12:37:36 -0000 1.19
@@ -28,10 +28,7 @@
// Coriolis Group Books, 1997
#include "saga/saga.h"
-#include "saga/yslib.h"
-
#include "saga/reinherit.h"
-
#include "saga/gfx_mod.h"
#include "saga/gfx.h"
Index: ihnm_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ihnm_introproc.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ihnm_introproc.cpp 2 May 2004 00:00:38 -0000 1.6
+++ ihnm_introproc.cpp 31 Jul 2004 12:37:36 -0000 1.7
@@ -108,7 +108,6 @@
int IHNM_IntroMovieProc1(int param, R_SCENE_INFO *scene_info) {
R_EVENT event;
- YS_IGNORE_PARAM(scene_info);
switch (param) {
case SCENE_BEGIN:
@@ -137,7 +136,6 @@
PALENTRY *pal;
static PALENTRY current_pal[R_PAL_ENTRIES];
- YS_IGNORE_PARAM(scene_info);
switch (param) {
case SCENE_BEGIN:
@@ -198,7 +196,6 @@
R_EVENT *q_event;
PALENTRY *pal;
static PALENTRY current_pal[R_PAL_ENTRIES];
- YS_IGNORE_PARAM(scene_info);
switch (param) {
case SCENE_BEGIN:
@@ -256,7 +253,6 @@
int IHNM_HateProc(int param, R_SCENE_INFO *scene_info) {
R_EVENT event;
R_EVENT *q_event;
- YS_IGNORE_PARAM(scene_info);
switch (param) {
case SCENE_BEGIN:
Index: image.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/image.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- image.cpp 4 May 2004 03:33:03 -0000 1.8
+++ image.cpp 31 Jul 2004 12:37:36 -0000 1.9
@@ -25,8 +25,6 @@
#include "saga.h"
#include "reinherit.h"
-#include "yslib.h"
-
#include "game_mod.h"
#include "image_mod.h"
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- interface.cpp 5 May 2004 13:05:30 -0000 1.8
+++ interface.cpp 31 Jul 2004 12:37:36 -0000 1.9
@@ -25,8 +25,6 @@
#include "saga.h"
#include "reinherit.h"
-#include "yslib.h"
-
#include "game_mod.h"
#include "cvar_mod.h"
#include "actor_mod.h"
Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- ite_introproc.cpp 5 May 2004 13:05:30 -0000 1.9
+++ ite_introproc.cpp 31 Jul 2004 12:37:36 -0000 1.10
@@ -169,7 +169,6 @@
// Handles the introductory Dreamer's Guild / NWC logo animation scene.
int ITE_IntroAnimProc(int param, R_SCENE_INFO *scene_info) {
R_EVENT event;
- YS_IGNORE_PARAM(scene_info);
switch (param) {
case SCENE_BEGIN:
@@ -959,7 +958,6 @@
R_EVENT event;
R_EVENT *q_event;
R_EVENT *q_event_start;
- YS_IGNORE_PARAM(scene_info);
switch (param) {
case SCENE_BEGIN:
Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/music.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- music.cpp 31 May 2004 08:59:11 -0000 1.18
+++ music.cpp 31 Jul 2004 12:37:36 -0000 1.19
@@ -23,8 +23,6 @@
#include "saga.h"
#include "reinherit.h"
-#include "yslib.h"
-
#include "music.h"
#include "rscfile_mod.h"
#include "game_mod.h"
Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/render.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- render.cpp 25 Jun 2004 20:01:31 -0000 1.12
+++ render.cpp 31 Jul 2004 12:37:36 -0000 1.13
@@ -26,8 +26,6 @@
#include "reinherit.h"
#include "timer.h"
-#include "yslib.h"
-
#include "actor_mod.h"
#include "console_mod.h"
#include "cvar_mod.h"
Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- scene.cpp 5 May 2004 13:05:30 -0000 1.9
+++ scene.cpp 31 Jul 2004 12:37:36 -0000 1.10
@@ -833,9 +833,6 @@
void CF_sceneinfo(int argc, char *argv[]) {
const char *fmt = "%-20s %d";
- YS_IGNORE_PARAM(argc);
- YS_IGNORE_PARAM(argv);
-
CON_Print(fmt, "Scene number:", SceneModule.scene_number);
CON_Print(fmt, "Descriptor R#:", SceneModule.scene_rn);
CON_Print("-------------------------");
Index: sceneproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sceneproc.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- sceneproc.cpp 13 May 2004 01:41:23 -0000 1.8
+++ sceneproc.cpp 31 Jul 2004 12:37:36 -0000 1.9
@@ -47,8 +47,6 @@
static PALENTRY current_pal[R_PAL_ENTRIES];
PALENTRY *pal;
- YS_IGNORE_PARAM(scene_info);
-
switch (param) {
case SCENE_BEGIN:
_vm->_music->stop();
@@ -121,8 +119,6 @@
int DefaultSceneProc(int param, R_SCENE_INFO *scene_info) {
R_EVENT event;
- YS_IGNORE_PARAM(scene_info);
-
switch (param) {
case SCENE_BEGIN:
// Set scene background
Index: sdata.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sdata.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- sdata.cpp 5 May 2004 13:05:44 -0000 1.5
+++ sdata.cpp 31 Jul 2004 12:37:36 -0000 1.6
@@ -24,8 +24,6 @@
#include "saga.h"
#include "reinherit.h"
-#include "yslib.h"
-
#include "text_mod.h"
#include "script_mod.h"
Index: sfuncs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sfuncs.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- sfuncs.cpp 13 May 2004 01:41:23 -0000 1.4
+++ sfuncs.cpp 31 Jul 2004 12:37:36 -0000 1.5
@@ -25,8 +25,6 @@
#include "reinherit.h"
-#include "yslib.h"
-
#include "actor_mod.h"
#include "animation_mod.h"
#include "console_mod.h"
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sound.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- sound.cpp 17 May 2004 16:11:04 -0000 1.7
+++ sound.cpp 31 Jul 2004 12:37:36 -0000 1.8
@@ -23,8 +23,6 @@
#include "saga.h"
#include "reinherit.h"
-#include "yslib.h"
-
#include "sound.h"
#include "game_mod.h"
Index: sstack.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sstack.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sstack.cpp 1 May 2004 16:15:55 -0000 1.2
+++ sstack.cpp 31 Jul 2004 12:37:36 -0000 1.3
@@ -25,8 +25,6 @@
#include "reinherit.h"
-#include "yslib.h"
-
#include "console_mod.h"
#include "text_mod.h"
Index: transitions.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/transitions.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- transitions.cpp 1 May 2004 19:41:47 -0000 1.4
+++ transitions.cpp 31 Jul 2004 12:37:36 -0000 1.5
@@ -23,8 +23,6 @@
//Background transition routines
#include "saga.h"
-#include "yslib.h"
-
#include "reinherit.h"
namespace Saga {
@@ -37,10 +35,6 @@
int seq = 1;
int i;
- YS_IGNORE_PARAM(flags);
- YS_IGNORE_PARAM(src_p);
- YS_IGNORE_PARAM(dst_p);
-
for (i = 0; i < seqlimit; i++) {
if (seq & 1) {
seq = (seq >> 1) ^ XOR_MASK;
Index: yslib.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/yslib.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- yslib.h 4 May 2004 03:33:03 -0000 1.6
+++ yslib.h 31 Jul 2004 12:37:36 -0000 1.7
@@ -42,9 +42,6 @@
// General-purpose utility macros
-// Ignore a parameter (Supress warnings)
-#define YS_IGNORE_PARAM( param ) ( void )( param )
-
//#define YS_ASSUME_2S_COMP
// Shared declarations for list modules
More information about the Scummvm-git-logs
mailing list