TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove textures.h #include "piggy.h"

Browse source
This commit is contained in:
Kp 2015-01-29 04:27:35 +00:00
parent 6baa2411a1
commit f31e9f76e0
4 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/main/textures.h
View file

@ -23,18 +23,13 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
*
*/
#ifndef _TEXTURES_H
#define _TEXTURES_H
#pragma once
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
#include "bm.h"
#include "piggy.h"
// Texture stuff... in mglobal.c
extern unsigned NumTextures;
extern array<bitmap_index, MAX_TEXTURES> Textures; // Array of all texture tmaps.
#endif
#endif /* _TEXTURES_H */

3
similar/main/bm.cpp
View file

@ -69,6 +69,9 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
array<ubyte, MAX_SOUNDS> Sounds, AltSounds;
unsigned NumTextures;
array<bitmap_index, MAX_TEXTURES> Textures; // All textures.
#ifdef EDITOR
int Num_object_subtypes = 1;
#endif

3
similar/main/mglobal.cpp
View file

@ -88,9 +88,6 @@ const int Side_to_verts_int[MAX_SIDES_PER_SEGMENT][4] = {
// Texture map stuff
unsigned NumTextures;
array<bitmap_index, MAX_TEXTURES> Textures; // All textures.
fix64 Next_laser_fire_time; // Time at which player can next fire his selected laser.
fix64 Next_missile_fire_time; // Time at which player can next fire his selected missile.
//--unused-- fix Laser_delay_time = F1_0/6; // Delay between laser fires.

1
similar/main/texmerge.cpp
View file

@ -30,6 +30,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "textures.h"
#include "rle.h"
#include "timer.h"
#include "piggy.h"
#include "texmerge.h"
#include "compiler-range_for.h"