Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean my WC 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1894 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2007-06-19 18:00:46 +00:00
parent 0198bceba2
commit cc2294112b
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/ivis_common/ivi.h
View File

@ -18,10 +18,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
//************************************************************************* //*************************************************************************
//*** ivi.h iVi engine definitions. [Sam Kerbeck] //*** ivi.h iVi engine definitions. [Sam Kerbeck] ***//
//* 24-04-96.30-07-96 PC
//* 18-11-96.04-12-96 WIN'95
//*
#ifndef _ivi_ #ifndef _ivi_
#define _ivi_ #define _ivi_

23
src/display3d.c
View File

@ -112,8 +112,11 @@
#include "cmddroid.h" #include "cmddroid.h"
// Extremely magic!
#define WATER_TILE 17 // ID of water tile. #define WATER_TILE 17 // ID of water tile.
#define BED_TILE 5 // ID of river bed tile. #define RIVERBED_TILE 5 // ID of river bed tile.
#define WATER_ALPHA_LEVEL 255 //was 164 // Amount to alpha blend water. #define WATER_ALPHA_LEVEL 255 //was 164 // Amount to alpha blend water.
#define WATER_ZOFFSET 32 // Sorting offset for main water tile. #define WATER_ZOFFSET 32 // Sorting offset for main water tile.
#define WATER_EDGE_ZOFFSET 64 // Sorting offset for water edge tiles. #define WATER_EDGE_ZOFFSET 64 // Sorting offset for water edge tiles.
@ -171,15 +174,14 @@ static BOOL bDrawBlips=TRUE;
static BOOL bDrawProximitys=TRUE; static BOOL bDrawProximitys=TRUE;
BOOL godMode; BOOL godMode;
static UWORD WaterTileID = WATER_TILE; static UWORD RiverBedTileID = RIVERBED_TILE;
static UWORD RiverBedTileID = BED_TILE;
static float waterRealValue = 0.0f; static float waterRealValue = 0.0f;
#define WAVE_SPEED 4 #define WAVE_SPEED 4
#define MAX_FIRE_STAGE 32 #define MAX_FIRE_STAGE 32
static float separation=(float)0; static float separation = 0.0f;
static SDWORD acceleration=0; static SDWORD acceleration = 0;
static SDWORD heightSpeed=0; static SDWORD heightSpeed = 0;
static float aSep; static float aSep = 0.0f;
static SDWORD aAccel = 0; static SDWORD aAccel = 0;
static SDWORD aSpeed = 0; static SDWORD aSpeed = 0;
@ -744,7 +746,7 @@ static void drawTiles(iView *camera, iView *player)
} }
// If it's the main water tile (has water texture) then.. // If it's the main water tile (has water texture) then..
if ( (psTile->texture & TILE_NUMMASK) == WaterTileID && !bEdgeTile ) if ( (psTile->texture & TILE_NUMMASK) == WATER_TILE && !bEdgeTile )
{ {
// Push the terrain down for the river bed. // Push the terrain down for the river bed.
PushedDown = TRUE; PushedDown = TRUE;
@ -847,7 +849,8 @@ static void drawTiles(iView *camera, iView *player)
bucketAddTypeToList(RENDER_WATERTILE, &tileIJ[i][j]); bucketAddTypeToList(RENDER_WATERTILE, &tileIJ[i][j]);
// check if we need to draw a water edge // check if we need to draw a water edge
if((mapTile(playerXTile+j, playerZTile+i)->texture & TILE_NUMMASK) != WaterTileID) { if ( (mapTile(playerXTile+j, playerZTile+i)->texture & TILE_NUMMASK) != WATER_TILE )
{
// the edge is in front of the water (which is drawn at z-index -1) // the edge is in front of the water (which is drawn at z-index -1)
pie_SetDepthOffset(-2.0); pie_SetDepthOffset(-2.0);
drawTerrainTile(i, j, TRUE); drawTerrainTile(i, j, TRUE);
@ -4767,10 +4770,8 @@ static void testEffect2( UDWORD player )
addEffect(&pos,EFFECT_EXPLOSION, EXPLOSION_TYPE_LASER,FALSE,NULL,0); addEffect(&pos,EFFECT_EXPLOSION, EXPLOSION_TYPE_LASER,FALSE,NULL,0);
} }
} }
} }
} }
} }
} }

2
src/map.h
View File

@ -115,7 +115,7 @@ typedef enum _terrain_type
extern UBYTE terrainTypes[MAX_TILE_TEXTURES]; extern UBYTE terrainTypes[MAX_TILE_TEXTURES];
#define TERRAIN_TYPE(x) terrainTypes[x->texture & TILE_NUMMASK] #define TERRAIN_TYPE(x) terrainTypes[(x)->texture & TILE_NUMMASK]
/* Information stored with each tile */ /* Information stored with each tile */
typedef struct _maptile typedef struct _maptile