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

Fix "loading" icon for all video modes

Browse source 
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 129
This commit is contained in:
Simon Howard 2005-09-24 23:41:07 +00:00
parent 84d4d10702
commit 5ed6a965e3
2 changed files with 151 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -3,6 +3,7 @@
Fixes for non-x86 architectures
Fix uac_dead.wad (platform drop on e1m8 should occur when all
bosses die, not just barons)
Fix "loading" icon to work for all graphics modes
0.0.3 (2005-09-17):
Mouse acceleration code to emulate the behaviour of old

273
src/i_video.c
View file

@ -1,7 +1,7 @@
// Emacs style mode select -*- C++ -*-
//-----------------------------------------------------------------------------
//
// $Id: i_video.c 126 2005-09-24 22:04:03Z fraggle $
// $Id: i_video.c 129 2005-09-24 23:41:07Z fraggle $
//
// Copyright(C) 1993-1996 Id Software, Inc.
// Copyright(C) 2005 Simon Howard
@ -22,6 +22,9 @@
// 02111-1307, USA.
//
// $Log$
// Revision 1.29 2005/09/24 23:41:07 fraggle
// Fix "loading" icon for all video modes
//
// Revision 1.28 2005/09/24 22:04:03 fraggle
// Add application icon to running program
//
@ -124,7 +127,7 @@
//-----------------------------------------------------------------------------
static const char
rcsid[] = "$Id: i_video.c 126 2005-09-24 22:04:03Z fraggle $";
rcsid[] = "$Id: i_video.c 129 2005-09-24 23:41:07Z fraggle $";
#include <SDL.h>
#include <ctype.h>
@ -242,57 +245,6 @@ static void UpdateFocus(void)
screenvisible = (state & SDL_APPACTIVE) != 0;
}
void I_BeginRead(void)
{
int y;
if (disk_image == NULL)
return;
// save background and copy the disk image in
for (y=0; y<disk_image_h; ++y)
{
byte *screenloc =
screens[0]
+ (SCREENHEIGHT - 1 - disk_image_h + y) * SCREENWIDTH
+ (SCREENWIDTH - 1 - disk_image_w);
memcpy(saved_background + y * disk_image_w,
screenloc,
disk_image_w);
memcpy(screenloc, disk_image + y * disk_image_w, disk_image_w);
}
SDL_UpdateRect(screen,
screen->w - disk_image_w, screen->h - disk_image_h,
disk_image_w, disk_image_h);
}
void I_EndRead(void)
{
int y;
if (disk_image == NULL)
return;
// save background and copy the disk image in
for (y=0; y<disk_image_h; ++y)
{
byte *screenloc =
screens[0]
+ (SCREENHEIGHT - 1 - disk_image_h + y) * SCREENWIDTH
+ (SCREENWIDTH - 1 - disk_image_w);
memcpy(screenloc, saved_background + y * disk_image_w, disk_image_w);
}
SDL_UpdateRect(screen,
screen->w - disk_image_w, screen->h - disk_image_h,
disk_image_w, disk_image_h);
}
static void LoadDiskImage(void)
{
patch_t *disk;
@ -548,6 +500,150 @@ void UpdateGrab(void)
}
// Update a small portion of the screen
static void UpdateArea(int x1, int y1, int x2, int y2, boolean always_update)
{
int w = x2 - x1;
int h = y2 - y1;
if (palette_to_set && !always_update)
{
// If we have a palette to set, the only way to update is to
// update the entire screen
// If we are only updating part of the screen (disk icon), we
// cannot update the screen
return;
}
if (screenmultiply == 1 && !native_surface)
{
byte *bufp, *screenp;
int y;
int pitch;
SDL_LockSurface(screen);
pitch = screen->pitch;
bufp = screens[0] + y1 * SCREENWIDTH + x1;
screenp = (byte *) screen->pixels + y1 * pitch + x1;
for (y=y1; y<y2; ++y)
{
memcpy(screenp, bufp, w);
screenp += pitch;
bufp += SCREENWIDTH;
}
SDL_UnlockSurface(screen);
}
// scales the screen size before blitting it
if (screenmultiply == 2)
{
byte *bufp, *screenp, *screenp2;
int x, y;
int pitch;
SDL_LockSurface(screen);
pitch = screen->pitch * 2;
bufp = screens[0] + y1 * SCREENWIDTH + x1;
screenp = (byte *) screen->pixels + (y1 * pitch) + (x1 * 2);
screenp2 = screenp + screen->pitch;
for (y=y1; y<y2; ++y)
{
byte *sp, *sp2, *bp;
sp = screenp;
sp2 = screenp2;
bp = bufp;
for (x=x1; x<x2; ++x)
{
*sp2++ = *bp;
*sp2++ = *bp;
*sp++ = *bp;
*sp++ = *bp++;
}
screenp += pitch;
screenp2 += pitch;
bufp += SCREENWIDTH;
}
SDL_UnlockSurface(screen);
}
// draw to screen
if (palette_to_set)
{
SDL_SetColors(screen, palette, 0, 256);
palette_to_set = 0;
}
else
{
SDL_UpdateRect(screen,
x1 * screenmultiply,
y1 * screenmultiply,
(x2-x1) * screenmultiply,
(y2-y1) * screenmultiply);
}
}
void I_BeginRead(void)
{
int y;
if (disk_image == NULL)
return;
// save background and copy the disk image in
for (y=0; y<disk_image_h; ++y)
{
byte *screenloc =
screens[0]
+ (SCREENHEIGHT - 1 - disk_image_h + y) * SCREENWIDTH
+ (SCREENWIDTH - 1 - disk_image_w);
memcpy(saved_background + y * disk_image_w,
screenloc,
disk_image_w);
memcpy(screenloc, disk_image + y * disk_image_w, disk_image_w);
}
UpdateArea(SCREENWIDTH - disk_image_w, SCREENHEIGHT - disk_image_h,
SCREENWIDTH, SCREENHEIGHT,
false);
}
void I_EndRead(void)
{
int y;
if (disk_image == NULL)
return;
// save background and copy the disk image in
for (y=0; y<disk_image_h; ++y)
{
byte *screenloc =
screens[0]
+ (SCREENHEIGHT - 1 - disk_image_h + y) * SCREENWIDTH
+ (SCREENWIDTH - 1 - disk_image_w);
memcpy(screenloc, saved_background + y * disk_image_w, disk_image_w);
}
UpdateArea(SCREENWIDTH - disk_image_w, SCREENHEIGHT - disk_image_h,
SCREENWIDTH, SCREENHEIGHT,
false);
}
//
// I_FinishUpdate
//
@ -583,76 +679,7 @@ void I_FinishUpdate (void)
}
if (screenmultiply == 1 && !native_surface)
{
byte *bufp, *screenp;
int y;
int pitch;
SDL_LockSurface(screen);
bufp = screens[0];
screenp = (byte *) screen->pixels;
pitch = screen->pitch;
for (y=0; y<SCREENHEIGHT; ++y)
{
memcpy(screenp, bufp, SCREENWIDTH);
screenp += pitch;
bufp += SCREENWIDTH;
}
SDL_UnlockSurface(screen);
}
// scales the screen size before blitting it
if (screenmultiply == 2)
{
byte *bufp, *screenp, *screenp2;
int x, y;
int pitch;
SDL_LockSurface(screen);
bufp = screens[0];
screenp = (byte *) screen->pixels;
screenp2 = ((byte *) screen->pixels) + screen->pitch;
pitch = screen->pitch * 2;
for (y=0; y<SCREENHEIGHT; ++y)
{
byte *sp, *sp2, *bp;
sp = screenp;
sp2 = screenp2;
bp = bufp;
for (x=0; x<SCREENWIDTH; ++x)
{
*sp2++ = *bp;
*sp2++ = *bp;
*sp++ = *bp;
*sp++ = *bp++;
}
screenp += pitch;
screenp2 += pitch;
bufp += SCREENWIDTH;
}
SDL_UnlockSurface(screen);
}
// draw to screen
if (palette_to_set)
{
SDL_SetColors(screen, palette, 0, 256);
palette_to_set = 0;
}
else
{
SDL_Flip(screen);
}
UpdateArea(0, 0, SCREENWIDTH, SCREENHEIGHT, true);
}