[Twin-e-cvs] twin-e/src HQRlib.c,1.7,1.8 lba.h,1.24,1.25 room.c,1.29,1.30 streamReader.c,1.4,1.5

[Vincent H. <ya...@us...>]

Update of /cvsroot/twin-e/twin-e/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7548

Modified Files:
	HQRlib.c lba.h room.c streamReader.c 
Log Message:
Fix defines for PS2/DREAMCAST



Index: room.c
===================================================================
RCS file: /cvsroot/twin-e/twin-e/src/room.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** room.c	17 Apr 2005 18:38:32 -0000	1.29
--- room.c	4 May 2005 20:26:21 -0000	1.30
***************
*** 1455,1459 ****
    outPtr4 = (outPtr2 + firstBrick*2);
  
! #ifndef PCLIKE
    //DC special
  {
--- 1455,1459 ----
    outPtr4 = (outPtr2 + firstBrick*2);
  
! #ifdef DREAMCAST 
    //DC special
  {

Index: lba.h
===================================================================
RCS file: /cvsroot/twin-e/twin-e/src/lba.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** lba.h	4 May 2005 08:23:53 -0000	1.24
--- lba.h	4 May 2005 20:26:21 -0000	1.25
***************
*** 40,47 ****
  #endif
  
- #ifdef _EE
- #define PCLIKE
- #endif
- 
  #ifdef PCLIKE
  #include<malloc.h>
--- 40,43 ----
***************
*** 55,58 ****
--- 51,55 ----
  
  #ifndef PCLIKE
+ #ifdef DREAMCAST
  #include <shinobi.h>    /* Shinobi system routines. */
  #include <kamui2.h>     /* Kamui2 low-level graphics HAL. */
***************
*** 62,65 ****
--- 59,63 ----
  #define PRELOAD_ALL
  #define USE_GL
+ #endif
  
  #endif

Index: streamReader.c
===================================================================
RCS file: /cvsroot/twin-e/twin-e/src/streamReader.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** streamReader.c	4 May 2005 07:57:42 -0000	1.4
--- streamReader.c	4 May 2005 20:26:21 -0000	1.5
***************
*** 104,108 ****
  boolean streamReader_open(streamReader* pThis, const int8* fileName)
  {
! #ifdef PCLIKE
  #ifdef USE_IFOPEN
    pThis->fileHandle = ifopen((const char*)fileName,"rb");
--- 104,108 ----
  boolean streamReader_open(streamReader* pThis, const int8* fileName)
  {
! #ifndef DREAMCAST
  #ifdef USE_IFOPEN
    pThis->fileHandle = ifopen((const char*)fileName,"rb");
***************
*** 128,132 ****
  void streamReader_feedBuffer(streamReader* pThis)
  {
! #ifdef PCLIKE
    fread(pThis->buffer, BUFFER_SIZE, 1, pThis->fileHandle);
  #else
--- 128,132 ----
  void streamReader_feedBuffer(streamReader* pThis)
  {
! #ifndef DREAMCAST
    fread(pThis->buffer, BUFFER_SIZE, 1, pThis->fileHandle);
  #else
***************
*** 204,208 ****
    } */
  
! #ifdef PCLIKE
    fseek(pThis->fileHandle, sectorToSeek * 2048, SEEK_SET );
  #else
--- 204,208 ----
    } */
  
! #ifndef DREAMCAST
    fseek(pThis->fileHandle, sectorToSeek * 2048, SEEK_SET );
  #else
***************
*** 219,223 ****
    if(pThis->fileHandle)
    {
! #ifdef PCLIKE
      fclose( pThis->fileHandle );
  #else
--- 219,223 ----
    if(pThis->fileHandle)
    {
! #ifndef DREAMCAST
      fclose( pThis->fileHandle );
  #else

Index: HQRlib.c
===================================================================
RCS file: /cvsroot/twin-e/twin-e/src/HQRlib.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HQRlib.c	4 May 2005 07:57:42 -0000	1.7
--- HQRlib.c	4 May 2005 20:26:21 -0000	1.8
***************
*** 22,26 ****
  #include "streamReader.h"
  
! #ifndef PCLIKE 
  #include <shinobi.h>
  #endif
--- 22,26 ----
  #include "streamReader.h"
  
! #ifdef DREAMCAST 
  #include <shinobi.h>
  #endif
***************
*** 38,42 ****
  int HQR_File_checkIfFileExist(char *fileName)
  {
! #ifdef PCLIKE
    FILE *fileHandle;
  
--- 38,42 ----
  int HQR_File_checkIfFileExist(char *fileName)
  {
! #ifndef DREAMCAST
    FILE *fileHandle;
  
***************
*** 69,73 ****
  #endif
  
! #ifdef PCLIKE 
  FILE* HQR_File_OpenRead(char *fileName)
  {
--- 69,73 ----
  #endif
  
! #ifndef DREAMCAST 
  FILE* HQR_File_OpenRead(char *fileName)
  {
***************
*** 109,113 ****
  #endif
  
! #ifdef PCLIKE 
  int HQR_File_Read(FILE * resourceFile, char *ptr, int length)
  {
--- 109,113 ----
  #endif
  
! #ifndef DREAMCAST 
  int HQR_File_Read(FILE * resourceFile, char *ptr, int length)
  {
***************
*** 146,150 ****
  #endif
  
! #ifdef PCLIKE 
  void HQR_File_Close(FILE * resourceFile)
  {
--- 146,150 ----
  #endif
  
! #ifndef DREAMCAST  
  void HQR_File_Close(FILE * resourceFile)
  {
***************
*** 197,201 ****
  long int getFileSize(char* resourceName)
  {
! #ifdef PCLIKE
    FILE* fHandle;
    int size;
--- 197,201 ----
  long int getFileSize(char* resourceName)
  {
! #ifndef DREAMCAST
    FILE* fHandle;
    int size;
***************
*** 218,222 ****
  void fileRead(char* resourceName, long int size, unsigned char* buffer)
  {
! #ifdef PCLIKE
    FILE* fHandle;
    fHandle = fopen(resourceName, "rb");
--- 218,222 ----
  void fileRead(char* resourceName, long int size, unsigned char* buffer)
  {
! #ifndef DREAMCAST
    FILE* fHandle;
    fHandle = fopen(resourceName, "rb");
***************
*** 349,353 ****
  int HQR_GetNumEntry(char* fileName)
  {
! #ifdef PCLIKE 
    FILE *resourceFile = NULL;
  #else
--- 349,353 ----
  int HQR_GetNumEntry(char* fileName)
  {
! #ifndef DREAMCAST 
    FILE *resourceFile = NULL;
  #else
***************
*** 368,372 ****
  unsigned char *LoadMalloc_HQR(char *fileName, short int imageNumber)
  {
! #ifdef PCLIKE 
    FILE *resourceFile;
    int headerSize;
--- 368,372 ----
  unsigned char *LoadMalloc_HQR(char *fileName, short int imageNumber)
  {
! #ifndef DREAMCAST 
    FILE *resourceFile;
    int headerSize;