Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Rip out dead sound code/data.

Constify gamestates.



git-svn-id: svn+ssh://jay/var/svn/wolf/trunk@14 32837ae5-38f0-4cfd-8401-3ff76d8497c4
  • Loading branch information...
commit c4ad8ce7646783168fa11a6b8f6cf124100ef1f9 1 parent 4450665
paul authored
View
2  Makefile
@@ -11,7 +11,7 @@ CFLAGS = -g -Wall -fno-common
OBJS = objs.o misc.o id_ca.o id_vh.o id_us.o \
wl_act1.o wl_act2.o wl_act3.o wl_agent.o wl_game.o \
wl_inter.o wl_menu.o wl_play.o wl_state.o wl_text.o wl_main.o \
- wl_debug.o vi_comm.o sd_comm.o tables.o
+ wl_debug.o vi_comm.o tables.o
ROBJS = wl_draw.o
SOBJS = $(OBJS) $(ROBJS) vi_svga.o
XOBJS = $(OBJS) $(ROBJS) vi_xlib.o
View
11 sd_null.c
@@ -6,9 +6,6 @@ SDMode SoundMode;
SMMode MusicMode;
SDSMode DigiMode;
-static boolean SD_Started;
-
-
void SD_SetDigiDevice(SDSMode mode)
{
}
@@ -40,10 +37,6 @@ boolean SD_SetMusicMode(SMMode mode)
///////////////////////////////////////////////////////////////////////////
void SD_Startup()
{
- if (SD_Started)
- return;
-
- InitDigiMap();
}
///////////////////////////////////////////////////////////////////////////
@@ -53,10 +46,6 @@ void SD_Startup()
///////////////////////////////////////////////////////////////////////////
void SD_Shutdown()
{
- if (!SD_Started)
- return;
-
- SD_Started = false;
}
///////////////////////////////////////////////////////////////////////////
View
2  sd_oss.c
@@ -14,6 +14,8 @@
#include "fmopl.h"
+#include "sd_comm.c"
+
typedef struct {
longword length;
word priority;
View
21 wl_act2.c
@@ -827,8 +827,10 @@ void T_Bite (objtype *ob)
void SpawnTrans (myint tilex, myint tiley)
{
+#ifdef WEIRD_TIMER_HACK
if (SoundBlasterPresent && DigiMode != sds_Off)
gamestates[s_transdie01].tictime = 105;
+#endif
SpawnNewObj(tilex,tiley,s_transstand);
new->obclass = transobj;
@@ -852,8 +854,10 @@ void SpawnTrans (myint tilex, myint tiley)
void SpawnUber (myint tilex, myint tiley)
{
+#ifdef WEIRD_TIMER_HACK
if (SoundBlasterPresent && DigiMode != sds_Off)
gamestates[s_uberdie01].tictime = 70;
+#endif
SpawnNewObj (tilex,tiley,s_uberstand);
new->obclass = uberobj;
@@ -894,8 +898,10 @@ void T_UShoot(objtype *ob)
void SpawnWill(myint tilex, myint tiley)
{
+#ifdef WEIRD_TIMER_HACK
if (SoundBlasterPresent && DigiMode != sds_Off)
gamestates[s_willdie2].tictime = 70;
+#endif
SpawnNewObj (tilex,tiley,s_willstand);
new->obclass = willobj;
@@ -1010,8 +1016,10 @@ void T_Will(objtype *ob)
void SpawnDeath(myint tilex, myint tiley)
{
+#ifdef WEIRD_TIMER_HACK
if (SoundBlasterPresent && DigiMode != sds_Off)
gamestates[s_deathdie2].tictime = 105;
+#endif
SpawnNewObj (tilex,tiley,s_deathstand);
new->obclass = deathobj;
@@ -1110,8 +1118,10 @@ void A_Breathing(objtype *ob)
void SpawnAngel(myint tilex, myint tiley)
{
+#ifdef WEIRD_TIMER_HACK
if (SoundBlasterPresent && DigiMode != sds_Off)
gamestates[s_angeldie11].tictime = 105;
+#endif
SpawnNewObj (tilex,tiley,s_angelstand);
new->obclass = angelobj;
@@ -1336,10 +1346,12 @@ void SpawnGhosts (myint which, myint tilex, myint tiley)
void SpawnSchabbs(myint tilex, myint tiley)
{
+#ifdef WEIRD_TIMER_HACK
if (DigiMode != sds_Off)
gamestates[s_schabbdie2].tictime = 140;
else
gamestates[s_schabbdie2].tictime = 5;
+#endif
SpawnNewObj(tilex, tiley, s_schabbstand);
new->speed = SPDPATROL;
@@ -1363,10 +1375,12 @@ void SpawnSchabbs(myint tilex, myint tiley)
void SpawnGift (myint tilex, myint tiley)
{
+#ifdef WEIRD_TIMER_HACK
if (DigiMode != sds_Off)
gamestates[s_giftdie2].tictime = 140;
else
gamestates[s_giftdie2].tictime = 5;
+#endif
SpawnNewObj (tilex,tiley,s_giftstand);
new->speed = SPDPATROL;
@@ -1390,10 +1404,12 @@ void SpawnGift (myint tilex, myint tiley)
void SpawnFat (myint tilex, myint tiley)
{
+#ifdef WEIRD_TIMER_HACK
if (DigiMode != sds_Off)
gamestates[s_fatdie2].tictime = 140;
else
gamestates[s_fatdie2].tictime = 5;
+#endif
SpawnNewObj (tilex,tiley,s_fatstand);
new->speed = SPDPATROL;
@@ -1782,10 +1798,12 @@ void T_Fat (objtype *ob)
void SpawnFakeHitler(myint tilex, myint tiley)
{
+#ifdef WEIRD_TIMER_HACK
if (DigiMode != sds_Off)
gamestates[s_hitlerdie2].tictime = 140;
else
gamestates[s_hitlerdie2].tictime = 5;
+#endif
SpawnNewObj(tilex, tiley, s_fakestand);
new->speed = SPDPATROL;
@@ -1809,11 +1827,12 @@ void SpawnFakeHitler(myint tilex, myint tiley)
void SpawnHitler(myint tilex, myint tiley)
{
+#ifdef WEIRD_TIMER_HACK
if (DigiMode != sds_Off)
gamestates[s_hitlerdie2].tictime = 140;
else
gamestates[s_hitlerdie2].tictime = 5;
-
+#endif
SpawnNewObj (tilex,tiley,s_mechastand);
new->speed = SPDPATROL;
View
2  wl_act3.c
@@ -51,7 +51,7 @@ void T_DeathCam(objtype *ob);
void T_Player(objtype *ob);
void T_Attack(objtype *ob);
-statetype gamestates[MAXSTATES] = {
+const statetype gamestates[MAXSTATES] = {
/* s_none */ {false,0,0,NULL,NULL,s_none},
/* s_boom1 */ {false,SPR_BOOM_1,6,NULL,NULL,s_boom2},
/* s_boom2 */ {false,SPR_BOOM_2,6,NULL,NULL,s_boom3},
View
2  wl_act3.h
@@ -617,6 +617,6 @@ typedef enum {
MAXSTATES
} stateenum;
-extern statetype gamestates[MAXSTATES];
+extern const statetype gamestates[MAXSTATES];
#endif
Please sign in to comment.
Something went wrong with that request. Please try again.