From c7d6425a386a046189689e54b46f34b38fe19b32 Mon Sep 17 00:00:00 2001
From: Jonathan Gray
Date: Sat, 31 Jul 2004 12:37:36 +0000
Subject: remove YS_IGNORE_PARAM macro and some uneeded yslib.h includes

svn-id: r14385
---
 saga/events.cpp         | 1 -
 saga/game.cpp           | 3 ---
 saga/gfx.cpp            | 3 ---
 saga/ihnm_introproc.cpp | 4 ----
 saga/image.cpp          | 2 --
 saga/interface.cpp      | 2 --
 saga/ite_introproc.cpp  | 2 --
 saga/music.cpp          | 2 --
 saga/render.cpp         | 2 --
 saga/scene.cpp          | 3 ---
 saga/sceneproc.cpp      | 4 ----
 saga/sdata.cpp          | 2 --
 saga/sfuncs.cpp         | 2 --
 saga/sound.cpp          | 2 --
 saga/sstack.cpp         | 2 --
 saga/transitions.cpp    | 6 ------
 saga/yslib.h            | 3 ---
 17 files changed, 45 deletions(-)

(limited to 'saga')

diff --git a/saga/events.cpp b/saga/events.cpp
index dc9d49ef2e..ad57acf43e 100644
--- a/saga/events.cpp
+++ b/saga/events.cpp
@@ -315,7 +315,6 @@ static int HandleOneShot(R_EVENT *event) {
 }
 
 static int HandleInterval(R_EVENT *event) {
-	YS_IGNORE_PARAM(event);
 	return R_EVENT_DELETE;
 }
 
