aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-04-27 11:47:36 +0000
committerMax Horn2004-04-27 11:47:36 +0000
commit54d27c12d9fe74c36f516f002da38747b28e5ad2 (patch)
tree409ba1d096e9d32508e15a82b1be781fc0d3899f
parent38ef0d081b70bb84db04099ea32d08616a751814 (diff)
downloadscummvm-rg350-54d27c12d9fe74c36f516f002da38747b28e5ad2.tar.gz
scummvm-rg350-54d27c12d9fe74c36f516f002da38747b28e5ad2.tar.bz2
scummvm-rg350-54d27c12d9fe74c36f516f002da38747b28e5ad2.zip
more dead code gone
svn-id: r13655
-rw-r--r--saga/module.mk1
-rw-r--r--saga/stack.cpp181
-rw-r--r--saga/stack.h49
-rw-r--r--saga/stack_mod.h69
4 files changed, 0 insertions, 300 deletions
diff --git a/saga/module.mk b/saga/module.mk
index 65c2798324..fec1996432 100644
--- a/saga/module.mk
+++ b/saga/module.mk
@@ -33,7 +33,6 @@ MODULE_OBJS = \
saga/sndres.o \
saga/sprite.o \
saga/sstack.o \
- saga/stack.o \
saga/sthread.o \
saga/text.o \
saga/transitions.o \
diff --git a/saga/stack.cpp b/saga/stack.cpp
deleted file mode 100644
index c7c5cc42ae..0000000000
--- a/saga/stack.cpp
+++ /dev/null
@@ -1,181 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2004 The ScummVM project
- *
- * The ReInherit Engine is (C)2000-2003 by Daniel Balsom.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Header$
- *
- */
-/*
- Description:
-
- Simple integer stack module
-
- Notes:
-*/
-
-#include "reinherit.h"
-
-#include "stack.h"
-#include "stack_mod.h"
-
-namespace Saga {
-
-int ISTACK_Create(R_ISTACK * stack, int stack_len, int flags)
-{
-
- R_ISTACK new_stack;
- int *new_stack_data;
-
- *stack = NULL;
-
- new_stack = (R_ISTACK_tag *)malloc(sizeof(struct R_ISTACK_tag));
-
- if (new_stack == NULL) {
- return STACK_MEM;
- }
-
- new_stack_data = (int *)calloc(stack_len, sizeof(int));
-
- if (new_stack_data == NULL) {
-
- free(new_stack);
- return STACK_MEM;
- }
-
- new_stack->flags = flags;
- new_stack->len = stack_len;
- new_stack->top = -1;
-
- return STACK_SUCCESS;
-}
-
-int ISTACK_Destroy(R_ISTACK * stack)
-{
-
- if (stack != NULL) {
- free((*stack)->data);
- }
-
- free(stack);
-
- *stack = NULL;
-
- return STACK_SUCCESS;
-}
-
-int ISTACK_Clear(R_ISTACK stack)
-{
-
- stack->top = -1;
- return STACK_SUCCESS;
-}
-
-int ISTACK_PushNull(R_ISTACK stack)
-{
-
- if (stack->top >= (stack->len - 1)) {
-
- if (stack->flags & STACK_FIXED) {
-
- return STACK_OVERFLOW;
- } else if (ISTACK_Grow(stack) != STACK_SUCCESS) {
-
- return STACK_MEM;
- }
- }
-
- stack->top++;
-
- return STACK_SUCCESS;
-}
-
-int ISTACK_Push(R_ISTACK stack, int value)
-{
-
- if (stack->top >= (stack->len - 1)) {
-
- if (stack->flags & STACK_FIXED) {
-
- return STACK_OVERFLOW;
- } else if (ISTACK_Grow(stack) != STACK_SUCCESS) {
-
- return STACK_MEM;
- }
- }
-
- stack->top++;
- stack->data[stack->top] = value;
-
- return STACK_SUCCESS;
-}
-
-int ISTACK_Pop(R_ISTACK stack, int *value)
-{
-
- if (stack->top <= -1) {
-
- return STACK_UNDERFLOW;
- }
-
- if (value == NULL) {
-
- stack->top--;
- return STACK_SUCCESS;
- }
-
- *value = stack->data[stack->top];
- stack->top--;
-
- return STACK_SUCCESS;
-}
-
-int ISTACK_Top(R_ISTACK stack, int *value)
-{
- *value = 0;
-
- if (stack->top <= -1) {
-
- return STACK_UNDERFLOW;
- }
-
- *value = stack->data[stack->top];
-
- return STACK_SUCCESS;
-
-}
-
-int ISTACK_Grow(R_ISTACK stack)
-{
-
- int *new_data;
-
- new_data = (int *)realloc(stack->data, (stack->len * 2) * sizeof(int));
-
- if (new_data == NULL) {
-
- return STACK_MEM;
- };
-
- stack->data = new_data;
- stack->len *= 2;
-
- return STACK_SUCCESS;
-}
-
-} // End of namespace Saga
-
diff --git a/saga/stack.h b/saga/stack.h
deleted file mode 100644
index 474d2d865c..0000000000
--- a/saga/stack.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2004 The ScummVM project
- *
- * The ReInherit Engine is (C)2000-2003 by Daniel Balsom.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Header$
- *
- */
-/*
- Description:
-
- Simple integer stack module private header
-
- Notes:
-*/
-
-#ifndef SAGA_STACK_H
-#define SAGA_STACK_H
-
-namespace Saga {
-
-#define ISTACK_MAX
-
-struct R_ISTACK_tag {
-
- int flags;
- int len;
- int top;
- int *data;
-
-};
-
-} // End of namespace Saga
-
-#endif /* SAGA_STACK_H */
diff --git a/saga/stack_mod.h b/saga/stack_mod.h
deleted file mode 100644
index 09e2711c89..0000000000
--- a/saga/stack_mod.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2004 The ScummVM project
- *
- * The ReInherit Engine is (C)2000-2003 by Daniel Balsom.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Header$
- *
- */
-/*
- Description:
-
- Simple integer stack module public header
-
- Notes:
-*/
-
-#ifndef SAGA_STACK_MOD_H
-#define SAGA_STACK_MOD_H
-
-#include "stack.h"
-
-namespace Saga {
-
-typedef enum STACK_ERR_enum {
- STACK_SUCCESS = 0,
- STACK_ERROR,
- STACK_MEM,
- STACK_UNDERFLOW,
- STACK_OVERFLOW
-} STACK_ERR_CODE;
-
-typedef enum STACK_FLAGS_enum {
- STACK_FIXED = 0x00,
- STACK_GROW = 0x01
-} STACK_FLAGS;
-
-typedef struct R_ISTACK_tag *R_ISTACK;
-
-int ISTACK_Create(R_ISTACK * stack, int stack_len, int flags);
-
-int ISTACK_Destroy(R_ISTACK * stack);
-
-int ISTACK_Clear(R_ISTACK stack);
-
-int ISTACK_Push(R_ISTACK stack, int value);
-
-int ISTACK_PushNull(R_ISTACK stack);
-
-int ISTACK_Pop(R_ISTACK stack, int *value);
-
-int ISTACK_Grow(R_ISTACK stack);
-
-} // End of namespace Saga
-
-#endif /* SAGA_STACK_MOD_H */