From 9942dc55d0891be4c5398c713278b884f1fda16e Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 22 Dec 2004 22:52:20 +0000 Subject: sdata.cpp not needed anymore svn-id: r16264 --- saga/module.mk | 1 - saga/sdata.cpp | 180 --------------------------------------------------------- saga/sdata.h | 46 --------------- 3 files changed, 227 deletions(-) delete mode 100644 saga/sdata.cpp delete mode 100644 saga/sdata.h (limited to 'saga') diff --git a/saga/module.mk b/saga/module.mk index 606a3de06b..08e9e567e8 100644 --- a/saga/module.mk +++ b/saga/module.mk @@ -24,7 +24,6 @@ MODULE_OBJS := \ saga/saga.o \ saga/scene.o \ saga/script.o \ - saga/sdata.o \ saga/sdebug.o \ saga/sfuncs.o \ saga/sndres.o \ diff --git a/saga/sdata.cpp b/saga/sdata.cpp deleted file mode 100644 index 533f171ab2..0000000000 --- a/saga/sdata.cpp +++ /dev/null @@ -1,180 +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$ - * - */ -// Type SDataWord_T must be unpadded -#include "saga/saga.h" - -#include "saga/gfx.h" -#include "saga/script.h" -#include "saga/sdata.h" - -namespace Saga { - -SData::SData() { - void *alloc_ptr; - int i; - - debug(0, "Initializing script data buffers"); - - for (i = 0; i < SCRIPT_DATABUF_NUM; i++) { - alloc_ptr = malloc(sizeof *_vm->_script->dataBuffer(0)); - - if (alloc_ptr == NULL) { - error("Couldn't allocate memory for script data buffer %d", i); - } - - _vm->_script->setBuffer(i, (SCRIPT_DATABUF *)alloc_ptr); - } - - alloc_ptr = calloc(SCRIPT_DATABUF_LEN, sizeof(SDataWord_T)); - - if (alloc_ptr == NULL) { - error("Couldn't allocate memory for shared script buffer"); - } - - // Buffer 0 is the shared data buffer. All scripts can access this. - _vm->_script->dataBuffer(0)->len = SCRIPT_DATABUF_LEN; - _vm->_script->dataBuffer(0)->data = (SDataWord_T *)alloc_ptr; - - // FIXME: Buffer 1 is the script's static area. The original - // interpreter uses part of buffer 0 for this, but I don't yet - // understand quite how. - - _vm->_script->setBuffer(1, (SCRIPT_DATABUF *)alloc_ptr); - _vm->_script->dataBuffer(1)->len = SCRIPT_DATABUF_LEN; - _vm->_script->dataBuffer(1)->data = (SDataWord_T *)alloc_ptr; - - // Remaining buffers are per-script. - for (i = 2; i < SCRIPT_DATABUF_NUM; i++) { - _vm->_script->dataBuffer(i)->len = 0; - _vm->_script->dataBuffer(i)->data = NULL; - } -} - -SData::~SData() { - // TODO: Free the script data buffers -} - -int SData::getWord(int n_buf, int n_word, SDataWord_T *data) { - if ((n_buf < 0) || (n_buf >= SCRIPT_DATABUF_NUM)) { - return FAILURE; - } - - if ((n_word < 0) || (n_word >= _vm->_script->dataBuffer(n_buf)->len)) { - return FAILURE; - } - - if (data == NULL) { - return FAILURE; - } - - *data = _vm->_script->dataBuffer(n_buf)->data[n_word]; - - return SUCCESS; -} - -int SData::putWord(int n_buf, int n_word, SDataWord_T data) { - if ((n_buf < 0) || (n_buf >= SCRIPT_DATABUF_NUM)) { - return FAILURE; - } - - if ((n_word < 0) || (n_word >= _vm->_script->dataBuffer(n_buf)->len)) { - return FAILURE; - } - - _vm->_script->dataBuffer(n_buf)->data[n_word] = data; - - return SUCCESS; -} - -int SData::setBit(int n_buf, SDataWord_T n_bit, int bitstate) { - int n_word; - int n_bitpos; - - SDataWord_T bit_pattern = 0x01; - - if ((n_buf < 0) || (n_buf >= SCRIPT_DATABUF_NUM)) { - return FAILURE; - } - - if (n_bit >= (unsigned long)_vm->_script->dataBuffer(n_buf)->len * (sizeof(SDataWord_T) * CHAR_BIT)) { - return FAILURE; - } - - n_word = n_bit / (sizeof(SDataWord_T) * CHAR_BIT); - n_bitpos = n_bit % (sizeof(SDataWord_T) * CHAR_BIT); - - bit_pattern <<= ((sizeof(SDataWord_T) * CHAR_BIT) - (n_bitpos + 1)); - - if (bitstate) { - _vm->_script->dataBuffer(n_buf)->data[n_word] |= bit_pattern; - } else { - _vm->_script->dataBuffer(n_buf)->data[n_word] &= ~bit_pattern; - } - - return SUCCESS; -} - -int SData::getBit(int n_buf, SDataWord_T n_bit, int *bitstate) { - int n_word; - int n_bitpos; - - SDataWord_T bit_pattern = 0x01; - - if ((n_buf < 0) || (n_buf >= SCRIPT_DATABUF_NUM)) { - return FAILURE; - } - - if (n_bit >= (SDataWord_T) _vm->_script->dataBuffer(n_buf)->len * (sizeof(SDataWord_T) * CHAR_BIT)) { - return FAILURE; - } - - n_word = n_bit / (sizeof(SDataWord_T) * CHAR_BIT); - n_bitpos = n_bit % (sizeof(SDataWord_T) * CHAR_BIT); - - bit_pattern <<= ((sizeof(SDataWord_T) * CHAR_BIT) - (n_bitpos + 1)); - - *bitstate = (_vm->_script->dataBuffer(n_buf)->data[n_word] & bit_pattern) ? 1 : 0; - - return SUCCESS; -} - -int SData::readWordS(SDataWord_T word) { - uint16 u_int = word; - int s_int; - - if (u_int & 0x8000U) { - s_int = (int)(u_int - 0x8000U) - 0x7FFF - 1; - } else { - s_int = u_int; - } - - return s_int; -} - -uint16 SData::readWordU(SDataWord_T word) { - uint16 u_int = (uint16) word; - - return u_int; -} - -} // End of namespace Saga diff --git a/saga/sdata.h b/saga/sdata.h deleted file mode 100644 index bcd67b4886..0000000000 --- a/saga/sdata.h +++ /dev/null @@ -1,46 +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$ - * - */ - -// Scripting module data management component header file - -#ifndef SAGA_SDATA_H -#define SAGA_SDATA_H - -namespace Saga { - -class SData { -public: - SData(); - ~SData(); - - int getWord(int n_buf, int n_word, SDataWord_T *data); - int putWord(int n_buf, int n_word, SDataWord_T data); - int setBit(int n_buf, SDataWord_T n_bit, int bitstate); - int getBit(int n_buf, SDataWord_T n_bit, int *bitstate); - int readWordS(SDataWord_T word); - uint16 readWordU(SDataWord_T word); -}; - -} // End of namespace Saga - -#endif -- cgit v1.2.3