diff --git a/saga/game.cpp b/saga/game.cpp
index e3760fc05a..834a978cb6 100644
--- a/saga/game.cpp
+++ b/saga/game.cpp
@@ -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 @@ int GAME_GetFileContext(R_RSCFILE_CONTEXT ** ctxt_p, uint16 r_type, int param) {
 	R_RSCFILE_CONTEXT *found_ctxt = NULL;
 	uint16 i;
 
-	YS_IGNORE_PARAM(param);
-
 	if (ctxt_p == NULL) {
 		return R_FAILURE;
 	}
diff --git a/saga/gfx.cpp b/saga/gfx.cpp
index ab8b8e7339..b53608ef70 100644
--- a/saga/gfx.cpp
+++ b/saga/gfx.cpp
@@ -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"
 
diff --git a/saga/ihnm_introproc.cpp b/saga/ihnm_introproc.cpp
index 53daa9c1ef..521c1205d9 100644
--- a/saga/ihnm_introproc.cpp
+++ b/saga/ihnm_introproc.cpp
@@ -108,7 +108,6 @@ int IHNM_StartProc() {
 
 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 @@ int IHNM_IntroMovieProc2(int param, R_SCENE_INFO *scene_info) {
 	PALENTRY *pal;
 
 	static PALENTRY current_pal[R_PAL_ENTRIES];
-	YS_IGNORE_PARAM(scene_info);
 	switch (param) {
 
 	case SCENE_BEGIN:
@@ -198,7 +196,6 @@ int IHNM_IntroMovieProc3(int param, R_SCENE_INFO *scene_info) {
 	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_IntroMovieProc3(int param, R_SCENE_INFO *scene_info) {
 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:
diff --git a/saga/image.cpp b/saga/image.cpp
index 9b6200dbaa..d63f9fc260 100644
--- a/saga/image.cpp
+++ b/saga/image.cpp
@@ -25,8 +25,6 @@
 #include "saga.h"
 #include "reinherit.h"
 
-#include "yslib.h"
-
 #include "game_mod.h"
 
 #include "image_mod.h"
diff --git a/saga/interface.cpp b/saga/interface.cpp
index 8d1b56457b..c32afc5bf5 100644
--- a/saga/interface.cpp
+++ b/saga/interface.cpp
@@ -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"
diff --git a/saga/ite_introproc.cpp b/saga/ite_introproc.cpp
index bf9a1df6a5..3559f9f725 100644
--- a/saga/ite_introproc.cpp
+++ b/saga/ite_introproc.cpp
@@ -169,7 +169,6 @@ int ITE_IntroRegisterLang() {
 // 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 @@ int ITE_IntroFaireTentProc(int param, R_SCENE_INFO *scene_info) {
 	R_EVENT event;
 	R_EVENT *q_event;
 	R_EVENT *q_event_start;
-	YS_IGNORE_PARAM(scene_info);
 
 	switch (param) {
 	case SCENE_BEGIN:
diff --git a/saga/music.cpp b/saga/music.cpp
index bad0fec18c..a19f9be96c 100644
--- a/saga/music.cpp
+++ b/saga/music.cpp
@@ -23,8 +23,6 @@
 #include "saga.h"
 #include "reinherit.h"
 
-#include "yslib.h"
-
 #include "music.h"
 #include "rscfile_mod.h"
 #include "game_mod.h"
diff --git a/saga/render.cpp b/saga/render.cpp
index 9c8fd3ac61..a697b64af0 100644
--- a/saga/render.cpp
+++ b/saga/render.cpp
@@ -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"
diff --git a/saga/scene.cpp b/saga/scene.cpp
index 8179df4fb7..39a7f02a22 100644
--- a/saga/scene.cpp
+++ b/saga/scene.cpp
@@ -833,9 +833,6 @@ void CF_scenechange(int argc, char *argv[]) {
 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("-------------------------");
diff --git a/saga/sceneproc.cpp b/saga/sceneproc.cpp
index 612b282f58..0abc334972 100644
--- a/saga/sceneproc.cpp
+++ b/saga/sceneproc.cpp
@@ -47,8 +47,6 @@ int InitialSceneProc(int param, R_SCENE_INFO *scene_info) {
 	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 InitialSceneProc(int param, R_SCENE_INFO *scene_info) {
 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
diff --git a/saga/sdata.cpp b/saga/sdata.cpp
index 40151cf166..188cdfcae5 100644
--- a/saga/sdata.cpp
+++ b/saga/sdata.cpp
@@ -24,8 +24,6 @@
 #include "saga.h"
 #include "reinherit.h"
 
-#include "yslib.h"
-
 #include "text_mod.h"
 
 #include "script_mod.h"
diff --git a/saga/sfuncs.cpp b/saga/sfuncs.cpp
index c6fc1b810e..ddfa77ee25 100644
--- a/saga/sfuncs.cpp
+++ b/saga/sfuncs.cpp
@@ -25,8 +25,6 @@
 
 #include "reinherit.h"
 
-#include "yslib.h"
-
 #include "actor_mod.h"
 #include "animation_mod.h"
 #include "console_mod.h"
diff --git a/saga/sound.cpp b/saga/sound.cpp
index 4995a7d007..c0c0c0eeee 100644
--- a/saga/sound.cpp
+++ b/saga/sound.cpp
@@ -23,8 +23,6 @@
 #include "saga.h"
 #include "reinherit.h"
 
-#include "yslib.h"
-
 #include "sound.h"
 #include "game_mod.h"
 
diff --git a/saga/sstack.cpp b/saga/sstack.cpp
index 8d899b8101..83d4796772 100644
--- a/saga/sstack.cpp
+++ b/saga/sstack.cpp
@@ -25,8 +25,6 @@
 
 #include "reinherit.h"
 
-#include "yslib.h"
-
 #include "console_mod.h"
 #include "text_mod.h"
 
diff --git a/saga/transitions.cpp b/saga/transitions.cpp
index 5e3091d7f6..eaec66861c 100644
--- a/saga/transitions.cpp
+++ b/saga/transitions.cpp
@@ -23,8 +23,6 @@
 
 //Background transition routines
 #include "saga.h"
-#include "yslib.h"
-
 #include "reinherit.h"
 
 namespace Saga {
@@ -37,10 +35,6 @@ int TRANSITION_Dissolve(byte *dst_img, int dst_w, int dst_h, int dst_p, const by
 	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;
diff --git a/saga/yslib.h b/saga/yslib.h
index c876ab14b1..d6f9000c26 100644
--- a/saga/yslib.h
+++ b/saga/yslib.h
@@ -42,9 +42,6 @@ typedef int (YS_COMPARE_FUNC) (const void *, const void *);
 
 // 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
-- 
cgit v1.2.3