jetomit/avp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Windows WIP.

Browse source
This commit is contained in:
unknown 2008-05-06 22:57:13 -07:00 • committed by Patryk Obara
parent 5d3725f9d9
commit c51b91cfe7
18 changed files with 256 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/win95/awtexld.h
View file

@ -42,8 +42,6 @@ enum AwTlErc
AW_TL_ERC;
#define NO_ERROR 0
/*********/
/* Flags */
/*********/

2
src/win95/chnkload.cpp
View file

@ -2176,7 +2176,7 @@ void SetupAnimatingShape(Shape_Chunk* sc,SHAPEHEADER* shp, Shape_Merge_Data_Chun
int x=max(-sas->min_x,sas->max_x);
int y=max(-sas->min_y,sas->max_y);
int z=max(-sas->min_z,sas->max_z);
sas->radius=(int)sqrt(x*x+y*y+z*z);
sas->radius=(int)sqrt((double)(x*x+y*y+z*z));
sas->vertex_normals=(int*)PoolAllocateMem(sizeof(VECTORCH)*cas->num_verts);

1
src/win95/db.c
View file

@ -64,7 +64,6 @@ int db_option = 0; /* Default is off. */
#include <stdlib.h>
#include <ctype.h>
#include <stdarg.h> /* For variable arguments. */
#include <unistd.h>
/* C O N S T A N T S ************************************************** */

150
src/win95/iff.hpp
View file

@ -3,12 +3,12 @@
#include "fixer.h"
#if defined(_WIN32) || defined(WIN32) || defined(WINDOWS) || defined(_WINDOWS)
#define _IFF_WIN_TARGET
#include <windows.h>
#else // ! WIN32 && ! _WIN32 && ! WINDOWS && ! _WINDOWS
//#if defined(_WIN32) || defined(WIN32) || defined(WINDOWS) || defined(_WINDOWS)
// #define _IFF_WIN_TARGET
// #include <windows.h>
//#else // ! WIN32 && ! _WIN32 && ! WINDOWS && ! _WINDOWS
#include <stdio.h>
#endif // ! WIN32 && ! _WIN32 && ! WINDOWS && ! _WINDOWS
//#endif // ! WIN32 && ! _WIN32 && ! WINDOWS && ! _WINDOWS
#include "media.hpp"
@ -123,6 +123,8 @@ namespace IFF
#undef BYTE
#pragma message("BYTE was defined - undefining")
#endif
#if !defined(_MSC_VER)
typedef int8_t BYTE;
typedef uint8_t UBYTE;
@ -134,6 +136,20 @@ namespace IFF
typedef int64_t INT64;
typedef uint64_t UINT64;
#else
#pragma message("might want to move these typedefs elsewhere")
typedef signed char BYTE;
typedef unsigned char UBYTE;
typedef signed short INT16;
typedef unsigned short UINT16;
typedef signed int INT32;
typedef unsigned int UINT32;
typedef signed __int64 INT64;
typedef unsigned __int64 UINT64;
#endif
struct RGBTriple
{
@ -557,12 +573,12 @@ namespace IFF
m_nBytesRemaining -= 2;
if (m_nBytesRemaining >= 0)
{
UBYTE byte;
::MediaRead(m_pMedium, &byte);
n = byte;
::MediaRead(m_pMedium, &byte);
UBYTE b;
::MediaRead(m_pMedium, &b);
n = b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
n |= b;
if (m_pMedium->m_fError) m_bError = true;
}
else m_bError = true;
@ -573,12 +589,12 @@ namespace IFF
m_nBytesRemaining -= 2;
if (m_nBytesRemaining >= 0)
{
BYTE byte;
::MediaRead(m_pMedium, &byte);
n = byte;
::MediaRead(m_pMedium, &byte);
BYTE b;
::MediaRead(m_pMedium, &b);
n = b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
n |= b;
if (m_pMedium->m_fError) m_bError = true;
}
else m_bError = true;
@ -589,18 +605,18 @@ namespace IFF
m_nBytesRemaining -= 4;
if (m_nBytesRemaining >= 0)
{
UBYTE byte;
::MediaRead(m_pMedium, &byte);
n = byte;
::MediaRead(m_pMedium, &byte);
UBYTE b;
::MediaRead(m_pMedium, &b);
n = b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
n |= b;
if (m_pMedium->m_fError) m_bError = true;
}
else m_bError = true;
@ -611,18 +627,18 @@ namespace IFF
m_nBytesRemaining -= 4;
if (m_nBytesRemaining >= 0)
{
BYTE byte;
::MediaRead(m_pMedium, &byte);
n = byte;
::MediaRead(m_pMedium, &byte);
BYTE b;
::MediaRead(m_pMedium, &b);
n = b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
n |= b;
if (m_pMedium->m_fError) m_bError = true;
}
else m_bError = true;
@ -633,30 +649,30 @@ namespace IFF
m_nBytesRemaining -= 8;
if (m_nBytesRemaining >= 0)
{
UBYTE byte;
::MediaRead(m_pMedium, &byte);
n = byte;
::MediaRead(m_pMedium, &byte);
UBYTE b;
::MediaRead(m_pMedium, &b);
n = b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
n |= b;
if (m_pMedium->m_fError) m_bError = true;
}
else m_bError = true;
@ -667,30 +683,30 @@ namespace IFF
m_nBytesRemaining -= 8;
if (m_nBytesRemaining >= 0)
{
BYTE byte;
::MediaRead(m_pMedium, &byte);
n = byte;
::MediaRead(m_pMedium, &byte);
BYTE b;
::MediaRead(m_pMedium, &b);
n = b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
::MediaRead(m_pMedium, &byte);
n |= b;
::MediaRead(m_pMedium, &b);
n <<= 8;
n |= byte;
n |= b;
if (m_pMedium->m_fError) m_bError = true;
}
else m_bError = true;

2
src/win95/inline.h
View file

@ -590,7 +590,7 @@ fptmp = (b); \
FloatToInt(); \
a = itmp;}
#elif defined(_MSC_VER) /* inline assember for the Microsoft compiler */
#elif defined(_MSC_VER) && 0 /* inline assember for the Microsoft compiler */
/* ADD */