Skip to content

Commit

Permalink
Remove excess map data.
Browse files Browse the repository at this point in the history
git-svn-id: svn+ssh://jay/var/svn/wolf/trunk@133 32837ae5-38f0-4cfd-8401-3ff76d8497c4
  • Loading branch information
paul committed Aug 19, 2007
1 parent b955d9d commit 2d87ccd
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build_mapheaders.c
Expand Up @@ -21,9 +21,9 @@ int main()

printf("#include \"wl_def.h\"\n");
printf("const word RLEWtag = 0x%x;\n", rlew);
printf("const maptype mapheaderseg[60] = {\n");
printf("const maptype mapheaderseg[NUMMAPS] = {\n");
f = fopen("gamemaps." GAMEEXT, "rb");
for (i = 0; i < 60; i++)
for (i = 0; i < NUMMAPS; i++)
{
if (!offsets[i]) {
printf ("{{0, 0}, {0,0}},\n");
Expand Down
4 changes: 4 additions & 0 deletions id_ca.h
Expand Up @@ -3,7 +3,11 @@

/* ======================================================================== */

#ifdef UPLOAD
#define NUMMAPS 10
#else
#define NUMMAPS 60
#endif
#define MAPPLANES 2

typedef struct
Expand Down
2 changes: 0 additions & 2 deletions version.h
Expand Up @@ -60,9 +60,7 @@
#if WMODE == 0
/* #define SPEAR */
/* #define SPEARDEMO */
#ifndef EMBEDDED
#define UPLOAD
#endif
#define GAMENAME "Wolfenstein 3D Shareware"
#define GAMEEXT "wl1"
#define GAMETYPE "WL1\0"
Expand Down
2 changes: 2 additions & 0 deletions wl_act2.c
Expand Up @@ -491,6 +491,7 @@ void A_DeathScream (objtype *ob)

case guardobj:
{
#ifdef ENABLE_AUDIO
#ifndef UPLOAD
myint sounds[8]={ DEATHSCREAM1SND, DEATHSCREAM2SND,
DEATHSCREAM3SND, DEATHSCREAM4SND,
Expand All @@ -505,6 +506,7 @@ void A_DeathScream (objtype *ob)
};
PlaySoundLocActor(sounds[US_RndT()%3], ob);
#endif
#endif
}
break;
case officerobj:
Expand Down
2 changes: 1 addition & 1 deletion wl_debug.c
@@ -1,5 +1,6 @@
#include "wl_def.h"

#ifndef EMBEDDED
/*
==================
=
Expand Down Expand Up @@ -90,7 +91,6 @@ void ShapeTest()
{
}

#ifndef EMBEDDED
/*
================
=
Expand Down
2 changes: 2 additions & 0 deletions wl_play.c
Expand Up @@ -524,7 +524,9 @@ void PollControls()

void CenterWindow(word w,word h)
{
#ifndef EMBEDDED
US_DrawWindow(((MAXX / 8) - w) / 2,((MAXY / 8) - h) / 2,w,h);
#endif
}

//===========================================================================
Expand Down

0 comments on commit 2d87ccd

Please sign in to comment.