Skip to content

W
wolf3d
Commit cb67569f authored by Steven Fuller's avatar Steven Fuller
Browse files
Options

Mainly cleanups. 

id_ca.c, id_vh.c: Moved CA_CacheScreen to VL_CacheScreen
parent 7b103fdd
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 233 deletions
src/NOTES
View file @ cb67569f
......@@ -18,17 +18,26 @@ Just some random facts/thoughts/ideas/musings:
* Unofficial ports:
- Linux (this, xwolf, wolfgl)
XWolf: http://www.sirius.demon.co.uk/xwolf/
- Amiga (port of my first pc wolf3d linux port)
[http://www.silab.dsi.unimi.it/~cs556770/wolf3d/]
- Windows (wolfgl) [http://www.sourceforge.net/projects/wolfgl/]
- Acorn/Archemedes
* PC source released on:
- now many ports, projects, etc
- urls
- http://www.abraxis.com/brucel/wolf3d.html
- http://www.wolf3dbunker.com
* Macintosh source released January 22(?), 2000
- url
* TED source (editor used for tons of games including wolf3d)
* Games which used the Wolfenstein 3D Engine:
- Blake Stone
- Corridor 7
- Operation Body Count
Wolfenstein 3D was originally planned to be a much more complex game. ...
... lots of unused code ... possibly from previous projects and incarnations
of wolf3d.
......
src/foreign.h
View file @ cb67569f
#ifndef __FOREIGN_H__
#define __FOREIGN_H__
#define QUITSUR "Are you sure you want\n"\
"to quit this great game?"
#define CURGAME "You are currently in\n"\
"a game. Continuing will\n"\
"erase old game. Ok?"
......@@ -126,6 +123,18 @@
#define STR_ENDGAME2 "You have served your country well."
#define STR_ENDGAME3 "With the spear gone, the Allies will finally"
#define STR_ENDGAME4 "by able to destroy Hitler..."
#else
#define ENDSTR1 "Dost thou wish to\nleave with such hasty\nabandon?"
#define ENDSTR2 "Chickening out...\nalready?"
#define ENDSTR3 "Press N for more carnage.\nPress Y to be a weenie."
#define ENDSTR4 "So, you think you can\nquit this easily, huh?"
#define ENDSTR5 "Press N to save the world.\nPress Y to abandon it in\nits hour of need."
#define ENDSTR6 "Press N if you are brave.\nPress Y to cower in shame."
#define ENDSTR7 "Heroes, press N.\nWimps, press Y."
#define ENDSTR8 "You are at an intersection.\nA sign says, 'Press Y to quit.'\n>"
#define ENDSTR9 "For guns and glory, press N.\nFor work and worry, press Y."
#endif
#endif
src/id_ca.c
View file @ cb67569f
......@@ -726,23 +726,6 @@ void CA_UnCacheGrChunk(int chunk)
grsegs[chunk] = 0;
}
/*
======================
=
= CA_CacheScreen
=
= Decompresses a chunk from disk straight onto the screen
=
======================
*/
void CA_CacheScreen(int chunk)
{
CA_CacheGrChunk(chunk);
VL_MemToScreen(grsegs[chunk], 320, 200, 0, 0);
CA_UnCacheGrChunk(chunk);
}
/* ======================================================================== */
/*
......@@ -750,8 +733,6 @@ void CA_CacheScreen(int chunk)
=
= CA_CacheMap
=
= WOLF: This is specialized for a 64*64 map size
=
======================
*/
......
src/id_ca.h
View file @ cb67569f
......@@ -48,8 +48,6 @@ void CA_UnCacheGrChunk(int chunk);
void CA_UpLevel();
void CA_DownLevel();
void CA_CacheScreen(int chunk);
/* ======================================================================= */
void MM_Startup();
......
src/id_us.c
View file @ cb67569f
/* id_us.c */
#include "id_heads.h"
// Global variables
......@@ -11,9 +9,6 @@ word WindowX,WindowY,WindowW,WindowH;
static boolean US_Started;
void (*USL_MeasureString)(char *,word *,word *) = VW_MeasurePropString,
(*USL_DrawString)(char *) = VW_DrawPropString;
HighScore Scores[MaxScores] = {
{"id software-'92",10000,1},
{"Adrian Carmack",10000,1},
......@@ -50,7 +45,7 @@ void US_Startup()
// US_Shutdown() - Shuts down the User Mgr
//
///////////////////////////////////////////////////////////////////////////
void US_Shutdown(void)
void US_Shutdown()
{
if (!US_Started)
return;
......@@ -210,7 +205,7 @@ void US_CPrint(char *str)
// cursor
//
///////////////////////////////////////////////////////////////////////////
void US_ClearWindow(void)
void US_ClearWindow()
{
VW_Bar(WindowX,WindowY,WindowW,WindowH,WHITE);
PrintX = WindowX;
......@@ -318,7 +313,7 @@ boolean US_LineInput(int x,int y,char *buf,char *def,boolean escok,
if (cursorvis)
USL_XORICursor(x,y,s,cursor);
IN_CheckAck(); /* TODO: handle events */
IN_CheckAck();
sc = LastScan;
LastScan = sc_None;
......@@ -465,7 +460,7 @@ boolean US_LineInput(int x,int y,char *buf,char *def,boolean escok,
return(result);
}
static const int rndtable[] ={
static const int rndtable[256] ={
0, 8, 109, 220, 222, 241, 149, 107, 75, 248, 254, 140, 16, 66,
74, 21, 211, 47, 80, 242, 154, 27, 205, 128, 161, 89, 77, 36,
95, 110, 85, 48, 212, 140, 211, 249, 22, 79, 200, 50, 28, 188,
......@@ -485,7 +480,6 @@ static const int rndtable[] ={
17, 46, 52, 231, 232, 76, 31, 221, 84, 37, 216, 165, 212, 106,
197, 242, 98, 43, 39, 175, 254, 145, 190, 84, 118, 222, 187, 136,
120, 163, 236, 249
};
static int rndindex = 0;
......
src/id_us.h
View file @ cb67569f
......@@ -14,20 +14,19 @@ typedef struct {
#define MaxString 128 // Maximum input string size
extern boolean ingame, // Set by game code if a game is in progress
loadedgame, // Set if the current game was loaded
NoWait;
extern boolean NoWait;
extern word PrintX,PrintY; // Current printing location in the window
extern word WindowX,WindowY,// Current location of window
WindowW,WindowH;// Current size of window
extern void (*USL_MeasureString)(char *,word *,word *),
(*USL_DrawString)(char *);
#define USL_MeasureString VW_MeasurePropString
#define USL_DrawString VW_DrawPropString
extern HighScore Scores[];
void US_Startup(void),
US_Shutdown(void),
void US_Startup(),
US_Shutdown(),
US_InitRndT(boolean randomize),
US_DrawWindow(word x,word y,word w,word h),
US_ClearWindow(void),
......
src/id_vh.c
View file @ cb67569f
/* id_vh.c */
#include "id_heads.h"
/* ======================================================================== */
......@@ -254,3 +252,10 @@ void VL_FadeIn(int start, int end, const byte *palette, int steps)
VL_SetPalette(palette);
screenfaded = false;
}
void VL_CacheScreen(int chunk)
{
CA_CacheGrChunk(chunk);
VL_MemToScreen(grsegs[chunk], 320, 200, 0, 0);
CA_UnCacheGrChunk(chunk);
}
src/id_vh.h
View file @ cb67569f
......@@ -26,7 +26,7 @@ extern byte fontcolor;
extern int fontnumber;
extern int px,py;
void VW_UpdateScreen (void);
void VW_UpdateScreen();
void VWB_DrawTile8(int x, int y, int tile);
void VWB_DrawPic(int x, int y, int chunknum);
......@@ -52,6 +52,8 @@ void VL_FadeOut(int start, int end, int red, int green, int blue, int steps);
void VL_FadeIn(int start, int end, const byte *palette, int steps);
void LatchDrawPic(unsigned x, unsigned y, unsigned picnum);
void LoadLatchMem(void);
void LoadLatchMem();
void VL_CacheScreen(int chunk);
#endif
src/sd_null.c
View file @ cb67569f
/* id_sd.c */
#include "id_heads.h"
boolean SoundSourcePresent, AdLibPresent, SoundBlasterPresent;
......@@ -159,18 +157,6 @@ boolean SD_MusicPlaying()
return false;
}
//===========================================================================
/*
==========================
=
= SetSoundLocGlobal - Sets up globalsoundx & globalsoundy and then calls
= UpdateSoundLoc() to transform that into relative channel volumes. Those
= values are then passed to the Sound Manager so that they'll be used for
= the next sound played (if possible).
=
==========================
*/
void PlaySoundLocGlobal(word s,fixed gx,fixed gy)
{
SD_PlaySound(s);
......
src/vi_null.c
View file @ cb67569f
/* id_vl.c */
/* input/video output "/dev/null" support */
/* this file does nothing but sit there and look pretty dumb */
......
src/wl_act1.c
View file @ cb67569f
/* wl_act1.c */
#include "wl_def.h"
/*
......@@ -182,7 +180,6 @@ void SpawnStatic(int tilex, int tiley, int type)
Quit ("Too many static objects!\n");
}
/*
===============
=
......@@ -238,8 +235,6 @@ void PlaceItemType(int itemtype, int tilex, int tiley)
spot->itemnumber = statinfo[type].type;
}
/*
=============================================================================
......@@ -265,7 +260,6 @@ Every time a door opens or closes the areabyplayer matrix gets recalculated.
=============================================================================
*/
#define DOORWIDTH 0x7800
#define OPENTICS 300
doorobj_t doorobjlist[MAXDOORS],*lastdoorobj;
......@@ -303,7 +297,6 @@ void RecursiveConnect(int areanumber)
}
}
void ConnectAreas()
{
memset(areabyplayer, 0, sizeof(areabyplayer));
......@@ -311,15 +304,12 @@ void ConnectAreas()
RecursiveConnect(player->areanumber);
}
void InitAreas()
{
memset(areabyplayer, 0, sizeof(areabyplayer));
areabyplayer[player->areanumber] = true;
}
/*
===============
=
......@@ -330,14 +320,13 @@ void InitAreas()
void InitDoorList()
{
memset (areabyplayer,0,sizeof(areabyplayer));
memset (areaconnect,0,sizeof(areaconnect));
memset(areabyplayer, 0, sizeof(areabyplayer));
memset(areaconnect, 0, sizeof(areaconnect));
lastdoorobj = &doorobjlist[0];
doornum = 0;
}
/*
===============
=
......@@ -385,8 +374,6 @@ void SpawnDoor(int tilex, int tiley, boolean vertical, int lock)
lastdoorobj++;
}
//===========================================================================
/*
=====================
=
......@@ -403,7 +390,6 @@ void OpenDoor(int door)
doorobjlist[door].action = dr_opening; // start it opening
}
/*
=====================
=
......@@ -481,8 +467,6 @@ void CloseDoor(int door)
= door | 0x80;
}
/*
=====================
=
......@@ -520,9 +504,6 @@ void OperateDoor(int door)
}
}
//===========================================================================
/*
===============
=
......
src/wl_act2.c
View file @ cb67569f
/* wl_act2.c */
#include "wl_def.h"
/*
......@@ -193,15 +191,15 @@ statetype s_hboom3 = {false,SPR_HBOOM_3,6,NULL,NULL,NULL};
#endif
void T_Schabb (objtype *ob);
void T_SchabbThrow (objtype *ob);
void T_Fake (objtype *ob);
void T_FakeFire (objtype *ob);
void T_Ghosts (objtype *ob);
void T_Schabb(objtype *ob);
void T_SchabbThrow(objtype *ob);
void T_Fake(objtype *ob);
void T_FakeFire(objtype *ob);
void T_Ghosts(objtype *ob);
void A_Slurpie (objtype *ob);
void A_HitlerMorph (objtype *ob);
void A_MechaSound (objtype *ob);
void A_Slurpie(objtype *ob);
void A_HitlerMorph(objtype *ob);
void A_MechaSound(objtype *ob);
/*
=================
......@@ -350,9 +348,6 @@ void T_Projectile (objtype *ob)
}
/*
=============================================================================
......
src/wl_agent.c
View file @ cb67569f
/* wl_agent.c */
#include "wl_def.h"
/*
......
src/wl_debug.c
View file @ cb67569f
/* wl_debug.c */
#include "wl_def.h"
/*
......
src/wl_def.h
View file @ cb67569f
......@@ -1056,7 +1056,6 @@ void SpawnBJVictory(void);
void SpawnStand (enemy_t which, int tilex, int tiley, int dir);
void SpawnPatrol (enemy_t which, int tilex, int tiley, int dir);
void KillActor (objtype *ob);
void US_ControlPanel(byte);
......
src/wl_draw.c
View file @ cb67569f
......@@ -266,7 +266,11 @@ static int CalcRotate(objtype *ob)
=====================
*/
#define MAXVISABLE 64
#ifdef DUMBTEST
#define MAXVISABLE 640
#else
#define MAXVISABLE 64
#endif
typedef struct {
int viewx;
......@@ -1252,5 +1256,7 @@ passhoriz:
xintercept += xstep;
goto horizcheck;
}
#ifdef DUMBTEST
memset(spotvis, 1, sizeof(spotvis));
#endif
}
src/wl_game.c
View file @ cb67569f
/* wl_game.c */
#include "wl_def.h"
/*
......@@ -477,14 +475,14 @@ void SetupGameLevel()
//
// load the level
//
CA_CacheMap (gamestate.mapon+10*gamestate.episode);
CA_CacheMap(gamestate.mapon+10*gamestate.episode);
mapon-=gamestate.episode*10;
mapwidth = mapheaderseg[mapon]->width;
mapheight = mapheaderseg[mapon]->height;
if (mapwidth != 64 || mapheight != 64)
Quit ("Map not 64*64!");
Quit("Map not 64*64!");
//
......@@ -503,7 +501,7 @@ void SetupGameLevel()
(unsigned)actorat[x][y] = tile;
} else { // area floor
tilemap[x][y] = 0;
(unsigned)actorat[x][y] = 0;
actorat[x][y] = NULL;
}
}
......@@ -547,7 +545,7 @@ void SetupGameLevel()
//
// spawn actors
//
ScanInfoPlane ();
ScanInfoPlane();
//
// take out the ambush markers
......@@ -576,14 +574,7 @@ void SetupGameLevel()
}
}
//
// have the caching manager load and purge stuff to make sure all marks
// are in memory
//
CA_LoadAllSounds();
}
......@@ -740,8 +731,6 @@ void FinishDemoRecord()
MM_FreePtr(&demobuffer);
}
//==========================================================================
/*
==================
=
......@@ -806,8 +795,6 @@ void RecordDemo()
FinishDemoRecord ();
}
//==========================================================================
/*
==================
=
......
src/wl_inter.c
View file @ cb67569f
/* wl_inter.c */
#include "wl_def.h"
//==========================================================================
......@@ -23,36 +21,37 @@ void ClearSplitVWB()
//==========================================================================
#ifdef SPEAR
#ifndef SPEARDEMO
#if defined(SPEAR) && !defined(SPEARDEMO)
////////////////////////////////////////////////////////
//
// End of Spear of Destiny
//
////////////////////////////////////////////////////////
void EndScreen (int palette, int screen)
void EndScreen(int palette, int screen)
{
CA_CacheScreen (screen);
VW_UpdateScreen ();
CA_CacheGrChunk (palette);
VL_FadeIn(0,255,grsegs[palette],30);
CA_UnCacheGrChunk (palette);
IN_ClearKeysDown ();
IN_Ack ();
VW_FadeOut ();
VL_CacheScreen(screen);
VW_UpdateScreen();
CA_CacheGrChunk(palette);
VL_FadeIn(0, 255, grsegs[palette], 30);
CA_UnCacheGrChunk(palette);
IN_ClearKeysDown();
IN_Ack();
VW_FadeOut();
}
void EndSpear(void)
void EndSpear()
{
EndScreen (END1PALETTE, ENDSCREEN11PIC);
EndScreen(END1PALETTE, ENDSCREEN11PIC);
CA_CacheScreen (ENDSCREEN3PIC);
VW_UpdateScreen ();
CA_CacheGrChunk (END3PALETTE);
VL_FadeIn(0,255,grsegs[END3PALETTE],30);
CA_UnCacheGrChunk (END3PALETTE);
VL_CacheScreen(ENDSCREEN3PIC);
VW_UpdateScreen();
CA_CacheGrChunk(END3PALETTE);
VL_FadeIn(0, 255, grsegs[END3PALETTE], 30);
CA_UnCacheGrChunk(END3PALETTE);
fontnumber = 0;
fontcolor = 0xd0;
WindowX = 0;
......@@ -90,7 +89,6 @@ void EndSpear(void)
MainMenu[savegame].active = 0;
}
#endif
#endif
//==========================================================================
......@@ -116,7 +114,7 @@ void Victory()
#ifdef SPEAR
StartCPMusic (XTHEEND_MUS);
StartCPMusic(XTHEEND_MUS);
CA_CacheGrChunk(BJCOLLAPSE1PIC);
CA_CacheGrChunk(BJCOLLAPSE2PIC);
......
src/wl_main.c
View file @ cb67569f
/* wl_main.c */
#include "wl_def.h"
/*
......@@ -1214,7 +1212,7 @@ void DemoLoop()
CA_UnCacheGrChunk (TITLEPALETTE);
#else
CA_CacheScreen (TITLEPIC);
VL_CacheScreen(TITLEPIC);
VW_UpdateScreen ();
VW_FadeIn();
#endif
......@@ -1224,7 +1222,7 @@ void DemoLoop()
//
// credits page
//
CA_CacheScreen (CREDITSPIC);
VL_CacheScreen(CREDITSPIC);
VW_UpdateScreen();
VW_FadeIn ();
if (IN_UserInput(TickBase*10))
......
src/wl_menu.c
View file @ cb67569f
......@@ -9,7 +9,7 @@
//
// PRIVATE PROTOTYPES
//
void CP_ReadThis(void);
void CP_ReadThis();
#ifdef UPLOAD
#define STARTITEM readthis
......@@ -17,19 +17,8 @@ void CP_ReadThis(void);
#define STARTITEM newgame
#endif
char endStrings[9][80]=
static char endStrings[9][80]=
{
#ifndef SPEAR
{"Dost thou wish to\nleave with such hasty\nabandon?"},
{"Chickening out...\nalready?"},
{"Press N for more carnage.\nPress Y to be a weenie."},
{"So, you think you can\nquit this easily, huh?"},
{"Press N to save the world.\nPress Y to abandon it in\nits hour of need."},
{"Press N if you are brave.\nPress Y to cower in shame."},
{"Heroes, press N.\nWimps, press Y."},
{"You are at an intersection.\nA sign says, 'Press Y to quit.'\n>"},
{"For guns and glory, press N.\nFor work and worry, press Y."}
#else
ENDSTR1,
ENDSTR2,
ENDSTR3,
......@@ -39,7 +28,6 @@ char endStrings[9][80]=
ENDSTR7,
ENDSTR8,
ENDSTR9
#endif
};
CP_iteminfo
......@@ -155,14 +143,13 @@ CusMenu[]=
{1,"",0},
{0,"",0},
{1,"",0}
}
;
};
int color_hlite[] = { DEACTIVE, HIGHLIGHT, READHCOLOR, 0x67 };
int color_norml[] = { DEACTIVE, TEXTCOLOR, READCOLOR, 0x6b };
static int color_hlite[] = { DEACTIVE, HIGHLIGHT, READHCOLOR, 0x67 };
static int color_norml[] = { DEACTIVE, TEXTCOLOR, READCOLOR, 0x6b };
int EpisodeSelect[6]={1};
static int EpisodeSelect[6]={1};
int SaveGamesAvail[10],StartGame,SoundStatus=1,pickquick;
......@@ -328,8 +315,7 @@ void US_ControlPanel(byte scancode)
{
which=HandleMenu(&MainItems,&MainMenu[0],NULL);
#ifdef SPEAR
#ifndef SPEARDEMO
#if defined(SPEAR) && !defined(SPEARDEMO)
//
// EASTER EGG FOR SPEAR OF DESTINY!
//
......@@ -351,8 +337,8 @@ void US_ControlPanel(byte scancode)
VW_UpdateScreen();
CA_CacheGrChunk (IDGUYSPALETTE);
VL_FadeIn(0,255,grsegs[IDGUYSPALETTE],30);
CA_CacheGrChunk(IDGUYSPALETTE);
VL_FadeIn(0, 255, grsegs[IDGUYSPALETTE], 30);
CA_UnCacheGrChunk(IDGUYSPALETTE);
while (IN_KeyDown(sc_I) || IN_KeyDown(sc_D)) IN_CheckAck();
......@@ -369,7 +355,6 @@ void US_ControlPanel(byte scancode)
MenuFadeIn();
}
#endif
#endif
switch(which)
{
......@@ -463,7 +448,7 @@ void US_ControlPanel(byte scancode)
//
// DRAW MAIN MENU SCREEN
//
void DrawMainMenu(void)
void DrawMainMenu()
{
ClearMScreen();
......@@ -500,7 +485,7 @@ void DrawMainMenu(void)
// READ THIS!
//
////////////////////////////////////////////////////////////////////
void CP_ReadThis(void)
void CP_ReadThis()
{
StartCPMusic(CORNER_MUS);
HelpScreens();
......@@ -512,7 +497,7 @@ void CP_ReadThis(void)
// BOSS KEY
//
////////////////////////////////////////////////////////////////////
void BossKey(void)
void BossKey()
{
}
#endif
......@@ -709,7 +694,7 @@ int CP_CheckQuick(unsigned scancode)
// END THE CURRENT GAME
//
////////////////////////////////////////////////////////////////////
int CP_EndGame(void)
int CP_EndGame()
{
if (!Confirm(ENDGAMESTR))
return 0;
......@@ -730,19 +715,19 @@ int CP_EndGame(void)
// VIEW THE HIGH SCORES
//
////////////////////////////////////////////////////////////////////
void CP_ViewScores(void)
void CP_ViewScores()
{
fontnumber=0;
#ifdef SPEAR
UnCacheLump (OPTIONS_LUMP_START,OPTIONS_LUMP_END);
StartCPMusic (XAWARD_MUS);
UnCacheLump(OPTIONS_LUMP_START,OPTIONS_LUMP_END);
StartCPMusic(XAWARD_MUS);
#else
StartCPMusic (ROSTER_MUS);
StartCPMusic(ROSTER_MUS);
#endif
DrawHighScores ();
VW_UpdateScreen ();
DrawHighScores();
VW_UpdateScreen();
MenuFadeIn();
fontnumber=1;
......@@ -763,7 +748,7 @@ void CP_ViewScores(void)
// START A NEW GAME
//
////////////////////////////////////////////////////////////////////
void CP_NewGame(void)
void CP_NewGame()
{
int which,episode;
......@@ -1460,7 +1445,7 @@ int CP_SaveGame(int quick)
// CALIBRATE JOYSTICK
//
////////////////////////////////////////////////////////////////////
int CalibrateJoystick(void)
int CalibrateJoystick()
{
#define CALX 85
#define CALY 40
......@@ -1547,7 +1532,7 @@ int CalibrateJoystick(void)
// DEFINE CONTROLS
//
////////////////////////////////////////////////////////////////////
void CP_Control(void)
void CP_Control()
{
enum {MOUSEENABLE,JOYENABLE,USEPORT2,PADENABLE,MOUSESENS,CUSTOMIZE};
int which;
......@@ -1613,7 +1598,7 @@ void CP_Control(void)
//
// DRAW MOUSE SENSITIVITY SCREEN
//
void DrawMouseSens(void)
void DrawMouseSens()
{
ClearMScreen();
VWB_DrawPic(112,184,C_MOUSELBACKPIC);
......@@ -1646,7 +1631,7 @@ void DrawMouseSens(void)
//
// ADJUST MOUSE SENSITIVITY
//
void MouseSensitivity(void)
void MouseSensitivity()
{
ControlInfo ci;
int exit=0,oldMA;
......
src/wl_play.c
View file @ cb67569f
/* wl_play.c */
#include "wl_def.h"
/*
......
src/wl_state.c
View file @ cb67569f
/* wl_state.c */
#include "wl_def.h"
/*
......@@ -27,19 +25,7 @@ static dirtype diagonal[9][9] =
{nodir,nodir,nodir,nodir,nodir,nodir,nodir,nodir,nodir}
};
void SpawnNewObj (unsigned tilex, unsigned tiley, statetype *state);
void NewState (objtype *ob, statetype *state);
boolean TryWalk (objtype *ob);
void MoveObj (objtype *ob, long move);
void KillActor (objtype *ob);
void DamageActor (objtype *ob, unsigned damage);
boolean CheckLine (objtype *ob);
void FirstSighting (objtype *ob);
boolean CheckSight (objtype *ob);
//===========================================================================
......@@ -56,9 +42,10 @@ boolean CheckSight (objtype *ob);
===================
*/
void SpawnNewObj (unsigned tilex, unsigned tiley, statetype *state)
void SpawnNewObj(unsigned tilex, unsigned tiley, statetype *state)
{
GetNewActor ();
GetNewActor();
new->state = state;
if (state->tictime)
new->ticcount = US_RndT () % state->tictime;
......@@ -76,8 +63,6 @@ void SpawnNewObj (unsigned tilex, unsigned tiley, statetype *state)
*(mapsegs[0] + farmapylookup[new->tiley]+new->tilex) - AREATILE;
}
/*
===================
=
......@@ -88,14 +73,12 @@ void SpawnNewObj (unsigned tilex, unsigned tiley, statetype *state)
===================
*/
void NewState (objtype *ob, statetype *state)
void NewState(objtype *ob, statetype *state)
{
ob->state = state;
ob->ticcount = state->tictime;
}
/*
=============================================================================
......@@ -156,10 +139,10 @@ void NewState (objtype *ob, statetype *state)
}
boolean TryWalk (objtype *ob)
boolean TryWalk(objtype *ob)
{
int doornum;
unsigned temp;
int doornum;
unsigned temp;
doornum = -1;
......@@ -312,8 +295,6 @@ boolean TryWalk (objtype *ob)
return true;
}
/*
==================================
=
......@@ -442,7 +423,6 @@ void SelectDodgeDir(objtype *ob)
ob->dir = nodir;
}
/*
============================
=
......@@ -552,7 +532,6 @@ void SelectChaseDir(objtype *ob)
ob->dir = nodir; // can't move
}
/*
============================
=
......@@ -621,7 +600,6 @@ void SelectRunDir (objtype *ob)
ob->dir = nodir; // can't move
}
/*
=================
=
......
src/wl_text.c
View file @ cb67569f
/* wl_text.c */
#include "wl_def.h"
#ifndef SPEAR
/*
=============================================================================
......@@ -24,8 +24,6 @@ TEXT FORMATTING COMMANDS
=============================================================================
*/
#ifndef SPEAR
#define BACKCOLOR 0x11
#define WORDLIMIT 80
......@@ -151,7 +149,7 @@ void ParseTimedCommand()
=====================
*/
void TimedPicCommand (void)
void TimedPicCommand()
{
ParseTimedCommand ();
......@@ -181,7 +179,7 @@ void TimedPicCommand (void)
=====================
*/
void HandleCommand (void)
void HandleCommand()
{
int i,margin,top,bottom;
int picwidth,picheight,picmid;
......@@ -284,7 +282,7 @@ void HandleCommand (void)
=====================
*/
void NewLine (void)
void NewLine()
{
char ch;
......@@ -324,7 +322,7 @@ void NewLine (void)
=====================
*/
void HandleCtrls (void)
void HandleCtrls()
{
char ch;
......@@ -406,7 +404,7 @@ void HandleWord()
=====================
*/
void PageLayout (boolean shownumber)
void PageLayout(boolean shownumber)
{
int i,oldfontcolor;
char ch;
......@@ -418,11 +416,11 @@ void PageLayout (boolean shownumber)
//
// clear the screen
//
VW_Bar (0,0,320,200,BACKCOLOR);
VWB_DrawPic (0,0,H_TOPWINDOWPIC);
VWB_DrawPic (0,8,H_LEFTWINDOWPIC);
VWB_DrawPic (312,8,H_RIGHTWINDOWPIC);
VWB_DrawPic (8,176,H_BOTTOMINFOPIC);
VW_Bar(0,0,320,200,BACKCOLOR);
VWB_DrawPic(0,0,H_TOPWINDOWPIC);
VWB_DrawPic(0,8,H_LEFTWINDOWPIC);
VWB_DrawPic(312,8,H_RIGHTWINDOWPIC);
VWB_DrawPic(8,176,H_BOTTOMINFOPIC);
for (i=0;i<TEXTROWS;i++)
......@@ -503,7 +501,7 @@ void PageLayout (boolean shownumber)
=====================
*/
void BackPage (void)
void BackPage()
{
pagenum--;
do
......@@ -528,7 +526,7 @@ void BackPage (void)
=
=====================
*/
void CacheLayoutGraphics (void)
void CacheLayoutGraphics()
{
char *bombpoint, *textstart;
char ch;
......@@ -652,9 +650,7 @@ void ShowArticle(char *article)
//===========================================================================
int endextern = T_ENDART1;
#ifndef SPEAR
int helpextern = T_HELPART;
#endif
/*
=================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment