Removed more unused code.
This commit is contained in:
Steven Fuller
Patryk Obara
parent
2a737d91fc
commit
02db356511
3 changed files with 1 additions and 166 deletions
4
Makefile
4
Makefile
|
|
@ -5,8 +5,6 @@ CXX = g++
|
|||
CFLAGS = -m32 -g -Wall -pipe -O2
|
||||
#CFLAGS = -DNDEBUG -Wall -pipe -O6 -ffast-math -fomit-frame-pointer -march=pentium -mcpu=pentiumpro
|
||||
|
||||
CFLAGS += -DLINUX
|
||||
|
||||
CFLAGS += -Isrc -Isrc/include -Isrc/win95 -Isrc/avp -Isrc/avp/win95 -Isrc/avp/support -Isrc/avp/win95/frontend -Isrc/avp/win95/gadgets
|
||||
CFLAGS += $(shell sdl-config --cflags) $(shell openal-config --cflags)
|
||||
CXXFLAGS = $(CFLAGS)
|
||||
|
|
@ -14,7 +12,7 @@ CXXFLAGS = $(CFLAGS)
|
|||
LDLIBS = -m32 $(shell sdl-config --libs) $(shell openal-config --libs)
|
||||
|
||||
ROOT = main.c files.c winapi.c stubs.c version.c mathline.c opengl.c oglfunc.c openal.c cdplayer.c menus.c net.c frustum.c kshape.c map.c maths.c md5.c mem3dc.c mem3dcpp.cpp module.c morph.c object.c shpanim.c sphere.c tables.c vdb.c
|
||||
AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cconvars.cpp cdtrackselection.cpp cheatmodes.c comp_map.c comp_shp.c consolelog.cpp davehook.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c equiputl.cpp extents.c game.c game_statistics.c gamecmds.cpp gamevars.cpp hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c mempool.c messagehistory.c missions.cpp movement.c paintball.c particle.c pfarlocs.c pheromon.c player.c pmove.c psnd.c psndproj.c pvisible.c savegame.c scream.cpp secstats.c sfx.c stratdef.c targeting.c track.c triggers.c weapons.c
|
||||
AVP = ai_sight.c avpview.c bh_agun.c bh_ais.c bh_alien.c bh_binsw.c bh_cable.c bh_corpse.c bh_deathvol.c bh_debri.c bh_dummy.c bh_fan.c bh_far.c bh_fhug.c bh_gener.c bh_ldoor.c bh_lift.c bh_light.c bh_lnksw.c bh_ltfx.c bh_marin.c bh_mission.c bh_near.c bh_pargen.c bh_plachier.c bh_plift.c bh_pred.c bh_queen.c bh_rubberduck.c bh_selfdest.c bh_snds.c bh_spcl.c bh_swdor.c bh_track.c bh_types.c bh_videoscreen.c bh_waypt.c bh_weap.c bh_xeno.c bonusabilities.c cconvars.cpp cdtrackselection.cpp cheatmodes.c comp_map.c comp_shp.c consolelog.cpp davehook.cpp deaths.c decal.c detaillevels.c dynamics.c dynblock.c equipmnt.c extents.c game.c game_statistics.c gamecmds.cpp gamevars.cpp hmodel.c hud.c inventry.c language.c lighting.c load_shp.c los.c mempool.c messagehistory.c missions.cpp movement.c paintball.c particle.c pfarlocs.c pheromon.c player.c pmove.c psnd.c psndproj.c pvisible.c savegame.c scream.cpp secstats.c sfx.c stratdef.c targeting.c track.c triggers.c weapons.c
|
||||
SHAPES = cube.c
|
||||
SUPPORT = consbind.cpp consbtch.cpp coordstr.cpp daemon.cpp indexfnt.cpp r2base.cpp r2pos666.cpp reflist.cpp refobj.cpp rentrntq.cpp scstring.cpp strtab.cpp strutil.c trig666.cpp wrapstr.cpp
|
||||
AVPWIN95 = avpchunk.cpp cheat.c chtcodes.cpp d3d_hud.cpp ddplat.cpp endianio.c ffread.cpp ffstdio.cpp gammacontrol.cpp hierplace.cpp iofocus.cpp jsndsup.cpp kzsort.c langplat.c modcmds.cpp npcsetup.cpp objsetup.cpp pathchnk.cpp platsup.c pldghost.c pldnet.c progress_bar.cpp projload.cpp scrshot.cpp strachnk.cpp system.c usr_io.c vision.c
|
||||
|
|
|
|||
|
|
@ -1,96 +0,0 @@
|
|||
/*******************************************************************
|
||||
*
|
||||
* DESCRIPTION: equiputl.cpp
|
||||
*
|
||||
* AUTHOR: David Malcolm
|
||||
*
|
||||
* HISTORY: Created 8/1/98
|
||||
*
|
||||
*******************************************************************/
|
||||
|
||||
/* Includes ********************************************************/
|
||||
#include "3dc.h"
|
||||
#include "equiputl.hpp"
|
||||
|
||||
#define UseLocalAssert Yes
|
||||
#include "ourasert.h"
|
||||
|
||||
/* Version settings ************************************************/
|
||||
|
||||
/* Constants *******************************************************/
|
||||
|
||||
/* Macros **********************************************************/
|
||||
|
||||
/* Imported function prototypes ************************************/
|
||||
|
||||
/* Imported data ***************************************************/
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
{
|
||||
#endif
|
||||
#if 0
|
||||
extern OurBool DaveDebugOn;
|
||||
extern FDIEXTENSIONTAG FDIET_Dummy;
|
||||
extern IFEXTENSIONTAG IFET_Dummy;
|
||||
extern FDIQUAD FDIQuad_WholeScreen;
|
||||
extern FDIPOS FDIPos_Origin;
|
||||
extern FDIPOS FDIPos_ScreenCentre;
|
||||
extern IFOBJECTLOCATION IFObjLoc_Origin;
|
||||
extern UncompressedGlobalPlotAtomID UGPAID_StandardNull;
|
||||
extern IFCOLOUR IFColour_Dummy;
|
||||
extern IFVECTOR IFVec_Zero;
|
||||
#endif
|
||||
#ifdef __cplusplus
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
/* Exported globals ************************************************/
|
||||
|
||||
/* Internal type definitions ***************************************/
|
||||
|
||||
/* Internal function prototypes ************************************/
|
||||
|
||||
/* Internal globals ************************************************/
|
||||
|
||||
/* Exported function definitions ***********************************/
|
||||
|
||||
// namespace EquipmentUtil
|
||||
|
||||
// Functions to get the ID for the text string "ROUNDS" and "MAGAZINES"
|
||||
// Mostly returns TEXTSTRING_ROUNDS and TEXTSTRING_MAGAZINES,
|
||||
// but some weapons have different strings
|
||||
|
||||
enum TEXTSTRING_ID EquipmentUtil :: GetTextID_Rounds
|
||||
(
|
||||
enum WEAPON_ID WeaponID
|
||||
)
|
||||
{
|
||||
{
|
||||
return TEXTSTRING_ROUNDS;
|
||||
}
|
||||
}
|
||||
|
||||
enum TEXTSTRING_ID EquipmentUtil :: GetTextID_Magazines
|
||||
(
|
||||
enum WEAPON_ID WeaponID
|
||||
)
|
||||
{
|
||||
switch (WeaponID)
|
||||
{
|
||||
default:
|
||||
return TEXTSTRING_MAGAZINES;
|
||||
|
||||
case WEAPON_FLAMETHROWER:
|
||||
return TEXTSTRING_MAGAZINES_FLAMETHROWER;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// Mostly returns TEXTSTRING_ROUNDS and TEXTSTRING_MAGAZINES,
|
||||
// but some weapons have different strings
|
||||
|
||||
/* Internal function definitions ***********************************/
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
/*
|
||||
|
||||
equiputl.hpp
|
||||
|
||||
Created 8/1/98 by DHM: Utilies for dealing with equipment
|
||||
|
||||
*/
|
||||
|
||||
#ifndef _equiputl
|
||||
#define _equiputl 1
|
||||
|
||||
#if ( defined( __WATCOMC__ ) || defined( _MSC_VER ) )
|
||||
#pragma once
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef _equipmnt_h_
|
||||
#include "equipmnt.h"
|
||||
#endif
|
||||
|
||||
#ifndef _langenum_h_
|
||||
#include "langenum.h"
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Version settings *****************************************************/
|
||||
|
||||
/* Constants ***********************************************************/
|
||||
|
||||
/* Macros ***************************************************************/
|
||||
|
||||
/* Type definitions *****************************************************/
|
||||
|
||||
/* Exported globals *****************************************************/
|
||||
|
||||
/* Function prototypes **************************************************/
|
||||
namespace EquipmentUtil
|
||||
{
|
||||
// Functions to get the ID for the text string "ROUNDS" and "MAGAZINES"
|
||||
// Mostly returns TEXTSTRING_ROUNDS and TEXTSTRING_MAGAZINES,
|
||||
// but some weapons have different strings
|
||||
|
||||
enum TEXTSTRING_ID GetTextID_Rounds
|
||||
(
|
||||
enum WEAPON_ID WeaponID
|
||||
);
|
||||
|
||||
enum TEXTSTRING_ID GetTextID_Magazines
|
||||
(
|
||||
enum WEAPON_ID WeaponID
|
||||
);
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
||||
/* End of the header ****************************************************/
|
||||
|
||||
|
||||
#ifdef __cplusplus
|
||||
};
|
||||
#endif
|
||||
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue