remove YS_IGNORE_PARAM macro and some uneeded yslib.h includes

svn-id: r14385
This commit is contained in:
Jonathan Gray 2004-07-31 12:37:36 +00:00
parent 020d0d2286
commit c7d6425a38
17 changed files with 0 additions and 45 deletions

View File

@ -315,7 +315,6 @@ static int HandleOneShot(R_EVENT *event) {
}
static int HandleInterval(R_EVENT *event) {
YS_IGNORE_PARAM(event);
return R_EVENT_DELETE;
}

View File

@ -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;
}

View File

@ -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"

View File

@ -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:

View File

@ -25,8 +25,6 @@
#include "saga.h"
#include "reinherit.h"
#include "yslib.h"
#include "game_mod.h"
#include "image_mod.h"

View File

@ -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"

View File

@ -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:

View File

@ -23,8 +23,6 @@
#include "saga.h"
#include "reinherit.h"
#include "yslib.h"
#include "music.h"
#include "rscfile_mod.h"
#include "game_mod.h"

View File

@ -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"

View File

@ -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("-------------------------");

View File

@ -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

View File

@ -24,8 +24,6 @@
#include "saga.h"
#include "reinherit.h"
#include "yslib.h"
#include "text_mod.h"
#include "script_mod.h"

View File

@ -25,8 +25,6 @@
#include "reinherit.h"
#include "yslib.h"
#include "actor_mod.h"
#include "animation_mod.h"
#include "console_mod.h"

View File

@ -23,8 +23,6 @@
#include "saga.h"
#include "reinherit.h"
#include "yslib.h"
#include "sound.h"
#include "game_mod.h"

View File

@ -25,8 +25,6 @@
#include "reinherit.h"
#include "yslib.h"
#include "console_mod.h"
#include "text_mod.h"

View File

@ -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;

View File

@ -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