jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from trunk.

Browse source 
Subversion-branch: /branches/v2-branch
Subversion-revision: 2553
This commit is contained in:
Simon Howard 2012-12-24 00:03:41 +00:00
commit f1934e990d
13 changed files with 16 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
pkg/osx/disk/dir.DS_Store
View file

Binary file not shown.

2
src/doom/am_map.c
View file

@ -604,7 +604,6 @@ AM_Responder
{
int rc;
static int cheatstate=0;
static int bigstate=0;
static char buffer[20];
int key;
@ -701,7 +700,6 @@ AM_Responder
}
else
{
cheatstate=0;
rc = false;
}

12
src/doom/g_game.c
View file

@ -1010,16 +1010,10 @@ void G_Ticker (void)
// Called by the game initialization functions.
//
void G_InitPlayer (int player)
{
player_t* p;
// set up the saved info
p = &players[player];
// clear everything else to defaults
{
// clear everything else to defaults
G_PlayerReborn (player);
}
}

2
src/doom/hu_lib.c
View file

@ -147,7 +147,6 @@ void HUlib_eraseTextLine(hu_textline_t* l)
int lh;
int y;
int yoffset;
static boolean lastautomapactive = true;
// Only erases when NOT in automap and the screen is reduced,
// and the text must either need updating or refreshing
@ -170,7 +169,6 @@ void HUlib_eraseTextLine(hu_textline_t* l)
}
}
lastautomapactive = automapactive;
if (l->needsupdate) l->needsupdate--;
}

5
src/doom/m_menu.c
View file

@ -510,10 +510,9 @@ menu_t SaveDef =
void M_ReadSaveStrings(void)
{
FILE *handle;
int count;
int i;
char name[256];
for (i = 0;i < load_end;i++)
{
strcpy(name, P_SaveGameFile(i));
@ -525,7 +524,7 @@ void M_ReadSaveStrings(void)
LoadMenu[i].status = 0;
continue;
}
count = fread(&savegamestrings[i], 1, SAVESTRINGSIZE, handle);
fread(&savegamestrings[i], 1, SAVESTRINGSIZE, handle);
fclose(handle);
LoadMenu[i].status = 1;
}

2
src/doom/p_doors.c
View file

@ -347,7 +347,6 @@ EV_VerticalDoor
mobj_t* thing )
{
player_t* player;
int secnum;
sector_t* sec;
vldoor_t* door;
int side;
@ -402,7 +401,6 @@ EV_VerticalDoor
// if the sector has an active thinker, use it
sec = sides[ line->sidenum[side^1]] .sector;
secnum = sec-sectors;
if (sec->specialdata)
{

5
src/doom/p_enemy.c
View file

@ -504,12 +504,9 @@ P_LookForPlayers
int c;
int stop;
player_t* player;
sector_t* sector;
angle_t an;
fixed_t dist;
sector = actor->subsector->sector;
c = 0;
stop = (actor->lastlook-1)&3;

5
src/doom/p_spec.c
View file

@ -1383,11 +1383,6 @@ void P_SpawnSpecials (void)
{
sector_t* sector;
int i;
int episode;
episode = 1;
if (W_CheckNumForName(DEH_String("texture2")) >= 0)
episode = 2;
// See if -TIMER was specified.

10
src/doom/r_data.c
View file

@ -199,10 +199,7 @@ R_DrawColumnInCache
int count;
int position;
byte* source;
byte* dest;
dest = (byte *)cache + 3;
while (patch->topdelta != 0xff)
{
source = (byte *)patch + 3;
@ -694,12 +691,11 @@ void R_InitSpriteLumps (void)
//
void R_InitColormaps (void)
{
int lump, length;
int lump;
// Load in the light tables,
// 256 byte align tables.
lump = W_GetNumForName(DEH_String("COLORMAP"));
length = W_LumpLength (lump);
colormaps = W_CacheLumpNum(lump, PU_STATIC);
}

6
src/doom/s_sound.c
View file

@ -404,7 +404,6 @@ void S_StartSound(void *origin_p, int sfx_id)
mobj_t *origin;
int rc;
int sep;
int priority;
int cnum;
int volume;
@ -422,7 +421,6 @@ void S_StartSound(void *origin_p, int sfx_id)
// Initialize sound parameters
if (sfx->link)
{
priority = sfx->priority;
volume += sfx->volume;
if (volume < 1)
@ -434,10 +432,6 @@ void S_StartSound(void *origin_p, int sfx_id)
{
volume = snd_SfxVolume;
}
}
else
{
priority = NORM_PRIORITY;
}

4
src/doom/wi_stuff.c
View file

@ -1013,10 +1013,6 @@ void WI_drawDeathmatchStats(void)
int x;
int y;
int w;
int lh; // line height
lh = WI_SPACINGY;
WI_slamBackground();

5
src/i_video.c
View file

@ -1342,7 +1342,7 @@ static boolean AutoAdjustFullscreen(void)
SDL_Rect **modes;
SDL_Rect *best_mode;
screen_mode_t *screen_mode;
int target_pixels, diff, best_diff;
int diff, best_diff;
int i;
modes = SDL_ListModes(NULL, SDL_FULLSCREEN);
@ -1359,9 +1359,8 @@ static boolean AutoAdjustFullscreen(void)
best_mode = NULL;
best_diff = INT_MAX;
target_pixels = screen_width * screen_height;
for (i=0; modes[i] != NULL; ++i)
for (i=0; modes[i] != NULL; ++i)
{
//printf("%ix%i?\n", modes[i]->w, modes[i]->h);

10
textscreen/txt_largefont.h
View file

@ -601,11 +601,11 @@ static uint8_t large_font_data[] =
// 57:
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x3f, 0xf0, 0x7f, 0xf8, 0xf0, 0x3c, 0xe0, 0x1c,
0xe0, 0x1c, 0xe0, 0x1c, 0xe0, 0x1c, 0xf0, 0x3c,
0x7f, 0xfc, 0x3f, 0xfc, 0x00, 0x1c, 0x00, 0x1c,
0x00, 0x1c, 0x00, 0x3c, 0x00, 0x38, 0x00, 0x78,
0x00, 0xf0, 0x03, 0xe0, 0x3f, 0xc0, 0x3f, 0x00,
0x3f, 0xf0, 0x7f, 0xf8, 0xf0, 0x3c, 0xf0, 0x3c,
0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
0x7f, 0xfc, 0x3f, 0xfc, 0x00, 0x3c, 0x00, 0x3c,
0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
0x00, 0x78, 0x00, 0xf0, 0x3f, 0xe0, 0x3f, 0xc0,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,